diff --git a/Configure b/Configure
new file mode 100755
index 0000000000..6c97c2fd08
--- /dev/null
+++ b/Configure
@@ -0,0 +1,4092 @@
+#! /bin/sh
+#
+# If these # comments don't work, trim them. Don't worry about any other
+# shell scripts, Configure will trim # comments from them for you.
+#
+# (If you are trying to port this package to a machine without sh,
+# I would suggest you have a look at the prototypical config_h.SH file
+# and edit it to reflect your system. Some packages may include samples
+# of config.h for certain machines, so you might look for one of those.)
+#
+# Yes, you may rip this off to use in other distribution packages. This
+# script belongs to the public domain and cannot be copyrighted.
+#
+# (Note: this Configure script was generated automatically. Rather than
+# working with this copy of Configure, you may wish to get metaconfig.
+# The dist-3.0 package (which contains metaconfig) was posted in
+# comp.sources.misc and is available on CPAN under authors/id/RAM so
+# you may fetch it yourself from your nearest archive site.)
+#
+
+# $Id: Configure,v 1.11 2001/07/03 13:25:59 sadilov Exp $
+#
+# Generated on Tue Jul  3 15:21:54 CEST 2001 [metaconfig 3.0 PL70]
+
+cat >/tmp/c1$$ <<EOF
+WARNING!!!!!
+
+SCO csh still thinks true is false!  /bin/csh needs to be updated.
+EOF
+cat >/tmp/c2$$ <<EOF
+
+You didn't run Configure with sh!
+I'll attempt to run sh for you...
+EOF
+
+true || cat /tmp/c1$$ /tmp/c2$$
+true || exec sh $0 $argv:q
+
+(exit $?0) || cat /tmp/c2$$
+(exit $?0) || exec sh $0 $argv:q
+rm -f /tmp/c1$$ /tmp/c2$$
+
+: compute my invocation name
+me=$0
+case "$0" in
+*/*)
+	me=`echo $0 | sed -e 's!.*/\(.*\)!\1!' 2>/dev/null`
+	test "$me" || me=$0
+	;;
+esac
+
+: Proper PATH separator
+p_=:
+: On OS/2 this directory should exist if this is not floppy only system :-]
+if test -d c:/.; then
+	p_=\;
+	PATH=`cmd /c "echo %PATH%" | tr '\\\\' / `
+	OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'`
+fi
+
+: Proper PATH setting
+paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
+paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
+paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
+paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
+paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
+paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin"
+paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
+paths="$paths /sbin /usr/sbin /usr/libexec"
+
+for p in $paths
+do
+	case "$p_$PATH$p_" in
+	*$p_$p$p_*) ;;
+	*) test -d $p && PATH=$PATH$p_$p ;;
+	esac
+done
+
+PATH=.$p_$PATH
+export PATH
+
+: shall we be using ksh?
+inksh=''
+needksh=''
+avoidksh=''
+newsh=/bin/ksh
+changesh=''
+if (PATH=.; alias -x) >/dev/null 2>&1; then
+		inksh=true
+fi
+if test -f /hp-ux -a -f /bin/ksh; then
+	needksh='to avoid sh bug in "here document" expansion'
+fi
+if test -d /usr/lpp -a -f /usr/bin/bsh -a -f /usr/bin/uname; then
+	if test X`/usr/bin/uname -v` = X4; then
+		avoidksh="to avoid AIX 4's /bin/sh"
+		newsh=/usr/bin/bsh
+	fi
+fi
+case "$inksh/$needksh" in
+/[a-z]*)
+		unset ENV
+		changesh=true
+		reason="$needksh"
+	;;
+esac
+case "$inksh/$avoidksh" in
+true/[a-z]*)
+	changesh=true
+	reason="$avoidksh"
+	;;
+esac
+case "$inksh/$needksh-$avoidksh-" in
+true/--)
+		cat <<EOM
+(I see you are using the Korn shell.  In case of problems
+ try the Bourne shell instead.)
+EOM
+	;;
+esac
+case "$changesh" in
+true)
+	echo "(Feeding myself to $newsh $reason.)"
+	case "$0" in
+	Configure|*/Configure) exec $newsh $0 "$@";;
+	*) exec $newsh Configure "$@";;
+	esac
+	;;
+esac
+
+: Configure runs within the UU subdirectory
+test -d UU || mkdir UU
+unset CDPATH
+cd UU && rm -f ./*
+
+eunicefix=''
+Mcc=''
+ar=''
+awk=''
+bash=''
+bison=''
+byacc=''
+cat=''
+chgrp=''
+chmod=''
+chown=''
+comm=''
+compress=''
+cp=''
+cpio=''
+cpp=''
+csh=''
+date=''
+echo=''
+egrep=''
+emacs=''
+expr=''
+find=''
+flex=''
+gcc=''
+grep=''
+gzip=''
+inews=''
+ksh=''
+less=''
+line=''
+lint=''
+ln=''
+lp=''
+lpr=''
+ls=''
+mail=''
+mailx=''
+make=''
+mkdir=''
+more=''
+mv=''
+nroff=''
+perl=''
+pg=''
+pmake=''
+pr=''
+rm=''
+rmail=''
+sed=''
+sendmail=''
+shar=''
+sleep=''
+smail=''
+sort=''
+submit=''
+tail=''
+tar=''
+tbl=''
+test=''
+touch=''
+tr=''
+troff=''
+uname=''
+uniq=''
+uuname=''
+vi=''
+zcat=''
+zip=''
+g4compiler=''
+g4osname=''
+g4system=''
+hint=''
+myuname=''
+osname=''
+osvers=''
+Author=''
+Date=''
+Header=''
+Id=''
+Locker=''
+Log=''
+RCSfile=''
+Revision=''
+Source=''
+State=''
+cf_by=''
+cf_time=''
+contains=''
+d_portable=''
+g4clhep_base_dir=''
+g4clhep_include_dir=''
+g4clhep_lib=''
+g4clhep_lib_dir=''
+g4debug=''
+g4data=''
+g4ledata=''
+g4levelgammadata=''
+g4neutronhpcrosssections=''
+g4radioactivedata=''
+g4base=''
+g4conf=''
+g4include=''
+g4install=''
+g4workdir=''
+g4bin=''
+g4lib=''
+g4tmp=''
+g4global=''
+g4granular=''
+g4lib_use_granular=''
+g4ospace_base_dir=''
+g4use_ospace=''
+g4use_hepodbms=''
+g4lib_build_shared=''
+g4lib_build_static=''
+g4lib_use_shared=''
+g4lib_use_static=''
+g4ui_build_gag_session=''
+g4ui_build_terminal_session=''
+g4ui_build_win32_session=''
+g4ui_build_xaw_session=''
+g4ui_build_xm_session=''
+g4ui_use_gag=''
+g4ui_use_tcsh=''
+g4ui_use_terminal=''
+g4ui_use_win32=''
+g4ui_use_xaw=''
+g4ui_use_xm=''
+g4vis_build_asciitree_driver=''
+g4vis_build_dawn_driver=''
+g4vis_build_dawnfile_driver=''
+g4vis_build_oix_driver=''
+g4vis_build_opacs_driver=''
+g4vis_build_openglx_driver=''
+g4vis_build_openglxm_driver=''
+g4vis_build_raytracer_driver=''
+g4vis_build_vrml_driver=''
+g4vis_build_vrmlfile_driver=''
+g4vis_use_asciitree=''
+g4vis_use_dawn=''
+g4vis_use_dawnfile=''
+g4vis_use_oix=''
+g4vis_use_opacs=''
+g4vis_use_openglx=''
+g4vis_use_openglxm=''
+g4vis_use_raytracer=''
+g4vis_use_vrml=''
+g4vis_use_vrmlfile=''
+g4wanalysis_build=''
+g4wanalysis_build_jas=''
+g4wanalysis_build_lab=''
+g4wanalysis_build_lizard=''
+g4wanalysis_use=''
+g4wanalysis_use_jas=''
+g4wanalysis_use_lab=''
+g4wanalysis_use_lizard=''
+lns=''
+c=''
+n=''
+package=''
+spackage=''
+sh=''
+sharpbang=''
+shsharp=''
+spitshell=''
+src=''
+startsh=''
+CONFIG=''
+
+define='define'
+undef='undef'
+smallmach='pdp11 i8086 z8000 i80286 iAPX286'
+rmlist=''
+
+: We must find out about Eunice early
+eunicefix=':'
+if test -f /etc/unixtovms; then
+	eunicefix=/etc/unixtovms
+fi
+if test -f /etc/unixtovms.exe; then
+	eunicefix=/etc/unixtovms.exe
+fi
+
+
+: Find the basic shell for Bourne shell scripts
+case "$sh" in
+'')
+	case "$SYSTYPE" in
+	*bsd*|sys5*) xxx="/$SYSTYPE/bin/sh";;
+	*) xxx='/bin/sh';;
+	esac
+	if test -f "$xxx"; then
+		sh="$xxx"
+	else
+		: Build up a list and do a single loop so we can 'break' out.
+		pth=`echo $PATH | sed -e "s/$p_/ /g"`
+		for xxx in sh bash ksh pdksh ash; do
+			for p in $pth; do
+				try="$try ${p}/${xxx}"
+			done
+		done
+		for xxx in $try; do
+			if test -f "$xxx"; then
+				sh="$xxx";
+				break
+			elif test -f "$xxx.exe"; then
+				sh="$xxx";
+				break
+			fi
+		done
+	fi
+	;;
+esac
+
+case "$sh" in
+'')	cat <<EOM >&2
+$me:  Fatal Error:  I can't find a Bourne Shell anywhere.  
+
+Usually it's in /bin/sh.
+Please contact Serguei.Sadilov@cern.ch and 
+we'll try to straighten this all out.
+EOM
+	exit 1
+	;;
+esac
+
+: see if sh knows # comments
+if `$sh -c '#' >/dev/null 2>&1`; then
+	shsharp=true
+	spitshell=cat
+	xcat=/bin/cat
+	test -f $xcat || xcat=/usr/bin/cat
+	echo "#!$xcat" >try
+	$eunicefix try
+	chmod +x try
+	./try > today
+	if test -s today; then
+		sharpbang='#!'
+	else
+		echo "#! $xcat" > try
+		$eunicefix try
+		chmod +x try
+		./try > today
+		if test -s today; then
+			sharpbang='#! '
+		else
+			sharpbang=': use '
+		fi
+	fi
+else
+	echo " "
+	echo "Your $sh doesn't grok # comments--I will strip them later on."
+	shsharp=false
+	cd ..
+	echo "exec grep -v '^[ 	]*#'" >spitshell
+	chmod +x spitshell
+	$eunicefix spitshell
+	spitshell=`pwd`/spitshell
+	cd UU
+	echo "I presume that if # doesn't work, #! won't work either!"
+	sharpbang=': use '
+fi
+rm -f try today
+
+: figure out how to guarantee sh startup
+case "$startsh" in
+'') startsh=${sharpbang}${sh} ;;
+*)
+esac
+cat >try <<EOSS
+$startsh
+set abc
+test "$?abc" != 1
+EOSS
+
+chmod +x try
+$eunicefix try
+if ./try; then
+	: echo "Yup, it does."
+else
+	echo "Hmm... '$startsh' does not guarantee sh startup..."
+	echo "You may have to fix up the shell scripts to make sure $sh runs them."
+fi
+rm -f try
+
+: produce awk script to parse command line options
+cat >options.awk <<'EOF'
+BEGIN {
+	optstr = "dD:eEf:hKOrsSU:V";	# getopt-style specification
+
+	len = length(optstr);
+	for (i = 1; i <= len; i++) {
+		c = substr(optstr, i, 1);
+		if (i < len) a = substr(optstr, i + 1, 1); else a = "";
+		if (a == ":") {
+			arg[c] = 1;
+			i++;
+		}
+		opt[c] = 1;
+	}
+}
+{
+	expect = 0;
+	str = $0;
+	if (substr(str, 1, 1) != "-") {
+		printf("'%s'\n", str);
+		next;
+	}
+	len = length($0);
+	for (i = 2; i <= len; i++) {
+		c = substr(str, i, 1);
+		if (!opt[c]) {
+			printf("-%s\n", substr(str, i));
+			next;
+		}
+		printf("-%s\n", c);
+		if (arg[c]) {
+			if (i < len)
+				printf("'%s'\n", substr(str, i + 1));
+			else
+				expect = 1;
+			next;
+		}
+	}
+}
+END {
+	if (expect)
+		print "?";
+}
+EOF
+
+: process the command line options
+set X `for arg in "$@"; do echo "X$arg"; done |
+	sed -e s/X// | awk -f options.awk`
+eval "set $*"
+shift
+rm -f options.awk
+
+: set up default values
+fastread=''
+reuseval=false
+config_sh=''
+alldone=''
+error=''
+silent=''
+extractsh=''
+override=''
+knowitall=''
+rm -f optdef.sh
+cat >optdef.sh <<EOS
+$startsh
+EOS
+
+
+: option parsing
+while test $# -gt 0; do
+	case "$1" in
+	-d) shift; fastread=yes;;
+	-e) shift; alldone=cont;;
+	-install) shift; install=yes;;
+	-f)
+		shift
+		cd ..
+		if test -r "$1"; then
+			config_sh="$1"
+		else
+			echo "$me: cannot read config file $1." >&2
+			error=true
+		fi
+		cd UU
+		shift;;
+	-h) shift; error=true;;
+	-r) shift; reuseval=true;;
+	-s) shift; silent=true; realsilent=true;;
+	-E) shift; alldone=exit;;
+	-K) shift; knowitall=true;;
+	-O) shift; override=true;;
+	-S) shift; silent=true; extractsh=true;;
+	-D)
+		shift
+		case "$1" in
+		*=)
+			echo "$me: use '-U symbol=', not '-D symbol='." >&2
+			echo "$me: ignoring -D $1" >&2
+			;;
+		*=*) echo "$1" | \
+				sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> optdef.sh;;
+		*) echo "$1='define'" >> optdef.sh;;
+		esac
+		shift
+		;;
+	-U)
+		shift
+		case "$1" in
+		*=) echo "$1" >> optdef.sh;;
+		*=*)
+			echo "$me: use '-D symbol=val', not '-U symbol=val'." >&2
+			echo "$me: ignoring -U $1" >&2
+			;;
+		*) echo "$1='undef'" >> optdef.sh;;
+		esac
+		shift
+		;;
+	-V) echo "$me generated by metaconfig 3.0 PL70." >&2
+		exit 0;;
+	--) break;;
+	-*) echo "$me: unknown option $1" >&2; shift; error=true;;
+	*) break;;
+	esac
+done
+
+case "$error" in
+true)
+	cat >&2 <<EOM
+Usage: $me [-dehrsEKOSV] [-install] [-f config.sh] [-D symbol] [-D symbol=value]
+                 [-U symbol] [-U symbol=]
+  -d : use defaults for all answers.
+  -e : go on without questioning past the production of config.sh.
+  -install : start configuration AND installation of Geant4 libraries. 
+  -f : specify an alternate default configuration file.
+  -h : print this help message and exit (with an error status).
+  -r : reuse C symbols value if possible (skips costly nm extraction).
+  -s : silent mode, only echoes questions and essential information.
+  -D : define symbol to have some value:
+         -D symbol         symbol gets the value 'define'
+         -D symbol=value   symbol gets the value 'value'
+  -E : stop at the end of questions, after having produced config.sh.
+  -K : do not use unless you know what you are doing.
+  -O : let -D and -U override definitions from loaded configuration file.
+  -S : perform variable substitutions on all .SH files (can mix with -f)
+  -U : undefine symbol:
+         -U symbol    symbol gets the value 'undef'
+         -U symbol=   symbol gets completely empty
+  -V : print version number and exit (with a zero status).
+EOM
+	exit 1
+	;;
+esac
+
+: Sanity checks
+case "$fastread$alldone" in
+yescont|yesexit) ;;
+*)
+	if test ! -t 0; then
+		echo "Say 'sh Configure', not 'sh <Configure'"
+		exit 1
+	fi
+	;;
+esac
+
+exec 4>&1
+case "$silent" in
+true) exec 1>/dev/null;;
+esac
+
+: run the defines and the undefines, if any, but leave the file out there...
+touch optdef.sh
+. ./optdef.sh
+
+: set package name
+package=g4conf
+
+: Some greps do not return status, grrr.
+echo "grimblepritz" >grimble
+if grep blurfldyick grimble >/dev/null 2>&1 ; then
+	contains=contains
+elif grep grimblepritz grimble >/dev/null 2>&1 ; then
+	contains=grep
+else
+	contains=contains
+fi
+rm -f grimble
+: the following should work in any shell
+case "$contains" in
+contains*)
+	echo " "
+	echo "Grep doesn't return a status!!  Attempting remedial action."
+	cat >contains <<'EOSS'
+grep "$1" "$2" >.greptmp && cat .greptmp && test -s .greptmp
+EOSS
+chmod +x contains
+esac
+
+: first determine how to suppress newline on echo command
+echo " "
+#echo "Checking echo to see how to suppress newlines..."
+(echo "hi there\c" ; echo " ") >.echotmp
+if $contains c .echotmp >/dev/null 2>&1 ; then
+#	echo "...using -n."
+	n='-n'
+	c=''
+else
+#	cat <<'EOM'
+#...using \c
+#EOM
+	n=''
+	c='\c'
+fi
+#echo $n "The star should be here-->$c"
+#echo '*'
+rm -f .echotmp
+
+: compute the number of columns on the terminal for proper question formatting
+case "$COLUMNS" in
+'') COLUMNS='80';;
+esac
+
+: set up the echo used in my read
+myecho="case \"\$xxxm\" in
+'') echo $n \"\$rp $c\" >&4;;
+*) case \"\$rp\" in
+	'') echo $n \"[\$xxxm] $c\";;
+	*)
+		if test \`echo \"\$rp [\$xxxm]  \" | wc -c\` -ge $COLUMNS; then
+			echo \"\$rp\" >&4
+			echo $n \"[\$xxxm] $c\" >&4
+		else
+			echo $n \"\$rp [\$xxxm] $c\" >&4
+		fi
+		;;
+	esac;;
+esac"
+
+: now set up to do reads with possible shell escape and default assignment
+cat <<EOSC >myread
+$startsh
+xxxm=\$dflt
+$myecho
+ans='!'
+case "\$fastread" in
+yes) case "\$dflt" in
+	'') ;;
+	*) ans='';
+		case "\$silent-\$rp" in
+		true-) ;;
+		*) echo " " >&4;;
+		esac;;
+	esac;;
+*) case "\$silent" in
+	true) case "\$rp" in
+		'') ans='';;
+		esac;;
+	esac;;
+esac
+while expr "X\$ans" : "X!" >/dev/null; do
+	read answ
+	set x \$xxxm
+	shift
+	aok=''; eval "ans=\\"\$answ\\"" && aok=y
+	case  "\$answ" in
+	"!")
+		sh 1>&4
+		echo " "
+		$myecho
+		;;
+	!*)
+		set x \`expr "X\$ans" : "X!\(.*\)\$"\`
+		shift
+		sh 1>&4 -c "\$*"
+		echo " "
+		$myecho
+		;;
+	"\$ans")
+		case "\$ans" in
+		\\&*)
+			set x \`expr "X\$ans" : "X&\(.*\)\$"\`
+			shift
+			case "\$1" in
+			-d)
+				fastread=yes
+				echo "(OK, I'll run with -d after this question.)" >&4
+				;;
+			-*)
+				echo "*** Sorry, \$1 not supported yet." >&4
+				;;
+			esac
+			$myecho
+			ans=!
+			;;
+		esac;;
+	*)
+		case "\$aok" in
+		y)
+			echo "*** Substitution done -- please confirm."
+			xxxm="\$ans"
+			ans=\`echo $n "\$ans$c" | tr '\012' ' '\`
+			xxxm="\$ans"
+			ans=!
+			;;
+		*)
+			echo "*** Error -- try again."
+			ans=!
+			;;
+		esac
+		$myecho
+		;;
+	esac
+	case "\$ans\$xxxm\$nostick" in
+	'')
+		ans=!
+		$myecho
+		;;
+	esac
+done
+case "\$ans" in
+'') ans="\$xxxm";;
+esac
+EOSC
+
+: Find the path to the source tree
+case "$src" in
+'') src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`
+#echo "src=$src"
+;;
+esac
+case "$src" in
+'')
+	src=.
+	rsrc=..
+	;;
+/*) rsrc="$src/.."
+#echo "rsrc=$rsrc"
+;;
+./*) 	cur_dir=`pwd`
+	cd ../$src
+	src=`pwd`
+	cd $cur_dir
+	rsrc="$src/.."
+rsrc="$src/.."
+#echo "src=$src"
+#echo "rsrc=$rsrc"
+;;
+*) rsrc="../$src"
+#echo "rsrc=$rsrc"
+;;
+esac
+#cur_dir=`pwd`
+#echo "cur_dir=$cur_dir"
+if test -f $src/Configure && \
+	$contains "^package=$package" $src/Configure >/dev/null 2>&1
+then
+   : found it, so we are ok.
+else
+	rsrc=''
+	for src in . .. ../.. ../../.. ../../../..; do
+		if test -f ../$src/Configure && \
+			$contains "^package=$package" ../$src/Configure >/dev/null 2>&1
+		then
+			rsrc=../$src
+			break
+		fi
+	done
+fi
+case "$rsrc" in
+'')
+	echo " "
+#	dflt=
+#	rp="Directory where sources for $package are located?"
+#	. ./myread
+#	src="$ans"
+	rsrc="$src"
+#echo "src=$src"
+#echo "rsrc=$rsrc"
+	if test -f $rsrc/Configure && \
+		$contains "^package=$package" $rsrc/Configure >/dev/null 2>&1
+	then
+		echo "Ok, I've found them under $src"
+	else
+		echo "Sorry, I can't seem to be able to locate $package sources." >&4
+		exit 1
+	fi
+	;;
+../.) ;;
+*)
+	echo " "
+	echo "Sources for $package found in $src" >&4
+	;;
+esac
+
+: script used to extract .SH files with variable substitutions
+cat >extract <<'EOS'
+CONFIG=true
+#echo "Doing variable substitutions on .SH files..."
+if test -f $src/MANIFEST; then
+	set x `awk '{print $1}' <$src/MANIFEST | grep '\.SH'`
+else
+#	echo "(Looking for .SH files under the source directory.)"
+	set x `(cd $src; find ./config/scripts -name "*.SH" -print)`
+fi
+shift
+case $# in
+0) set x `(cd $src; echo *.SH)`; shift;;
+esac
+if test ! -f $src/$1; then
+	shift
+fi
+mkdir_p='
+name=$1;
+create="";
+while test $name; do
+	if test ! -d "$name"; then
+		create="$name $create";
+		name=`echo $name | sed -e "s|^[^/]*$||"`;
+		name=`echo $name | sed -e "s|\(.*\)/.*|\1|"`;
+	else
+		name="";
+	fi;
+done;
+for file in $create; do
+	mkdir $file;
+done
+'
+for file in $*; do
+	case "$src" in
+	".")
+		case "$file" in
+		*/*)
+			dir=`expr X$file : 'X\(.*\)/'`
+			file_SH=`expr X$file : 'X.*/\(.*\)'`
+			file_EX=`expr X$file : 'X.*/\(.*\).SH'`
+			(cd $dir && . ./$file_SH && mkdir -p $abssrc/.config/bin/$g4system && mv $file_EX $abssrc/.config/bin/$g4system)
+#			echo Sergei_1
+#			echo "file_SH=$file_SH"
+#			echo "file_EX=$file_EX"
+#			echo "file=$file"
+#			echo "dir=$dir"
+#			echo "src=$src"
+#			echo "g4system=$g4system"
+#			echo Sergei_1
+			;;
+		*)
+			file_SH=`expr X$file : 'X.*/\(.*\)'`
+			file_EX=`expr X$file : 'X.*/\(.*\).SH'`
+			(. ./$file && mkdir -p $abssrc/.config/bin/$g4system && mv file-SH $abssrc/.config/bin/$g4system)
+#			echo Sergei_2
+#			echo "file_SH=$file_SH"
+#			echo "file_EX=$file_EX"
+#			echo "file=$file"
+#			echo "dir=$dir"
+#			echo "src=$src"
+#			echo "g4system=$g4system"
+#			echo Sergei_2
+			;;
+		esac
+		;;
+	*)
+		case "$file" in
+		*/*)
+			dir=`expr X$file : 'X\(.*\)/'`
+			file_SH=`expr X$file : 'X.*/\(.*\)'`
+			file_EX=`expr X$file : 'X.*/\(.*\)\.SH'`
+			(set x $dir; shift; eval $mkdir_p)
+
+			(sh <$src/$dir/$file_SH && mkdir -p $src/.config/bin/$g4system && mv $file_EX $src/.config/bin/$g4system)
+
+#			echo Sergei_3
+#			echo "dir=$dir"
+#			echo "file=$file"
+
+#			echo Sergei_3
+			;;
+		*)
+			file_SH=`expr X$file : 'X.*/\(.*\)'`
+			file_EX=`expr X$file : 'X.*/\(.*\)\.SH'`
+			(sh <$src/$file && mkdir -p $src/.config/bin/$g4system && mv $file_EX $src/.config/bin/$g4system)
+			echo Sergei_4
+			;;
+		esac
+		;;
+	esac
+done
+if test -f $src/config_h.SH; then
+	if test ! -f config.h; then
+	: oops, they left it out of MANIFEST, probably, so do it anyway.
+	. $src/config_h.SH
+	fi
+fi
+EOS
+
+: extract files and exit if asked to do so
+case "$extractsh" in
+true)
+	case "$realsilent" in
+	true) ;;
+	*) exec 1>&4;;
+	esac
+	case "$config_sh" in
+	'') config_sh='$g4conf/config.sh'; config="$g4conf/config.sh";;
+	/*) config="$g4conf/$config_sh";;
+	*) config="$g4conf/$config_sh";;
+	esac
+	echo " "
+	echo "Fetching answers from $config_sh..."
+	. $config
+	test "$override" && . ./optdef.sh
+	echo " "
+	cd ..
+	. UU/extract
+	rm -rf UU
+	echo "Done."
+	exit 0
+	;;
+esac
+
+: Eunice requires " " instead of "", can you believe it
+echo " "
+: Here we go...
+if [ X$install = Xyes ] ; then
+echo " "
+echo " "
+echo " "
+echo "                --- Geant4 Toolkit Installation  ---"
+echo " "
+echo " "
+echo " "
+echo " "
+else
+echo " "
+echo " "
+echo " "
+echo "                --- Geant4 Toolkit Installation  ---"
+echo "                  (setting environments for USER )"
+echo " "
+echo " "
+echo " "
+fi
+
+trap 'echo " ";rm -rf ../UU; test -d ../UU && rm -rf X $rmlist; exit 1' 1 2 3 15
+
+: create .config dir to save info across Configure sessions
+test -d ../.config || mkdir ../.config
+cat >../.config/README <<EOF
+This directory created by Configure to save information that should
+persist across sessions for $package.
+
+You may safely delete it if you wish.
+EOF
+
+: general instructions
+needman=true
+firsttime=true
+user=`(logname) 2>/dev/null`
+case "$user" in
+'') user=`whoami 2>&1`;;
+esac
+if [ X$install = Xyes ] ; then
+if $contains "^$user\$" ../.config/instruct >/dev/null 2>&1; then
+	firsttime=false
+	echo " "
+	rp='Would you like to see the instructions?'
+	dflt=n
+	. ./myread
+	case "$ans" in
+	[yY]*) ;;
+	*) needman=false;;
+	esac
+fi
+fi
+
+if [ X$install = X ] ; then
+needman=false
+fi
+
+if $needman; then
+	cat <<EOH
+ 
+This installation shell script will examine your system and ask you questions
+to determine how the Geant4 Toolkit should be installed.  If you get stuck on
+a question, you may use a ! shell escape to start a subshell or execute a
+command.  Many of the questions will have default answers in square brackets;
+typing carriage return will set the default.
+
+If asked for a path or file name, you are allowed to use the ~username
+construct to specify the AFS path.
+Questions where this is allowed will be marked "(~username ok)".
+
+EOH
+	rp=''
+	dflt='Type carriage return to continue'
+	. ./myread
+	cat <<'EOH'
+
+The prompt used in this script allows you to use shell variables and backticks
+in your answers. You may use $1, $2, etc...  to refer to the words in the
+default answer, as if the default line was a set of arguments given to a
+script shell. This means you may also use $* to repeat the whole default line.
+
+Everytime there is a substitution, you will have to confirm.  If there is an
+error (e.g. an unmatched backtick), the default answer will remain unchanged
+and you will be prompted again.
+
+Running 'Configure -d' will bypass nearly all the questions and use the
+computed defaults (or the previous answers if there was already a config.sh
+file generated).
+
+Type 'Configure -h' for a list of options.
+
+You may also start interactively and then answer '& -d' at any prompt to turn
+on the non-interactive behaviour for the rest of the execution.
+
+EOH
+	. ./myread
+	cat <<EOH
+
+Much effort has been spent to ensure that this shell script will run on any
+Unix system. If despite that you can't run Configure for some reason, you'll
+have to set the proper environment variables by hand and follow the "manual"
+installation.
+
+EOH
+	dflt='Type carriage return to continue'
+	. ./myread
+	case "$firsttime" in
+	true) echo $user >>../.config/instruct;;
+	esac
+fi
+
+: find out where common programs are
+echo " "
+echo "Locating common programs..." >&4
+cat <<EOSC >loc
+$startsh
+case \$# in
+0) exit 1;;
+esac
+thing=\$1
+shift
+dflt=\$1
+shift
+for dir in \$*; do
+	case "\$thing" in
+	.)
+	if test -d \$dir/\$thing; then
+		echo \$dir
+		exit 0
+	fi
+	;;
+	*)
+	for thisthing in \$dir/\$thing; do
+		: just loop through to pick last item
+	done
+	if test -f \$thisthing; then
+		echo \$thisthing
+		exit 0
+	elif test -f \$dir/\$thing.exe; then
+		: on Eunice apparently
+		echo \$dir/\$thing
+		exit 0
+	fi
+	;;
+	esac
+done
+echo \$dflt
+exit 1
+EOSC
+chmod +x loc
+$eunicefix loc
+loclist="
+awk
+cat
+expr
+rm
+sed
+touch
+tr
+"
+trylist="
+date
+ln
+test
+uname
+"
+pth=`echo $PATH | sed -e "s/$p_/ /g"`
+pth="$pth /lib /usr/lib"
+for file in $loclist; do
+	eval xxx=\$$file
+	case "$xxx" in
+	/*|?:[\\/]*)
+		if test -f "$xxx"; then
+			: ok
+		else
+			echo "WARNING: no $xxx -- ignoring your setting for $file." >&4
+			xxx=`./loc $file $file $pth`
+		fi
+		;;
+	'') xxx=`./loc $file $file $pth`;;
+	*) xxx=`./loc $xxx $xxx $pth`;;
+	esac
+	eval $file=$xxx
+	eval _$file=$xxx
+	case "$xxx" in
+	/*)
+		echo $file is in $xxx.
+		;;
+	?:[\\/]*)
+		echo $file is in $xxx.
+		;;
+	*)
+		echo "I don't know where '$file' is." >&4
+		echo "Please, install it or fix your PATH settings!" >&4
+		exit 1
+		;;
+	esac
+done
+echo " "
+echo "Don't worry if any of the following aren't found..."
+say=offhand
+for file in $trylist; do
+	eval xxx=\$$file
+	case "$xxx" in
+	/*|?:[\\/]*)
+		if test -f "$xxx"; then
+			: ok
+		else
+			echo "WARNING: no $xxx -- ignoring your setting for $file." >&4
+			xxx=`./loc $file $file $pth`
+		fi
+		;;
+	'') xxx=`./loc $file $file $pth`;;
+	*) xxx=`./loc $xxx $xxx $pth`;;
+	esac
+	eval $file=$xxx
+	eval _$file=$xxx
+	case "$xxx" in
+	/*)
+		echo $file is in $xxx.
+		;;
+	?:[\\/]*)
+		echo $file is in $xxx.
+		;;
+	*)
+		echo "I don't see $file out there, $say."
+		say=either
+		;;
+	esac
+done
+case "$egrep" in
+egrep)
+	echo "Substituting grep for egrep."
+	egrep=$grep
+	;;
+esac
+case "$ln" in
+ln)
+	echo "Substituting cp for ln."
+	ln=$cp
+	;;
+esac
+case "$test" in
+test)
+	echo "Hopefully test is built into your sh."
+	;;
+*)
+	if `sh -c "PATH= test true" >/dev/null 2>&1`; then
+		echo "Using the test built into your sh."
+		test=test
+		_test=test
+	fi
+	;;
+esac
+case "$echo" in
+echo)
+	echo "Hopefully echo is built into your sh."
+	;;
+'') ;;
+*)
+	echo " "
+echo "Checking compatibility between $echo and builtin echo (if any)..." >&4
+	$echo $n "hi there$c" >foo1
+	echo $n "hi there$c" >foo2
+	if cmp foo1 foo2 >/dev/null 2>&1; then
+		echo "They are compatible.  In fact, they may be identical."
+	else
+		case "$n" in
+		'-n') n='' c='\c';;
+		*) n='-n' c='';;
+		esac
+		cat <<FOO
+They are not compatible!  You are probably running ksh on a non-USG system.
+I'll have to use $echo instead of the builtin, since Bourne shell doesn't
+have echo built in and we may have to run some Bourne shell scripts.  That
+means I'll have to use '$n$c' to suppress newlines now.
+
+FOO
+		$echo $n "The star should be here-->$c"
+		$echo "*"
+	fi
+	$rm -f foo1 foo2
+	;;
+esac
+
+: determine whether symbolic links are supported
+echo " "
+$touch blurfl
+if $ln -s blurfl sym > /dev/null 2>&1 ; then
+	echo "Symbolic links are supported." >&4
+	lns="$ln -s"
+else
+	echo "Symbolic links are NOT supported." >&4
+	lns="$ln"
+fi
+$rm -f blurfl sym
+
+: see whether [:lower:] and [:upper:] are supported character classes
+echo " "
+up='[A-Z]'
+low='[a-z]'
+case "`echo AbyZ | $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in
+ABYZ)
+	echo "Good, your tr supports [:lower:] and [:upper:] to convert case." >&4
+	up='[:upper:]'
+	low='[:lower:]'
+	;;
+*)
+	echo "Your tr only supports [a-z] and [A-Z] to convert case." >&4
+	;;
+esac
+: set up the translation script tr, must be called with ./tr of course
+cat >tr <<EOSC
+$startsh
+case "\$1\$2" in
+'[A-Z][a-z]') exec $tr '$up' '$low';;
+'[a-z][A-Z]') exec $tr '$low' '$up';;
+esac
+exec $tr "\$@"
+EOSC
+chmod +x tr
+$eunicefix tr
+
+: Try to determine whether config.sh was made on this system
+case "$config_sh" in
+'')
+myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
+myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
+	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
+newmyuname="$myuname"
+dflt=n
+case "$knowitall" in
+'')
+	if test -f ../config.sh; then
+		if $contains myuname= ../config.sh >/dev/null 2>&1; then
+			eval "`grep myuname= ../config.sh`"
+		fi
+		if test "X$myuname" = "X$newmyuname"; then
+			dflt=y
+		fi
+	fi
+	;;
+*) dflt=y;;
+esac
+
+: Get old answers from old config file if Configure was run on the
+: same system, otherwise use the hints.
+hint=default
+cd ..
+
+	(cd $src/hints; ls -C *.sh) | $sed 's/\.sh/   /g' >&4
+	dflt=''
+	: Half the following guesses are probably wrong... If you have better
+	: tests or hints, please send them to Serguei.Sadilov@cern.ch
+	: The metaconfig authors would also appreciate a copy...
+	$test -f /irix && osname=irix
+	$test -f /xenix && osname=sco_xenix
+	$test -f /dynix && osname=dynix
+	$test -f /dnix && osname=dnix
+	$test -f /lynx.os && osname=lynxos
+	$test -f /unicos && osname=unicos && osvers=`$uname -r`
+	$test -f /unicosmk.ar && osname=unicosmk && osvers=`$uname -r`
+	$test -f /bin/mips && /bin/mips && osname=mips
+	$test -d /NextApps && set X `hostinfo | grep 'NeXT Mach.*:' | \
+		$sed -e 's/://' -e 's/\./_/'` && osname=next && osvers=$4
+	$test -d /usr/apollo/bin && osname=apollo
+	$test -f /etc/saf/_sactab && osname=svr4
+	$test -d /usr/include/minix && osname=minix
+	if $test -d /MachTen; then
+		osname=machten
+		if $test -x /sbin/version; then
+			osvers=`/sbin/version | $awk '{print $2}' |
+			$sed -e 's/[A-Za-z]$//'`
+		elif $test -x /usr/etc/version; then
+			osvers=`/usr/etc/version | $awk '{print $2}' |
+			$sed -e 's/[A-Za-z]$//'`
+		else
+			osvers="$2.$3"
+		fi
+	fi
+	if $test -f $uname; then
+		set X $myuname
+		shift
+
+		case "$5" in
+		fps*) osname=fps ;;
+		mips*)
+			case "$4" in
+			umips) osname=umips ;;
+			*) osname=mips ;;
+			esac;;
+		[23]100) osname=mips ;;
+		next*) osname=next ;;
+		news*) osname=news ;;
+		i386*)
+			if $test -f /etc/kconfig; then
+				osname=isc
+				if test "$lns" = "ln -s"; then
+					osvers=4
+				elif $contains _SYSV3 /usr/include/stdio.h > /dev/null 2>&1 ; then
+					osvers=3
+				elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1 ; then
+					osvers=2
+				fi
+			fi
+			;;
+		esac
+
+		case "$1" in
+		aix) osname=aix
+			tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1`
+			case "$tmp" in
+			'not found') osvers="$4"."$3" ;;
+			'<3240'|'<>3240') osvers=3.2.0 ;;
+			'=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;;
+			'=3250'|'>3250') osvers=3.2.5 ;;
+			*) osvers=$tmp;;
+			esac
+			;;
+		*dc.osx) osname=dcosx
+			osvers="$3"
+			;;
+		dnix) osname=dnix
+			osvers="$3"
+			;;
+		domainos) osname=apollo
+			osvers="$3"
+			;;
+		dgux) osname=dgux 
+			osvers="$3"
+			;;
+		dynixptx*) osname=dynixptx
+			osvers="$3"
+			;;
+		freebsd) osname=freebsd 
+			osvers="$3" ;;
+		genix) osname=genix ;;
+		hp*) osname=hpux 
+			case "$3" in
+			*.08.*) osvers=9 ;;
+			*.09.*) osvers=9 ;;
+			*.10.*) osvers=10 ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		irix*) osname=irix
+			case "$3" in
+			4*) osvers=4 ;;
+			5*) osvers=5 ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		linux) osname=linux
+			case "$3" in
+			1*) osvers=1 ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		netbsd*) osname=netbsd 
+			osvers="$3"
+			;;
+		bsd386) osname=bsd386
+			osvers=`$uname -r`
+			;;
+		next*) osname=next ;;
+		solaris) osname=solaris
+			case "$3" in
+			5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		sunos) osname=sunos
+			case "$3" in
+			5*) osname=solaris
+				osvers=`echo $3 | $sed 's/^5/2/g'` ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		titanos) osname=titanos
+			case "$3" in
+			1*) osvers=1 ;;
+			2*) osvers=2 ;;
+			3*) osvers=3 ;;
+			4*) osvers=4 ;;
+			*)	osvers="$3" ;;
+			esac
+			;;
+		ultrix) osname=ultrix
+			osvers="$3"
+			;;
+		osf1|mls+)	case "$5" in
+				alpha)
+					osname=dec_osf
+					osvers=`echo "$3" | sed 's/^[vt]//'`
+					;;
+			hp*)	osname=hp_osf1	;;
+			mips)	osname=mips_osf1 ;;
+			esac
+			;;
+		uts) osname=uts 
+			osvers="$3"
+			;;
+		qnx) osname=qnx
+			osvers="$4"
+			;;
+		$2) case "$osname" in
+			*isc*) ;;
+			*freebsd*) ;;
+			svr*)
+				: svr4.x or possibly later
+				case "svr$3" in	
+				${osname}*)
+					osname=svr$3
+					osvers=$4
+					;;
+				esac
+				case "$osname" in
+				svr4.0)
+					: Check for ESIX
+					if test -f /stand/boot ; then
+						eval `grep '^INITPROG=[a-z/0-9]*$' /stand/boot`
+						if test -n "$INITPROG" -a -f "$INITPROG"; then
+			isesix=`strings -a $INITPROG|grep 'ESIX SYSTEM V/386 Release 4.0'`
+							if test -n "$isesix"; then
+								osname=esix4
+							fi
+						fi
+					fi
+					;;
+				esac
+				;;
+			*)	if test -f /etc/systemid; then
+					osname=sco
+					set `echo $3 | $sed 's/\./ /g'` $4
+					if $test -f sco_$1_$2_$3.sh; then
+						osvers=$1.$2.$3
+					elif $test -f sco_$1_$2.sh; then
+						osvers=$1.$2
+					elif $test -f sco_$1.sh; then
+						osvers=$1
+					fi
+				else
+					case "$osname" in
+					'') : Still unknown.  Probably a generic Sys V.
+						osname="sysv"
+						osvers="$3"
+						;;
+					esac
+				fi
+				;;
+			esac
+			;;
+		*)	case "$osname" in
+			'') : Still unknown.  Probably a generic BSD.
+				osname="$1"
+				osvers="$3"
+				;;
+			esac
+			;;
+		esac
+	else
+		if test -f /vmunix -a -f $src/hints/news_os.sh; then
+			(what /vmunix | UU/tr '[A-Z]' '[a-z]') > UU/kernel.what 2>&1
+			if $contains news-os UU/kernel.what >/dev/null 2>&1; then
+				osname=news_os
+			fi
+			$rm -f UU/kernel.what
+		elif test -d c:/.; then
+			set X $myuname
+			osname=os2
+			osvers="$5"
+		fi
+	fi
+	: Now look for a hint file osname_osvers, unless one has been
+	: specified already.
+	case "$hintfile" in
+	''|' ')
+		file=`echo "${osname}_${osvers}" | $sed -e 's@\.@_@g' -e 's@_$@@'`
+		: Also try without trailing minor version numbers.
+		xfile=`echo $file | $sed -e 's@_[^_]*$@@'`
+		xxfile=`echo $xfile | $sed -e 's@_[^_]*$@@'`
+		xxxfile=`echo $xxfile | $sed -e 's@_[^_]*$@@'`
+		xxxxfile=`echo $xxxfile | $sed -e 's@_[^_]*$@@'`
+		case "$file" in
+		'') dflt=none ;;
+		*)  case "$osvers" in
+			'') dflt=$file
+				;;
+			*)  if $test -f $src/hints/$file.sh ; then
+					dflt=$file
+				elif $test -f $src/hints/$xfile.sh ; then
+					dflt=$xfile
+				elif $test -f $src/hints/$xxfile.sh ; then
+					dflt=$xxfile
+				elif $test -f $src/hints/$xxxfile.sh ; then
+					dflt=$xxxfile
+				elif $test -f $src/hints/$xxxxfile.sh ; then
+					dflt=$xxxxfile
+				elif $test -f "$src/hints/${osname}.sh" ; then
+					dflt="${osname}"
+				else
+					dflt=none
+				fi
+				;;
+			esac
+			;;
+		esac
+		;;
+	*)
+		dflt=`echo $hintfile | $sed 's/\.sh$//'`
+		;;
+	esac
+
+if [ X$install = Xnever ] ; then
+	$cat <<EOM
+
+You may give one or more space-separated answers, or "none" if appropriate.
+If your OS version has no hints, DO NOT give a wrong version -- say "none".
+
+EOM
+	rp="Which of these apply, if any?"
+	. UU/myread
+	tans=$ans
+	for file in $tans; do
+		if $test -f $src/hints/$file.sh; then
+			. $src/hints/$file.sh
+			$cat $src/hints/$file.sh >> UU/config.sh
+		elif $test X$tans = X -o X$tans = Xnone ; then
+			: nothing
+		else
+			: Give one chance to correct a possible typo.
+			echo "$file.sh does not exist"
+			dflt=$file
+			rp="hint to use instead?"
+			. UU/myread
+			for file in $ans; do
+				if $test -f "$src/hints/$file.sh"; then
+					. $src/hints/$file.sh
+					$cat $src/hints/$file.sh >> UU/config.sh
+				elif $test X$ans = X -o X$ans = Xnone ; then
+					: nothing
+				else
+					echo "$file.sh does not exist -- ignored."
+				fi
+			done
+		fi
+	done
+fi
+
+	hint=recommended
+	: Remember our hint file for later.
+	if $test -f "$src/hints/$file.sh" ; then
+		hintfile="$file"
+	else
+		hintfile=''
+	fi
+	: Sadilov: g4system.U - inserted here.
+	: 'current' directory is where 'Configure' is started 
+echo " "
+case "$g4osname" in
+
+'')
+	case "$osname" in
+		'aix')		g4osname=AIX
+				;;
+		'dec_osf')	g4osname=DEC
+				;;
+		'hpux')		g4osname=HP
+				;;
+		'linux')	g4osname=Linux
+				;;
+		'irix')		g4osname=SGI
+				;;
+		'sunos')	g4osname=SUN
+				;;
+	esac
+esac
+
+echo " "
+
+case  "$g4compiler" in
+
+'')	
+	case "$g4osname" in
+		'AIX')
+				g4compiler=xlC
+				;;
+		'DEC')
+				g4compiler=cxx
+				;;
+		'HP')
+				g4compiler=aCC
+				;;
+		'Linux')
+				g4compiler=g++
+				;;
+		'SGI')
+				g4compiler=CC
+				;;
+		'SUN')
+				g4compiler=CC
+				;;
+	esac
+esac
+
+if [ X$install = Xyes ] ; then
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Definition of G4SYSTEM variable.
+
+1) OS		: $g4osname
+
+2) Compiler	: $g4compiler
+
+Select from list above (e.g. 2) 
+EOM`
+
+dflt="Press [Enter] for default settings"
+rp=$g4message
+. UU/myread
+gans=$ans
+
+	case $gans in
+
+	1) 
+		case "$osname" in
+			'aix')
+					g4osnamerec=AIX
+					;;
+			'dec_osf')
+					g4osnamerec=DEC
+					;;
+			'hpux')	
+					g4osnamerec=HP
+					;;
+			'linux')
+					g4osnamerec=Linux
+					;;
+			'irix')	
+					g4osnamerec=SGI
+					;;
+			'sunos')
+					g4osnamerec=SUN
+					;;
+		esac
+		dflt=$g4osname
+		rp="What is your OS'?"
+		. UU/myread
+		tans=$ans
+
+		if test X$tans != X$g4osnamerec ; then
+		echo ""
+
+cat << EOM
+
+		You are running 'Configure' on NOT native platform!
+		You are on your own way !!!
+
+EOM
+
+		dflt=$tans
+		rp="Confirm your selection or set native '$g4osnamerec'!"
+		. UU/myread
+		tans=$ans
+		fi
+
+		g4osname=$tans
+		;;
+	2) 
+		case "$g4osname" in
+			'AIX')
+					g4compilerrec=xlC
+					;;
+			'DEC')
+					g4compilerrec=cxx
+					;;
+			'HP')
+					g4compilerrec=aCC
+					;;
+			'Linux')
+					g4compilerrec=g++
+					;;
+			'SGI')
+					g4compilerrec=CC
+					;;
+			'SUN')
+					g4compilerrec=CC
+					;;
+		esac
+		dflt=$g4compiler
+		rp="Which C++ compiler?"
+		. UU/myread
+		tans=$ans
+
+		if test X$tans != X$g4compilerrec ; then
+		echo ""
+
+cat << EOM
+
+		The recommmended compiler for this platform ($g4osname) is $g4compilerrec.
+		You are on your own way !!!
+
+EOM
+
+		dflt=$tans
+		rp="Confirm your selection or set recommended '$g4compilerrec'!"
+		. UU/myread
+		tans=$ans
+		fi
+
+		g4compiler=$tans
+		;;
+#	[eE]) 
+#		break
+#		;;
+	*) 
+#		echo " "
+		break
+		;;
+	esac
+done
+fi
+
+#
+# Ask about compiler used. 
+#
+g4system=$g4osname-$g4compiler
+
+cat << EOM
+
+G4SYSTEM is now set to $g4system.
+
+EOM
+
+cd UU
+
+myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
+myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
+	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
+newmyuname="$myuname"
+dflt=n
+
+cd ..
+if [ X$install = X ] ; then
+	if test -f $src/.config/bin/$g4system/env.sh; then
+	cat >&2 <<EOM
+---------------------------------------------------
+For setting Geant4 environments you should make:
+
+source $src/.config/bin/$g4system/env.csh
+
+or
+
+. $src/.config/bin/$g4system/env.sh
+---------------------------------------------------
+EOM
+	$rm -rf UU
+	exit 1
+else
+	echo " "
+	echo "WARNING: Geant4 is NOT installed yet!"
+	echo "You (or the administrator if you have not enough privileges)"
+	echo "should start with \$G4INSTALL/Configure -install."
+	echo "(where \$G4INSTALL is Geant4 install directory)."
+	echo " "
+	$rm -rf UU
+	exit 1
+	fi
+fi
+cd UU
+
+case "$knowitall" in
+'')
+	cd ..
+	if test -f $src/.config/bin/$g4system/config.sh; then
+		if $contains myuname= $src/.config/bin/$g4system/config.sh >/dev/null 2>&1; then
+			eval "`grep myuname= $src/.config/bin/$g4system/config.sh`"
+		fi
+		if test "X$myuname" = "X$newmyuname"; then
+			dflt=y
+		fi
+	fi
+	cd UU
+	;;
+*) dflt=y;;
+esac
+
+cd ..
+
+if test -f $src/.config/bin/$g4system/config.sh; then
+	echo " "
+	rp="There exists a config.sh file. Shall I use it to set the defaults?"
+	. UU/myread
+	case "$ans" in
+	n*|N*) echo "OK, I'll ignore it."; mv $src/.config/bin/$g4system/config.sh $src/.config/bin/$g4system/config.sh.old;;
+	*)  echo "Fetching default answers from your old config.sh file..." >&4
+		tmp_n="$n"
+		tmp_c="$c"
+		tmp_sh="$sh"
+		. $src/.config/bin/$g4system/config.sh
+		cp $src/.config/bin/$g4system/config.sh UU
+		n="$tmp_n"
+		c="$tmp_c"
+		: Older versions did not always set $sh.  Catch re-use of such
+		: an old config.sh.
+		case "$sh" in
+		'') sh="$tmp_sh" ;;
+		esac
+		hint=previous
+		;;
+	esac
+fi
+
+cd UU
+;;
+*)
+	echo " "
+	echo "Fetching default answers from $config_sh..." >&4
+	tmp_n="$n"
+	tmp_c="$c"
+	cd ..
+	cp $config_sh config.sh 2>/dev/null
+	chmod +w config.sh
+	. ./config.sh
+	cd UU
+	cp ../config.sh .
+	n="$tmp_n"
+	c="$tmp_c"
+	hint=previous
+	;;
+esac
+test "$override" && . ./optdef.sh
+myuname="$newmyuname"
+
+: Restore computed paths
+for file in $loclist $trylist; do
+	eval $file="\$_$file"
+done
+
+: who configured the system
+cf_time=`$date 2>&1`
+cf_by=`(logname) 2>/dev/null`
+case "$cf_by" in
+"")
+	cf_by=`(whoami) 2>/dev/null`
+	case "$cf_by" in
+	"") cf_by=unknown ;;
+	esac ;;
+esac
+
+: decide how portable to be
+case "$d_portable" in
+"$define") dflt=y;;
+*)	dflt=n;;
+esac
+$cat <<'EOH'
+ 
+I can set things up so that your shell scripts and binaries are more portable,
+at what may be a noticable cost in performance.  In particular, if you
+ask to be portable, the following happens:
+
+     1) Shell scripts will rely on the PATH variable rather than using
+	the paths derived above.
+     2) ~username interpretations will be done at run time rather than
+	by Configure.
+
+EOH
+rp="Do you expect to run these scripts and binaries on multiple machines?"
+. ./myread
+case "$ans" in
+	y*) d_portable="$define"
+	;;
+	*)  d_portable="$undef" ;;
+esac
+
+: set up shell script to do ~ expansion
+cat >filexp <<EOSS
+$startsh
+: expand filename
+case "\$1" in
+ ~/*|~)
+	echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|"
+	;;
+ ~*)
+	if $test -f /bin/csh; then
+		/bin/csh -f -c "glob \$1"
+		failed=\$?
+		echo ""
+		exit \$failed
+	else
+		name=\`$expr x\$1 : '..\([^/]*\)'\`
+		dir=\`$sed -n -e "/^\${name}:/{s/^[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:\([^:]*\).*"'\$'"/\1/" -e p -e q -e '}' </etc/passwd\`
+		if $test ! -d "\$dir"; then
+			me=\`basename \$0\`
+			echo "\$me: can't locate home directory for: \$name" >&2
+			exit 1
+		fi
+		case "\$1" in
+		*/*)
+			echo \$dir/\`$expr x\$1 : '..[^/]*/\(.*\)'\`
+			;;
+		*)
+			echo \$dir
+			;;
+		esac
+	fi
+	;;
+*)
+	echo \$1
+	;;
+esac
+EOSS
+chmod +x filexp
+$eunicefix filexp
+
+: now set up to get a file name
+cat <<EOS >getfile
+$startsh
+EOS
+cat <<'EOSC' >>getfile
+tilde=''
+fullpath=''
+already=''
+skip=''
+none_ok=''
+exp_file=''
+nopath_ok=''
+orig_rp="$rp"
+orig_dflt="$dflt"
+
+case "$fn" in
+*\(*)
+	expr $fn : '.*(\(.*\)).*' | tr ',' '\012' >getfile.ok
+	fn=`echo $fn | sed 's/(.*)//'`
+	;;
+esac
+
+case "$fn" in
+*:*)
+	loc_file=`expr $fn : '.*:\(.*\)'`
+	fn=`expr $fn : '\(.*\):.*'`
+	;;
+esac
+
+case "$fn" in
+*~*) tilde=true;;
+esac
+case "$fn" in
+*/*) fullpath=true;;
+esac
+case "$fn" in
+*+*) skip=true;;
+esac
+case "$fn" in
+*n*) none_ok=true;;
+esac
+case "$fn" in
+*e*) exp_file=true;;
+esac
+case "$fn" in
+*p*) nopath_ok=true;;
+esac
+
+case "$fn" in
+*f*) type='File';;
+*d*) type='Directory';;
+*l*) type='Locate';;
+esac
+
+what="$type"
+case "$what" in
+Locate) what='File';;
+esac
+
+case "$exp_file" in
+'')
+	case "$d_portable" in
+	"$define") ;;
+	*) exp_file=true;;
+	esac
+	;;
+esac
+
+cd ..
+while test "$type"; do
+	redo=''
+	rp="$orig_rp"
+	dflt="$orig_dflt"
+	case "$tilde" in
+	true) rp="$rp (~name ok)";;
+	esac
+	. UU/myread
+	if test -f UU/getfile.ok && \
+		$contains "^$ans\$" UU/getfile.ok >/dev/null 2>&1
+	then
+		value="$ans"
+		ansexp="$ans"
+		break
+	fi
+	case "$ans" in
+	none)
+		value=''
+		ansexp=''
+		case "$none_ok" in
+		true) type='';;
+		esac
+		;;
+	*)
+		case "$tilde" in
+		'') value="$ans"
+			ansexp="$ans";;
+		*)
+			value=`UU/filexp $ans`
+			case $? in
+			0)
+				if test "$ans" != "$value"; then
+					echo "(That expands to $value on this system.)"
+				fi
+				;;
+			*) value="$ans";;
+			esac
+			ansexp="$value"
+			case "$exp_file" in
+			'') value="$ans";;
+			esac
+			;;
+		esac
+		case "$fullpath" in
+		true)
+			case "$ansexp" in
+			/*) value="$ansexp" ;;
+			*)
+				redo=true
+				case "$already" in
+				true)
+				echo "I shall only accept a full path name, as in /bin/ls." >&4
+				echo "Use a ! shell escape if you wish to check pathnames." >&4
+					;;
+				*)
+				echo "Please give a full path name, starting with slash." >&4
+					case "$tilde" in
+					true)
+				echo "Note that using ~username is ok provided it expands well." >&4
+						already=true
+						;;
+					esac
+				esac
+				;;
+			esac
+			;;
+		esac
+		case "$redo" in
+		'')
+			case "$type" in
+			File)
+				if test -f "$ansexp"; then
+					type=''
+				elif test -r "$ansexp" || (test -h "$ansexp") >/dev/null 2>&1
+				then
+					echo "($value is not a plain file, but that's ok.)"
+					type=''
+				fi
+				;;
+			Directory)
+				if test -d "$ansexp"; then
+					type=''
+				fi
+				;;
+			Locate)
+				if test -d "$ansexp"; then
+					echo "(Looking for $loc_file in directory $value.)"
+					value="$value/$loc_file"
+					ansexp="$ansexp/$loc_file"
+				fi
+				if test -f "$ansexp"; then
+					type=''
+				fi
+				case "$nopath_ok" in
+				true)	case "$value" in
+					*/*) ;;
+					*)	echo "Assuming $value will be in people's path."
+						type=''
+						;;
+					esac
+					;;
+				esac
+				;;
+			esac
+
+			case "$skip" in
+			true) type='';
+			esac
+
+			case "$type" in
+			'') ;;
+			*)
+				if test "$fastread" = yes; then
+					dflt=y
+				else
+					dflt=n
+				fi
+				rp="$what $value doesn't exist.  Use that name anyway?"
+				. UU/myread
+				dflt=''
+				case "$ans" in
+				y*) type='';;
+				*) echo " ";;
+				esac
+				;;
+			esac
+			;;
+		esac
+		;;
+	esac
+done
+cd UU
+ans="$value"
+rp="$orig_rp"
+dflt="$orig_dflt"
+rm -f getfile.ok
+EOSC
+
+echo " "
+
+#echo "SSS"
+#echo `pwd`
+#echo "SSS"
+
+if [ X$src = X. ] ; then
+	cd ..
+	abssrc=`pwd`
+	cd UU
+else
+	abssrc=$src
+fi
+
+case "$g4conf" in
+'')
+	g4conf=$abssrc/.config/bin/$g4system
+	;;
+esac
+
+#echo "g4conf=$g4conf"
+
+case "$g4install" in
+'')
+	g4install=$HOME/geant4
+	;;
+esac
+
+case "$g4base" in
+'')
+	g4base=$g4install/source
+	;;
+esac
+
+case "$g4workdir" in
+'')
+	g4workdir=$g4install
+	;;
+esac
+
+case "$g4includes_flag" in
+'')
+	g4includes_flag=n
+	;;
+esac
+
+case "$g4include" in
+'')
+	g4include=$g4install/include
+	;;
+esac
+
+g4message=`cat << EOM
+
+Where is Geant4 installed?
+EOM`
+
+#dflt="NO DEFAULT ANSWER"
+dflt=$g4install
+fn='d~'
+rp=$g4message
+. ./getfile
+g4install=$ans
+g4workdir=$g4install
+
+g4message=`cat << EOM
+
+Do you want to copy all Geant4 headers 
+in one directory?
+EOM`
+
+#dflt="NO DEFAULT ANSWER"
+dflt=$g4includes_flag
+#fn='d~'
+rp=$g4message
+. ./myread
+g4includes_flag=$ans
+
+if [ X$g4includes_flag = Xy ] ; then
+
+g4message=`cat << EOM
+
+Where will be directory to copy all Geant4 headers?
+EOM`
+
+#dflt="NO DEFAULT ANSWER"
+dflt=$g4include
+fn='d~+'
+rp=$g4message
+. ./getfile
+g4include=$ans
+
+fi
+
+g4base=$g4install/source
+#if test "X$g4include" = "X[NOT DEFINED]" ; then
+#g4include=""
+#fi
+
+echo " "
+
+case "$g4tmp" in
+'')
+	g4tmp=$g4workdir/tmp
+	;;
+esac
+
+case "$g4lib" in
+'')
+	g4lib=$g4workdir/lib
+	;;
+esac
+
+case "$g4bin" in
+'')
+	g4bin=$g4workdir/bin
+	;;
+esac
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+(OPTIONAL) You can now customise installation directories:
+  G4TMP - tmp/ containing temporary dependency (.d) and object (.o) files;
+  G4LIB - lib/ containing final static (.a) or shared (.so) libraries;
+  G4BIN - bin/ containing final executable and scripts.
+
+1) G4TMP:		$g4tmp
+
+2) G4LIB:		$g4lib
+
+3) G4BIN:		$g4bin
+
+Select from list above (e.g. 2) 
+EOM`
+
+#dflt="NO DEFAULT ANSWER"
+dflt="Press [Enter] for default settings"
+#fn='d~'
+rp=$g4message
+. ./myread
+gans=$ans
+
+
+	case $gans in
+
+	1) 
+		dflt=$g4tmp
+		fn='d~+'
+		rp="Where will be your Geant4 tmp directory?"
+		. ./getfile
+		g4tmp=$ans
+		;;
+	2) 
+		dflt=$g4lib
+		fn='d~+'
+		rp="Where will be your Geant4 lib directory?"
+		. ./getfile
+		g4lib=$ans
+		;;
+	3) 
+		dflt=$g4bin
+		fn='d~+'
+		rp="Where will be your Geant4 bin directory?"
+		. ./getfile
+		g4bin=$ans
+		;;
+
+#	[eE]) 
+#		break
+#		;;
+	*) 
+		break
+#		echo " "
+		;;
+	esac
+done
+echo " "
+case "$g4clhep_base_dir" in
+'')
+	g4clhep_base_dir=/usr/local
+	;;
+esac
+
+case "$g4clhep_include_dir" in
+'')
+	g4clhep_include_dir=$g4clhep_base_dir/include
+	;;
+esac
+
+case "$g4clhep_lib_dir" in
+'')
+	g4clhep_lib_dir=$g4clhep_base_dir/lib
+	;;
+esac
+
+case "$g4clhep_lib" in
+'')
+	g4clhep_lib=CLHEP
+	;;
+esac
+
+#while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Please, specify where CLHEP is installed:
+
+CLHEP_BASE_DIR:			$g4clhep_base_dir
+
+According to it will be set:
+
+CLHEP_INCLUDE_DIR:		\\$CLHEP_BASE_DIR/include
+CLHEP_LIB_DIR:			\\$CLHEP_BASE_DIR/lib
+CLHEP_LIB:			CLHEP
+
+If you need to change one of those last three you can do it by editing
+the generated config.sh at the end of this session.
+EOM`
+
+
+#dflt="Press [Enter] for default settings"
+#fn='d~'
+rp=$g4message
+#. ./myread
+#gans=$ans
+
+#	case $gans in
+
+#	1) 
+		dflt=$g4clhep_base_dir
+		fn='d~'
+#		rp="Where is CLHEP installed?"
+		. ./getfile
+		g4clhep_base_dir=$ans
+		g4clhep_include_dir=$ans/include
+		g4clhep_lib_dir=$ans/lib
+#		;;
+#	2) 
+#		dflt=$g4clhep_include_dir
+#		fn='d~'
+#		rp="Where is CLHEP include directory?"
+#		. ./getfile
+#		g4clhep_include_dir=$ans
+#		;;
+#	3) 
+#		dflt=$g4clhep_lib_dir
+#		fn='d~'
+#		rp="Where is CLHEP lib directory?"
+#		. ./getfile
+#		g4clhep_lib_dir=$ans
+#		;;
+#	4) 
+#		dflt=$g4clhep_lib
+#		rp="What is CLHEP lib title?"
+#		. ./myread
+#		g4clhep_lib=$ans
+#		;;
+##	[eE]) 
+##		break
+##		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+#	esac
+#done
+echo " "
+
+case "$g4data" in
+'')
+	g4data=$g4install/data
+	;;
+esac
+
+case "$g4levelgammadata" in
+'')
+	g4levelgammadata=$g4data/PhotonEvaporation
+	;;
+esac
+
+case "$g4radioactivedata" in
+'')
+	g4radioactivedata=$g4data/RadiativeDecay
+	;;
+esac
+
+case "$g4ledata" in
+'')
+	g4ledata=$g4install/../G4EMLOW
+	;;
+esac
+
+case "$g4neutronhpcrosssections" in
+'')
+	g4neutronhpcrosssections=$g4install/../G4NDL
+	;;
+esac
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Please, specify directories where the Geant4 data is installed:
+
+1) G4LEVELGAMMADATA:		$g4levelgammadata
+
+2) G4RADIOACTIVEDATA:		$g4radioactivedata
+
+Data which is not part of the default Geant4 distribution:
+
+3) G4LEDATA:			$g4ledata
+
+4) NeutronHPCrossSections:	$g4neutronhpcrosssections
+
+Select from list above (e.g. 2) 
+EOM`
+
+#dflt="NO DEFAULT ANSWER"
+dflt="Press [Enter] for default settings"
+#fn='d~'
+rp=$g4message
+. ./myread
+gans=$ans
+
+
+	case $gans in
+
+	1) 
+		dflt=$g4levelgammadata
+		fn='f~'
+		rp="Where is Geant4 PhotonEvaporation data installed?"
+		. ./getfile
+		g4levelgammadata=$ans
+		;;
+	2) 
+		dflt=$g4radioactivedata
+		fn='f~'
+		rp="Where is Geant4 RadiativeDecay data installed?"
+		. ./getfile
+		g4radioactivedata=$ans
+		;;
+	3) 
+		dflt=$g4ledata
+		fn='f~'
+		rp="Where is G4EMLOW0.3 data installed ?"
+		. ./getfile
+		g4ledata=$ans
+		;;
+	4) 
+		dflt=$g4neutronhpcrosssections
+		fn='f~'
+		rp="Where is G4NDL0.2 installed?"
+		. ./getfile
+		g4neutronhpcrosssections=$ans
+		;;
+#	[eE]) 
+#		break
+#		;;
+	*) 
+		break
+#		echo " "
+		;;
+	esac
+done
+
+echo " "
+case "$g4debug" in
+'')
+	g4debug=""
+	;;
+esac
+
+#
+# Ask about g4debug - default "(empty)". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Do you want to compile libraries in DEBUG mode (-g)?
+EOM`
+
+dflt="n"
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		break
+		;;
+	y*|Y*) 
+		g4debug=1
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+
+echo " "
+case "$g4global" in
+'')
+	g4global=n
+	;;
+esac
+
+#
+# Ask about g4global - default "(empty)". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Do you want to build 'global' compound libraries?
+EOM`
+
+dflt=$g4global
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4global=n
+		break
+		;;
+	y*|Y*) 
+		g4global=y
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+
+echo " "
+case "$g4granular" in
+'')
+	g4granular=n
+	;;
+esac
+
+if [ X$g4global = Xy ] ; then
+#
+# Ask about g4granular - default "n". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Granular libraries are used by defaults, you asked to build global
+compound libraries. Do you want to build 'granular' libraries too?
+EOM`
+
+dflt=$g4granular
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4granular=n
+		break
+		;;
+	y*|Y*) 
+		g4granular=y
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+fi
+
+echo " "
+case "$g4lib_use_granular" in
+'')
+	g4lib_use_granular=n
+	;;
+esac
+
+if [ X$g4granular = Xy ] ; then
+#
+# Ask about g4lib_use_granular - default "n". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+Global libraries are used by defaults, you asked to build global
+compound libraries and granular libraries. 
+Do you want to use 'granular' libraries instead?
+EOM`
+
+dflt=$g4lib_use_granular
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		break
+		;;
+	y*|Y*) 
+		g4lib_use_granular=y
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+fi
+
+echo " "
+case "$g4lib_build_shared" in
+'')
+	g4lib_build_shared=n
+	;;
+esac
+
+echo " "
+case "$g4lib_build_static" in
+'')
+	g4lib_build_static=n
+	;;
+esac
+
+echo " "
+case "$g4lib_use_shared" in
+'')
+	g4lib_use_shared=n
+	;;
+esac
+
+echo " "
+case "$g4lib_use_static" in
+'')
+	g4lib_use_static=n
+	;;
+esac
+
+#
+# Ask about building of SHARED|STATIC libraries - default STATIC. 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+By default 'static' (.a) libraries are built.
+
+Do you want to build 'shared' (.so) libraries?
+EOM`
+
+dflt=$g4lib_build_shared
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		break
+		;;
+	y*|Y*) 
+		g4lib_build_shared=y
+#		g4lib_build_static=""
+#		g4lib_use_shared=1
+#		g4lib_use_static=""
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+
+if [ X$g4lib_build_shared = Xy ] ; then
+#
+# Ask about g4lib_build_static - default "n". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+You selected to build 'shared' (.so) libraries. 
+Do you want to build 'static' (.a) libraries too?
+EOM`
+
+dflt=$g4lib_build_static
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		break
+		;;
+	y*|Y*) 
+#		g4lib_build_shared=1
+		g4lib_build_static=y
+#		g4lib_use_shared=1
+#		g4lib_use_static=""
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+
+if [ X$g4lib_build_static = Xy ] ; then
+#
+# Ask about g4lib_use_static - default "n". 
+#
+echo ""
+
+while test 1 = 1  ; do
+
+g4message=`cat << EOM
+
+You selected to build 'shared' (.so) and 'static' (.a) libraries. 
+Do you want to use 'static' (.a) libraries?
+EOM`
+
+dflt=$g4lib_use_static
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		break
+		;;
+	y*|Y*) 
+#		g4lib_build_shared=1
+#		g4lib_build_static=1
+#		g4lib_use_shared=1
+		g4lib_use_static=y
+		break
+		;;
+#	[eE]) 
+#		break
+#		;;
+#	*) 
+#		echo " "
+#		break
+#		;;
+	esac
+done
+fi
+
+fi
+
+
+echo " "
+case "$g4use_ospace" in
+'')
+	g4use_ospace=n
+	;;
+esac
+
+case "$g4ospace_base_dir" in
+'')
+	g4ospace_base_dir=""
+	;;
+esac
+
+#
+# Ask about g4install used. 
+#
+echo ""
+
+g4message=`cat << EOM
+
+In case your compiler do not provide 'native' STL and choose for a non
+ISO/ANSI installation, ObjectSpace STL (if available in your system) may
+be used and its installation path specified.
+
+Do you want to use ObjectSpace STL?
+EOM`
+
+dflt=$g4use_ospace
+rp=$g4message
+. ./myread
+g4use_ospace=$ans
+
+if [ X$g4use_ospace = Xy ] ; then
+		
+dflt=$g4ospace_base_dir
+fn='d~'
+rp="Where is OSPACE installed?"
+. ./getfile
+g4ospace_base_dir=$ans
+
+fi
+
+#if test "X$g4use_ospace" = "X[NOT DEFINED]" ; then
+#g4use_ospace=""
+#fi
+
+echo " "
+case "$g4ui_build_terminal_session" in
+'')
+	g4ui_build_terminal_session=y
+	;;
+esac
+
+case "$g4ui_use_terminal" in
+'')
+	g4ui_use_terminal=y
+	;;
+esac
+
+case "$g4ui_build_gag_session" in
+'')
+	g4ui_build_gag_session=n
+	;;
+esac
+
+case "$g4ui_use_gag" in
+'')
+	g4ui_use_gag=n
+	;;
+esac
+
+case "$g4ui_build_xm_session" in
+'')
+	g4ui_build_xm_session=n
+	;;
+esac
+
+case "$g4ui_build_xaw_session" in
+'')
+	g4ui_build_xaw_session=n
+	;;
+esac
+
+case "$g4ui_use_xm" in
+'')
+	g4ui_use_xm=n
+	;;
+esac
+
+case "$g4ui_use_xaw" in
+'')
+	g4ui_use_xaw=n
+	;;
+esac
+
+case "$g4ui_build_win32_session" in
+'')
+	g4ui_build_win32_session=n
+	;;
+esac
+
+case "$g4ui_use_win32" in
+'')
+	g4ui_use_win32=n
+	;;
+esac
+
+case "$g4ui_use_tcsh" in
+'')
+	g4ui_use_tcsh=n
+	;;
+esac
+
+echo ""
+
+g4message=`cat << EOM
+
+  G4UI_BUILD_TERMINAL_SESSION
+  Specifies to include in kernel library a basic dumb terminal
+  user interface (default).
+
+  G4UI_USE_TERMINAL
+  Specifies to use dumb terminal interface in the application to be
+  built (default).
+EOM`
+
+dflt=$g4ui_use_terminal
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_build_terminal_session=n
+		g4ui_use_terminal=n
+		;;
+	y*|Y*) 
+		g4ui_build_terminal_session=y
+		g4ui_use_terminal=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4UI_BUILD_GAG_SESSION
+  Specifies to include in kernel library the GAG based
+  user interface.
+
+  G4UI_USE_GAG
+  Specifies to use the GAG interface in the application to be
+  built.
+EOM`
+
+dflt=$g4ui_use_gag
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_build_gag_session=n
+		g4ui_use_gag=n
+		;;
+	y*|Y*) 
+		g4ui_build_gag_session=y
+		g4ui_use_gag=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4UI_BUILD_XAW_SESSION
+  Specifies to include in kernel library the XAW
+  Motif-based user interfaces.
+
+  G4UI_USE_XAW
+  Specifies to use the XAW interfaces in the
+  application to be built.
+EOM`
+
+dflt=$g4ui_use_xaw
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_build_xaw_session=n
+		g4ui_use_xaw=n
+		;;
+	y*|Y*) 
+		g4ui_build_xaw_session=y
+		g4ui_use_xaw=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4UI_BUILD_XM_SESSION
+  Specifies to include in kernel library the XM
+  Motif-based user interfaces.
+
+  G4UI_USE_XM
+  Specifies to use the XM interfaces in the
+  application to be built.
+EOM`
+
+dflt=$g4ui_use_xm
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_build_xm_session=n
+		g4ui_use_xm=n
+		;;
+	y*|Y*) 
+		g4ui_build_xm_session=y
+		g4ui_use_xm=y
+		;;
+	esac
+
+
+g4message=`cat << EOM
+
+  G4UI_BUILD_WIN32_SESSION
+  Specifies to include in kernel library the WIN32 terminal interface
+  for Windows systems.
+
+  G4UI_USE_WIN32
+  Specifies to use the WIN32 interfaces in the application to be built
+  on Windows systems.
+EOM`
+
+dflt=$g4ui_use_win32
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_build_win32_session=n
+		g4ui_use_win32=n
+		;;
+	y*|Y*) 
+		g4ui_build_win32_session=y
+		g4ui_use_win32=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4UI_USE_TCSH
+  Specifies to use the tcsh-style terminal in the application
+  to be built.
+EOM`
+
+dflt=$g4ui_use_tcsh
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4ui_use_tcsh=n
+		;;
+	y*|Y*) 
+		g4ui_use_tcsh=y
+		;;
+	esac
+
+
+echo " "
+case "$g4use_hepodbms" in
+'')
+	g4use_hepodbms=n
+	;;
+esac
+
+g4message=`cat << EOM
+
+  G4USE_HEPODBMS
+In Geant4, object persistency is provided as an optional category, so
+that the users could be able to run Geant4 with or without a commercial 
+ODBMS package. How to store and retrieve Geant4 events, hits and geometry 
+objects is explained in documentation. 
+EOM`
+
+dflt=$g4use_hepodbms
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4use_hepodbms=n
+		;;
+	y*|Y*) 
+		g4use_hepodbms=y
+		;;
+	esac
+
+
+echo " "
+case "$g4vis_build_dawn_driver" in
+'')
+	g4vis_build_dawn_driver=n
+	;;
+esac
+
+case "$g4vis_build_dawnfile_driver" in
+'')
+	g4vis_build_dawnfile_driver=n
+	;;
+esac
+
+case "$g4vis_build_opacs_driver" in
+'')
+	g4vis_build_opacs_driver=n
+	;;
+esac
+
+case "$g4vis_build_openglx_driver" in
+'')
+	g4vis_build_openglx_driver=n
+	;;
+esac
+
+case "$g4vis_build_openglxm_driver" in
+'')
+	g4vis_build_openglxm_driver=n
+	;;
+esac
+
+case "$g4vis_build_oix_driver" in
+'')
+	g4vis_build_oix_driver=n
+	;;
+esac
+
+case "$g4vis_build_raytracer_driver" in
+'')
+	g4vis_build_raytracer_driver=n
+	;;
+esac
+
+case "$g4vis_build_vrml_driver" in
+'')
+	g4vis_build_vrml_driver=n
+	;;
+esac
+
+case "$g4vis_build_vrmlfile_driver" in
+'')
+	g4vis_build_vrmlfile_driver=n
+	;;
+esac
+
+# Set by default!
+case "$g4vis_build_asciitree_driver" in
+'')
+	g4vis_build_asciitree_driver=y
+	;;
+esac
+
+case "$g4vis_use_dawn" in
+'')
+	g4vis_use_dawn=n
+	;;
+esac
+
+case "$g4vis_use_dawnfile" in
+'')
+	g4vis_use_dawnfile=n
+	;;
+esac
+
+case "$g4vis_use_opacs" in
+'')
+	g4vis_use_opacs=n
+	;;
+esac
+
+case "$g4vis_use_openglx" in
+'')
+	g4vis_use_openglx=n
+	;;
+esac
+
+case "$g4vis_use_openglxm" in
+'')
+	g4vis_use_openglxm=n
+	;;
+esac
+
+case "$g4vis_use_oix" in
+'')
+	g4vis_use_oix=n
+	;;
+esac
+
+case "$g4vis_use_raytracer" in
+'')
+	g4vis_use_raytracer=n
+	;;
+esac
+
+case "$g4vis_use_vrml" in
+'')
+	g4vis_use_vrml=n
+	;;
+esac
+
+case "$g4vis_use_vrmlfile" in
+'')
+	g4vis_use_vrmlfile=n
+	;;
+esac
+
+# Set by default!
+case "$g4vis_use_asciitree" in
+'')
+	g4vis_use_asciitree=y
+	;;
+esac
+
+echo ""
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_DAWN_DRIVER
+  G4VIS_USE_DAWN
+
+DAWN drivers are interfaces to Fukui Renderer DAWN. It is a vectorized 3D 
+PostScript processor, and so well suited to prepare technical high
+quality outputs for presentation and/or documentation. 
+When Geant4 Visualization is performed with the DAWN driver, 
+the visualized view is automatically saved to a file
+named g4.eps in the current directory, which describes a vectorized 
+(Encapsulated) PostScript data of the view. 
+EOM`
+
+dflt=$g4vis_use_dawn
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_dawn_driver=n
+		g4vis_use_dawn=n
+		;;
+	y*|Y*) 
+		g4vis_build_dawn_driver=y
+		g4vis_use_dawn=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_DAWNFILE_DRIVER
+  G4VIS_USE_DAWNFILE
+
+DAWN drivers are interfaces to Fukui Renderer DAWN. It is a vectorized 3D 
+PostScript processor, and so well suited to prepare technical high
+quality outputs for presentation and/or documentation. 
+The DAWNFILE driver sends 3D data to DAWN via an intermediate file, 
+named g4.prim in the current directory. The file g4.prim is able to 
+be re-visualized later without the help of Geant4. 
+EOM`
+
+dflt=$g4vis_use_dawnfile
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_dawnfile_driver=n
+		g4vis_use_dawnfile=n
+		;;
+	y*|Y*) 
+		g4vis_build_dawnfile_driver=y
+		g4vis_use_dawnfile=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_OPACS_DRIVER
+  G4VIS_USE_OPACS
+
+OPACS is a visualization environment based on X windows and OpenGL. 
+It is written in ANSI C and is highly portable (UNIX, NT/X11, VMS). 
+EOM`
+
+dflt=$g4vis_use_opacs
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_opacs_driver=n
+		g4vis_use_opacs=n
+		;;
+	y*|Y*) 
+		g4vis_build_opacs_driver=y
+		g4vis_use_opacs=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_OPENGLX_DRIVER
+  G4VIS_USE_OPENGLX
+
+It is an interface to the de facto standard 3D graphics library, OpenGL. 
+It is well suited for real-time fast visualization
+and demonstration. Fast visualization is realized with hardware 
+acceleration, reuse of shapes stored in a display list, etc. 
+NURBS visualization is also supported. This is version for Xlib.
+EOM`
+
+dflt=$g4vis_use_openglx
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_openglx_driver=n
+		g4vis_use_openglx=n
+		;;
+	y*|Y*) 
+		g4vis_build_openglx_driver=y
+		g4vis_use_openglx=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_OPENGLXM_DRIVER
+  G4VIS_USE_OPENGLXM
+
+It is an interface to the de facto standard 3D graphics library, OpenGL. 
+It is well suited for real-time fast visualization
+and demonstration. Fast visualization is realized with hardware 
+acceleration, reuse of shapes stored in a display list, etc. 
+NURBS visualization is also supported. This is version for Motif.
+EOM`
+
+dflt=$g4vis_use_openglxm
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_openglxm_driver=n
+		g4vis_use_openglxm=n
+		;;
+	y*|Y*) 
+		g4vis_build_openglxm_driver=y
+		g4vis_use_openglxm=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_OIX_DRIVER
+  G4VIS_USE_OIX
+
+These drivers are based on the "Hepvis class library". 
+The OpenInventor drivers and the Hepvis class library are based on the
+well-established OpenInventor technology for scientific visualization. 
+They have high extendibility. 
+EOM`
+
+dflt=$g4vis_use_oix
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_oix_driver=n
+		g4vis_use_oix=n
+		;;
+	y*|Y*) 
+		g4vis_build_oix_driver=y
+		g4vis_use_oix=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_RAYTRACER_DRIVER
+  G4VIS_USE_RAYTRACER
+
+It performs ray-tracing visualization using the tracking routines of Geant4. 
+It is, therefore, available for debugging tracking routines. 
+It is well suited for photo-realistic high quality output for 
+presentation, and for intuitive debugging of detector geometry. 
+EOM`
+
+dflt=$g4vis_use_raytracer
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_raytracer_driver=n
+		g4vis_use_raytracer=n
+		;;
+	y*|Y*) 
+		g4vis_build_raytracer_driver=y
+		g4vis_use_raytracer=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_VRML_DRIVER
+  G4VIS_USE_VRML
+
+This driver generates VRML files, which describe 3D scenes to be 
+visualized with a proper VRML viewer, at either a local or a remote host. 
+EOM`
+
+dflt=$g4vis_use_vrml
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_vrml_driver=n
+		g4vis_use_vrml=n
+		;;
+	y*|Y*) 
+		g4vis_build_vrml_driver=y
+		g4vis_use_vrml=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_VRMLFILE_DRIVER
+  G4VIS_USE_VRMLFILE
+
+This driver generates VRML files, which describe 3D scenes to be 
+visualized with a proper VRML viewer, at either a local or a remote host. 
+The VRMLFILE driver sends 3D data to your VRML viewer, which is running 
+in the same host machine as Geant4, via an intermediate file named 
+g4.wrl created in the current directory. This file is available for 
+re-visualization afterwards. In visualization, you should specify a 
+name of the VRML viewer by setting the environment variable G4VRML_VIEWER 
+beforehand.
+EOM`
+
+dflt=$g4vis_use_vrmlfile
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_vrmlfile_driver=n
+		g4vis_use_vrmlfile=n
+		;;
+	y*|Y*) 
+		g4vis_build_vrmlfile_driver=y
+		g4vis_use_vrmlfile=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4VIS_BUILD_ASCIITREE_DRIVER
+  G4VIS_USE_ASCIITREE
+
+Description????????????????????????
+EOM`
+
+dflt=$g4vis_use_asciitree
+rp=$g4message
+# Don't ask by default and set to 'y'!
+#. ./myread
+gans=y
+
+	case $gans in
+	
+	n*|N*) 
+		g4vis_build_asciitree_driver=n
+		g4vis_use_asciitree=n
+		;;
+	y*|Y*) 
+		g4vis_build_asciitree_driver=y
+		g4vis_use_asciitree=y
+		;;
+	esac
+
+
+echo " "
+case "$g4wanalysis_build" in
+'')
+	g4wanalysis_build=n
+	;;
+esac
+
+case "$g4wanalysis_build_jas" in
+'')
+	g4wanalysis_build_jas=n
+	;;
+esac
+
+case "$g4wanalysis_build_lab" in
+'')
+	g4wanalysis_build_lab=n
+	;;
+esac
+
+case "$g4wanalysis_build_lizard" in
+'')
+	g4wanalysis_build_lizard=n
+	;;
+esac
+
+case "$g4wanalysis_use" in
+'')
+	g4wanalysis_use=n
+	;;
+esac
+
+case "$g4wanalysis_use_jas" in
+'')
+	g4wanalysis_use_jas=n
+	;;
+esac
+
+case "$g4wanalysis_use_lab" in
+'')
+	g4wanalysis_use_lab=n
+	;;
+esac
+
+case "$g4wanalysis_use_lizard" in
+'')
+	g4wanalysis_use_lizard=n
+	;;
+esac
+
+echo ""
+
+g4message=`cat << EOM
+
+  G4ANALYSIS_BUILD
+  G4ANALYSIS_USE
+  Specifies to include building (using) of the abstract G4analysisManager for
+  activating interfaces based on AIDA to analysis drivers.
+  No histogramming capabilities are possible without a specific
+  wanalysis driver activated.
+EOM`
+
+dflt=$g4wanalysis_use
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4wanalysis_build=n
+		g4wanalysis_use=n
+		;;
+	y*|Y*) 
+		g4wanalysis_build=y
+		g4wanalysis_use=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4ANALYSIS_BUILD_LAB
+  Includes the Open Scientist proxy driver for analysis in the kernel.
+
+  G4ANALYSIS_USE_LAB
+  To use Open Scientist as analysis system in the application
+  to be built.
+EOM`
+
+dflt=$g4wanalysis_use_lab
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4wanalysis_build_lab=n
+		g4wanalysis_use_lab=n
+		;;
+	y*|Y*) 
+		g4wanalysis_build_lab=y
+		g4wanalysis_use_lab=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4ANALYSIS_BUILD_LIZARD
+  Includes the Lizard proxy driver for analysis in the kernel.
+
+  G4ANALYSIS_USE_LIZARD
+  To use Lizard as analysis system in the application to be built.
+EOM`
+
+dflt=$g4wanalysis_use_lizard
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4wanalysis_build_lizard=n
+		g4wanalysis_use_lizard=n
+		;;
+	y*|Y*) 
+		g4wanalysis_build_lizard=y
+		g4wanalysis_use_lizard=y
+		;;
+	esac
+
+g4message=`cat << EOM
+
+  G4ANALYSIS_BUILD_JAS
+  Includes the JAS proxy driver for analysis in the kernel.
+
+  G4ANALYSIS_USE_JAS
+  To use JAS as analysis system in the application to be built.
+EOM`
+
+dflt=$g4wanalysis_use_jas
+rp=$g4message
+. ./myread
+gans=$ans
+
+	case $gans in
+	
+	n*|N*) 
+		g4wanalysis_build_jas=n
+		g4wanalysis_use_jas=n
+		;;
+	y*|Y*) 
+		g4wanalysis_build_jas=y
+		g4wanalysis_use_jas=y
+		;;
+	esac
+
+
+: end of configuration questions
+echo " "
+echo "End of configuration phase."
+echo " "
+
+: back to where it started
+if test -d ../UU; then
+	cd ..
+fi
+
+: configuration may be patched via a 'config.over' file
+if $test -f config.over; then
+	echo " "
+	dflt=y
+	rp='A config.over file exists.  Do you wish to load it?'
+	. UU/myread
+	case "$ans" in
+	n*) echo "OK, I'll ignore it.";;
+	*)	. ./config.over
+		echo "Configuration settings have been loaded."
+		;;
+	esac
+fi
+
+: in case they want portability, strip down executable paths
+case "$d_portable" in
+"$define")
+	echo " "
+	echo "Stripping down executable paths..." >&4
+	for file in $loclist $trylist; do
+		eval $file="\$file"
+	done
+	;;
+esac
+
+: create config.sh file
+echo " "
+echo "Creating config.sh..." >&4
+mkdir -p $g4conf
+$spitshell <<EOT > $g4conf/config.sh
+$startsh
+#
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
+#
+
+# Package name      : $package
+# Source directory  : $src
+# Configuration time: $cf_time
+# Configured by     : $cf_by
+# Target system     : $myuname
+
+Author='$Author'
+Date='$Date'
+Header='$Header'
+Id='$Id'
+Locker='$Locker'
+Log='$Log'
+Mcc='$Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source='$Source'
+State='$State'
+ar='$ar'
+awk='$awk'
+bash='$bash'
+bison='$bison'
+byacc='$byacc'
+c='$c'
+cat='$cat'
+cf_by='$cf_by'
+cf_time='$cf_time'
+chgrp='$chgrp'
+chmod='$chmod'
+chown='$chown'
+comm='$comm'
+compress='$compress'
+contains='$contains'
+cp='$cp'
+cpio='$cpio'
+cpp='$cpp'
+csh='$csh'
+d_portable='$d_portable'
+date='$date'
+echo='$echo'
+egrep='$egrep'
+emacs='$emacs'
+eunicefix='$eunicefix'
+expr='$expr'
+find='$find'
+flex='$flex'
+g4base='$g4base'
+g4bin='$g4bin'
+g4clhep_base_dir='$g4clhep_base_dir'
+g4clhep_include_dir='$g4clhep_include_dir'
+g4clhep_lib='$g4clhep_lib'
+g4clhep_lib_dir='$g4clhep_lib_dir'
+g4compiler='$g4compiler'
+g4conf='$g4conf'
+g4data='$g4data'
+g4debug='$g4debug'
+g4global='$g4global'
+g4granular='$g4granular'
+g4include='$g4include'
+g4install='$g4install'
+g4ledata='$g4ledata'
+g4levelgammadata='$g4levelgammadata'
+g4lib='$g4lib'
+g4lib_build_shared='$g4lib_build_shared'
+g4lib_build_static='$g4lib_build_static'
+g4lib_use_granular='$g4lib_use_granular'
+g4lib_use_shared='$g4lib_use_shared'
+g4lib_use_static='$g4lib_use_static'
+g4neutronhpcrosssections='$g4neutronhpcrosssections'
+g4osname='$g4osname'
+g4ospace_base_dir='$g4ospace_base_dir'
+g4radioactivedata='$g4radioactivedata'
+g4system='$g4system'
+g4tmp='$g4tmp'
+g4ui_build_gag_session='$g4ui_build_gag_session'
+g4ui_build_terminal_session='$g4ui_build_terminal_session'
+g4ui_build_win32_session='$g4ui_build_win32_session'
+g4ui_build_xaw_session='$g4ui_build_xaw_session'
+g4ui_build_xm_session='$g4ui_build_xm_session'
+g4ui_use_gag='$g4ui_use_gag'
+g4ui_use_tcsh='$g4ui_use_tcsh'
+g4ui_use_terminal='$g4ui_use_terminal'
+g4ui_use_win32='$g4ui_use_win32'
+g4ui_use_xaw='$g4ui_use_xaw'
+g4ui_use_xm='$g4ui_use_xm'
+g4use_hepodbms='$g4use_hepodbms'
+g4use_ospace='$g4use_ospace'
+g4vis_build_asciitree_driver='$g4vis_build_asciitree_driver'
+g4vis_build_dawn_driver='$g4vis_build_dawn_driver'
+g4vis_build_dawnfile_driver='$g4vis_build_dawnfile_driver'
+g4vis_build_oix_driver='$g4vis_build_oix_driver'
+g4vis_build_opacs_driver='$g4vis_build_opacs_driver'
+g4vis_build_openglx_driver='$g4vis_build_openglx_driver'
+g4vis_build_openglxm_driver='$g4vis_build_openglxm_driver'
+g4vis_build_raytracer_driver='$g4vis_build_raytracer_driver'
+g4vis_build_vrml_driver='$g4vis_build_vrml_driver'
+g4vis_build_vrmlfile_driver='$g4vis_build_vrmlfile_driver'
+g4vis_use_asciitree='$g4vis_use_asciitree'
+g4vis_use_dawn='$g4vis_use_dawn'
+g4vis_use_dawnfile='$g4vis_use_dawnfile'
+g4vis_use_oix='$g4vis_use_oix'
+g4vis_use_opacs='$g4vis_use_opacs'
+g4vis_use_openglx='$g4vis_use_openglx'
+g4vis_use_openglxm='$g4vis_use_openglxm'
+g4vis_use_raytracer='$g4vis_use_raytracer'
+g4vis_use_vrml='$g4vis_use_vrml'
+g4vis_use_vrmlfile='$g4vis_use_vrmlfile'
+g4wanalysis_build='$g4wanalysis_build'
+g4wanalysis_build_jas='$g4wanalysis_build_jas'
+g4wanalysis_build_lab='$g4wanalysis_build_lab'
+g4wanalysis_build_lizard='$g4wanalysis_build_lizard'
+g4wanalysis_use='$g4wanalysis_use'
+g4wanalysis_use_jas='$g4wanalysis_use_jas'
+g4wanalysis_use_lab='$g4wanalysis_use_lab'
+g4wanalysis_use_lizard='$g4wanalysis_use_lizard'
+g4workdir='$g4workdir'
+gcc='$gcc'
+grep='$grep'
+gzip='$gzip'
+hint='$hint'
+inews='$inews'
+ksh='$ksh'
+less='$less'
+line='$line'
+lint='$lint'
+ln='$ln'
+lns='$lns'
+lp='$lp'
+lpr='$lpr'
+ls='$ls'
+mail='$mail'
+mailx='$mailx'
+make='$make'
+mkdir='$mkdir'
+more='$more'
+mv='$mv'
+myuname='$myuname'
+n='$n'
+nroff='$nroff'
+osname='$osname'
+osvers='$osvers'
+package='$package'
+perl='$perl'
+pg='$pg'
+pmake='$pmake'
+pr='$pr'
+rm='$rm'
+rmail='$rmail'
+sed='$sed'
+sendmail='$sendmail'
+sh='$sh'
+shar='$shar'
+sharpbang='$sharpbang'
+shsharp='$shsharp'
+sleep='$sleep'
+smail='$smail'
+sort='$sort'
+spackage='$spackage'
+spitshell='$spitshell'
+src='$src'
+startsh='$startsh'
+submit='$submit'
+tail='$tail'
+tar='$tar'
+tbl='$tbl'
+test='$test'
+touch='$touch'
+tr='$tr'
+troff='$troff'
+uname='$uname'
+uniq='$uniq'
+uuname='$uuname'
+vi='$vi'
+zcat='$zcat'
+zip='$zip'
+EOT
+
+: add special variables
+mkdir -p $g4conf
+$test -f $src/patchlevel.h && \
+awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >> $g4conf/config.sh
+echo "CONFIG=true" >> $g4conf/config.sh
+
+: propagate old symbols
+if $test -f UU/config.sh; then
+	<UU/config.sh sort | uniq >UU/oldconfig.sh
+	sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' config.sh config.sh UU/oldconfig.sh |\
+	sort | uniq -u >UU/oldsyms
+	set X `cat UU/oldsyms`
+	shift
+	case $# in
+	0) ;;
+	*)
+		cat <<EOM
+		
+Hmm...You had some extra variables I don't know about...
+      I'll try to keep 'em...
+
+EOM
+		echo "# Variables propagated from previous config.sh file." >>.config/bin/$g4system/config.sh
+		for sym in `cat UU/oldsyms`; do
+			echo "    Propagating $hint variable "'$'"$sym..."
+			eval 'tmp="$'"${sym}"'"'
+			echo "$tmp" | \
+				sed -e "s/'/'\"'\"'/g" -e "s/^/$sym='/" -e "s/$/'/" >>.config/bin/$g4system/config.sh
+		done
+		;;
+	esac
+fi
+
+: preserve RCS keywords in files with variable substitution, grrr
+Id='$Id'
+
+: Finish up by extracting the .SH files
+case "$alldone" in
+exit)
+	$rm -rf UU
+	echo "Done."
+	exit 0
+	;;
+cont)
+	;;
+'')
+	dflt=''
+	nostick=true
+	$cat <<EOM
+
+WARNING: You can check and edit!
+If you'd like to make any change to the $g4conf/config.sh file before the final
+configuration, do it as a shell escape now (e.g. !vi $g4conf/config.sh).
+
+EOM
+	rp="Press [Enter] to start installation or use a shell escape to edit config.sh:"
+	. UU/myread
+	nostick=''
+	case "$ans" in
+	'') ;;
+	*) : in case they cannot read
+		sh 1>&4 -c "$ans";;
+	esac
+	;;
+esac
+
+: if this fails, just run all the .SH files by hand
+. $g4conf/config.sh
+
+echo " "
+exec 1>&4
+. ./UU/extract
+
+if $contains '^depend:' [Mm]akefile >/dev/null 2>&1; then
+	dflt=y
+	case "$silent" in
+	true) ;;
+	*)
+		$cat <<EOM
+
+Now you need to generate make dependencies by running "make depend".
+You might prefer to run it in background: "make depend > makedepend.out &"
+It can take a while, so you might not want to run it right now.
+
+EOM
+		;;
+	esac
+	rp="Run make depend now?"
+	. UU/myread
+	case "$ans" in
+	y*)
+		make depend && echo "Now you must run a make."
+		;;
+	*)
+		echo "You must run 'make depend' then 'make'."
+		;;
+	esac
+elif test -f [Mm]akefile; then
+	echo " "
+	echo "Now you must run a make."
+elif test -f $g4conf/install.sh; then
+	echo " "
+	echo "Now starting Geant4 libraries installation..."
+	echo " "
+	. $g4conf/install.sh
+else
+	echo " "
+	echo "WARNING: Geant4 is NOT installed yet!"
+	echo "You (or the administrator if you have not enough privileges)"
+	echo "should start with \$G4INSTALL/Configure -install"
+	echo "(where \$G4INSTALL is Geant4 install directory)."
+	echo " "
+fi
+
+$rm -f kit*isdone ark*isdone
+$rm -rf UU
+
+: End of Configure
+
diff --git a/ReleaseNotes/ReleaseNotes4.3.2.txt b/ReleaseNotes/ReleaseNotes4.3.2.txt
new file mode 100644
index 0000000000..62db2bb461
--- /dev/null
+++ b/ReleaseNotes/ReleaseNotes4.3.2.txt
@@ -0,0 +1,442 @@
+
+                 Geant4 3.2 Release Notes
+                 ------------------------
+
+                                                      29th June 2001
+
+These are the main new features/fixes included in this release since
+release 3.1 (for the detailed list of fixes/additions, please refer to the
+related History files):
+
+  o Configuration:
+    -------------
+    - Added G4VIS_BUILD_ASCIITREE_DRIVER, G4VIS_USE_ASCIITREE and
+      G4VIS_BUILD_GAGTREE_DRIVER, G4VIS_USE_GAGTREE variables to
+      activate module for ascii/GAG hierachycal tree of geometry volumes.
+    - Introduced changes for persistency: common.gmk is now split in three, 
+      one general, and one for specific for transient and persistent each. 
+      Dependencies now much better handled in persistency. 
+    - Removed G4_NO_CBRT flag from WIN32-VC.gmk, no more needed.
+
+  o Event:
+    -----
+    - Fixes to cowork with STL vector migration of 'geometry'.
+
+  o Electromagnetic Processes (Low-energy):
+    --------------------------------------
+    - Migration to STL vector. Removed references to RW wrappers.
+    - Fixed pedantic warnings detected on Linux ANSI setup.
+    - Added new process for polarised Compton scattering.
+    - Bug fix in anti-proton ionisation.
+
+  o Electromagnetic Processes (Standard):
+    ------------------------------------
+    - Fixed pedantic warnings detected on Linux ANSI setup.
+
+  o General Processes, Parameterisation, Decay, Optical:
+    ---------------------------------------------------
+    - Fixed pedantic warnings detected on Linux ANSI setup.
+
+  o Geometry:
+    --------
+    - Migrated code to native STL vector. Removed all references to
+      Rogue-Wave wrappers.
+    - Management:
+      o Adopt explicit initialisation for 'minExtents' and 'maxExtents' 
+        in G4SmartVoxelHeader::BuildNodes(...).
+    - Boolean solids:
+      o Fix in G4IntersectionSolid::DistanceToIn(p,v) resolving 
+        bug observed in problem report #153. 
+    - BREPS solids:
+      o Fixes to allow -ansi compilation on Linux-g++, gcc-2.95-2 compiler: 
+        - G4Ray: changed usage of hypot(x,y) to sqrt(x*x+y*y). 
+        - G4Hyperbola: changed usage of atanh(x) to 0.5*log((1+x)/(1-x)). 
+      o G4ProjectedSurface: corrected initialisation of temporary
+        G4Point3D objects, to use the correct CLHEP constructor. 
+    - CSG solids:
+      o Added G4CSGDEBUG preprocessor flag to discriminate for debug
+        verbosity specific to CSG solids. Included in G4Exception of
+        DistanceToOut() for "point p is outside" in G4Box, G4Cons,
+	G4Tubs.
+      o G4Trap: fixed memory leak in CalculateExtent() for creation of
+        vertices in case of finite rotation.
+    - Magnetic Field:
+      o Updated G4Mag_SpinEqRhs for correction to spin tracking.
+      o Fixed G4FieldManager constructors to give default values to
+        delta parameters.
+    - STEP reader:
+      - Fix for porting on Linux-g++ 2.95-2 -ansi: removed usage of
+        strdup() in dirobj.cc; replaced with existing solution for
+        __O3DB__. 
+    - Volumes:
+      o G4AuxiliaryNavServices::CheckPointOnSurface(): added additional
+        check to resolve endless looping of G4Navigator in case the track
+        is passing through a point, edge or surface shared by two solids. 
+        Fixes problem report #185. 
+      o Fixes in G4ReplicaNavigation for bug reports #253 and #254: 
+        - in VoxelLocate(...), treated particular case of rotational
+          symmetry  with extent over 360 degrees. 
+        - in DistanceToOutPhi(...), fix to correctly handle cases where
+          the starting point is on boundary of replicas and direction is
+          along boundary. 
+      o Enabled the use of different field managers for different parts
+        of the detector. This first implementation allows a volume that
+        has a field manager to override the global one. 
+        - Note: All field managers currently must refer to fields
+                in global coordinates. 
+        - New ability: setting of the delta accuracy parameters differently
+                in different volumes (even while maintaining the same
+                field as the global one).
+      o Added new parameter to G4PropagatorInField 'fEpsilonMin' which is
+        the minimal relative accuracy for MF driving. 
+
+  o Global:
+    ------
+    - Added contructor to G4DataVector with additional argument 
+      for initialising values of collection.
+    - Removed definition of cbrt() in globals.hh to allow ANSI compilation
+      on Linux-g++ architecture with compiler gcc-2.95-2.
+    - Defined 'str_size' as G4std::string::size_type and replaced usage of
+      'size_t' in G4String and G4SubString. Fixes problem report #40. 
+
+  o Graphics Representations:
+    ------------------------
+  - Fixes in HepPolyhedron:
+    o Extended implementation to cover unforeseen earlier situation 
+      during preselection of faces without intersection. 
+    o Made GetNumberOfRotationSteps() static and public.
+    o Added GetSurfaceArea() and GetVolume(). 
+  - Fixed warnings about possible use of uninitialized variables. 
+  - Migrated to STL vector. Removed references to RW wrappers.
+  - Bug fix in BooleanProcessor to address problem report #153. 
+
+  o Hadronic Processes:
+    ------------------
+  - Migration to STL vector of the pre-compound and evaporation codes and
+    removal of most warnings detected by Linux ANSI pedantic setup.
+  - Management:
+    o Fixes memory leak in G4InelasticInteraction: systematic search
+      for leaks - energy scan 50MeV-10GeV. 
+  - High energy model:
+    o Energy- OR Momentum- conservation, can be chosen by the user.
+    o Added production of Evaporation particles.
+    o Better description of experimental data, mainly in Strange
+      Particle Production.    
+    o Cleared compilation warnings on Linux-g++.
+    o Minor bug-fix in G4HEPionMinusInelastic.
+    o Introduced temporary workaround in G4HEInelastic for high energy
+      problem (number of particles created in one event larger than
+      allocation).
+    o Missing initialization of strangeness corrected, removing energy
+      non-conservation in rare cases. 
+  - Generator models:
+    o Upgrade of angular distributions and fission yields in pre-compound
+      and evaporation models.
+    o Defined local cbrt() in G4FermiMomentum, to allow porting 
+      on gcc-2.95-2 ANSI setup.
+    o De-excitation: interface adjustment in G4ParaFissionModel.
+    o Kinetic model: fixed exceptional condition for inelastic scattering
+      off Hydrogene. No recoil required. 
+  - Radiative-decay model:
+    o Fixes to cowork with STL vector migration of 'geometry'.
+  - Low energy neutron transport model:
+    o New code revision: requires new set of data, G4NDL3.0 or later.
+    o Includes also an upgrade of the doppler broadening.
+      Allows for running on 0K data, and doing exact doppler broadening
+      on the fly (according to the temperature specified in G4Material),
+      with good performance up to about 5000K.
+    o Bug fix in G4NeutronHPInelasticCompFS to get the correct Q-value
+      for Lithium (the bug was introduced in recent development).
+  - Utilities:
+    o Fixed memory leak in G4ReactionDynamics: systematic search for
+      leaks - energy scan verification 50MeV-10GeV.
+    o Fixed bug in nuclear reactions for light ions. 
+
+  o Materials:
+    ---------
+    - Fixed pedantic warnings detected on Linux ANSI setup.
+    - Fix to explicitly initialise to zero values of G4DataVector used
+      to fill sandia-matrix.
+
+  o Particles:
+    ---------
+    - Added a0(980), f0(400-1200), f0(980).
+    - Fixed bugs in G4ParticleDefinition::GetPDGIsospin().
+    - Fixed element name in G4IonTable.
+    - Fixed PDG encoding for excited Lambdas.
+    - Added special treatment for Lamdas in G4PDGCodeChecker.
+    - Fixed pedantic warnings detected on Linux ANSI setup.
+
+  o Persistency:
+    -----------
+    - Removed useless declaration of typedef G4ThreeVectorList.
+    - Adapted to new config setup. 
+    - Changed usage of NULL to 0. 
+
+  o Run and Intercoms:
+    -----------------
+    - Added binary mode for G4VUserPhysicsList::Retrieve/StorePhysicsTable().
+    - Added G4VUserPhysicsList::RetrieveCutValues and related.
+    - Added G4VUserPhysicsList::Set/ResetStoredInAscii() to switch on ascii
+      mode for Retrieve/StorePhysicsTable().
+    - Added 'setStoredInAscii' command in G4UserPhysicsList.
+
+  o Tracking & Track:
+    ----------------
+    - Migration to STL vector. Removed references to RW wrappers.
+    - Moved G4TrackingMessenger* messenger to the class scope in
+      G4TrackingManager.
+    - Fixed problem of vertex information loss for suspended tracks.
+      Fixes problem report #240.
+    - Fix to G4SteppingManager to explicitly initialise values in STL
+      collections members of the class. 
+
+  o Transportation:
+    --------------
+    - Correction for 'spin-update' to G4Transportation: to avoid overwrite
+      of the spin value for photons and other non-charged particles (and
+      for charged particles in zero field).
+
+  o Visualization:
+    -------------
+    - Added two new commands:
+      /vis/scene/add/text
+      /vis/scene/add/axes
+    - Improvements in /vis/scene/add/volume.
+    - Added /vis/drawTree.
+    - Introduced first version of G4ASCIITree to dump geometry hierarchy
+      to standard output as ASCII stream.
+      This requires two new environment variables:
+      G4VIS_BUILD_ASCIITREE_DRIVER and G4VIS_USE_ASCIITREE.
+    - Introduced first version of G4GAGTree to dump geometry hierarchy
+      to GAG GUI system.
+      This requires two new environment variables:
+      G4VIS_BUILD_GAGTREE_DRIVER and G4VIS_USE_GAGTREE.
+    - Migration to STL vector. Removed references to RW wrappers.
+    - Removed OS dependence from the DAWN-network driver. 
+      * gethostname() removed 
+      * removed G4SocketConfig.hh and G4SocketMacro.hh. 
+      NOTE: now "setenv G4DAWN_HOST_NAME hostname" is mandatory to use 
+            the DAWN-network driver. 
+
+  o G4toG4 Tool:
+    -----------
+    - Fix in GNUmakefile: G4MAKESHLIB replaced with G4LIB_BUILD_SHARED
+      to allow building of shared library according to the new mechanism.
+    - Fix in G3toG4BuildTree for a case of the placement a volume in
+      cloned mothers. G3toG4BuildTree() has been split in two methods
+      G3toG4BuildLVTree() and G3toG4BuildPVTree(), the first creating
+      logical volumes only, the second performing placements afterwards.
+    - Cleared pedantic warnings detected on Linux-g++ with ISO/ANSI setup.
+
+  o Examples:
+    --------
+    - exampleN03: updated visualization macros in visTutor: 
+      o Commands /vis/set/XXX's are replaced with /vis/viewer/set/XXX 
+      o Commands /vis/camera/XXX's are replaced with /vis/viewer/XXX 
+        except for /vis/camera/spin. 
+      o Added exN03Tree0.mac for ASCII DTREE and exN03Tree1.mac for
+        GAG DTREE 
+    - Migrated novice/N05 to STL vector.
+    - Added new interactive commands in extended/electromagnetic/TestEm5.
+    - Updated examples:
+      o extended/analysis/AnaEx01
+      o extended/persistency/PersistentEx01 and PersistentEx02
+      o advanced/xray_telescope
+
+Notes: 
+
+  o  Geant4 3.2 is based on STL and can be installed with strict
+     ISO/ANSI C++ compliant setup or not. See notes below.
+
+The code and some binary libraries are available through our "Source Code"
+Web page:
+- see our <A href="http://cern.ch/geant4">Geant4 Home Page</A>.
+
+Please refer to <A
+href="http://cern.ch/geant4/G4UsersDocuments/Overview/html/index.html">Geant4
+User Documentation</A> for further information about using Geant4.
+Updates to the documentation for Geant4 3.2 are expected to be published as
+usual within three weeks from the release date.
+
+
+Contents
+--------
+
+  1. Supported and Tested Platforms
+  2. ANAPHE and CLHEP
+  3. The Standard Template Library (STL)
+  4. Persistency
+  5. Compiler Specific Problems
+  6. Known Run-Time Problems
+  7. Compilation Warnings
+  8. Known Run-Time Warnings
+
+
+1. Supported and Tested Platforms
+---------------------------------
+
+  o SUN Solaris 5.6/5.7, C++ 4.2 Patch 104631-04, C++ 5.2 Patch 109508-03.
+  o HP 10.20, aCC C++ B3910B A.01.23
+  o Linux 2.2.17-7, gcc C++ egcs-2.91.66 (egcs 1.1.2), gcc 2.95-2.
+      This configuration was tested with the RedHat 6.1 distribution, but
+      versions of Geant4 have also been compiled successfully on more recent
+      RedHat, Debian and Suse distributions.
+  o NT 4.0 with Service Pack 4 or Windows-2000 and Cygnus Tools b20 with:
+      Visual C++ 6.0 Service Pack 2
+
+Platforms also tested but giving rise to some problems - see below:
+
+  o DEC V4.0, cxx C++ V6.1-027.
+
+Platforms configured but not tested and not supported:
+  o SGI V6.5.5, CC 7.2.1 with ObjectSpace
+  o AIX 4.3.2, xlC compiler with ObjectSpace
+
+
+2. ANAPHE and CLHEP
+-------------------
+
+Geant4 3.2 requires the installation of CLHEP. 
+
+See <A href="http://wwwinfo.cern.ch/asd/lhc++/INSTALLATION/clhep.html">
+CLHEP</A>. Tests have been performed with CLHEP 1.6.0.0.
+
+By default, the CLHEP installation scripts will activate ISO/ANSI C++ features
+if the compiler is capable. You need to explicitly disable CLHEP settings in
+case you wish non-ISO/ANSI setup on specific compilers.
+
+Geant4 3.2 coworks with ANAPHE 3.6.0 and components included therein:
+  Objectivity 6.1 
+  ObjectSpace 2.1
+  HepODBMS 0.3.2.9
+  CLHEP 1.6.0.0
+
+For more information about ANAPHE 3.6.0, see:
+  <A href="http://cern.ch/anaphe">ANAPHE</A>
+
+
+3. The Standard Template Library
+--------------------------------
+
+The following versions of STL have been tested:
+
+   ObjectSpace STL on SUN (CC 4.2).
+
+          See <A href="http://www.objectspace.com/">ObjectSpace</A>.
+
+   "Native" STL on: Windows/NT, Linux, HP, DEC and SUN (CC 5.2).
+
+This is selected at installation/compile time by the environment variable
+G4USE_OSPACE in the case of the former - see documentation.
+
+NOTES:
+- Be aware that by default, the installation scripts will expect to use
+  the native STL implementation. You must set the G4USE_OSPACE variable
+  in the environment in order to select the ObjectSpace implementation.
+
+- Platform specific setup:
+  o DEC:   ObjectSpace is required in non ISO/ANSI setup.
+           Native STL is required for ISO/ANSI setup.
+  o HP:    Native STL is used (non ISO/ANSI setup).
+  o SUN:   ObjectSpace is required in non ISO/ANSI setup (CC 4.2).
+           Native STL is required for ISO/ANSI setup (CC 5.2 only).
+  o Linux: Native STL is required (non ISO/ANSI setup).
+  o NT:    Native STL and ISO/ANSI setup required.
+
+
+4. Persistency
+--------------
+
+ Platform
+ --------
+
+ Persistency in Geant4 3.2 release is tested on the following
+ platforms:
+
+ G4SYSTEM       OS        C++ compiler   HepODBMS    Objectivity
+ ---------  -----------   ------------   ---------   -----------
+ SUN-CC     SunOS 5.6     CC 4.2         0.3.1.4     5.2.1
+ SUN-CC5    SunOS 5.7     CC 5.2         0.3.2.10(*) 6.1.3 (*)
+ Linux-g++  RedHat 6.1    egcs-2.91.66   0.3.1.4     5.2.1
+ Linux-g++  RedHat 6.1    egcs-2.95.2    0.3.2.3 (#) 6.0   (#)
+
+ (*) HepODBMS header files must be prepared with "ooddlx -noline"
+     option. See below.
+ (#) Setup scripts for HepODBMS and Objectivity has been changed on
+     CERN AFS.  See g4odbms_setup[.sh.csh] in example PersistentEx01
+     in 'geant4/examples/extended/persistency' for example setup scripts.
+
+ Known Problems
+ --------------
+
+ - There are several warning messages on some platforms during the
+   installation of the libraries and the compilation of the examples.
+   Most of them can be safely ignored.  It is annoying but hard to get
+   rid of them due to various reasons.
+
+ - A warning message "Could not find naming root directory" appears at
+   runtime of the persistency examples. It is generaged by
+   HepDbApplication in HepODBMS. It can be ignored.
+
+ - On Solaris7 (SUN-CC5), persistent header files has to be generated by
+   ooddlx with "-noline" option to work around a bug in C++ compiler.
+   This workaround applies not only to Geant4 Persistency category but
+   also to HepODBMS, and the user defined ddl files as well.  This
+   option removes the "#line" directive of the file name and the line
+   number of the original .ddl file.  As a consequences, C++ compiler
+   no longer "tells" the correct file name and the line number of the
+   .ddl file if compiler error occurs.  Try to identify the compiler
+   error by first looking into the header file generated by ooddlx,
+   and then locate the source of the problem by looking into the .ddl
+   file. A patch to the compiler is expected from SUN.
+
+
+5. Compiler Specific Problems
+-----------------------------
+
+  o DEC V4.0, cxx C++ V6.1-027.
+
+    - We have found cases of mis-compilation of min and max templates
+      on DEC.  We have traced those which cause serious malfunction
+      but there is no guarantee that there are no other cases.
+      Detailed inspection of assembler output suggests that this
+      problem might not be confined to min and max.  This has been
+      reported to DEC/Compaq.  We understand a new version 6.2 of the
+      compiler is now available.  However we cannot guarantee correct
+      execution of Geant4 on DEC with the current version of the
+      compiler.
+    - A bug in cin.getline() system function causes an anomalous
+      behavior when running in interactive-mode on DEC-cxx 6.1 in
+      ISO/ANSI mode. We tested the bug has been fixed in more recent
+      versions of the compiler.
+
+
+6. Known Run-Time Problems and Limitations
+------------------------------------------
+
+For a complete list of outstanding run-time problems and to submit any
+problem you may find running this version of Geant4, please refer to the
+Geant4 Problem Reporting System, available on the Web at this address:
+
+    http://wwwinfo.cern.ch/asd/cgi-bin/geant4/problemreport
+
+
+7. Compilation Warnings
+-----------------------
+
+There are compilation warnings on some platforms.  We do not believe
+that any will lead to incorrect run-time behaviour, but we are working
+on reducing them.
+
+
+8. Known Run-Time Warnings
+--------------------------
+
+The following messages can be written to error output while tracking.  We
+believe none give rise to incorrect behaviour.
+
+  o G4PropagateInField: Warning: Particle is looping 
+    -  tracking in field will be stopped. 
+       It has performed 10000 steps in Field  while a maximum of 10000
+       are allowed. 
diff --git a/config/G4VIS_BUILD.gmk b/config/G4VIS_BUILD.gmk
index c7a5e1c5cc..d5abfee595 100644
--- a/config/G4VIS_BUILD.gmk
+++ b/config/G4VIS_BUILD.gmk
@@ -1,4 +1,4 @@
-# $Id: G4VIS_BUILD.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
+# $Id: G4VIS_BUILD.gmk,v 1.5 2001/06/19 20:38:12 johna Exp $
 # -------------------------------------------------------------
 # Visualization-specific CPPFLAGS for BUILD phase.
 #   John Allison, 24th January 1998.
@@ -78,8 +78,16 @@ ifdef G4VIS_BUILD_VRMLFILE_DRIVER
 endif
 # End of VRML and VRMLFILE drivers
 
+ifdef G4VIS_BUILD_ASCIITREE_DRIVER
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD_ASCIITREE_DRIVER
+endif
+
+ifdef G4VIS_BUILD_GAGTREE_DRIVER
+  G4VIS_BUILD = 1
+  CPPFLAGS += -DG4VIS_BUILD_GAGTREE_DRIVER
+endif
+
 ifdef G4VIS_BUILD
   CPPFLAGS += -DG4VIS_BUILD
 endif
-
-
diff --git a/config/G4VIS_USE.gmk b/config/G4VIS_USE.gmk
index 2092fb7718..79ce86b713 100644
--- a/config/G4VIS_USE.gmk
+++ b/config/G4VIS_USE.gmk
@@ -1,4 +1,4 @@
-# $Id: G4VIS_USE.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
+# $Id: G4VIS_USE.gmk,v 1.5 2001/06/19 20:38:31 johna Exp $
 # -------------------------------------------------------------
 # GNUmakefile for CPPFLAGS for visualization USE phase.
 #   John Allison, 24th January 1998.
@@ -91,6 +91,20 @@ ifdef G4VIS_USE_VRML_OR_VRMLFILE
   VISLIBS += -lG4VRML
 endif
 
+ifdef G4VIS_USE_ASCIITREE
+  G4VIS_USE_TREE = 1
+  CPPFLAGS += -DG4VIS_USE_ASCIITREE
+endif
+ifdef G4VIS_USE_GAGTREE
+  G4VIS_USE_TREE = 1
+  CPPFLAGS += -DG4VIS_USE_GAGTREE
+endif
+ifdef G4VIS_USE_TREE
+  G4VIS_USE = 1
+  CPPFLAGS += -I$(G4BASE)/visualization/Tree/include
+  VISLIBS += -lG4Tree
+endif
+
 ifdef G4VIS_USE
   ifdef G4_SOLVE_TEMPLATES
     G4_SOLVE_VIS_TEMPLATES = 1
diff --git a/config/History b/config/History
index fd24b2d250..2a03681d53 100644
--- a/config/History
+++ b/config/History
@@ -1,5 +1,6 @@
-$Id: History,v 1.132.2.1 2001/03/22 14:00:01 gunter Exp $
-$Name: geant4-03-01 $
+$Id: History,v 1.149 2001/06/29 12:49:25 gcosmo Exp $
+$Name:  $
+
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,7 +18,68 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
-22 March 2001 Gunter Folger (config-V03-00-03)
+29th June 2001 Gabriele Cosmo (config-V03-01-10)
+- Updated source scripts for 'Configure'.
+
+26th June 2001 Youhei Morita (config-V03-01-09)
+- globlib.gmk: added block for copying headers for persistency in $G4INCLUDE
+  when invoking the 'includes' target.
+
+25th June 2001 Youhei Morita (config-V03-01-08)
+- Restored lib_d target (again) in common.gmk with a protection of G4ODBMS.
+- Linux-g++.gmk (G.Cosmo)
+  o Commented out -ansi setup for public release
+  o Fixed logic for activating G4OODDLX_FLAGS on egcs compiler
+
+22nd June Gabriele Cosmo (config-V03-01-07)
+- common.gmk (G.Folger):
+  o removed lib_d target (again).
+  o restored G4SKIP_DEPEND.
+- Linux-g++.gmk:
+  o added temporary cludge for identify compiler version
+    and define G4DDLX_FLAGS for egcs-1.1.2.
+- binmake.gmk:
+  o added mechanism to correctly handle include paths when source headers
+    are centrally installed in $G4INCLUDE. Temporarly disabled, requires
+    update (re-design?) of liblist.c to properly generate the list of
+    libraries from the map.
+    Once activated, also G4UI_USE.gmk, G4VIS_USE.gmk and analysis.gmk
+    have to be modified accordingly.
+
+22nd June 2001 Youhei Morita (config-V03-01-06)
+- Restored lib_d target in common.gmk with a protection of G4ODBMS.
+- Get rid of G4SKIP_DEPEND in binmake.gmk.
+- Comment out G4DDLX_FLAGS options in sys/Linux-g++.gmk for gcc-2.95.2.
+
+21st June 2001 Gunter Folger (config-V03-01-05)
+- Removed bin_d and lib_d targets and thus the re-start of make.
+
+21st June 2001 Gunter Folger (config-V03-01-04)
+- common.gmk, binmake.gmk: run gmake via $(MAKE).
+
+19th June 2001 John Allison (config-V03-01-03)
+- Added GAG_TREE to G4VIS_BUILD.gmk and G4VIS_USE.gmk.
+
+20th June 2001 (Japan Time - still 19th in Europe!)
+               Youhei Morita (config-V03-01-02)
+- A few bug fixes in binmake.gmk, common_objy.gmk, sys/SUN-CC5.gmk,
+  sys/Linux-g++.gmk, sys/Win32-g++.gmk.
+
+19th June 2001 Gabriele Cosmo
+- Removed G4_NO_CBRT flag from WIN32-VC setup. No more necessary.
+
+30th May 2001 Gunter Folger
+- Do changes for persistency from Youhei: common.gmk is now split in three,
+  one general, and one for specific for transient and persistent each. 
+  Dependencies now much better handled in persistency.
+
+2nd May 2001 Gabriele Cosmo (config-V03-01-01)
+- Added options "-Wall -ansi -pedantic" to Linux-g++ setup.
+
+10th April 2001  John Allison  (config-V03-01-00)
+- Added G4VIS_BUILD_ASCIITREE_DRIVER and G4VIS_USE_ASCIITREE to G4VIS*gmk.
+
+22nd March 2001 Gunter Folger (config-V03-00-03)
 - binmake.gmk, only store in executable PATH to libs from example/test; 
   other libs should be taken/found from LD_LIBRARY_PATH
 - sys/{Linux-g++,SUN-CC}.gmk: enable storing of PATH to libs in executable 
diff --git a/config/architecture.gmk b/config/architecture.gmk
index 09fbccc9b8..5b4bef26ee 100644
--- a/config/architecture.gmk
+++ b/config/architecture.gmk
@@ -1,4 +1,4 @@
-# $Id: architecture.gmk,v 1.70 2000/12/08 09:41:26 gcosmo Exp $
+# $Id: architecture.gmk,v 1.71 2001/05/30 15:04:13 gunter Exp $
 # ------------------------------------------------------------------------
 #       GEANT 4 - Architecture configuration script for GNU Make
 #
@@ -123,7 +123,8 @@ ifdef G4ODBMS
 # set to $G4LIB/$G4SYSTEM/schema ...
 #
 ifndef G4SCHEMA_DIR
-  G4SCHEMA_DIR := $(G4LIB)/$(G4SYSTEM)/schema
+  G4SCHEMA_DIR     := $(G4LIB)/$(G4SYSTEM)/schema
+  G4SCHEMA_BOOT    := $(G4SCHEMA_DIR)/G4SCHEMA
   G4SCHEMA_INCLUDE := $(G4SCHEMA_DIR)/include
 endif
 ifndef G4SCHEMA_FDID
@@ -133,16 +134,6 @@ endif
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_DIR) ] && mkdir -p $(G4SCHEMA_DIR) )
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4SCHEMA_INCLUDE) ] && mkdir -p $(G4SCHEMA_INCLUDE) )
 
-# If not specified, the default path for G4 temporary schema G4TMPSCHEMA_DIR is
-# set to $G4TMP/$G4SYSTEM/schema (for building persistency library)...
-#
-ifndef G4TMPSCHEMA_DIR
-  G4TMPSCHEMA_DIR := $(G4TMP)/$(G4SYSTEM)/schema
-  G4TMPSCHEMA_BOOT := $(G4TMPSCHEMA_DIR)/G4SCHEMA
-endif
-
-G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMPSCHEMA_DIR) ] && mkdir -p $(G4TMPSCHEMA_DIR) )
-
 # If not specified, the default path for G4 example schema G4EXAMPLE_BOOT_DIR is
 # set to $G4WORKDIR/exampleSchema (for persistency examples)...
 #
@@ -165,7 +156,7 @@ ifndef G4EXAMPLE_FD_DIR
 endif
 
 G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4EXAMPLE_FD_DIR) ] && mkdir -p $(G4EXAMPLE_FD_DIR) )
-G4OODDLX_FLAGS := -DTEMPLATEP_HIDES_FNCD
+G4DDLX_FLAGS := -DTEMPLATEP_HIDES_FNCD
 
 ifndef G4EXAMPLE_FD
   G4EXAMPLE_FD = $(G4EXAMPLE_FD_DIR)/$(name)
diff --git a/config/binmake.gmk b/config/binmake.gmk
index 57eaf96642..954370fafe 100644
--- a/config/binmake.gmk
+++ b/config/binmake.gmk
@@ -1,7 +1,7 @@
-# $Id: binmake.gmk,v 1.56.2.1 2001/03/22 13:54:24 gunter Exp $
+# $Id: binmake.gmk,v 1.63 2001/06/22 16:11:21 gcosmo Exp $
 # ----------------------------------------------------------
 # Script defining rules and paths for making binaries.
-#                          Gabriele Cosmo, 25/06/1998.
+#    First implementation: Gabriele Cosmo, 25/06/1998.
 # ----------------------------------------------------------
 
 ifndef LDFLAGS
@@ -10,12 +10,20 @@ endif
 
 G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
 
+# Define variable checking for existence of centrally installed headers.
+# If check will be true, avoid explicit definition of paths to INCFLAGS.
+#
+# G4INCLUDE_EXEC := $(shell [ -r $(G4INCLUDE)/globals.hh ] && echo 1)
+
 include $(G4INSTALL)/config/G4UI_USE.gmk
 include $(G4INSTALL)/config/G4VIS_USE.gmk
 include $(G4INSTALL)/config/interactivity.gmk
 include $(G4INSTALL)/config/analysis.gmk
 
 ifndef INCFLAGS
+# ifeq ($(G4INCLUDE_EXEC),1)
+#   INCFLAGS := -I$(G4INCLUDE)
+# else
   INCFLAGS := \
               -I$(G4BASE)/global/management/include \
               -I$(G4BASE)/global/HEPRandom/include \
@@ -83,9 +91,11 @@ ifndef INCFLAGS
               -I$(G4BASE)/graphics_reps/include \
               -I$(G4BASE)/intercoms/include \
               -I$(G4BASE)/g3tog4/include
+# endif
 endif
 
 ifdef G4ODBMS
+# ifneq ($(G4INCLUDE_EXEC),1)
   INCFLAGS += \
               -I$(G4BASE)/persistency/global/include \
               -I$(G4BASE)/persistency/digits+hits/hits/include \
@@ -95,8 +105,9 @@ ifdef G4ODBMS
               -I$(G4BASE)/persistency/geometry/solids/CSG/include \
               -I$(G4BASE)/persistency/geometry/solids/Boolean/include \
               -I$(G4BASE)/persistency/geometry/management/include \
-              -I$(G4BASE)/persistency/management/include \
-              -I$(G4SCHEMA_INCLUDE) \
+              -I$(G4BASE)/persistency/management/include
+# endif
+  INCFLAGS += -I$(G4SCHEMA_INCLUDE) \
               -I$(OBJY_DIR)/include \
               -I$(HEP_ODBMS_DIR)/include \
               -DHep_HAS_BUILDIN_BOOL_CONSTANTS
@@ -125,8 +136,8 @@ ifdef G4EXLIB
   LDFLAGS += -L$(G4LIBDIR)
   ifdef SHAREDLIBS
     ifdef G4RUNPATHOPTION
-#        for the example dependant directory, keep the path to the shared lib 
-#          in the executable.
+#         For the example dependent directory, keep the 
+#         path to the shared lib in the executable.
       LDFLAGS += $(G4RUNPATHOPTION)$(G4LIBDIR)
     endif
   endif
@@ -253,7 +264,13 @@ else
 .PHONY: bin clean clean_bin debug cleandb newboot newfd
 endif
 
+#
+# Target "bin" requires dependency files when G4ODBMS=1.
+# gmake must be recursively called with MAKE_DFILES=1.
+#
+
 # Make $(G4TARGET) executable.
+
 bin: $(G4BINDIR)/$(G4TARGET)
 
 $(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
@@ -313,10 +330,6 @@ else
 endif
 
 # Make the $(G4TARGET).d file and include it.
-ifdef G4SKIP_DEPEND
-$(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
-	@echo Skip dependency file creation for file $< ...
-else
 $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
 	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
 	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
@@ -324,6 +337,7 @@ $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
 	@echo Making dependency for file $<...
 	@($(ECHO) $(G4TMPDIR)/exe/\\c ; \
 	g++ $(GPPFLAGS) $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/exe/$*.o!& $@!' >$@
+ifneq ($(dependencies),)
 -include $(dependencies)
 endif
 
@@ -347,6 +361,14 @@ ifdef G4ODBMS
 
 cleandb: clean newboot
 
+$(G4EXAMPLE_BOOT):
+	@echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name)
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name).FDDB
+	@rm -f $(G4EXAMPLE_BOOT_DIR)/*.$(name).DB
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \
+	                            $(G4EXAMPLE_BOOT) $(G4SCHEMA_FDID)
+
 newboot:
 	@echo Copying schema file to $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
 	@rm -f $(G4EXAMPLE_BOOT_DIR)/$(name)
@@ -355,17 +377,22 @@ newboot:
 	@$(HEP_ODBMS_DIR)/etc/getdb $(G4SCHEMA_DIR)/G4SCHEMA \
 	                            $(G4EXAMPLE_BOOT) $(G4SCHEMA_FDID)
 
-newfd:
-ifndef G4EXAMPLE_FDID
-	@echo G4EXAMPLE_FDID is not defined.  Stop.
-	exit 1
-endif
+$(G4EXAMPLE_FD):
 	@echo Creating new runtime federated database $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
 	@rm -f $(G4EXAMPLE_FD_DIR)/$(name)
 	@rm -f $(G4EXAMPLE_FD_DIR)/$(name).FDDB
 	@rm -f $(G4EXAMPLE_FD_DIR)/*.$(name).DB
 	@$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \
 	                            $(G4EXAMPLE_FD) $(G4EXAMPLE_FDID)
+
+newfd:
+	@echo Creating new runtime federated database $(G4EXAMPLE_BOOT) for FDID $(G4EXAMPLE_FDID)
+	@rm -f $(G4EXAMPLE_FD_DIR)/$(name)
+	@rm -f $(G4EXAMPLE_FD_DIR)/$(name).FDDB
+	@rm -f $(G4EXAMPLE_FD_DIR)/*.$(name).DB
+	@$(HEP_ODBMS_DIR)/etc/getdb $(G4EXAMPLE_BOOT) \
+	                            $(G4EXAMPLE_FD) $(G4EXAMPLE_FDID)
+
 endif
 ############################- targets for G4ODBMS -############################
 
diff --git a/config/common.gmk b/config/common.gmk
index fecdd7b980..ad7697096b 100644
--- a/config/common.gmk
+++ b/config/common.gmk
@@ -1,47 +1,22 @@
-# $Id: common.gmk,v 1.24 2000/12/13 08:31:31 gcosmo Exp $
+# $Id: common.gmk,v 1.30 2001/06/25 10:58:51 morita Exp $
 # ----------------------------------------------------------------
 # Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
 # ----------------------------------------------------------------
 # Libraries are created according to G4SYSTEM. G.Cosmo, 11/6/96.
 # Introduced G4LIBDIR and G4TMPDIR. G.Cosmo, 23/6/98.
 # Introduced G4SCHEMA_HEADER_DIR and G4SCHEMA_SRC_DIR. Y.Morita, 16/11/99.
+# Actual targets splitted into common_kernel.gmk and common_objy.gmk,
+#                                                      Y.Morita, 15/3/01.
 
 ifndef G4LIBDIR
   G4LIBDIR := $(G4LIB)/$(G4SYSTEM)
 endif
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
 
-ifdef G4ODBMS_INSTALLATION
-  G4OODDLX_SCHEMA_NAME := -schema Geant4
-else
-  G4OODDLX_SCHEMA_NAME := 
-endif
-G4SCHEMA_HEADER_DIR := $(G4TMPDIR)
-G4SCHEMA_SRC_DIR    := $(G4TMPDIR)
-
 sources := $(wildcard src/*.cc)
-schema_ddl := $(wildcard include/*.ddl)
-schema_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl))
-schema_ref_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl))
 objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
 dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
 
-# output of ooddlx in G4TMPDIR (.hh, _ref.hh, _ddl.cc)
-#
-temporaries := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl))
-
-# output of ooddlx in the current directory (if the process does not finish)
-#
-temporaries2 := $(patsubst include/%.ddl,%.hh,$(schema_ddl))
-
-ifdef G4ODBMS
-  temporaries += $(patsubst include/%.ddl,$(G4SCHEMA_SRC_DIR)/%_ddl.cc,$(schema_ddl)) \
-                 $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl))
-  temporaries2 += $(patsubst include/%.ddl,%_ddl.cc,$(schema_ddl)) \
-                  $(patsubst include/%.ddl,%_ref.hh,$(schema_ddl))
-  objects += $(patsubst include/%.ddl,$(G4TMPDIR)/%_ddl.o,$(schema_ddl))
-endif
-
    g4libraries_to_build :=
 ifneq ($(G4LIB_BUILD_SHARED),)
    g4libraries_to_build += $(G4LIBDIR)/lib$(name).$(SHEXT)
@@ -50,7 +25,34 @@ ifneq ($(G4LIB_BUILD_STATIC),)
    g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
 endif
 
+# GPPFLAGS is defined here to make the .d file(s) and include it(them).
+# This variable is actually used in common_kernel.gmk and common_objy.gmk.
+
+ifdef G4ODBMS
+  GPPFLAGS := "-MM"
+else
+  GPPFLAGS := "-M"
+endif
+
+###############################################################################
+#
+# Actual gmake targets.
+#
+
+#
+# Target "lib" requires dependency files when G4ODBMS=1.
+# gmake must be recursively called with MAKE_DFILES=1.
+#
+
+ifdef G4ODBMS
+lib: 
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
+	@(MAKE_DFILES=1; export MAKE_DFILES; $(MAKE) lib_d)
+
+lib_d: $(g4libraries_to_build)
+else
 lib: $(g4libraries_to_build)
+endif
 
 ifneq ($(G4LIB_BUILD_SHARED),)
 # Make shared library.
@@ -72,116 +74,49 @@ $(G4LIBDIR)/lib$(name).a: $(G4TMPDIR)/obj.last
 	@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then ranlib $(G4LIBDIR)/lib$(name).a ;fi
 endif
 
+###############################################################################
+#
+# Actual targets for .o, .d files and others are defined in
+# common_kernel.gmk and common_objy.gmk.
+#
+ifndef G4ODBMS
+
+  include $(G4INSTALL)/config/common_kernel.gmk
+
+else
+
+  include $(G4INSTALL)/config/common_objy.gmk
+
+endif
+###############################################################################
+
 # Touch the versioning file
-$(G4TMPDIR)/obj.last: $(objects)
+$(G4TMPDIR)/obj.last: $(objects) $(schema_o)
 	@touch $@
 
-# Make the .o files.
-ifdef G4ODBMS
-$(G4TMPDIR)/%.o: src/%.cc $(schema_hh)
-else
-$(G4TMPDIR)/%.o: src/%.cc
-endif
-ifdef CPPVERBOSE
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
-else
-	@echo Compiling $*.cc ...
-	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
-endif
-ifdef G4ODBMS
-$(G4TMPDIR)/%.o: $(G4SCHEMA_SRC_DIR)/%.cc
-ifdef CPPVERBOSE
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4SCHEMA_SRC_DIR)/$*.cc
-else
-	@echo Compiling $*.cc ...
-	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $(G4TMPDIR)/$(*F).o $(G4SCHEMA_SRC_DIR)/$*.cc
-endif
-endif
-# Make the temporary files.
-.PRECIOUS: $(G4SCHEMA_SRC_DIR)/%_ddl.cc $(G4SCHEMA_HEADER_DIR)/%.hh $(G4SCHEMA_HEADER_DIR)/%_ref.hh
-
-ifdef G4ODBMS
-$(G4SCHEMA_SRC_DIR)/%_ddl.cc $(G4SCHEMA_HEADER_DIR)/%.hh $(G4SCHEMA_HEADER_DIR)/%_ref.hh: include/%.ddl
-ifndef G4OODDLX_BOOT
-	@echo G4OODDLX_BOOT is not defined.  Stop.
-	exit 1
-endif
-	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
-	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
-	@if [ ! -d $(G4SCHEMA_HEADER_DIR) ] ; then mkdir $(G4SCHEMA_HEADER_DIR) ;fi
-	@if [ ! -d $(G4SCHEMA_SRC_DIR) ] ; then mkdir $(G4SCHEMA_SRC_DIR) ;fi
-ifdef CPPVERBOSE
-	ooddlx -notitle $(G4OODDLX_SCHEMA_NAME) \
-	  -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \
-	  $(G4OODDLX_FLAGS) $(CPPFLAGS) $< $(G4OODDLX_BOOT)
-else
-	@echo Preprocessing $< ...
-	@ooddlx -notitle $(G4OODDLX_SCHEMA_NAME) \
-	  -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc \
-	  $(G4OODDLX_FLAGS) $(CPPFLAGS) $< $(G4OODDLX_BOOT)
-endif
-	@mv -f $*.hh $(G4SCHEMA_HEADER_DIR)/
-	@mv -f $*_ref.hh $(G4SCHEMA_HEADER_DIR)/
-	@mv -f $*_ddl.cc $(G4SCHEMA_SRC_DIR)/
-endif
-
 # Make the .d file(s) and include it(them).
 # g++ -MM (or -M) is good at this, except it forgets the subdirectory
 # (hence the use of $G4TMP/).
+# schema_hh and schema_ref_hh are defined in common_objy.gmk.
 
-# define G4SKIP_DEPEND for simplicity
-ifndef G4ODBMS_DEPEND
-ifdef G4ODBMS
-  G4SKIP_DEPEND := 1
-endif
-endif
-
-ifdef G4ODBMS
-  GPPFLAGS := "-MM"
-else
-  GPPFLAGS := "-M"
-endif
-
-ifdef G4SKIP_DEPEND
-$(G4TMPDIR)/%.d: src/%.cc
-	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
-	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
-	@echo Skip dependency file creation for file $< ...
-else
-$(G4TMPDIR)/%.d: src/%.cc
-	@if [ ! -d $(G4TMP)/$(G4SYSTEM) ] ; then mkdir $(G4TMP)/$(G4SYSTEM) ;fi
-	@if [ ! -d $(G4TMPDIR) ] ; then mkdir $(G4TMPDIR) ;fi
+$(G4TMPDIR)/%.d: src/%.cc $(schema_hh) $(schema_ref_hh)
 	@echo Making dependency for file $< ...
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
 	@($(ECHO) $(G4TMPDIR)/\\c ; \
 	g++ $(GPPFLAGS) $(CPPFLAGS) $< ) | sed 's!$(G4TMPDIR)/$*.o!& $@!' >$@
 ifneq ($(dependencies),)
+ifndef G4ODBMS
+-include $(dependencies)
+else
+ifdef MAKE_DFILES
 -include $(dependencies)
 endif
 endif
-
-# .PHONY targets are executed regardless of time-stamp of any file of
-# same name.
-ifdef G4ODBMS_DEPEND
-.PHONY: all obj lib clean clean_libs d_files install_schema includes
-else
-.PHONY: all obj lib clean clean_libs includes
-endif
-
-obj: $(G4TMPDIR)/obj.last
-
-ifdef G4ODBMS
-headers: $(schema_hh)
-
-d_files: $(dependencies)
-
-$(schema_hh): $(schema_ddl)
-
-install_schema:
-	@echo installing schema header files ...
-	-@(cp -f $(G4TMPDIR)/*.hh $(G4SCHEMA_INCLUDE)/ || \
-	  echo "  schema header file does not exist, so ignore the error message...")
 endif
 
+#
+# Installation of include files
+#
 installed_includes:=$(foreach file,$(wildcard include/*),$(shell test -f $(file) && echo $(file)))
 installed_includes:=$(patsubst include/%,$(G4INCLUDE)/%,$(installed_includes))
 
@@ -195,12 +130,17 @@ includes::	$(installed_includes)
 $(installed_includes): $(G4INCLUDE)/% : include/%
 	@cp -p $< $@
 
+#
+# Clean up libraries
+#
 ifndef G4EXLIB
 clean:
 	@echo Cleaning up ...
 	@rm -f $(G4LIBDIR)/lib$(name).a
 	@rm -f $(G4LIBDIR)/lib$(name).$(SHEXT)
+ifdef schema_hh
 	@rm -f $(schema_hh) $(schema_ref_hh)
+endif
 	@rm -rf $(G4TMPDIR)
 endif
 
diff --git a/config/common_kernel.gmk b/config/common_kernel.gmk
new file mode 100644
index 0000000000..bc406f1a23
--- /dev/null
+++ b/config/common_kernel.gmk
@@ -0,0 +1,20 @@
+# $Id: common_kernel.gmk,v 1.3 2001/06/21 17:48:33 morita Exp $
+# ----------------------------------------------------------------
+# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
+# ----------------------------------------------------------------
+# Splitted from common.gmk for transient part of G4.   Y.Morita, 15/3/01.
+
+$(G4TMPDIR)/%.o: src/%.cc
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
+else
+	@echo Compiling $*.cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ)$(G4TMPDIR)/$(*F).o src/$*.cc
+endif
+
+# .PHONY targets are executed regardless of time-stamp of any file of
+# same name.
+.PHONY: all obj lib clean clean_libs includes
+
+obj: $(G4TMPDIR)/obj.last
+
diff --git a/config/common_objy.gmk b/config/common_objy.gmk
new file mode 100644
index 0000000000..43c5fb5e4b
--- /dev/null
+++ b/config/common_objy.gmk
@@ -0,0 +1,105 @@
+# $Id: common_objy.gmk,v 1.3 2001/06/22 15:09:25 gunter Exp $
+# ----------------------------------------------------------------
+# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
+# ----------------------------------------------------------------
+# Splitted from common.gmk for persistency part of G4.   Y.Morita, 15/3/01.
+
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
+
+ifdef G4ODBMS_INSTALLATION
+  G4_SCHEMA_NAME := -schema Geant4
+else
+  G4_SCHEMA_NAME := 
+endif
+G4SCHEMA_HEADER_DIR := $(G4TMPDIR)
+
+G4DDLX  := ooddlx -notitle $(G4_SCHEMA_NAME)
+G4DDLX_FLAGS += -header_suffix .hh -ref_suffix _ref.hh -c++_suffix _ddl.cc
+
+schema_ddl := $(wildcard include/*.ddl)
+schema_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl))
+schema_ref_hh := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl))
+schema_cc := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ddl.cc,$(schema_ddl))
+schema_o  := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ddl.o ,$(schema_ddl))
+
+# output of ooddlx in G4TMPDIR (.hh, _ref.hh, _ddl.cc)
+#
+temporaries := $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%.hh,$(schema_ddl))
+
+# output of ooddlx in the current directory (if the process does not finish)
+#
+temporaries2 := $(patsubst include/%.ddl,%.hh,$(schema_ddl))
+
+temporaries += $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ddl.cc,$(schema_ddl)) \
+               $(patsubst include/%.ddl,$(G4SCHEMA_HEADER_DIR)/%_ref.hh,$(schema_ddl))
+temporaries2 += $(patsubst include/%.ddl,%_ddl.cc,$(schema_ddl)) \
+                $(patsubst include/%.ddl,%_ref.hh,$(schema_ddl))
+objects += $(patsubst include/%.ddl,$(G4TMPDIR)/%_ddl.o,$(schema_ddl))
+
+###############################################################################
+#
+# Actual target.
+#
+
+# Make the .o files.
+$(G4TMPDIR)/%.o: src/%.cc $(G4TMPDIR)/%.d $(G4OODDLX_BOOT)
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ) $@ $<
+else
+	@echo Compiling $*.cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ) $@ $<
+endif
+
+$(G4TMPDIR)/%_ddl.o: $(G4SCHEMA_HEADER_DIR)/%_ddl.cc \
+		     $(G4SCHEMA_HEADER_DIR)/%.hh \
+		     $(G4SCHEMA_HEADER_DIR)/%_ref.hh \
+		     $(G4TMPDIR)/%.d $(G4OODDLX_BOOT) 
+ifdef CPPVERBOSE
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ) $@ $<
+else
+	@echo Compiling $*.cc ...
+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(OUT_OBJ) $@ $<
+endif
+
+# Make the temporary files.
+.PRECIOUS: $(G4SCHEMA_HEADER_DIR)/%_ddl.cc $(G4SCHEMA_HEADER_DIR)/%.hh \
+	   $(G4SCHEMA_HEADER_DIR)/%_ref.hh
+
+$(G4SCHEMA_HEADER_DIR)/%_ddl.cc \
+$(G4SCHEMA_HEADER_DIR)/%.hh \
+$(G4SCHEMA_HEADER_DIR)/%_ref.hh: include/%.ddl $(G4OODDLX_BOOT)
+ifndef G4OODDLX_BOOT
+	@echo G4OODDLX_BOOT is not defined.  Stop.
+	exit 1
+endif
+	@if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR)  ;fi
+	@if [ ! -d $(G4SCHEMA_HEADER_DIR) ] ; then mkdir -p $(G4SCHEMA_HEADER_DIR) ;fi
+ifdef CPPVERBOSE
+	(cd $(G4SCHEMA_HEADER_DIR) ; \
+	 $(G4DDLX) $(G4DDLX_FLAGS) $(CPPFLAGS) $(PWD)/$< $(G4OODDLX_BOOT) )
+else
+	@echo Preprocessing $< ...
+	@(cd $(G4SCHEMA_HEADER_DIR) ; \
+	  $(G4DDLX) $(G4DDLX_FLAGS) $(CPPFLAGS) $(PWD)/$< $(G4OODDLX_BOOT) )
+endif
+
+# .PHONY targets are executed regardless of time-stamp of any file of
+# same name.
+.PHONY: all obj lib clean clean_libs includes
+
+obj: $(G4TMPDIR)/obj.last
+
+$(schema_hh): $(schema_ddl)
+
+install_schema:
+	@echo installing schema header files ...
+	-@(cp -f $(G4TMPDIR)/*.hh $(G4SCHEMA_INCLUDE)/ || \
+	  echo "  schema header file does not exist, so ignore the error message...")
+
+$(G4SCHEMA_BOOT):
+	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA
+	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
+	@echo Copying schema file to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID)
+	@$(HEP_ODBMS_DIR)/etc/getdb $(HEP_ODBMS_DIR)/schema/HEP_BASE \
+	  $(G4SCHEMA_BOOT) $(G4SCHEMA_FDID)
+
diff --git a/config/globlib.gmk b/config/globlib.gmk
index 902c215485..2b87d8b64a 100644
--- a/config/globlib.gmk
+++ b/config/globlib.gmk
@@ -1,4 +1,4 @@
-# $Id: globlib.gmk,v 1.16 2000/12/13 09:19:14 gcosmo Exp $
+# $Id: globlib.gmk,v 1.18 2001/06/26 02:16:10 morita Exp $
 # --------------------------------------------------------------
 # Script for compound libraries.  Gabriele Cosmo, 25/6/98.
 # --------------------------------------------------------------
@@ -13,22 +13,16 @@ G4LIBDIR = $(G4LIB)/$(G4SYSTEM)
 
 .PHONY : all glob global objs includes clean clean_libs wipe_libs
 
-all:
-ifndef G4ODBMS
+all: makesub $(G4SCHEMA_BOOT)
+
+makesub:
 	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE)); done
-else
-	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) headers); done
-	@for dir in $(SUBDIRS); do (cd $$dir && G4ODBMS_DEPEND=1 &&  \
-	               export G4ODBMS_DEPEND && $(MAKE)); done
+ifdef G4ODBMS
 	@echo Copying tmp schema header from G4TMPDIR to $(G4SCHEMA_INCLUDE)
 	@rm -f $(G4SCHEMA_INCLUDE)/*.hh
 	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) install_schema); done
-	@echo Copying tmp schema to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID)
-	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA
-	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
-	@$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \
-	  $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID)
 endif
+
 g4libraries_to_build:=
 
 ifneq ($(G4LIB_BUILD_SHARED),)
@@ -42,11 +36,7 @@ ifneq ($(G4LIB_BUILD_STATIC),)
   g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
 endif
 
-ifndef G4ODBMS
 glob global: objs wipe_libs $(g4libraries_to_build)
-else
-glob global: headers d_files objs wipe_libs $(g4libraries_to_build) $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
-endif
 
 ##
 ## make static libraries
@@ -99,21 +89,6 @@ $(SHARED_LIB):	$(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
 	$(build-global-shared-lib)
 endif
 
-ifdef G4ODBMS
-headers:
-	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) headers); done
-
-d_files:
-	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) d_files); done
-
-$(G4SCHEMA_DIR)/G4SCHEMA.FDDB: $(G4TMPSCHEMA_DIR)/G4SCHEMA.FDDB
-	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA
-	@rm -f $(G4SCHEMA_DIR)/G4SCHEMA.FDDB
-	@echo Copying schema file to $(G4SCHEMA_DIR) for FDID $(G4SCHEMA_FDID)
-	@$(HEP_ODBMS_DIR)/etc/getdb $(G4TMPSCHEMA_BOOT) \
-	  $(G4SCHEMA_DIR)/G4SCHEMA $(G4SCHEMA_FDID)
-endif
-
 objs:
 	@for dir in $(SUBDIRS); \
 	  do (cd $$dir; $(MAKE) -q obj && ok=yes; \
@@ -125,6 +100,9 @@ objs:
 
 includes::
 	@for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@ ); done
+ifdef G4ODBMS
+	-@cp -p $(G4SCHEMA_INCLUDE)/*.hh $(G4INCLUDE)/
+endif
 	
 wipe_libs:
 	@for lib in $(SUBLIBS); do (rm -f $(G4LIBDIR)/lib$$lib.a); done
diff --git a/config/scripts/env.csh.SH b/config/scripts/env.csh.SH
new file mode 100755
index 0000000000..78474eda92
--- /dev/null
+++ b/config/scripts/env.csh.SH
@@ -0,0 +1,527 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting env.csh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >env.csh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+set G4SYSTEM="$g4system"
+
+#
+# g4dirs.U
+#
+set G4INSTALL="$g4install"
+set G4INCLUDE="$g4include"
+set G4BASE="$g4base"
+set G4WORKDIR="$g4workdir"
+set G4TMP="$g4tmp"
+set G4LIB="$g4lib"
+set G4BIN="$g4bin"
+set G4DATA="$g4data"
+set G4LEVELGAMMADATA="$g4levelgammadata"
+#+
+set G4RADIOACTIVEDATA="$g4radioactivedata"
+#+
+set G4LEDATA="$g4ledata"
+#+
+set NeutronHPCrossSections="$g4neutronhpcrosssections"
+
+#
+# g4clhep.U
+#
+set CLHEP_BASE_DIR="$g4clhep_base_dir"
+set CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+set set CLHEP_LIB_DIR="$g4clhep_lib_dir"
+set CLHEP_LIB="$g4clhep_lib"
+
+#
+# g4ospace
+#
+if ( X$g4use_ospace == Xy ) then
+set G4USE_OSPACE=1
+else
+set G4USE_OSPACE=""
+endif
+
+set G4OSPACE_BASE_DIR="$g4ospace_base_dir"
+
+#
+# g4debug
+#
+set G4DEBUG="$g4debug"
+
+#
+# g4analysis
+#
+if ( X$g4wanalysis_build == Xy ) then
+set G4ANALYSIS_BUILD=1
+else
+set G4ANALYSIS_BUILD=""
+endif 
+
+if ( X$g4wanalysis_build_lab == Xy ) then
+set G4ANALYSIS_BUILD_LAB=1
+else
+set G4ANALYSIS_BUILD_LAB=""
+endif 
+
+if ( X$g4wanalysis_build_jas == Xy ) then
+set G4ANALYSIS_BUILD_JAS=1
+else
+set G4ANALYSIS_BUILD_JAS=""
+endif 
+
+if ( X$g4wanalysis_build_lizard == Xy ) then
+set G4ANALYSIS_BUILD_LIZARD=1
+else
+set G4ANALYSIS_BUILD_LIZARD=""
+endif 
+
+if ( X$g4wanalysis_use == Xy ) then
+set G4ANALYSIS_USE=1
+else
+set G4ANALYSIS_USE=""
+endif 
+
+if ( X$g4wanalysis_use_lab == Xy ) then
+set G4ANALYSIS_USE_LAB=1
+else
+set G4ANALYSIS_USE_LAB=""
+endif 
+
+if ( X$g4wanalysis_use_jas == Xy ) then
+set G4ANALYSIS_USE_JAS=1
+else
+set G4ANALYSIS_USE_JAS=""
+endif 
+
+if ( X$g4wanalysis_use_lizard == Xy ) then
+set G4ANALYSIS_USE_LIZARD=1
+else
+set G4ANALYSIS_USE_LIZARD=""
+endif 
+
+#+
+#
+# g4persistency
+#
+if ( X$g4use_hepodbms == Xy ) then
+set G4USE_HEPODBMS=1
+source  \$G4INSTALL/examples/extended/persistency/PersistentEx01/g4odbms_setup.csh
+else
+set G4USE_HEPODBMS=""
+endif 
+
+#
+# g4ui
+#
+if ( X$g4ui_build_terminal_session == Xy ) then
+set G4UI_BUILD_TERMINAL_SESSION=1
+else
+set G4UI_BUILD_TERMINAL_SESSION=""
+endif 
+
+if ( X$g4ui_use_terminal == Xy ) then
+set G4UI_USE_TERMINAL=1
+else
+set G4UI_USE_TERMINAL=""
+endif 
+
+if ( X$g4ui_build_gag_session == Xy ) then
+set G4UI_BUILD_GAG_SESSION=1
+else
+set G4UI_BUILD_GAG_SESSION=""
+endif 
+
+if ( X$g4ui_use_gag == Xy ) then
+set G4UI_USE_GAG=1
+else
+set G4UI_USE_GAG=""
+endif 
+
+if ( X$g4ui_build_xaw_session == Xy ) then
+set G4UI_BUILD_XAW_SESSION=1
+else
+set G4UI_BUILD_XAW_SESSION=""
+endif 
+
+if ( X$g4ui_use_xaw == Xy ) then
+set G4UI_USE_XAW=1
+else
+set G4UI_USE_XAW=""
+endif 
+
+if ( X$g4ui_build_xm_session == Xy ) then
+set G4UI_BUILD_XM_SESSION=1
+else
+set G4UI_BUILD_XM_SESSION=""
+endif 
+
+if ( X$g4ui_use_xm == Xy ) then
+set G4UI_USE_XM=1
+else
+set G4UI_USE_XM=""
+endif 
+
+if ( X$g4ui_build_win32_session == Xy ) then
+set G4UI_BUILD_WIN32_SESSION=1
+else
+set G4UI_BUILD_WIN32_session=""
+endif 
+
+if ( X$g4ui_use_win32 == Xy ) then
+set G4UI_USE_WIN32=1
+else
+set G4UI_USE_WIN32=""
+endif 
+
+if ( X$g4ui_use_tcsh == Xy ) then
+set G4UI_USE_TCSH=1
+else
+set G4UI_USE_TCSH=""
+endif 
+
+#
+# g4vis
+#
+if ( X$g4vis_build_dawn_driver == Xy ) then
+set G4VIS_BUILD_DAWN_DRIVER=1
+else
+set G4VIS_BUILD_DAWN_DRIVER=""
+endif 
+
+if ( X$g4vis_build_dawnfile_driver == Xy ) then
+set G4VIS_BUILD_DAWNFILE_DRIVER=1
+else
+set G4VIS_BUILD_DAWN_DRIVER=""
+endif 
+
+if ( X$g4vis_build_opacs_driver == Xy ) then
+set G4VIS_BUILD_OPACS_DRIVER=1
+else
+set G4VIS_BUILD_OPACS_DRIVER=""
+endif 
+
+if ( X$g4vis_build_opengl_driver == Xy ) then
+set G4VIS_BUILD_OPENGL_DRIVER=1
+else
+set G4VIS_BUILD_OPENGL_DRIVER=""
+endif 
+
+if ( X$g4vis_build_OPENGLX_driver == Xy ) then
+set G4VIS_BUILD_OPENGLX_DRIVER=1
+else
+set G4VIS_BUILD_OPENGLX_DRIVER=""
+endif 
+
+if ( X$g4vis_build_oix_driver == Xy ) then
+set G4VIS_BUILD_OIX_DRIVER=1
+else
+set G4VIS_BUILD_OIX_DRIVER=""
+endif 
+
+if ( X$g4vis_build_raytracer_driver == Xy ) then
+set G4VIS_BUILD_RAYTRACER_DRIVER=1
+else
+set G4VIS_BUILD_RAYTRACER_DRIVER=""
+endif 
+
+if ( X$g4vis_build_vrml_driver == Xy ) then
+set G4VIS_BUILD_VRML_DRIVER=1
+else
+set G4VIS_BUILD_VRML_DRIVER=""
+endif 
+
+if ( X$g4vis_build_vrmlfile_driver == Xy ) then
+set G4VIS_BUILD_VRMLFILE_DRIVER=1
+else
+set G4VIS_BUILD_VRMLFILE_DRIVER=""
+endif 
+
+if ( X$g4vis_build_asciitree_driver == Xy ) then
+set G4VIS_BUILD_ASCIITREE_DRIVER=1
+else
+set G4VIS_BUILD_ASCIITREE_DRIVER=""
+endif 
+
+if ( X$g4vis_use_dawn == Xy ) then
+set G4VIS_USE_DAWN=1
+else
+set G4VIS_USE_DAWN=""
+endif 
+
+if ( X$g4vis_use_dawnfile == Xy ) then
+set G4VIS_USE_DAWNFILE=1
+else
+set G4VIS_USE_DAWN=""
+endif 
+
+if ( X$g4vis_use_opacs == Xy ) then
+set G4VIS_USE_OPACS=1
+else
+set G4VIS_USE_OPACS=""
+endif
+
+if ( X$g4vis_use_opengl == Xy ) then
+set G4VIS_USE_OPENGL=1
+else
+set G4VIS_USE_OPENGL=""
+endif 
+
+if ( X$g4vis_use_OPENGLX == Xy ) then
+set G4VIS_USE_OPENGLX=1
+else
+set G4VIS_USE_OPENGLX=""
+endif 
+
+if ( X$g4vis_use_oix == Xy ) then
+set G4VIS_USE_OIX=1
+else
+set G4VIS_USE_OIX=""
+endif 
+
+if ( X$g4vis_use_raytracer == Xy ) then
+set G4VIS_USE_RAYTRACER=1
+else
+set G4VIS_USE_RAYTRACER=""
+endif 
+
+if ( X$g4vis_use_vrml == Xy ) then
+set G4VIS_USE_VRML=1
+else
+set G4VIS_USE_VRML=""
+endif 
+
+if ( X$g4vis_use_vrmlfile == Xy ) then
+set G4VIS_USE_VRMLFILE=1
+else
+set G4VIS_USE_VRMLFILE=""
+endif 
+
+if ( X$g4vis_use_asciitree == Xy ) then
+set G4VIS_USE_ASCIITREE=1
+else
+set G4VIS_USE_ASCIITREE=""
+endif
+
+#
+# g4shared
+#
+set G4LIB_BUILD_SHARED="$g4lib_build_shared"
+set G4LIB_BUILD_STATIC="$g4lib_build_static"
+set G4LIB_USE_SHARED="$g4lib_use_shared"
+set G4LIB_USE_STATIC="$g4lib_use_static"
+
+if ( X$g4lib_build_shared == Xy ) then
+set G4LIB_BUILD_SHARED=1
+else
+set G4LIB_BUILD_SHARED=""
+endif 
+
+if ( X$g4lib_build_static == Xy ) then
+set G4LIB_BUILD_STATIC=1
+else
+set G4LIB_BUILD_STATIC=""
+endif 
+
+if ( X$g4lib_use_shared == Xy ) then
+set G4LIB_USE_SHARED=1
+else
+set G4LIB_USE_SHARED=""
+endif 
+
+if ( X$g4lib_use_static == Xy ) then
+set G4LIB_USE_STATIC=1
+else
+set G4LIB_USE_STATIC=""
+endif 
+
+#
+# g4granular
+#
+if ( X$g4lib_use_granular == Xy ) then
+set G4LIB_USE_GRANULAR=1
+else
+set G4LIB_USE_GRANULAR=""
+endif 
+
+#####################################################################
+setenv G4SYSTEM	 $G4SYSTEM
+
+setenv G4INSTALL	$G4INSTALL
+setenv G4INCLUDE	 $G4INCLUDE
+setenv G4BASE	 $G4BASE
+setenv G4WORKDIR	 $G4WORKDIR
+setenv G4TMP	 $G4TMP
+setenv G4LIB	 $G4LIB
+setenv G4BIN	 $G4BIN
+setenv G4DATA	 $G4DATA
+setenv G4LEVELGAMMADATA	 $G4LEVELGAMMADATA
+
+setenv CLHEP_BASE_DIR	 $CLHEP_BASE_DIR
+setenv CLHEP_INCLUDE_DIR	 $CLHEP_INCLUDE_DIR
+setenv CLHEP_LIB_DIR	 $CLHEP_LIB_DIR
+setenv CLHEP_LIB	 $CLHEP_LIB
+
+setenv G4USE_OSPACE	 $G4USE_OSPACE
+setenv G4OSPACE_BASE_DIR	 $G4OSPACE_BASE_DIR
+
+setenv G4LIB_USE_GRANULAR	 $G4LIB_USE_GRANULAR
+
+setenv G4DEBUG	 $G4DEBUG
+
+setenv G4ANALYSIS_BUILD	 $G4ANALYSIS_BUILD
+setenv G4ANALYSIS_BUILD_LAB	 $G4ANALYSIS_BUILD_LAB
+setenv G4ANALYSIS_BUILD_JAS	 $G4ANALYSIS_BUILD_JAS
+setenv G4ANALYSIS_BUILD_LIZARD	 $G4ANALYSIS_BUILD_LIZARD
+setenv G4ANALYSIS_USE	 $G4ANALYSIS_USE
+setenv G4ANALYSIS_USE_LAB	 $G4ANALYSIS_USE_LAB
+setenv G4ANALYSIS_USE_JAS	 $G4ANALYSIS_USE_JAS
+setenv G4ANALYSIS_USE_LIZARD	 $G4ANALYSIS_USE_LIZARD
+
+setenv G4USE_HEPODBMS	 $G4USE_HEPODBMS
+
+setenv G4UI_BUILD_TERMINAL_SESSION	 $G4UI_BUILD_TERMINAL_SESSION
+setenv G4UI_USE_TERMINAL	 $G4UI_USE_TERMINAL
+setenv G4UI_BUILD_GAG_SESSION	 $G4UI_BUILD_GAG_SESSION
+setenv G4UI_USE_GAG	 $G4UI_USE_GAG
+setenv G4UI_BUILD_XAW_SESSION	 $G4UI_BUILD_XAW_SESSION
+setenv G4UI_USE_XAW	 $G4UI_USE_XAW
+setenv G4UI_BUILD_XM_SESSION	 $G4UI_BUILD_XM_SESSION
+setenv G4UI_USE_XM	 $G4UI_USE_XM
+setenv G4UI_BUILD_WIN32_SESSION	 $G4UI_BUILD_WIN32_SESSION
+setenv G4UI_USE_WIN32	 $G4UI_USE_WIN32
+setenv G4UI_USE_TCSH	 $G4UI_USE_TCSH
+
+setenv G4VIS_BUILD_DAWN_DRIVER	 $G4VIS_BUILD_DAWN_DRIVER
+setenv G4VIS_USE_DAWN	 $G4VIS_USE_DAWN
+setenv G4VIS_BUILD_DAWNFILE_DRIVER	 $G4VIS_BUILD_DAWNFILE_DRIVER
+setenv G4VIS_USE_DAWNFILE	 $G4VIS_USE_DAWNFILE
+setenv G4VIS_BUILD_OPACS_DRIVER	 $G4VIS_BUILD_OPACS_DRIVER
+setenv G4VIS_USE_OPACS	 $G4VIS_USE_OPACS
+setenv G4VIS_BUILD_OPENGL_DRIVER	 $G4VIS_BUILD_OPENGL_DRIVER
+setenv G4VIS_USE_OPENGL	 $G4VIS_USE_OPENGL
+setenv G4VIS_BUILD_OPENGLX_DRIVER	 $G4VIS_BUILD_OPENGLX_DRIVER
+setenv G4VIS_USE_OPENGLX	 $G4VIS_USE_OPENGLX
+setenv G4VIS_BUILD_OIX_DRIVER	 $G4VIS_BUILD_OIX_DRIVER
+setenv G4VIS_USE_OIX	 $G4VIS_USE_OIX
+setenv G4VIS_BUILD_RAYTRACER_DRIVER	 $G4VIS_BUILD_RAYTRACER_DRIVER
+setenv G4VIS_USE_RAYTRACER	 $G4VIS_USE_RAYTRACER
+setenv G4VIS_BUILD_VRML_DRIVER	 $G4VIS_BUILD_VRML_DRIVER
+setenv G4VIS_USE_VRML	 $G4VIS_USE_VRML
+setenv G4VIS_BUILD_VRMLFILE_DRIVER	 $G4VIS_BUILD_VRMLFILE_DRIVER
+setenv G4VIS_USE_VRMLFILE	 $G4VIS_USE_VRMLFILE
+setenv G4VIS_BUILD_ASCIITREE_DRIVER	 $G4VIS_BUILD_ASCIITREE_DRIVER
+setenv G4VIS_USE_ASCIITREE	 $G4VIS_USE_ASCIITREE
+
+setenv G4LIB_BUILD_SHARED	 $G4LIB_BUILD_SHARED
+setenv G4LIB_BUILD_STATIC	 $G4LIB_BUILD_STATIC
+setenv G4LIB_USE_SHARED	 $G4LIB_USE_SHARED
+setenv G4LIB_USE_STATIC	 $G4LIB_USE_STATIC
+
+###############################################
+
+
+#####################################################################
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+echo "On this machine the G4BASE=\$G4BASE"
+echo "On this machine the G4WORKDIR=\$G4WORKDIR"
+echo "On this machine the G4TMP=\$G4TMP"
+echo "On this machine the G4LIB=\$G4LIB"
+echo "On this machine the G4BIN=\$G4BIN"
+echo "On this machine the G4DATA=\$G4DATA"
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+
+echo "On this machine the G4USE_OSPACE=\$G4USE_OSPACE"
+echo "On this machine the G4OSPACE_BASE_DIR=\$G4OSPACE_BASE_DIR"
+
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+
+echo "On this machine the G4UI_BUILD_TERMINAL_SESSION=\$G4UI_BUILD_TERMINAL_SESSION"
+echo "On this machine the G4UI_USE_TERMINAL=\$G4UI_USE_TERMINAL"
+echo "On this machine the G4UI_BUILD_GAG_SESSION=\$G4UI_BUILD_GAG_SESSION"
+echo "On this machine the G4UI_USE_GAG=\$G4UI_USE_GAG"
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
+
+echo "On this machine the G4ANALYSIS_BUILD=\$G4ANALYSIS_BUILD"
+echo "On this machine the G4ANALYSIS_BUILD_LAB=\$G4ANALYSIS_BUILD_LAB"
+echo "On this machine the G4ANALYSIS_BUILD_JAS=\$G4ANALYSIS_BUILD_JAS"
+echo "On this machine the G4ANALYSIS_BUILD_LIZARD=\$G4ANALYSIS_BUILD_LIZARD"
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+echo "On this machine the G4ANALYSIS_USE_LAB=\$G4ANALYSIS_USE_LAB"
+echo "On this machine the G4ANALYSIS_USE_JAS=\$G4ANALYSIS_USE_JAS"
+echo "On this machine the G4ANALYSIS_USE_LIZARD=\$G4ANALYSIS_USE_LIZARD"
+
+echo "On this machine the G4USE_HEPODBMS=\$G4USE_HEPODBMS"
+
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+echo "On this machine the G4VIS_BUILD_DAWNFILE_DRIVER=\$G4VIS_BUILD_DAWNFILE_DRIVER"
+echo "On this machine the G4VIS_USE_DAWNFILE=\$G4VIS_USE_DAWNFILE"
+echo "On this machine the G4VIS_BUILD_OPACS_DRIVER=\$G4VIS_BUILD_OPACS_DRIVER"
+echo "On this machine the G4VIS_USE_OPACS=\$G4VIS_USE_OPACS"
+echo "On this machine the G4VIS_BUILD_OPENGL_DRIVER=\$G4VIS_BUILD_OPENGL_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGL=\$G4VIS_USE_OPENGL"
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+echo "On this machine the G4VIS_BUILD_RAYTRACER_DRIVER=\$G4VIS_BUILD_RAYTRACER_DRIVER"
+echo "On this machine the G4VIS_USE_RAYTRACER=\$G4VIS_USE_RAYTRACER"
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+echo "On this machine the G4VIS_BUILD_VRMLFILE_DRIVER=\$G4VIS_BUILD_VRMLFILE_DRIVER"
+echo "On this machine the G4VIS_USE_VRMLFILE=\$G4VIS_USE_VRMLFILE"
+echo "On this machine the G4VIS_BUILD_ASCIITREE_DRIVER=\$G4VIS_BUILD_ASCIITREE_DRIVER"
+echo "On this machine the G4VIS_USE_ASCIITREE=\$G4VIS_USE_ASCIITREE"
+
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+echo "On this machine the G4LIB_USE_SHARED=\$G4LIB_USE_SHARED"
+echo "On this machine the G4LIB_USE_STATIC=\$G4LIB_USE_STATIC"
+
+###############################################################
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>env.csh <<'!NO!SUBS!'
+!NO!SUBS!
+chmod 755 env.csh
+$eunicefix env.csh
diff --git a/config/scripts/env.sh.SH b/config/scripts/env.sh.SH
new file mode 100755
index 0000000000..d028cbb632
--- /dev/null
+++ b/config/scripts/env.sh.SH
@@ -0,0 +1,527 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting env.sh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >env.sh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+G4SYSTEM="$g4system"
+
+#
+# g4dirs.U
+#
+G4INSTALL="$g4install"
+G4INCLUDE="$g4include"
+G4BASE="$g4base"
+G4WORKDIR="$g4workdir"
+G4TMP="$g4tmp"
+G4LIB="$g4lib"
+G4BIN="$g4bin"
+G4DATA="$g4data"
+G4LEVELGAMMADATA="$g4levelgammadata"
+#+
+G4RADIOACTIVEDATA="$g4radioactivedata"
+#+
+G4LEDATA="$g4ledata"
+#+
+NeutronHPCrossSections="$g4neutronhpcrosssections"
+
+#
+# g4clhep.U
+#
+CLHEP_BASE_DIR="$g4clhep_base_dir"
+CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+CLHEP_LIB_DIR="$g4clhep_lib_dir"
+CLHEP_LIB="$g4clhep_lib"
+
+#
+# g4ospace
+#
+if [ X$g4use_ospace = Xy ] ; then
+G4USE_OSPACE=1
+else
+G4USE_OSPACE=""
+fi
+
+G4OSPACE_BASE_DIR="$g4ospace_base_dir"
+
+#
+# g4debug
+#
+G4DEBUG="$g4debug"
+
+#
+# g4analysis
+#
+if [ X$g4wanalysis_build = Xy ] ; then
+G4ANALYSIS_BUILD=1
+else
+G4ANALYSIS_BUILD=""
+fi 
+
+if [ X$g4wanalysis_build_lab = Xy ] ; then
+G4ANALYSIS_BUILD_LAB=1
+else
+G4ANALYSIS_BUILD_LAB=""
+fi 
+
+if [ X$g4wanalysis_build_jas = Xy ] ; then
+G4ANALYSIS_BUILD_JAS=1
+else
+G4ANALYSIS_BUILD_JAS=""
+fi 
+
+if [ X$g4wanalysis_build_lizard = Xy ] ; then
+G4ANALYSIS_BUILD_LIZARD=1
+else
+G4ANALYSIS_BUILD_LIZARD=""
+fi 
+
+if [ X$g4wanalysis_use = Xy ] ; then
+G4ANALYSIS_USE=1
+else
+G4ANALYSIS_USE=""
+fi 
+
+if [ X$g4wanalysis_use_lab = Xy ] ; then
+G4ANALYSIS_USE_LAB=1
+else
+G4ANALYSIS_USE_LAB=""
+fi 
+
+if [ X$g4wanalysis_use_jas = Xy ] ; then
+G4ANALYSIS_USE_JAS=1
+else
+G4ANALYSIS_USE_JAS=""
+fi 
+
+if [ X$g4wanalysis_use_lizard = Xy ] ; then
+G4ANALYSIS_USE_LIZARD=1
+else
+G4ANALYSIS_USE_LIZARD=""
+fi 
+
+#+
+#
+# g4persistency
+#
+if [ X$g4use_hepodbms = Xy ] ; then
+G4USE_HEPODBMS=1
+.  \$G4INSTALL/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh
+else
+G4USE_HEPODBMS=""
+fi 
+
+#
+# g4ui
+#
+if [ X$g4ui_build_terminal_session = Xy ] ; then
+G4UI_BUILD_TERMINAL_SESSION=1
+else
+G4UI_BUILD_TERMINAL_SESSION=""
+fi 
+
+if [ X$g4ui_use_terminal = Xy ] ; then
+G4UI_USE_TERMINAL=1
+else
+G4UI_USE_TERMINAL=""
+fi 
+
+if [ X$g4ui_build_gag_session = Xy ] ; then
+G4UI_BUILD_GAG_SESSION=1
+else
+G4UI_BUILD_GAG_SESSION=""
+fi 
+
+if [ X$g4ui_use_gag = Xy ] ; then
+G4UI_USE_GAG=1
+else
+G4UI_USE_GAG=""
+fi 
+
+if [ X$g4ui_build_xaw_session = Xy ] ; then
+G4UI_BUILD_XAW_SESSION=1
+else
+G4UI_BUILD_XAW_SESSION=""
+fi 
+
+if [ X$g4ui_use_xaw = Xy ] ; then
+G4UI_USE_XAW=1
+else
+G4UI_USE_XAW=""
+fi 
+
+if [ X$g4ui_build_xm_session = Xy ] ; then
+G4UI_BUILD_XM_SESSION=1
+else
+G4UI_BUILD_XM_SESSION=""
+fi 
+
+if [ X$g4ui_use_xm = Xy ] ; then
+G4UI_USE_XM=1
+else
+G4UI_USE_XM=""
+fi 
+
+if [ X$g4ui_build_win32_session = Xy ] ; then
+G4UI_BUILD_WIN32_SESSION=1
+else
+G4UI_BUILD_WIN32_session=""
+fi 
+
+if [ X$g4ui_use_win32 = Xy ] ; then
+G4UI_USE_WIN32=1
+else
+G4UI_USE_WIN32=""
+fi 
+
+if [ X$g4ui_use_tcsh = Xy ] ; then
+G4UI_USE_TCSH=1
+else
+G4UI_USE_TCSH=""
+fi 
+
+#
+# g4vis
+#
+if [ X$g4vis_build_dawn_driver = Xy ] ; then
+G4VIS_BUILD_DAWN_DRIVER=1
+else
+G4VIS_BUILD_DAWN_DRIVER=""
+fi 
+
+if [ X$g4vis_build_dawnfile_driver = Xy ] ; then
+G4VIS_BUILD_DAWNFILE_DRIVER=1
+else
+G4VIS_BUILD_DAWN_DRIVER=""
+fi 
+
+if [ X$g4vis_build_opacs_driver = Xy ] ; then
+G4VIS_BUILD_OPACS_DRIVER=1
+else
+G4VIS_BUILD_OPACS_DRIVER=""
+fi 
+
+if [ X$g4vis_build_opengl_driver = Xy ] ; then
+G4VIS_BUILD_OPENGL_DRIVER=1
+else
+G4VIS_BUILD_OPENGL_DRIVER=""
+fi 
+
+if [ X$g4vis_build_OPENGLX_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLX_DRIVER=1
+else
+G4VIS_BUILD_OPENGLX_DRIVER=""
+fi 
+
+if [ X$g4vis_build_oix_driver = Xy ] ; then
+G4VIS_BUILD_OIX_DRIVER=1
+else
+G4VIS_BUILD_OIX_DRIVER=""
+fi 
+
+if [ X$g4vis_build_raytracer_driver = Xy ] ; then
+G4VIS_BUILD_RAYTRACER_DRIVER=1
+else
+G4VIS_BUILD_RAYTRACER_DRIVER=""
+fi 
+
+if [ X$g4vis_build_vrml_driver = Xy ] ; then
+G4VIS_BUILD_VRML_DRIVER=1
+else
+G4VIS_BUILD_VRML_DRIVER=""
+fi 
+
+if [ X$g4vis_build_vrmlfile_driver = Xy ] ; then
+G4VIS_BUILD_VRMLFILE_DRIVER=1
+else
+G4VIS_BUILD_VRMLFILE_DRIVER=""
+fi 
+
+if [ X$g4vis_build_asciitree_driver = Xy ] ; then
+G4VIS_BUILD_ASCIITREE_DRIVER=1
+else
+G4VIS_BUILD_ASCIITREE_DRIVER=""
+fi 
+
+if [ X$g4vis_use_dawn = Xy ] ; then
+G4VIS_USE_DAWN=1
+else
+G4VIS_USE_DAWN=""
+fi 
+
+if [ X$g4vis_use_dawnfile = Xy ] ; then
+G4VIS_USE_DAWNFILE=1
+else
+G4VIS_USE_DAWN=""
+fi 
+
+if [ X$g4vis_use_opacs = Xy ] ; then
+G4VIS_USE_OPACS=1
+else
+G4VIS_USE_OPACS=""
+fi 
+
+if [ X$g4vis_use_opengl = Xy ] ; then
+G4VIS_USE_OPENGL=1
+else
+G4VIS_USE_OPENGL=""
+fi 
+
+if [ X$g4vis_use_OPENGLX = Xy ] ; then
+G4VIS_USE_OPENGLX=1
+else
+G4VIS_USE_OPENGLX=""
+fi 
+
+if [ X$g4vis_use_oix = Xy ] ; then
+G4VIS_USE_OIX=1
+else
+G4VIS_USE_OIX=""
+fi 
+
+if [ X$g4vis_use_raytracer = Xy ] ; then
+G4VIS_USE_RAYTRACER=1
+else
+G4VIS_USE_RAYTRACER=""
+fi 
+
+if [ X$g4vis_use_vrml = Xy ] ; then
+G4VIS_USE_VRML=1
+else
+G4VIS_USE_VRML=""
+fi 
+
+if [ X$g4vis_use_vrmlfile = Xy ] ; then
+G4VIS_USE_VRMLFILE=1
+else
+G4VIS_USE_VRMLFILE=""
+fi 
+
+if [ X$g4vis_use_asciitree = Xy ] ; then
+G4VIS_USE_ASCIITREE=1
+else
+G4VIS_USE_ASCIITREE=""
+fi 
+
+#
+# g4shared
+#
+G4LIB_BUILD_SHARED="$g4lib_build_shared"
+G4LIB_BUILD_STATIC="$g4lib_build_static"
+G4LIB_USE_SHARED="$g4lib_use_shared"
+G4LIB_USE_STATIC="$g4lib_use_static"
+
+if [ X$g4lib_build_shared = Xy ] ; then
+G4LIB_BUILD_SHARED=1
+else
+G4LIB_BUILD_SHARED=""
+fi 
+
+if [ X$g4lib_build_static = Xy ] ; then
+G4LIB_BUILD_STATIC=1
+else
+G4LIB_BUILD_STATIC=""
+fi 
+
+if [ X$g4lib_use_shared = Xy ] ; then
+G4LIB_USE_SHARED=1
+else
+G4LIB_USE_SHARED=""
+fi 
+
+if [ X$g4lib_use_static = Xy ] ; then
+G4LIB_USE_STATIC=1
+else
+G4LIB_USE_STATIC=""
+fi 
+
+#
+# g4granular
+#
+if [ X$g4lib_use_granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+else
+G4LIB_USE_GRANULAR=""
+fi 
+
+#####################################################################
+export G4SYSTEM
+
+export G4INSTALL
+export G4INCLUDE
+export G4BASE
+export G4WORKDIR
+export G4TMP
+export G4LIB
+export G4BIN
+export G4DATA
+export G4LEVELGAMMADATA
+
+export CLHEP_BASE_DIR
+export CLHEP_INCLUDE_DIR
+export CLHEP_LIB_DIR
+export CLHEP_LIB
+
+export G4USE_OSPACE
+export G4OSPACE_BASE_DIR
+
+export G4LIB_USE_GRANULAR
+
+export G4DEBUG
+
+export G4ANALYSIS_BUILD
+export G4ANALYSIS_BUILD_LAB
+export G4ANALYSIS_BUILD_JAS
+export G4ANALYSIS_BUILD_LIZARD
+export G4ANALYSIS_USE
+export G4ANALYSIS_USE_LAB
+export G4ANALYSIS_USE_JAS
+export G4ANALYSIS_USE_LIZARD
+
+export G4USE_HEPODBMS
+
+export G4UI_BUILD_TERMINAL_SESSION
+export G4UI_USE_TERMINAL
+export G4UI_BUILD_GAG_SESSION
+export G4UI_USE_GAG
+export G4UI_BUILD_XAW_SESSION
+export G4UI_USE_XAW
+export G4UI_BUILD_XM_SESSION
+export G4UI_USE_XM
+export G4UI_BUILD_WIN32_SESSION
+export G4UI_USE_WIN32
+export G4UI_USE_TCSH
+
+export G4VIS_BUILD_DAWN_DRIVER
+export G4VIS_USE_DAWN
+export G4VIS_BUILD_DAWNFILE_DRIVER
+export G4VIS_USE_DAWNFILE
+export G4VIS_BUILD_OPACS_DRIVER
+export G4VIS_USE_OPACS
+export G4VIS_BUILD_OPENGL_DRIVER
+export G4VIS_USE_OPENGL
+export G4VIS_BUILD_OPENGLX_DRIVER
+export G4VIS_USE_OPENGLX
+export G4VIS_BUILD_OIX_DRIVER
+export G4VIS_USE_OIX
+export G4VIS_BUILD_RAYTRACER_DRIVER
+export G4VIS_USE_RAYTRACER
+export G4VIS_BUILD_VRML_DRIVER
+export G4VIS_USE_VRML
+export G4VIS_BUILD_VRMLFILE_DRIVER
+export G4VIS_USE_VRMLFILE
+export G4VIS_BUILD_ASCIITREE_DRIVER
+export G4VIS_USE_ASCIITREE
+
+export G4LIB_BUILD_SHARED
+export G4LIB_BUILD_STATIC
+export G4LIB_USE_SHARED
+export G4LIB_USE_STATIC
+
+###############################################
+
+
+#####################################################################
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+echo "On this machine the G4BASE=\$G4BASE"
+echo "On this machine the G4WORKDIR=\$G4WORKDIR"
+echo "On this machine the G4TMP=\$G4TMP"
+echo "On this machine the G4LIB=\$G4LIB"
+echo "On this machine the G4BIN=\$G4BIN"
+echo "On this machine the G4DATA=\$G4DATA"
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+
+echo "On this machine the G4USE_OSPACE=\$G4USE_OSPACE"
+echo "On this machine the G4OSPACE_BASE_DIR=\$G4OSPACE_BASE_DIR"
+
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+
+echo "On this machine the G4UI_BUILD_TERMINAL_SESSION=\$G4UI_BUILD_TERMINAL_SESSION"
+echo "On this machine the G4UI_USE_TERMINAL=\$G4UI_USE_TERMINAL"
+echo "On this machine the G4UI_BUILD_GAG_SESSION=\$G4UI_BUILD_GAG_SESSION"
+echo "On this machine the G4UI_USE_GAG=\$G4UI_USE_GAG"
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
+
+echo "On this machine the G4ANALYSIS_BUILD=\$G4ANALYSIS_BUILD"
+echo "On this machine the G4ANALYSIS_BUILD_LAB=\$G4ANALYSIS_BUILD_LAB"
+echo "On this machine the G4ANALYSIS_BUILD_JAS=\$G4ANALYSIS_BUILD_JAS"
+echo "On this machine the G4ANALYSIS_BUILD_LIZARD=\$G4ANALYSIS_BUILD_LIZARD"
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+echo "On this machine the G4ANALYSIS_USE_LAB=\$G4ANALYSIS_USE_LAB"
+echo "On this machine the G4ANALYSIS_USE_JAS=\$G4ANALYSIS_USE_JAS"
+echo "On this machine the G4ANALYSIS_USE_LIZARD=\$G4ANALYSIS_USE_LIZARD"
+
+echo "On this machine the G4USE_HEPODBMS=\$G4USE_HEPODBMS"
+
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+echo "On this machine the G4VIS_BUILD_DAWNFILE_DRIVER=\$G4VIS_BUILD_DAWNFILE_DRIVER"
+echo "On this machine the G4VIS_USE_DAWNFILE=\$G4VIS_USE_DAWNFILE"
+echo "On this machine the G4VIS_BUILD_OPACS_DRIVER=\$G4VIS_BUILD_OPACS_DRIVER"
+echo "On this machine the G4VIS_USE_OPACS=\$G4VIS_USE_OPACS"
+echo "On this machine the G4VIS_BUILD_OPENGL_DRIVER=\$G4VIS_BUILD_OPENGL_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGL=\$G4VIS_USE_OPENGL"
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+echo "On this machine the G4VIS_BUILD_RAYTRACER_DRIVER=\$G4VIS_BUILD_RAYTRACER_DRIVER"
+echo "On this machine the G4VIS_USE_RAYTRACER=\$G4VIS_USE_RAYTRACER"
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+echo "On this machine the G4VIS_BUILD_VRMLFILE_DRIVER=\$G4VIS_BUILD_VRMLFILE_DRIVER"
+echo "On this machine the G4VIS_USE_VRMLFILE=\$G4VIS_USE_VRMLFILE"
+echo "On this machine the G4VIS_BUILD_ASCIITREE_DRIVER=\$G4VIS_BUILD_ASCIITREE_DRIVER"
+echo "On this machine the G4VIS_USE_ASCIITREE=\$G4VIS_USE_ASCIITREE"
+
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+echo "On this machine the G4LIB_USE_SHARED=\$G4LIB_USE_SHARED"
+echo "On this machine the G4LIB_USE_STATIC=\$G4LIB_USE_STATIC"
+
+###############################################################
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>env.sh <<'!NO!SUBS!'
+!NO!SUBS!
+chmod 755 env.sh
+$eunicefix env.sh
diff --git a/config/scripts/install.sh.SH b/config/scripts/install.sh.SH
new file mode 100755
index 0000000000..96ebe8bacd
--- /dev/null
+++ b/config/scripts/install.sh.SH
@@ -0,0 +1,597 @@
+case $CONFIG in
+'')
+	if test -f config.sh; then TOP=.;
+	elif test -f ../config.sh; then TOP=..;
+	elif test -f ../../config.sh; then TOP=../..;
+	elif test -f ../../../config.sh; then TOP=../../..;
+	elif test -f ../../../../config.sh; then TOP=../../../..;
+	else
+		echo "Can't find config.sh."; exit 1
+	fi
+	. $TOP/config.sh
+	;;
+esac
+: This forces SH files to create target in same directory as SH file.
+: This is so that make depend always knows where to find SH derivatives.
+case "$0" in
+*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
+esac
+#echo "Extracting install.sh (with variable substitutions)"
+: This section of the file will have variable substitutions done on it.
+: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
+: Protect any dollar signs and backticks that you do not want interpreted
+: by putting a backslash in front.  You may delete these comments.
+$spitshell >install.sh <<!GROK!THIS!
+######################################
+#
+# g4system.U
+#
+#+
+G4SYSTEM="$g4system"
+
+#
+# g4dirs.U
+#
+#+
+G4INSTALL="$g4install"
+#+
+G4INCLUDE="$g4include"
+G4BASE="$g4base"
+G4WORKDIR="$g4workdir"
+#+
+G4TMP="$g4tmp"
+#+
+G4LIB="$g4lib"
+#+
+G4BIN="$g4bin"
+G4DATA="$g4data"
+#+
+G4LEVELGAMMADATA="$g4levelgammadata"
+#+
+G4RADIOACTIVEDATA="$g4radioactivedata"
+#+
+G4LEDATA="$g4ledata"
+#+
+NeutronHPCrossSections="$g4neutronhpcrosssections"
+
+#
+# g4clhep.U
+#
+CLHEP_BASE_DIR="$g4clhep_base_dir"
+#+
+CLHEP_INCLUDE_DIR="$g4clhep_include_dir"
+#+
+CLHEP_LIB_DIR="$g4clhep_lib_dir"
+#+
+CLHEP_LIB="$g4clhep_lib"
+
+
+#+
+#
+# g4ospace
+#
+if [ X$g4use_ospace = Xy ] ; then
+G4USE_OSPACE=1
+else
+G4USE_OSPACE=""
+fi
+
+G4OSPACE_BASE_DIR="$g4ospace_base_dir"
+
+#+
+#
+# g4debug
+#
+G4DEBUG="$g4debug"
+
+#
+# g4analysis
+#
+#+
+if [ X$g4wanalysis_build = Xy ] ; then
+G4ANALYSIS_BUILD=1
+else
+G4ANALYSIS_BUILD=""
+fi 
+
+#+
+if [ X$g4wanalysis_build_lab = Xy ] ; then
+G4ANALYSIS_BUILD_LAB=1
+else
+G4ANALYSIS_BUILD_LAB=""
+fi 
+
+#+
+if [ X$g4wanalysis_build_jas = Xy ] ; then
+G4ANALYSIS_BUILD_JAS=1
+else
+G4ANALYSIS_BUILD_JAS=""
+fi 
+
+#+
+if [ X$g4wanalysis_build_lizard = Xy ] ; then
+G4ANALYSIS_BUILD_LIZARD=1
+else
+G4ANALYSIS_BUILD_LIZARD=""
+fi 
+
+#+
+if [ X$g4wanalysis_use = Xy ] ; then
+G4ANALYSIS_USE=1
+else
+G4ANALYSIS_USE=""
+fi 
+
+#+
+if [ X$g4wanalysis_use_lab = Xy ] ; then
+G4ANALYSIS_USE_LAB=1
+else
+G4ANALYSIS_USE_LAB=""
+fi 
+
+#+
+if [ X$g4wanalysis_use_jas = Xy ] ; then
+G4ANALYSIS_USE_JAS=1
+else
+G4ANALYSIS_USE_JAS=""
+fi 
+
+#+
+if [ X$g4wanalysis_use_lizard = Xy ] ; then
+G4ANALYSIS_USE_LIZARD=1
+else
+G4ANALYSIS_USE_LIZARD=""
+fi 
+
+#+
+#
+# g4persistency
+#
+if [ X$g4use_hepodbms = Xy ] ; then
+G4USE_HEPODBMS=1
+.  \$G4INSTALL/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh
+else
+G4USE_HEPODBMS=""
+fi 
+
+#
+# g4ui
+#
+#+
+if [ X$g4ui_build_terminal_session = Xy ] ; then
+G4UI_BUILD_TERMINAL_SESSION=1
+else
+G4UI_BUILD_TERMINAL_SESSION=""
+fi 
+
+#+
+if [ X$g4ui_use_terminal = Xy ] ; then
+G4UI_USE_TERMINAL=1
+else
+G4UI_USE_TERMINAL=""
+fi 
+
+#+
+if [ X$g4ui_build_gag_session = Xy ] ; then
+G4UI_BUILD_GAG_SESSION=1
+else
+G4UI_BUILD_GAG_SESSION=""
+fi 
+
+#+
+if [ X$g4ui_use_gag = Xy ] ; then
+G4UI_USE_GAG=1
+else
+G4UI_USE_GAG=""
+fi 
+
+#+
+if [ X$g4ui_build_xaw_session = Xy ] ; then
+G4UI_BUILD_XAW_SESSION=1
+else
+G4UI_BUILD_XAW_SESSION=""
+fi 
+
+#+
+if [ X$g4ui_use_xaw = Xy ] ; then
+G4UI_USE_XAW=1
+else
+G4UI_USE_XAW=""
+fi 
+
+#+
+if [ X$g4ui_build_xm_session = Xy ] ; then
+G4UI_BUILD_XM_SESSION=1
+else
+G4UI_BUILD_XM_SESSION=""
+fi 
+
+#+
+if [ X$g4ui_use_xm = Xy ] ; then
+G4UI_USE_XM=1
+else
+G4UI_USE_XM=""
+fi 
+
+#+
+if [ X$g4ui_build_win32_session = Xy ] ; then
+G4UI_BUILD_WIN32_SESSION=1
+else
+G4UI_BUILD_WIN32_session=""
+fi 
+
+#+
+if [ X$g4ui_use_win32 = Xy ] ; then
+G4UI_USE_WIN32=1
+else
+G4UI_USE_WIN32=""
+fi 
+
+#+
+if [ X$g4ui_use_tcsh = Xy ] ; then
+G4UI_USE_TCSH=1
+else
+G4UI_USE_TCSH=""
+fi 
+
+#
+# g4vis
+#
+#+
+if [ X$g4vis_build_dawn_driver = Xy ] ; then
+G4VIS_BUILD_DAWN_DRIVER=1
+else
+G4VIS_BUILD_DAWN_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_dawnfile_driver = Xy ] ; then
+G4VIS_BUILD_DAWNFILE_DRIVER=1
+else
+G4VIS_BUILD_DAWN_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_opacs_driver = Xy ] ; then
+G4VIS_BUILD_OPACS_DRIVER=1
+else
+G4VIS_BUILD_OPACS_DRIVER=""
+fi 
+
+#?
+if [ X$g4vis_build_opengl_driver = Xy ] ; then
+G4VIS_BUILD_OPENGL_DRIVER=1
+else
+G4VIS_BUILD_OPENGL_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_OPENGLX_driver = Xy ] ; then
+G4VIS_BUILD_OPENGLX_DRIVER=1
+else
+G4VIS_BUILD_OPENGLX_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_oix_driver = Xy ] ; then
+G4VIS_BUILD_OIX_DRIVER=1
+else
+G4VIS_BUILD_OIX_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_raytracer_driver = Xy ] ; then
+G4VIS_BUILD_RAYTRACER_DRIVER=1
+else
+G4VIS_BUILD_RAYTRACER_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_vrml_driver = Xy ] ; then
+G4VIS_BUILD_VRML_DRIVER=1
+else
+G4VIS_BUILD_VRML_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_build_vrmlfile_driver = Xy ] ; then
+G4VIS_BUILD_VRMLFILE_DRIVER=1
+else
+G4VIS_BUILD_VRMLFILE_DRIVER=""
+fi 
+
+#?
+if [ X$g4vis_build_asciitree_driver = Xy ] ; then
+G4VIS_BUILD_ASCIITREE_DRIVER=1
+else
+G4VIS_BUILD_ASCIITREE_DRIVER=""
+fi 
+
+#+
+if [ X$g4vis_use_dawn = Xy ] ; then
+G4VIS_USE_DAWN=1
+else
+G4VIS_USE_DAWN=""
+fi 
+
+#+
+if [ X$g4vis_use_dawnfile = Xy ] ; then
+G4VIS_USE_DAWNFILE=1
+else
+G4VIS_USE_DAWN=""
+fi 
+
+#+
+if [ X$g4vis_use_opacs = Xy ] ; then
+G4VIS_USE_OPACS=1
+else
+G4VIS_USE_OPACS=""
+fi 
+
+#?
+if [ X$g4vis_use_opengl = Xy ] ; then
+G4VIS_USE_OPENGL=1
+else
+G4VIS_USE_OPENGL=""
+fi 
+
+#+
+if [ X$g4vis_use_OPENGLX = Xy ] ; then
+G4VIS_USE_OPENGLX=1
+else
+G4VIS_USE_OPENGLX=""
+fi 
+
+#+
+if [ X$g4vis_use_oix = Xy ] ; then
+G4VIS_USE_OIX=1
+else
+G4VIS_USE_OIX=""
+fi 
+
+#+
+if [ X$g4vis_use_raytracer = Xy ] ; then
+G4VIS_USE_RAYTRACER=1
+else
+G4VIS_USE_RAYTRACER=""
+fi 
+
+#+
+if [ X$g4vis_use_vrml = Xy ] ; then
+G4VIS_USE_VRML=1
+else
+G4VIS_USE_VRML=""
+fi 
+
+#+
+if [ X$g4vis_use_vrmlfile = Xy ] ; then
+G4VIS_USE_VRMLFILE=1
+else
+G4VIS_USE_VRMLFILE=""
+fi 
+
+#?
+if [ X$g4vis_use_asciitree = Xy ] ; then
+G4VIS_USE_ASCIITREE=1
+else
+G4VIS_USE_ASCIITREE=""
+fi 
+
+#+
+#
+# g4shared
+#
+G4LIB_BUILD_SHARED="$g4lib_build_shared"
+G4LIB_BUILD_STATIC="$g4lib_build_static"
+G4LIB_USE_SHARED="$g4lib_use_shared"
+G4LIB_USE_STATIC="$g4lib_use_static"
+
+if [ X$g4lib_build_shared = Xy ] ; then
+G4LIB_BUILD_SHARED=1
+else
+G4LIB_BUILD_SHARED=""
+fi 
+
+if [ X$g4lib_build_static = Xy ] ; then
+G4LIB_BUILD_STATIC=1
+else
+G4LIB_BUILD_STATIC=""
+fi 
+
+if [ X$g4lib_use_shared = Xy ] ; then
+G4LIB_USE_SHARED=1
+else
+G4LIB_USE_SHARED=""
+fi 
+
+if [ X$g4lib_use_static = Xy ] ; then
+G4LIB_USE_STATIC=1
+else
+G4LIB_USE_STATIC=""
+fi 
+
+#+
+#
+# g4granular
+#
+if [ X$g4lib_use_granular = Xy ] ; then
+G4LIB_USE_GRANULAR=1
+else
+G4LIB_USE_GRANULAR=""
+fi 
+
+#####################################################################
+export G4SYSTEM
+
+export G4INSTALL
+export G4INCLUDE
+export G4BASE
+export G4WORKDIR
+export G4TMP
+export G4LIB
+export G4BIN
+export G4DATA
+export G4LEVELGAMMADATA
+
+export CLHEP_BASE_DIR
+export CLHEP_INCLUDE_DIR
+export CLHEP_LIB_DIR
+export CLHEP_LIB
+
+export G4USE_OSPACE
+export G4OSPACE_BASE_DIR
+
+export G4LIB_USE_GRANULAR
+
+export G4DEBUG
+
+export G4ANALYSIS_BUILD
+export G4ANALYSIS_BUILD_LAB
+export G4ANALYSIS_BUILD_JAS
+export G4ANALYSIS_BUILD_LIZARD
+export G4ANALYSIS_USE
+export G4ANALYSIS_USE_LAB
+export G4ANALYSIS_USE_JAS
+export G4ANALYSIS_USE_LIZARD
+
+export G4USE_HEPODBMS
+
+export G4UI_BUILD_TERMINAL_SESSION
+export G4UI_USE_TERMINAL
+export G4UI_BUILD_GAG_SESSION
+export G4UI_USE_GAG
+export G4UI_BUILD_XAW_SESSION
+export G4UI_USE_XAW
+export G4UI_BUILD_XM_SESSION
+export G4UI_USE_XM
+export G4UI_BUILD_WIN32_SESSION
+export G4UI_USE_WIN32
+export G4UI_USE_TCSH
+
+export G4VIS_BUILD_DAWN_DRIVER
+export G4VIS_USE_DAWN
+export G4VIS_BUILD_DAWNFILE_DRIVER
+export G4VIS_USE_DAWNFILE
+export G4VIS_BUILD_OPACS_DRIVER
+export G4VIS_USE_OPACS
+export G4VIS_BUILD_OPENGL_DRIVER
+export G4VIS_USE_OPENGL
+export G4VIS_BUILD_OPENGLX_DRIVER
+export G4VIS_USE_OPENGLX
+export G4VIS_BUILD_OIX_DRIVER
+export G4VIS_USE_OIX
+export G4VIS_BUILD_RAYTRACER_DRIVER
+export G4VIS_USE_RAYTRACER
+export G4VIS_BUILD_VRML_DRIVER
+export G4VIS_USE_VRML
+export G4VIS_BUILD_VRMLFILE_DRIVER
+export G4VIS_USE_VRMLFILE
+export G4VIS_BUILD_ASCIITREE_DRIVER
+export G4VIS_USE_ASCIITREE
+
+export G4LIB_BUILD_SHARED
+export G4LIB_BUILD_STATIC
+export G4LIB_USE_SHARED
+export G4LIB_USE_STATIC
+
+###############################################
+
+
+#####################################################################
+echo "On this machine the G4SYSTEM=\$G4SYSTEM"
+
+echo "On this machine the G4INSTALL=\$G4INSTALL"
+echo "On this machine the G4INCLUDE=\$G4INCLUDE"
+echo "On this machine the G4BASE=\$G4BASE"
+echo "On this machine the G4WORKDIR=\$G4WORKDIR"
+echo "On this machine the G4TMP=\$G4TMP"
+echo "On this machine the G4LIB=\$G4LIB"
+echo "On this machine the G4BIN=\$G4BIN"
+echo "On this machine the G4DATA=\$G4DATA"
+echo "On this machine the G4LEVELGAMMADATA=\$G4LEVELGAMMADATA"
+
+echo "On this machine the CLHEP_BASE_DIR=\$CLHEP_BASE_DIR"
+echo "On this machine the CLHEP_INCLUDE_DIR=\$CLHEP_INCLUDE_DIR"
+echo "On this machine the CLHEP_LIB_DIR=\$CLHEP_LIB_DIR"
+echo "On this machine the CLHEP_LIB=\$CLHEP_LIB"
+
+echo "On this machine the G4USE_OSPACE=\$G4USE_OSPACE"
+echo "On this machine the G4OSPACE_BASE_DIR=\$G4OSPACE_BASE_DIR"
+
+echo "On this machine the G4LIB_USE_GRANULAR=\$G4LIB_USE_GRANULAR"
+
+echo "On this machine the G4DEBUG=\$G4DEBUG"
+
+echo "On this machine the G4UI_BUILD_TERMINAL_SESSION=\$G4UI_BUILD_TERMINAL_SESSION"
+echo "On this machine the G4UI_USE_TERMINAL=\$G4UI_USE_TERMINAL"
+echo "On this machine the G4UI_BUILD_GAG_SESSION=\$G4UI_BUILD_GAG_SESSION"
+echo "On this machine the G4UI_USE_GAG=\$G4UI_USE_GAG"
+echo "On this machine the G4UI_BUILD_XAW_SESSION=\$G4UI_BUILD_XAW_SESSION"
+echo "On this machine the G4UI_USE_XAW=\$G4UI_USE_XAW"
+echo "On this machine the G4UI_BUILD_XM_SESSION=\$G4UI_BUILD_XM_SESSION"
+echo "On this machine the G4UI_USE_XM=\$G4UI_USE_XM"
+echo "On this machine the G4UI_BUILD_WIN32_SESSION=\$G4UI_BUILD_WIN32_SESSION"
+echo "On this machine the G4UI_USE_WIN32=\$G4UI_USE_WIN32"
+echo "On this machine the G4UI_USE_TCSH=\$G4UI_USE_TCSH"
+
+echo "On this machine the G4ANALYSIS_BUILD=\$G4ANALYSIS_BUILD"
+echo "On this machine the G4ANALYSIS_BUILD_LAB=\$G4ANALYSIS_BUILD_LAB"
+echo "On this machine the G4ANALYSIS_BUILD_JAS=\$G4ANALYSIS_BUILD_JAS"
+echo "On this machine the G4ANALYSIS_BUILD_LIZARD=\$G4ANALYSIS_BUILD_LIZARD"
+echo "On this machine the G4ANALYSIS_USE=\$G4ANALYSIS_USE"
+echo "On this machine the G4ANALYSIS_USE_LAB=\$G4ANALYSIS_USE_LAB"
+echo "On this machine the G4ANALYSIS_USE_JAS=\$G4ANALYSIS_USE_JAS"
+echo "On this machine the G4ANALYSIS_USE_LIZARD=\$G4ANALYSIS_USE_LIZARD"
+
+echo "On this machine the G4USE_HEPODBMS=\$G4USE_HEPODBMS"
+
+echo "On this machine the G4VIS_BUILD_DAWN_DRIVER=\$G4VIS_BUILD_DAWN_DRIVER"
+echo "On this machine the G4VIS_USE_DAWN=\$G4VIS_USE_DAWN"
+echo "On this machine the G4VIS_BUILD_DAWNFILE_DRIVER=\$G4VIS_BUILD_DAWNFILE_DRIVER"
+echo "On this machine the G4VIS_USE_DAWNFILE=\$G4VIS_USE_DAWNFILE"
+echo "On this machine the G4VIS_BUILD_OPACS_DRIVER=\$G4VIS_BUILD_OPACS_DRIVER"
+echo "On this machine the G4VIS_USE_OPACS=\$G4VIS_USE_OPACS"
+echo "On this machine the G4VIS_BUILD_OPENGL_DRIVER=\$G4VIS_BUILD_OPENGL_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGL=\$G4VIS_USE_OPENGL"
+echo "On this machine the G4VIS_BUILD_OPENGLX_DRIVER=\$G4VIS_BUILD_OPENGLX_DRIVER"
+echo "On this machine the G4VIS_USE_OPENGLX=\$G4VIS_USE_OPENGLX"
+echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
+echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
+echo "On this machine the G4VIS_BUILD_RAYTRACER_DRIVER=\$G4VIS_BUILD_RAYTRACER_DRIVER"
+echo "On this machine the G4VIS_USE_RAYTRACER=\$G4VIS_USE_RAYTRACER"
+echo "On this machine the G4VIS_BUILD_VRML_DRIVER=\$G4VIS_BUILD_VRML_DRIVER"
+echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
+echo "On this machine the G4VIS_BUILD_VRMLFILE_DRIVER=\$G4VIS_BUILD_VRMLFILE_DRIVER"
+echo "On this machine the G4VIS_USE_VRMLFILE=\$G4VIS_USE_VRMLFILE"
+echo "On this machine the G4VIS_BUILD_ASCIITREE_DRIVER=\$G4VIS_BUILD_ASCIITREE_DRIVER"
+echo "On this machine the G4VIS_USE_ASCIITREE=\$G4VIS_USE_ASCIITREE"
+
+echo "On this machine the G4LIB_BUILD_SHARED=\$G4LIB_BUILD_SHARED"
+echo "On this machine the G4LIB_BUILD_STATIC=\$G4LIB_BUILD_STATIC"
+echo "On this machine the G4LIB_USE_SHARED=\$G4LIB_USE_SHARED"
+echo "On this machine the G4LIB_USE_STATIC=\$G4LIB_USE_STATIC"
+
+###############################################################
+echo ""
+echo "Starting installation..."
+echo ""
+cd $g4install/source
+echo `pwd`
+if [ X$g4global = Xy ] ; then
+gmake global
+if [ X$g4granular = Xy ] ; then
+gmake
+fi
+else
+gmake
+fi
+if [ X$g4includes_flag = Xy ] ; then
+gmake includes
+fi
+!GROK!THIS!
+
+: In the following dollars and backticks do not need the extra backslash.
+$spitshell >>install.sh <<'!NO!SUBS!'
+!NO!SUBS!
+chmod 755 install.sh
+$eunicefix install.sh
diff --git a/config/sys/Linux-g++.gmk b/config/sys/Linux-g++.gmk
index 9bbdf26237..82af9ca663 100644
--- a/config/sys/Linux-g++.gmk
+++ b/config/sys/Linux-g++.gmk
@@ -4,6 +4,7 @@
 ifeq ($(G4SYSTEM),Linux-g++)
   CXX       := g++
   GNU_GCC = 1
+#  CXXFLAGS  := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
   CXXFLAGS  := -pipe -fno-for-scope -DGNU_GCC
   ifdef G4OPTIMISE
     CXXFLAGS  += -O
@@ -43,11 +44,16 @@ ifeq ($(G4SYSTEM),Linux-g++)
     CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
     CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
     CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
+#  else
+#    G4USE_STD_NAMESPACE := yes
+#    CPPFLAGS += -DG4USE_STD_NAMESPACE
   endif
   ifdef G4ODBMS
-    G4OODDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
+    GCCVERSION := $(shell g++ -v 2>&1 | grep version | grep egcs)
+    ifeq ($(findstring 1.1,$(GCCVERSION)),1.1)
+      G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
+    endif
   endif
-
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \
      cd $(G4TMPDIR); \
diff --git a/config/sys/SUN-CC.gmk b/config/sys/SUN-CC.gmk
index 3f5d5abaf7..479cce90b4 100644
--- a/config/sys/SUN-CC.gmk
+++ b/config/sys/SUN-CC.gmk
@@ -3,7 +3,6 @@
 #
 ifeq ($(G4SYSTEM),SUN-CC)
   CXX       := CC
-# -Qoption ld -m
   ifdef G4OPTIMISE
     CXXFLAGS  := -O
   else
diff --git a/config/sys/SUN-CC5.gmk b/config/sys/SUN-CC5.gmk
index 75c6d952a7..aff3d9d95a 100644
--- a/config/sys/SUN-CC5.gmk
+++ b/config/sys/SUN-CC5.gmk
@@ -48,7 +48,7 @@ ifeq ($(G4SYSTEM),SUN-CC5)
   CPPFLAGS += -DG4NOT_ISO_DELETES
   CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM)
   ifdef G4ODBMS
-    G4OODDLX_FLAGS += -noline
+    G4DDLX_FLAGS += -noline
   endif
   ifdef G4USE_OSPACE
     CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
diff --git a/config/sys/WIN32-VC.gmk b/config/sys/WIN32-VC.gmk
index 779668c8bb..2a0633e01b 100644
--- a/config/sys/WIN32-VC.gmk
+++ b/config/sys/WIN32-VC.gmk
@@ -4,7 +4,6 @@
 ifeq ($(G4SYSTEM),WIN32-VC)
   CXX       := CL
   G4_HAVE_BOOL := yes
-  G4_NO_CBRT := yes
   ifdef G4OPTIMISE
     CXXFLAGS  += -Ox
   else
diff --git a/config/sys/WIN32-g++.gmk b/config/sys/WIN32-g++.gmk
index ca9df4c61d..59ad08e7cf 100644
--- a/config/sys/WIN32-g++.gmk
+++ b/config/sys/WIN32-g++.gmk
@@ -47,7 +47,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
     CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
   endif
   ifdef G4ODBMS
-    G4OODDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
+    G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
   endif
 
   define build-granular-shared-lib
diff --git a/environments/OPACS/app/EXPO.cc b/environments/OPACS/app/EXPO.cc
index df32cd8b61..f95920b6ec 100644
--- a/environments/OPACS/app/EXPO.cc
+++ b/environments/OPACS/app/EXPO.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: EXPO.cc,v 1.8 2000/03/17 08:56:10 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: EXPO.cc,v 1.8.4.1 2001/06/28 19:06:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/app/TEST.cc b/environments/OPACS/app/TEST.cc
index 18eda2d2ec..bc6630801c 100644
--- a/environments/OPACS/app/TEST.cc
+++ b/environments/OPACS/app/TEST.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TEST.cc,v 1.3 1999/12/15 14:48:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TEST.cc,v 1.3.4.1 2001/06/28 19:06:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include <stdlib.h>
 
diff --git a/environments/OPACS/include/EXPO_Detector.icc b/environments/OPACS/include/EXPO_Detector.icc
index 34ee8adf62..24f38e08b2 100644
--- a/environments/OPACS/include/EXPO_Detector.icc
+++ b/environments/OPACS/include/EXPO_Detector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: EXPO_Detector.icc,v 1.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: EXPO_Detector.icc,v 1.3.4.1 2001/06/28 19:06:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  See also G4/run/example/MyDetectorConstruction.cc.
 
diff --git a/environments/OPACS/include/EXPO_PhysicsList.hh b/environments/OPACS/include/EXPO_PhysicsList.hh
index c5e7d2538e..5e7a34626f 100644
--- a/environments/OPACS/include/EXPO_PhysicsList.hh
+++ b/environments/OPACS/include/EXPO_PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: EXPO_PhysicsList.hh,v 1.4 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: EXPO_PhysicsList.hh,v 1.4.4.1 2001/06/28 19:06:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/environments/OPACS/include/EXPO_PhysicsList.icc b/environments/OPACS/include/EXPO_PhysicsList.icc
index 1591c00b7a..ad15562ad3 100644
--- a/environments/OPACS/include/EXPO_PhysicsList.icc
+++ b/environments/OPACS/include/EXPO_PhysicsList.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: EXPO_PhysicsList.icc,v 1.4 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: EXPO_PhysicsList.icc,v 1.4.4.1 2001/06/28 19:06:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/environments/OPACS/include/EXPO_Primary.icc b/environments/OPACS/include/EXPO_Primary.icc
index 696ff0fdee..eac86ec594 100644
--- a/environments/OPACS/include/EXPO_Primary.icc
+++ b/environments/OPACS/include/EXPO_Primary.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: EXPO_Primary.icc,v 1.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: EXPO_Primary.icc,v 1.3.4.1 2001/06/28 19:06:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  See also G4/run/example/EXPO_PrimaryGeneratorAction.cc.
 
diff --git a/environments/OPACS/include/EXPO_Templates.hh b/environments/OPACS/include/EXPO_Templates.hh
index eb6a8454e8..eaeb9e0cf3 100644
--- a/environments/OPACS/include/EXPO_Templates.hh
+++ b/environments/OPACS/include/EXPO_Templates.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 // I need that for SunOS-CC !!!
 //    G.Barrand
 //
diff --git a/environments/OPACS/include/G4o.h b/environments/OPACS/include/G4o.h
index eabeb1d21e..389a618f45 100644
--- a/environments/OPACS/include/G4o.h
+++ b/environments/OPACS/include/G4o.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4o.h,v 1.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4o.h,v 1.3.4.1 2001/06/28 19:06:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oCommon.hh b/environments/OPACS/include/G4oCommon.hh
index ffafcde0c2..06bb50400d 100644
--- a/environments/OPACS/include/G4oCommon.hh
+++ b/environments/OPACS/include/G4oCommon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oCommon.hh,v 1.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oCommon.hh,v 1.3.4.1 2001/06/28 19:06:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
    Included by G4o.h.
diff --git a/environments/OPACS/include/G4oCommon.icc b/environments/OPACS/include/G4oCommon.icc
index 2b26598b46..d3183b9ab6 100644
--- a/environments/OPACS/include/G4oCommon.icc
+++ b/environments/OPACS/include/G4oCommon.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oCommon.icc,v 1.3 1999/12/15 14:48:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oCommon.icc,v 1.3.4.1 2001/06/28 19:06:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
    Included by G4o.cc.
diff --git a/environments/OPACS/include/G4oDrawer.hh b/environments/OPACS/include/G4oDrawer.hh
index 8dfe858780..1cd5c27689 100644
--- a/environments/OPACS/include/G4oDrawer.hh
+++ b/environments/OPACS/include/G4oDrawer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oDrawer.hh,v 1.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oDrawer.hh,v 1.3.4.1 2001/06/28 19:06:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oEXPO.h b/environments/OPACS/include/G4oEXPO.h
index 6f739c971e..0ba7ebad20 100644
--- a/environments/OPACS/include/G4oEXPO.h
+++ b/environments/OPACS/include/G4oEXPO.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oEXPO.h,v 1.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oEXPO.h,v 1.3.4.1 2001/06/28 19:06:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oScene.hh b/environments/OPACS/include/G4oScene.hh
index 71ce355db2..6cf4058a4b 100644
--- a/environments/OPACS/include/G4oScene.hh
+++ b/environments/OPACS/include/G4oScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oScene.hh,v 1.4 2000/03/17 08:58:32 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oScene.hh,v 1.4.4.1 2001/06/28 19:06:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/include/G4oState.hh b/environments/OPACS/include/G4oState.hh
index fb39ffc616..3259db264f 100644
--- a/environments/OPACS/include/G4oState.hh
+++ b/environments/OPACS/include/G4oState.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oState.hh,v 1.4 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oState.hh,v 1.4.4.1 2001/06/28 19:06:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4oState_h
 #define G4oState_h 
diff --git a/environments/OPACS/include/WoG4o.h b/environments/OPACS/include/WoG4o.h
index b62e1d550e..c11a4e83d2 100644
--- a/environments/OPACS/include/WoG4o.h
+++ b/environments/OPACS/include/WoG4o.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: WoG4o.h,v 1.3 1999/12/15 14:48:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: WoG4o.h,v 1.3.4.1 2001/06/28 19:06:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/src/G4o.cc b/environments/OPACS/src/G4o.cc
index 96e111ac90..4ba814576d 100644
--- a/environments/OPACS/src/G4o.cc
+++ b/environments/OPACS/src/G4o.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4o.cc,v 1.7 2000/03/17 08:57:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4o.cc,v 1.7.4.1 2001/06/28 19:06:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
 #define DEBUG
diff --git a/environments/OPACS/src/G4oDrawer.cc b/environments/OPACS/src/G4oDrawer.cc
index 0e3fba56f3..4e575153ad 100644
--- a/environments/OPACS/src/G4oDrawer.cc
+++ b/environments/OPACS/src/G4oDrawer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oDrawer.cc,v 1.6 2000/03/17 08:57:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oDrawer.cc,v 1.6.4.1 2001/06/28 19:06:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
   From geant4/visualization/management/src/G4VisManager.cc.
diff --git a/environments/OPACS/src/G4oScene.cc b/environments/OPACS/src/G4oScene.cc
index 1e9f7fc38b..258f86c348 100644
--- a/environments/OPACS/src/G4oScene.cc
+++ b/environments/OPACS/src/G4oScene.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oScene.cc,v 1.7 2000/06/09 10:00:58 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oScene.cc,v 1.7.4.1 2001/06/28 19:06:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /* +---------------------- Copyright notice -------------------------------+ */
 /* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr)    | */
diff --git a/environments/OPACS/src/G4oState.cc b/environments/OPACS/src/G4oState.cc
index e3c02e9cad..20adf8fab4 100644
--- a/environments/OPACS/src/G4oState.cc
+++ b/environments/OPACS/src/G4oState.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oState.cc,v 1.6 2000/03/17 08:57:48 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oState.cc,v 1.6.4.1 2001/06/28 19:06:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //#define DEBUG
 
diff --git a/examples/advanced/brachytherapy/Brachy.cc b/examples/advanced/brachytherapy/Brachy.cc
index e572314f70..e2bf6e08c9 100644
--- a/examples/advanced/brachytherapy/Brachy.cc
+++ b/examples/advanced/brachytherapy/Brachy.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this
-// statement, and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Brachy.cc,v 1.4 2000/12/10 08:56:15 chauvie Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Brachy.cc,v 1.4.4.1 2001/06/28 19:06:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //                 GEANT 4 - Brachytherapy example
diff --git a/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh b/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh
index a5da0669e7..fada68e39a 100644
--- a/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh
+++ b/examples/advanced/brachytherapy/include/BrachyDetectorConstruction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ****************************************
 //    *                                      *
 //    *    BrachyDetectorConstruction.hh     *
diff --git a/examples/advanced/brachytherapy/include/BrachyDummySD.hh b/examples/advanced/brachytherapy/include/BrachyDummySD.hh
index 23df21e977..0726524c6e 100644
--- a/examples/advanced/brachytherapy/include/BrachyDummySD.hh
+++ b/examples/advanced/brachytherapy/include/BrachyDummySD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************
 //    *                              *
 //    *       BrachyDummySD.hh       *
diff --git a/examples/advanced/brachytherapy/include/BrachyEventAction.hh b/examples/advanced/brachytherapy/include/BrachyEventAction.hh
index 0b504cb255..b487607ca4 100644
--- a/examples/advanced/brachytherapy/include/BrachyEventAction.hh
+++ b/examples/advanced/brachytherapy/include/BrachyEventAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    **********************************
 //    *                                *
 //    *      BrachyEventAction.hh      *
diff --git a/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh b/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh
index f0bee00bc4..fb32269703 100644
--- a/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh
+++ b/examples/advanced/brachytherapy/include/BrachyPhysicsList.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    **********************************
 //    *                                *
 //    *      BrachyPhysicsList.hh      *
diff --git a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh
index d752fa3691..34f350495c 100644
--- a/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh
+++ b/examples/advanced/brachytherapy/include/BrachyPrimaryGeneratorAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************************
 //    *                                          *
 //    *      BrachyPrimaryGeneratorAction.hh     *
diff --git a/examples/advanced/brachytherapy/include/BrachyWaterBoxHit.hh b/examples/advanced/brachytherapy/include/BrachyWaterBoxHit.hh
index 239ecd5b2c..a01a2c144f 100644
--- a/examples/advanced/brachytherapy/include/BrachyWaterBoxHit.hh
+++ b/examples/advanced/brachytherapy/include/BrachyWaterBoxHit.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************
 //    *                              *
 //    *    BrachyWaterBoxHit.hh      *
diff --git a/examples/advanced/brachytherapy/include/BrachyWaterBoxROGeometry.hh b/examples/advanced/brachytherapy/include/BrachyWaterBoxROGeometry.hh
index a210e118fb..0dc7ae597b 100644
--- a/examples/advanced/brachytherapy/include/BrachyWaterBoxROGeometry.hh
+++ b/examples/advanced/brachytherapy/include/BrachyWaterBoxROGeometry.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ************************************
 //    *                                  *
 //    *    BrachyWaterBoxROGeometry.hh   *
diff --git a/examples/advanced/brachytherapy/include/BrachyWaterBoxSD.hh b/examples/advanced/brachytherapy/include/BrachyWaterBoxSD.hh
index 3ed51aa326..c6775c7fd6 100644
--- a/examples/advanced/brachytherapy/include/BrachyWaterBoxSD.hh
+++ b/examples/advanced/brachytherapy/include/BrachyWaterBoxSD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************
 //    *                              *  
 //    *     BrachyWaterBoxSD.hh      *
diff --git a/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc b/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc
index 1e5d5ac275..0d1448bf42 100644
--- a/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc
+++ b/examples/advanced/brachytherapy/src/BrachyDetectorConstruction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ****************************************
 //    *                                      *
 //    *    BrachyDetectorConstruction.cc     *
diff --git a/examples/advanced/brachytherapy/src/BrachyEventAction.cc b/examples/advanced/brachytherapy/src/BrachyEventAction.cc
index bf45dd7d1b..f716c393fb 100644
--- a/examples/advanced/brachytherapy/src/BrachyEventAction.cc
+++ b/examples/advanced/brachytherapy/src/BrachyEventAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    *******************************
 //    *                             *
 //    *    BrachyEventAction.cc  	*
diff --git a/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc b/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc
index 716c25c487..35b4e6610b 100644
--- a/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc
+++ b/examples/advanced/brachytherapy/src/BrachyPhysicsList.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    **********************************
 //    *                                *
 //    *     BrachyPhysicsList.cc       *
diff --git a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc
index 7cfc488c53..aa4b7ef964 100644
--- a/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc
+++ b/examples/advanced/brachytherapy/src/BrachyPrimaryGeneratorAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************************
 //    *                                          *
 //    *    BrachyPrimaryGeneratorAction.cc       *
diff --git a/examples/advanced/brachytherapy/src/BrachyWaterBoxHit.cc b/examples/advanced/brachytherapy/src/BrachyWaterBoxHit.cc
index 3b8fa43a4b..dc12bd2b09 100644
--- a/examples/advanced/brachytherapy/src/BrachyWaterBoxHit.cc
+++ b/examples/advanced/brachytherapy/src/BrachyWaterBoxHit.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************
 //    *                              *
 //    *     BrachyWaterBoxHit.cc     *
diff --git a/examples/advanced/brachytherapy/src/BrachyWaterBoxROGeometry.cc b/examples/advanced/brachytherapy/src/BrachyWaterBoxROGeometry.cc
index b4ad3655e7..ed9e83d288 100644
--- a/examples/advanced/brachytherapy/src/BrachyWaterBoxROGeometry.cc
+++ b/examples/advanced/brachytherapy/src/BrachyWaterBoxROGeometry.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ************************************
 //    *                                  *
 //    *   BrachyWaterBoxROGeometry.cc    *
diff --git a/examples/advanced/brachytherapy/src/BrachyWaterBoxSD.cc b/examples/advanced/brachytherapy/src/BrachyWaterBoxSD.cc
index 2765bcbb5e..054cf10c83 100644
--- a/examples/advanced/brachytherapy/src/BrachyWaterBoxSD.cc
+++ b/examples/advanced/brachytherapy/src/BrachyWaterBoxSD.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //    ********************************
 //    *                              *  
 //    *    BrachyWaterBoxSD.cc       *
diff --git a/examples/advanced/gammaray_telescope/GammaRayTel.cc b/examples/advanced/gammaray_telescope/GammaRayTel.cc
index bd3555c759..7fcdf8c228 100644
--- a/examples/advanced/gammaray_telescope/GammaRayTel.cc
+++ b/examples/advanced/gammaray_telescope/GammaRayTel.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTel.cc,v 1.3 2000/12/06 16:53:12 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTel.cc,v 1.3.4.2 2001/06/28 20:18:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 main program
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTel example main program ------
 //           by F.Longo, R.Giannitrapani & G.Santin (29 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
index 0e65bd5d7d..babafbda01 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisManager.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnalysisManager.hh,v 1.2 2001/03/05 13:58:19 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnalysisManager.hh,v 1.2.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //     
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnalysisManager  ------
 //           by R.Giannitrapani, F. Longo & G.Santin (30 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
index a10eb7db05..e8ccb7a465 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnalysisMessenger.hh,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnalysisMessenger.hh,v 1.1.4.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnalysysMessenger  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (03 dec 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
index 81d6617d31..08f14980db 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnticoincidenceHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnticoincidenceHit.hh,v 1.1.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnticoincidenceHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
index 41a01922e5..08cacb4c03 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnticoincidenceSD.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnticoincidenceSD.hh,v 1.1.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnticoincidenceSD  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
index 325b3646c7..cea735475d 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelCalorimeterHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelCalorimeterHit.hh,v 1.1.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelCalorimeterHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
index c374f6da62..5416664e7e 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelCalorimeterSD.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelCalorimeterSD.hh,v 1.1.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelCalorimeterSD  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
index aa6184a3e9..4962b46ef1 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelDetectorConstruction.hh,v 1.5 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelDetectorConstruction.hh,v 1.5.2.2 2001/06/28 20:18:37 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelDetectorConstruction  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
index 7b491aa5d7..c314cbe195 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelDetectorMessenger.hh,v 1.2 2000/11/15 20:27:38 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelDetectorMessenger.hh,v 1.2.4.2 2001/06/28 20:18:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelDetectorMessenger  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
index 31750feb61..6324687e1e 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh
@@ -1,19 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: GammaRayTelDummySD.hh,v 1.1 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: GammaRayTelDummySD.hh,v 1.1.4.2 2001/06/28 20:18:38 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelDummySD  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
index 66acc53f5f..f549e52775 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelEventAction.hh,v 1.4 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelEventAction.hh,v 1.4.2.2 2001/06/28 20:18:38 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelEventAction  ------
 //           by R.Giannitrapani, F. Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
index aec3b16a50..720c8a4973 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPhysicsList.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPhysicsList.hh,v 1.2.4.2 2001/06/28 20:18:39 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPhysicsList  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
index 06551ce65b..b6a2f6a702 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.3 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.3.4.2 2001/06/28 20:18:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPrimaryGeneratorAction  ------
 //           by G.Santin, F.Longo & R.Giannitrapani (30 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
index 3610fb6f1c..e9b58caee2 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.2.4.2 2001/06/28 20:18:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPrimaryGeneratorMessenger  ------
 //           by G.Santin, F.Longo & R.Giannitrapani (13 nov 2000) 
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
index 29a99dd3b6..43c3c52113 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelRunAction.hh,v 1.3 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelRunAction.hh,v 1.3.4.2 2001/06/28 20:18:39 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelRunAction  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
index d5c479b521..b04dab0b21 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerHit.hh,v 1.1 2001/03/05 13:58:20 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerHit.hh,v 1.1.2.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
index 735a24b575..2e33d3b293 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerROGeometry.hh,v 1.1 2001/03/05 13:58:21 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerROGeometry.hh,v 1.1.2.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerROGeometry  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
index b28fe23619..6d4c4f38e4 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerSD.hh,v 1.1 2001/03/05 13:58:21 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerSD.hh,v 1.1.2.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerSD  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh b/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
index 38f91b1e57..ea560bfe70 100644
--- a/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
+++ b/examples/advanced/gammaray_telescope/include/GammaRayTelVisManager.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelVisManager.hh,v 1.2 2000/11/15 20:27:39 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelVisManager.hh,v 1.2.4.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelVisManager  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
index 9f037b7fe2..8fccab7884 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisManager.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnalysisManager.cc,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnalysisManager.cc,v 1.1.4.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayAnalysisManager  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (03 dic 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
index c4d939f014..28177688b3 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnalysisMessenger.cc,v 1.1 2000/12/06 16:53:13 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnalysisMessenger.cc,v 1.1.4.2 2001/06/28 20:18:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnalysisMessenger ------
 //           by R.Giannitrapani, F.Longo & G.Santin (03 dic 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
index a130089332..cd9dcda6c7 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnticoincidenceHit.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnticoincidenceHit.cc,v 1.1.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnticoincidenceHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
index 5790ce7589..facbf0e807 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelAnticoincidenceSD.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelAnticoincidenceSD.cc,v 1.1.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelAnticoincidenceSD  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
index 987a3a1224..36bcade4d1 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelCalorimeterHit.cc,v 1.1 2001/03/05 13:58:22 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelCalorimeterHit.cc,v 1.1.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelCalorimeterHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
index 6ea448ecd6..d809cf2172 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelCalorimeterSD.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelCalorimeterSD.cc,v 1.1.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelCalorimeterSD  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
index b92edcadf7..13b2bf8dba 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelDetectorConstruction.cc,v 1.5 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelDetectorConstruction.cc,v 1.5.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelDetectorConstruction  ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
index e858bf19b9..94305da398 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelDetectorMessenger.cc,v 1.3 2000/12/06 16:53:14 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelDetectorMessenger.cc,v 1.3.4.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelDetectorMessenger ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
index 81630d2e67..8b11713e26 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelEventAction.cc,v 1.5 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelEventAction.cc,v 1.5.2.2 2001/06/28 20:18:41 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelEventAction  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
index 0c9e0aaf67..087189cc64 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPhysicsList.cc,v 1.2 2000/11/15 20:27:41 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPhysicsList.cc,v 1.2.4.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPhysicsList  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
index 2a98b6bdfe..daa55072f1 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.3 2000/11/24 16:57:00 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.3.4.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPrimaryGeneratorAction  ------
 //           by  G.Santin, F.Longo & R.Giannitrapani (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
index 4445ed72c4..59f972aead 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.2 2000/11/15 20:27:41 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.2.4.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelPrimaryGeneratorMessenger  ------
 //           by G.Santin, F.Longo & R.Giannitrapani (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
index 477132f78d..c53dc02d63 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelRunAction.cc,v 1.3 2000/12/06 16:53:14 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelRunAction.cc,v 1.3.4.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelRunAction  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
index 4452a42349..8a09795469 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerHit.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerHit.cc,v 1.1.2.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerHit  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
index fc1ea98bc9..b4386ec7fd 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerROGeometry.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerROGeometry.cc,v 1.1.2.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerROGeometry class ------
 //           by F.Longo, R.Giannitrapani & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
index 2d6595463a..80f6516d9a 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: GammaRayTelTrackerSD.cc,v 1.1 2001/03/05 13:58:23 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: GammaRayTelTrackerSD.cc,v 1.1.2.2 2001/06/28 20:18:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelTrackerSD  ------
 //           by  R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc b/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
index 32a033b31e..0355d7d13f 100644
--- a/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
+++ b/examples/advanced/gammaray_telescope/src/GammaRayTelVisManager.cc
@@ -1,19 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: GammaRayTelVisManager.cc,v 1.2 2000/11/15 20:27:42 flongo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: GammaRayTelVisManager.cc,v 1.2.4.2 2001/06/28 20:18:43 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      ------------ GammaRayTelVisManager  ------
 //           by R.Giannitrapani, F.Longo & G.Santin (13 nov 2000)
diff --git a/examples/advanced/xray_telescope/History b/examples/advanced/xray_telescope/History
index 438982d0aa..55a67c30cd 100644
--- a/examples/advanced/xray_telescope/History
+++ b/examples/advanced/xray_telescope/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.9 2000/12/06 18:34:34 nartallo Exp $
+$Id: History,v 1.10 2001/06/18 17:43:03 nartallo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+18.06.2001 - RN, tag xraytel-V02-00-11
+             tested with latest global tag geant4-03-01-ref-02
+
 06.12.2000 - RN, tag xraytel-V02-00-10
              Removed old XrayTelPrimaryGeneratorMessenger.cc and .hh
              files from cvs
diff --git a/examples/advanced/xray_telescope/XrayTel.cc b/examples/advanced/xray_telescope/XrayTel.cc
index efbcba1680..9740774bb3 100644
--- a/examples/advanced/xray_telescope/XrayTel.cc
+++ b/examples/advanced/xray_telescope/XrayTel.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelAnalysisManager.hh b/examples/advanced/xray_telescope/include/XrayTelAnalysisManager.hh
index 264e565cde..18cb7a5f36 100644
--- a/examples/advanced/xray_telescope/include/XrayTelAnalysisManager.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelAnalysisManager.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelDetectorConstruction.hh b/examples/advanced/xray_telescope/include/XrayTelDetectorConstruction.hh
index 6fd3c5792b..be49e1c93d 100644
--- a/examples/advanced/xray_telescope/include/XrayTelDetectorConstruction.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelDetectorConstruction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelEventAction.hh b/examples/advanced/xray_telescope/include/XrayTelEventAction.hh
index f56e9997f1..5677b5af04 100644
--- a/examples/advanced/xray_telescope/include/XrayTelEventAction.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelEventAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelEventActionMessenger.hh b/examples/advanced/xray_telescope/include/XrayTelEventActionMessenger.hh
index dce507b74c..c4bd6a752b 100644
--- a/examples/advanced/xray_telescope/include/XrayTelEventActionMessenger.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelEventActionMessenger.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelPhysicsList.hh b/examples/advanced/xray_telescope/include/XrayTelPhysicsList.hh
index 9af620f6da..46928a0d87 100644
--- a/examples/advanced/xray_telescope/include/XrayTelPhysicsList.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelPhysicsList.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelPrimaryGeneratorAction.hh b/examples/advanced/xray_telescope/include/XrayTelPrimaryGeneratorAction.hh
index b893fa3b66..5c19204482 100644
--- a/examples/advanced/xray_telescope/include/XrayTelPrimaryGeneratorAction.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelPrimaryGeneratorAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelRunAction.hh b/examples/advanced/xray_telescope/include/XrayTelRunAction.hh
index 30306795a8..214a2d41c4 100644
--- a/examples/advanced/xray_telescope/include/XrayTelRunAction.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelRunAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelStepCut.hh b/examples/advanced/xray_telescope/include/XrayTelStepCut.hh
index ec61290025..10981587c8 100644
--- a/examples/advanced/xray_telescope/include/XrayTelStepCut.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelStepCut.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelSteppingAction.hh b/examples/advanced/xray_telescope/include/XrayTelSteppingAction.hh
index f16d43d8b5..284694d267 100644
--- a/examples/advanced/xray_telescope/include/XrayTelSteppingAction.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelSteppingAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/include/XrayTelVisManager.hh b/examples/advanced/xray_telescope/include/XrayTelVisManager.hh
index aa101792e7..8facee7b36 100644
--- a/examples/advanced/xray_telescope/include/XrayTelVisManager.hh
+++ b/examples/advanced/xray_telescope/include/XrayTelVisManager.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelAnalysisManager.cc b/examples/advanced/xray_telescope/src/XrayTelAnalysisManager.cc
index 270c6735d4..7da718b0c3 100644
--- a/examples/advanced/xray_telescope/src/XrayTelAnalysisManager.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelAnalysisManager.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelDetectorConstruction.cc b/examples/advanced/xray_telescope/src/XrayTelDetectorConstruction.cc
index 22a7b95018..9ef8e2effd 100644
--- a/examples/advanced/xray_telescope/src/XrayTelDetectorConstruction.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelDetectorConstruction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelEventAction.cc b/examples/advanced/xray_telescope/src/XrayTelEventAction.cc
index 788d48226c..9c7f57fb9a 100644
--- a/examples/advanced/xray_telescope/src/XrayTelEventAction.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelEventAction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelEventActionMessenger.cc b/examples/advanced/xray_telescope/src/XrayTelEventActionMessenger.cc
index f77093eb46..040f48074d 100644
--- a/examples/advanced/xray_telescope/src/XrayTelEventActionMessenger.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelEventActionMessenger.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelPhysicsList.cc b/examples/advanced/xray_telescope/src/XrayTelPhysicsList.cc
index 18d5dd2281..4ccf42fabe 100644
--- a/examples/advanced/xray_telescope/src/XrayTelPhysicsList.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelPhysicsList.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelPrimaryGeneratorAction.cc b/examples/advanced/xray_telescope/src/XrayTelPrimaryGeneratorAction.cc
index 9bb70d9670..7a2e6cbb6f 100644
--- a/examples/advanced/xray_telescope/src/XrayTelPrimaryGeneratorAction.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelPrimaryGeneratorAction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelRunAction.cc b/examples/advanced/xray_telescope/src/XrayTelRunAction.cc
index 24ff11c604..c1dbb007e1 100644
--- a/examples/advanced/xray_telescope/src/XrayTelRunAction.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelRunAction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelStepCut.cc b/examples/advanced/xray_telescope/src/XrayTelStepCut.cc
index 23aa4c579a..298fa209d4 100644
--- a/examples/advanced/xray_telescope/src/XrayTelStepCut.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelStepCut.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelSteppingAction.cc b/examples/advanced/xray_telescope/src/XrayTelSteppingAction.cc
index 6679123884..1ad5239d44 100644
--- a/examples/advanced/xray_telescope/src/XrayTelSteppingAction.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelSteppingAction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
diff --git a/examples/advanced/xray_telescope/src/XrayTelVisManager.cc b/examples/advanced/xray_telescope/src/XrayTelVisManager.cc
index 22dfadac04..0c68387dd5 100644
--- a/examples/advanced/xray_telescope/src/XrayTelVisManager.cc
+++ b/examples/advanced/xray_telescope/src/XrayTelVisManager.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // **********************************************************************
 // *                                                                    *
@@ -35,6 +51,10 @@
 
 // Supported drivers...
 
+#ifdef G4VIS_USE_ASCIITREE
+#include "G4ASCIITree.hh"
+#endif
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif
@@ -71,8 +91,8 @@
 #include "G4OpenInventorWin32.hh"
 #endif
 
-#ifdef G4VIS_USE_RAYX
-#include "G4RayX.hh"
+#ifdef G4VIS_USE_RAYTRACER
+#include "G4RayTracer.hh"
 #endif
 
 #ifdef G4VIS_USE_VRML
@@ -93,6 +113,10 @@ XrayTelVisManager::XrayTelVisManager () {}
 
 void XrayTelVisManager::RegisterGraphicsSystems () {
 
+#ifdef G4VIS_USE_ASCIITREE
+  RegisterGraphicsSystem (new G4ASCIITree);
+#endif
+
 #ifdef G4VIS_USE_DAWN
   RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif
@@ -129,8 +153,8 @@ void XrayTelVisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
 
-#ifdef G4VIS_USE_RAYX
-  RegisterGraphicsSystem (new G4RayX);
+#ifdef G4VIS_USE_RAYTRACER
+  RegisterGraphicsSystem (new G4RayTracer);
 #endif
 
 #ifdef G4VIS_USE_VRML
diff --git a/examples/extended/analysis/AnaEx01/AnaEx01.cc b/examples/extended/analysis/AnaEx01/AnaEx01.cc
index e926badf30..005fe40c48 100644
--- a/examples/extended/analysis/AnaEx01/AnaEx01.cc
+++ b/examples/extended/analysis/AnaEx01/AnaEx01.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01.cc,v 1.6 2000/11/15 13:46:23 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01.cc,v 1.6.4.2 2001/06/28 20:18:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - exampleN03 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/extended/analysis/AnaEx01/History b/examples/extended/analysis/AnaEx01/History
index 2407cc79ec..a36cf50014 100644
--- a/examples/extended/analysis/AnaEx01/History
+++ b/examples/extended/analysis/AnaEx01/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
+$Id: History,v 1.2 2001/06/20 06:49:05 barrand Exp $
 --------------------------------------------------
 
      =========================================================
@@ -15,5 +15,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+20 June 2001, Guy Barrand :
+- AnaEx01SteppingVerbose.cc : replace "entries" to "size" in order
+  to compile with 03-00-ref-03 kernel.
+
 14 September 2000, Guy Barrand :
 - Birth.
diff --git a/examples/extended/analysis/AnaEx01/analysis/Lab/session.tcl b/examples/extended/analysis/AnaEx01/analysis/Lab/session.tcl
index 42e1ded934..1aea75637c 100644
--- a/examples/extended/analysis/AnaEx01/analysis/Lab/session.tcl
+++ b/examples/extended/analysis/AnaEx01/analysis/Lab/session.tcl
@@ -1,3 +1,25 @@
+#
+# ********************************************************************
+# * DISCLAIMER                                                       *
+# *                                                                  *
+# * The following disclaimer summarizes all the specific disclaimers *
+# * of contributors to this software. The specific disclaimers,which *
+# * govern, are listed with their locations in:                      *
+# *   http://cern.ch/geant4/license                                  *
+# *                                                                  *
+# * Neither the authors of this software system, nor their employing *
+# * institutes,nor the agencies providing financial support for this *
+# * work  make  any representation or  warranty, express or implied, *
+# * regarding  this  software system or assume any liability for its *
+# * use.                                                             *
+# *                                                                  *
+# * This  code  implementation is the  intellectual property  of the *
+# * GEANT4 collaboration.                                            *
+# * By copying,  distributing  or modifying the Program (or any work *
+# * based  on  the Program)  you indicate  your  acceptance of  this *
+# * statement, and all its terms.                                    *
+# ********************************************************************
+#
 #/////////////////////////////////////////////////////////////////////////////
 #/////////////////////////////////////////////////////////////////////////////
 #/////////////////////////////////////////////////////////////////////////////
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
index f114c48985..46fff1c36a 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01AnalysisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01AnalysisManager.hh,v 1.3 2000/10/31 13:10:00 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01AnalysisManager.hh,v 1.3.4.1 2001/06/28 19:06:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
index f11125771d..7ffb092550 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01CalorHit.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01CalorHit.hh,v 1.1.1.1.4.1 2001/06/28 19:06:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
index b8079053fc..2bcb697370 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01CalorimeterSD.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01CalorimeterSD.hh,v 1.1.1.1.4.1 2001/06/28 19:06:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
index d0f6b3e1ea..b41d430503 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01DetectorConstruction.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01DetectorConstruction.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
index 692ecc9b1f..ae162fe697 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01DetectorMessenger.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01DetectorMessenger.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
index 36deb21871..1ed437c94d 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01EventAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01EventAction.hh,v 1.3.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
index 5862bbb163..254dd563ef 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PhysicsList.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PhysicsList.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
index 6151d68852..f5c76787f2 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PrimaryGeneratorAction.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PrimaryGeneratorAction.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
index 280102d8da..858bb9fe0a 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01PrimaryGeneratorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PrimaryGeneratorMessenger.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PrimaryGeneratorMessenger.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
index a3d7d7c301..5b94eb91b2 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01RunAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01RunAction.hh,v 1.3.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
index 6da767de88..2281889c64 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01SteppingAction.hh,v 1.3 2000/11/10 14:12:07 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01SteppingAction.hh,v 1.3.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
index bfa0b2c9c8..e25c6c0c22 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01SteppingVerbose.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01SteppingVerbose.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh b/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
index a9d13b66eb..1a89c7ef3e 100644
--- a/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
+++ b/examples/extended/analysis/AnaEx01/include/AnaEx01VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01VisManager.hh,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01VisManager.hh,v 1.1.1.1.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
index 77a69199cf..db6f2d8901 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01AnalysisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01AnalysisManager.cc,v 1.9 2000/12/06 13:08:03 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01AnalysisManager.cc,v 1.9.4.1 2001/06/28 19:06:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14th Septembre 2000.
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
index d5c3fcac10..0d8377c487 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01CalorHit.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01CalorHit.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
index d2f27cb793..7d62a0c62e 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01CalorimeterSD.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01CalorimeterSD.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
index a5ecf4fd28..dffcaf7f18 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01DetectorConstruction.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01DetectorConstruction.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
index be6a8a1e3e..01053fe8b8 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01DetectorMessenger.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01DetectorMessenger.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
index 1083d08a76..0919d1f8ba 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01EventAction.cc,v 1.3 2000/11/10 14:08:08 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01EventAction.cc,v 1.3.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
index 52fe7ee8ca..b1f7bd342b 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PhysicsList.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PhysicsList.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
index 301f30e720..8cab144223 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PrimaryGeneratorAction.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PrimaryGeneratorAction.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
index f88604cf63..4d2de16a59 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01PrimaryGeneratorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01PrimaryGeneratorMessenger.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01PrimaryGeneratorMessenger.cc,v 1.1.1.1.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
index 0cdc9a6898..9d03456ae5 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01RunAction.cc,v 1.3 2000/11/10 14:08:09 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01RunAction.cc,v 1.3.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
index 3ded737d6c..41cbc5b978 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01SteppingAction.cc,v 1.3 2000/11/10 14:08:10 gbarrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01SteppingAction.cc,v 1.3.4.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
index 99548213fe..4a9b8efbdd 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01SteppingVerbose.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01SteppingVerbose.cc,v 1.2.2.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
@@ -95,12 +111,12 @@ void AnaEx01SteppingVerbose::StepInfo()
 	       << ",Along=" << G4std::setw(2) << fN2ndariesAlongStepDoIt
 	       << ",Post="  << G4std::setw(2) << fN2ndariesPostStepDoIt
 	       << "), "
-	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).entries()
+	       << "#SpawnTotal=" << G4std::setw(3) << (*fSecondary).size()
 	       << " ---------------"
 	       << G4endl;
 
-	for(G4int lp1=(*fSecondary).entries()-tN2ndariesTot; 
-                        lp1<(*fSecondary).entries(); lp1++){
+	for(G4int lp1=(*fSecondary).size()-tN2ndariesTot; 
+                        lp1<(*fSecondary).size(); lp1++){
 	  G4cout << "    : "
 		 << G4std::setw(6)
 		 << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
@@ -114,7 +130,6 @@ void AnaEx01SteppingVerbose::StepInfo()
 		 << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
 	  G4cout << G4endl;
 	}
-              
 	G4cout << "    :-----------------------------"
 	       << "----------------------------------"
 	       << "-- EndOf2ndaries Info ---------------"
diff --git a/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc b/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
index 55838fa91c..4261fc7f2b 100644
--- a/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
+++ b/examples/extended/analysis/AnaEx01/src/AnaEx01VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: AnaEx01VisManager.cc,v 1.1.1.1 2000/09/14 11:37:21 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: AnaEx01VisManager.cc,v 1.2.2.1 2001/06/28 19:06:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
@@ -20,6 +36,10 @@
 
 // Supported drivers...
 
+#ifdef G4VIS_USE_ASCIITREE
+#include "G4ASCIITree.hh"
+#endif
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif
@@ -56,6 +76,10 @@
 #include "G4OpenInventorWin32.hh"
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+#include "G4RayTracer.hh"
+#endif
+
 #ifdef G4VIS_USE_VRML
 #include "G4VRML1.hh"
 #include "G4VRML2.hh"
@@ -66,10 +90,6 @@
 #include "G4VRML2File.hh"
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-#include "G4RayTracer.hh"
-#endif
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 AnaEx01VisManager::AnaEx01VisManager () {}
@@ -78,6 +98,10 @@ AnaEx01VisManager::AnaEx01VisManager () {}
 
 void AnaEx01VisManager::RegisterGraphicsSystems () {
 
+#ifdef G4VIS_USE_ASCIITREE
+  RegisterGraphicsSystem (new G4ASCIITree);
+#endif
+
 #ifdef G4VIS_USE_DAWN
   RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif
@@ -114,6 +138,10 @@ void AnaEx01VisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+  RegisterGraphicsSystem (new G4RayTracer);
+#endif
+
 #ifdef G4VIS_USE_VRML
   RegisterGraphicsSystem (new G4VRML1);
   RegisterGraphicsSystem (new G4VRML2);
@@ -124,10 +152,6 @@ void AnaEx01VisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4VRML2File);
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-  RegisterGraphicsSystem (new G4RayTracer);
-#endif
-
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.cc b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
index b49051c9dc..3b3bcca7bc 100644
--- a/examples/extended/electromagnetic/TestEm1/TestEm1.cc
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm1.cc,v 1.4 2000/12/06 13:21:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm1.cc,v 1.4.4.1 2001/06/28 19:06:47 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm1/TestEm1.out b/examples/extended/electromagnetic/TestEm1/TestEm1.out
index baf6f8804f..013c284ea3 100644
--- a/examples/extended/electromagnetic/TestEm1/TestEm1.out
+++ b/examples/extended/electromagnetic/TestEm1/TestEm1.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -61,25 +61,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-            H2liquid         28.089
-               Water         81.851
-         liquidArgon         79.954
-           Aluminium         125.02
-             Silicon         116.88
-                Iron         225.11
-                Lead         228.53
-             Uranium         294.24
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -88,44 +74,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-            H2liquid         28.089
-               Water         81.851
-         liquidArgon         79.954
-           Aluminium         125.02
-             Silicon         116.88
-                Iron         225.11
-                Lead         228.53
-             Uranium         294.24
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  1 mm            1 mm 
@@ -140,7 +112,7 @@ Cut in energy
                Lead         101 keV        1.38 MeV
             Uranium         110 keV        1.92 MeV
 ===================================================
-# $Id: TestEm1.out,v 1.11 2001/03/30 09:02:57 stesting Exp $
+# $Id: TestEm1.out,v 1.15 2001/04/26 12:33:03 stesting Exp $
 #
 # Macro file for "TestEm1.cc"
 # (can be run in batch, without graphic)
@@ -160,40 +132,26 @@ phot:  Total cross sections from a parametrisation. Good description from 10 KeV
 
 compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
         Scattered gamma energy according Klein-Nishina.
-        PhysicsTables from 10 keV to 100 GeV in 100 bins. 
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
 
 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
         e+e- energies according Bethe-Heitler
-        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
         delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
-
- eIoni   Minimum Delta cut in range=0.000605  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-            H2liquid           0.99
-               Water         3.2733
-         liquidArgon         3.9154
-           Aluminium         6.2979
-             Silicon         5.8817
-                Iron         10.524
-                Lead         9.1135
-             Uranium         11.689
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -202,44 +160,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.000605  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-            H2liquid           0.99
-               Water         3.2733
-         liquidArgon         3.9154
-           Aluminium         6.2979
-             Silicon         5.8817
-                Iron         10.524
-                Lead         9.1135
-             Uranium         11.689
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                2.2 mm         6.05 mum
@@ -274,18 +218,18 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=91.99s Real=97.75s Sys=5.73s
+  User=53s Real=58s Sys=5.3s
 
- nb tracks/event   neutral:   27.57   charged:  666.07
- nb  steps/event   neutral:  144.93   charged: 2194.99
+ nb tracks/event   neutral:   28.25   charged:  664.76
+ nb  steps/event   neutral:  148.67   charged: 2195.14
 
  nb of process calls per event: 
-       eIoni    eBrem     conv  annihil    compt     phot
-     2168.94    24.47     1.58     1.58   117.36    25.99
+       eIoni    eBrem    compt     phot     conv  annihil
+     2168.25    25.46   120.42    26.82     1.43     1.43
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1463312763, 65501812
+ Current couple of seeds = 1296175024, 1662236208
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
index 914f280be1..be221e8ed5 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1DetectorConstruction.hh,v 1.2 1999/12/15 14:48:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:06:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
index 6f533610ce..cd5bc9adeb 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1DetectorMessenger.hh,v 1.2 1999/12/15 14:48:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
index 4b7f943095..97266d7934 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1EventAction.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1EventAction.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
index 79b2450759..0a32424ff1 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1EventActionMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
index e03cfbd12e..cafb46dd52 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PhysicsList.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PhysicsList.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
index 7bb6ba93f3..7c442564c3 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PhysicsListMessenger.hh,v 1.2 1999/12/15 14:48:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PhysicsListMessenger.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
index 903fae9626..31adb99769 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
index c47e5a7b50..90a35d6f8a 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1RunAction.hh,v 1.5 2001/02/21 14:00:34 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1RunAction.hh,v 1.5.2.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
index 7e02e166d7..af31bdb838 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1RunActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1RunActionMessenger.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1RunActionMessenger.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
index 079f8f5caa..b6be8a8f73 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1SteppingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1SteppingAction.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
index e9a5b59ea2..ca245b24e1 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1SteppingVerbose.hh,v 1.5 2001/02/19 14:04:26 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1SteppingVerbose.hh,v 1.5.2.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
index e74e227dfa..eca10d9a15 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1TrackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1TrackingAction.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1TrackingAction.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
index 766001b44a..e12ad97564 100644
--- a/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/Em1VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1VisManager.hh,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1VisManager.hh,v 1.2.4.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
index 0f6dc5e37d..bf893fc58e 100644
--- a/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
+++ b/examples/extended/electromagnetic/TestEm1/include/ProcessesCount.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ProcessesCount.hh,v 1.5 2001/03/08 16:45:17 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ProcessesCount.hh,v 1.5.2.1 2001/06/28 19:06:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
index b134a7da2e..b2706a6b43 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorConstruction.cc
@@ -1,13 +1,29 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: Em1DetectorConstruction.cc,v 1.4 2000/12/13 11:11:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: Em1DetectorConstruction.cc,v 1.4.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
index 22cc18115e..18cedc7ec3 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1DetectorMessenger.cc,v 1.2 1999/12/15 14:48:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
index cd289fb20d..517616480e 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1EventAction.cc,v 1.3 2001/02/20 15:45:17 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1EventAction.cc,v 1.3.2.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
index 75293ca035..4d295fbe68 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1EventActionMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
index 2f7edce872..200638ae92 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PhysicsList.cc,v 1.3 2000/03/05 03:31:39 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PhysicsList.cc,v 1.3.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
index cc4b1dbbfe..632baa270a 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PhysicsListMessenger.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PhysicsListMessenger.cc,v 1.2.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
index 18ef2a8775..effe426b47 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:06:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
index 7f5675c97b..87b5d98e22 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1RunAction.cc,v 1.10 2001/03/27 08:34:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1RunAction.cc,v 1.10.2.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
index 433d35e251..4728c67fa6 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1RunActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1RunActionMessenger.cc,v 1.3 2001/02/20 15:45:17 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1RunActionMessenger.cc,v 1.3.2.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
index 25272c42f0..630a8dc487 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1SteppingAction.cc,v 1.5 2001/02/21 14:00:35 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1SteppingAction.cc,v 1.5.2.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
index 81a78dd1c3..8213d095c7 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1SteppingVerbose.cc,v 1.6 2001/02/19 14:05:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc b/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
index 24f70b5518..d431422c3d 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1TrackingAction.cc
@@ -1,13 +1,29 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: Em1TrackingAction.cc,v 1.5 2001/02/21 14:00:35 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: Em1TrackingAction.cc,v 1.5.2.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc b/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
index 66675a23f4..930e8d4799 100644
--- a/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm1/src/Em1VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em1VisManager.cc,v 1.2 1999/12/15 14:48:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em1VisManager.cc,v 1.2.4.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.cc b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
index ef44328165..0bae1315dc 100644
--- a/examples/extended/electromagnetic/TestEm2/TestEm2.cc
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm2.cc,v 1.4 2000/12/06 14:12:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm2.cc,v 1.4.4.1 2001/06/28 19:06:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm2/TestEm2.out b/examples/extended/electromagnetic/TestEm2/TestEm2.out
index 68422e7b66..91fb3f0bb3 100644
--- a/examples/extended/electromagnetic/TestEm2/TestEm2.out
+++ b/examples/extended/electromagnetic/TestEm2/TestEm2.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -64,25 +64,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-               Water         81.851
-                 lAr         79.954
-                  Al         125.02
-                  Fe         225.11
-                 BGO         187.26
-               PbWO4         201.19
-            Tungsten         336.44
-                Lead         228.53
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -91,44 +77,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-               Water         81.851
-                 lAr         79.954
-                  Al         125.02
-                  Fe         225.11
-                 BGO         187.26
-               PbWO4         201.19
-            Tungsten         336.44
-                Lead         228.53
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  1 mm            1 mm 
@@ -143,7 +115,7 @@ Cut in energy
            Tungsten         105 keV        2.31 MeV
                Lead         101 keV        1.38 MeV
 ===================================================
-# $Id: TestEm2.out,v 1.13 2001/03/30 09:03:08 stesting Exp $
+# $Id: TestEm2.out,v 1.17 2001/04/26 12:33:31 stesting Exp $
 #
 # Macro file for "TestEm2.cc" 
 # (can be run in batch, without graphic)
@@ -158,7 +130,7 @@ Cut in energy
 /calor/setLbin 9 1.11
 /calor/setRbin 6 0.111
 /calor/update
-Absorber is 3.6056 m   of Water
+Absorber is 3.6 m   of Water
 #
 /run/particle/setCut 5.0 mm
 /run/initialize
@@ -170,40 +142,26 @@ phot:  Total cross sections from a parametrisation. Good description from 10 KeV
 
 compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
         Scattered gamma energy according Klein-Nishina.
-        PhysicsTables from 10 keV to 100 GeV in 100 bins. 
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
 
 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
         e+e- energies according Bethe-Heitler
-        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
         delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
-
- eIoni   Minimum Delta cut in range=0.5  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air         3.2397
-               Water         215.85
-                 lAr          213.4
-                  Al         349.38
-                  Fe         698.96
-                 BGO         569.64
-               PbWO4         622.56
-            Tungsten         1181.6
-                Lead         737.09
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -212,44 +170,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.5  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air         3.2397
-               Water         215.85
-                 lAr          213.4
-                  Al         349.38
-                  Fe         698.96
-                 BGO         569.64
-               PbWO4         622.56
-            Tungsten         1181.6
-                Lead         737.09
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  5 mm            5 mm 
@@ -281,32 +225,32 @@ Cut in energy
 Start closing geometry.
 Start Run processing.
 
----> Begin Of Event: 0
+---> Begin of Event: 0
 
----> Begin Of Event: 20
+---> Begin of Event: 20
 
----> Begin Of Event: 40
+---> Begin of Event: 40
 
----> Begin Of Event: 60
+---> Begin of Event: 60
 
----> Begin Of Event: 80
+---> Begin of Event: 80
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=118.39s Real=124.16s Sys=5.71s
+  User=62s Real=67s Sys=5.2s
                  LATERAL PROFILE                         CUMULATIVE LATERAL PROFILE
 
         bin              Mean         rms                 bin            Mean      rms 
 
-    0.00-> 1.11 radl:   13.95%       5.86%             0-> 1.11 radl:   13.95%     5.86% 
-    1.11-> 2.22 radl:   24.45%      11.26%             0-> 2.22 radl:   38.40%    14.27% 
-    2.22-> 3.33 radl:   21.91%       9.16%             0-> 3.33 radl:   60.31%    16.74% 
-    3.33-> 4.44 radl:   13.94%       8.39%             0-> 4.44 radl:   74.25%    15.37% 
-    4.44-> 5.55 radl:    9.45%       7.28%             0-> 5.55 radl:   83.71%    11.88% 
-    5.55-> 6.66 radl:    5.33%       6.03%             0-> 6.66 radl:   89.04%     8.36% 
-    6.66-> 7.77 radl:    3.38%       4.46%             0-> 7.77 radl:   92.41%     5.90% 
-    7.77-> 8.88 radl:    1.43%       2.94%             0-> 8.88 radl:   93.84%     3.90% 
-    8.88-> 9.99 radl:    0.98%       2.37%             0-> 9.99 radl:   94.82%     3.19% 
+    0.00-> 1.11 radl:   12.89%       4.71%             0-> 1.11 radl:   12.89%     4.71% 
+    1.11-> 2.22 radl:   22.83%       9.74%             0-> 2.22 radl:   35.73%    11.99% 
+    2.22-> 3.33 radl:   22.34%      10.32%             0-> 3.33 radl:   58.06%    17.37% 
+    3.33-> 4.44 radl:   15.76%       8.11%             0-> 4.44 radl:   73.82%    15.23% 
+    4.44-> 5.55 radl:   10.06%       7.82%             0-> 5.55 radl:   83.88%    12.67% 
+    5.55-> 6.66 radl:    4.37%       4.93%             0-> 6.66 radl:   88.25%    10.48% 
+    6.66-> 7.77 radl:    2.99%       4.84%             0-> 7.77 radl:   91.24%     8.60% 
+    7.77-> 8.88 radl:    1.38%       2.29%             0-> 8.88 radl:   92.62%     8.13% 
+    8.88-> 9.99 radl:    0.96%       2.13%             0-> 9.99 radl:   93.58%     7.14% 
 
 
 
@@ -314,21 +258,21 @@ Run Summary
 
         bin              Mean         rms                 bin            Mean      rms 
 
-    0.00-> 0.11 radl:   65.09%       8.82%             0-> 0.11 radl:   65.09%     8.82% 
-    0.11-> 0.22 radl:   17.01%       6.52%             0-> 0.22 radl:   82.10%     7.04% 
-    0.22-> 0.33 radl:    6.93%       4.24%             0-> 0.33 radl:   89.02%     5.40% 
-    0.33-> 0.44 radl:    3.06%       3.03%             0-> 0.44 radl:   92.08%     3.54% 
-    0.44-> 0.56 radl:    1.71%       1.25%             0-> 0.56 radl:   93.79%     3.27% 
-    0.56-> 0.67 radl:    1.03%       0.93%             0-> 0.67 radl:   94.82%     3.19% 
+    0.00-> 0.11 radl:   64.16%      10.45%             0-> 0.11 radl:   64.16%    10.45% 
+    0.11-> 0.22 radl:   16.51%       6.50%             0-> 0.22 radl:   80.67%     9.46% 
+    0.22-> 0.33 radl:    6.57%       5.05%             0-> 0.33 radl:   87.24%     8.33% 
+    0.33-> 0.44 radl:    3.22%       2.65%             0-> 0.44 radl:   90.46%     7.47% 
+    0.44-> 0.56 radl:    1.91%       1.62%             0-> 0.56 radl:   92.36%     7.25% 
+    0.56-> 0.67 radl:    1.22%       1.38%             0-> 0.67 radl:   93.58%     7.14% 
 
                               SUMMARY
-                         energy deposit :   94.82 % E0 +-    3.19 % E0
-                         charged traklen:   13.56 radl +-    0.46 radl
-                         neutral traklen:  200.51 radl +-   16.58 radl
+                         energy deposit :   93.58 % E0 +-    7.14 % E0
+                         charged traklen:   13.38 radl +-    1.03 radl
+                         neutral traklen:  197.32 radl +-   21.81 radl
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 576966569, 1968644705
+ Current couple of seeds = 1440604435, 866484929
 ----------------------------------------
 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
index 11689723c8..eb7c4611d7 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2DetectorConstruction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
index 38e670b015..856b80d3c7 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2DetectorMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
index 467ee0d7a7..d299fb92b3 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2EventAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2EventAction.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
index e4e2459916..0caf54d3d8 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2EventActionMessenger.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
index 27692e67fc..f5ecdcf776 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PhysicsList.hh,v 1.3 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PhysicsList.hh,v 1.3.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
index aef4f628a2..a679dcd3ae 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PhysicsListMessenger.hh,v 1.1 2000/04/17 11:25:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PhysicsListMessenger.hh,v 1.1.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
index acd6440f9a..b498952908 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:48:59 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
index 54fb7c777b..e34f946ce1 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2RunAction.hh,v 1.7 2001/03/08 14:28:14 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2RunAction.hh,v 1.7.2.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
index a41004d22e..97385244c6 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2RunActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2RunActionMessenger.hh,v 1.3 2000/01/21 10:56:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2RunActionMessenger.hh,v 1.3.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
index ba0b2831c0..da09332f85 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2SteppingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2SteppingAction.hh,v 1.2.4.1 2001/06/28 19:06:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
index a426f9bc04..f58a83b5b9 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2SteppingVerbose.hh,v 1.5 2001/02/19 14:06:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2SteppingVerbose.hh,v 1.5.2.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
index 16557930bb..33d4e5e330 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2TrackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2TrackingAction.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2TrackingAction.hh,v 1.2.4.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
index 0a087a0b4e..891478eb00 100644
--- a/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm2/include/Em2VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2VisManager.hh,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2VisManager.hh,v 1.2.4.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
index fa9ff6ee6d..62f293a874 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2DetectorConstruction.cc,v 1.4 2000/05/09 13:56:33 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2DetectorConstruction.cc,v 1.4.4.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
index 0a102a4a2f..b0c07ab0bc 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2DetectorMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
index 384997bae6..07dc683462 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2EventAction.cc,v 1.3 2001/02/20 15:58:35 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2EventAction.cc,v 1.3.2.1 2001/06/28 19:06:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
index 928a58db62..049f001454 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2EventActionMessenger.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:06:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
index 32bbdeb6f7..4b0266c7b8 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PhysicsList.cc,v 1.5 2000/12/06 14:12:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PhysicsList.cc,v 1.5.4.1 2001/06/28 19:06:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
index 2f16763b45..92f17918a4 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PhysicsListMessenger.cc,v 1.1 2000/04/17 11:26:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PhysicsListMessenger.cc,v 1.1.4.1 2001/06/28 19:06:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
index 498127dd4a..7e74ccd88b 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:06:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
index e5002e10a1..cc6f7eaa33 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2RunAction.cc,v 1.10 2001/03/27 08:58:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2RunAction.cc,v 1.10.2.1 2001/06/28 19:06:53 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
index 23d1a3bce5..e98894f860 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2RunActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2RunActionMessenger.cc,v 1.4 2001/02/20 15:58:36 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2RunActionMessenger.cc,v 1.4.2.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
index 9f7cc70ad5..4c353ee1ba 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2SteppingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2SteppingAction.cc,v 1.2.4.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
index 0619b51b38..eb3c54d2fb 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2SteppingVerbose.cc,v 1.6 2001/02/19 14:06:36 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
index 25f4d8126e..b8863105da 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2TrackingAction.cc
@@ -1,13 +1,29 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: Em2TrackingAction.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: Em2TrackingAction.cc,v 1.2.4.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
index f8f2a09866..d900bb56dc 100644
--- a/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm2/src/Em2VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em2VisManager.cc,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em2VisManager.cc,v 1.2.4.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm3/History b/examples/extended/electromagnetic/TestEm3/History
index 747817a53c..fc16e98e10 100644
--- a/examples/extended/electromagnetic/TestEm3/History
+++ b/examples/extended/electromagnetic/TestEm3/History
@@ -1,11 +1,11 @@
-$Id: History,v 1.7 2001/03/26 16:01:57 maire Exp $
+$Id: History,v 1.11 2001/05/31 15:49:34 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
      Geant4 - an Object-Oriented Toolkit for Simulation in HEP
      =========================================================
 
-                    TestEm2 History file
+                    TestEm3 History file
                     --------------------
 This file should be used by the G4 example coordinator to briefly
 summarize all major modifications introduced in the code and keep
@@ -14,33 +14,56 @@ track of all tags.
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+31-05-01  mma (testem3-V03-01-01)
+- VisManager
      
+30-05-01  mma
+- in RunAction: method PrintDedxTables() : binning as Geant3,
+  printout ready to be read as ffread data cards.
+- Geant3 application in geant3/g4mat to read the above data cards,
+  in order to compare G3 and G4 dE/dx tables (see README).   
+
+13-04-01  mma (testem3-V03-01-00)
+- In PrimaryGeneratorAction, possibility to randomize the beam spot
+- command /gun/rndm in PrimaryGeneratorMessenger
+- similar functionality in geant3: gukine.F
+     
+12-04-01  mma
+- In DetectorConstruction, possibility to limit the step size, via
+  a G4UserLimit object. 
+- command /tracking/stepMax in DetectorMessenger
+- data card STEPMX in geant3
+       
+06-04-01  mma
+- in RunAction: method PrintDedxTables()
+- in DetectorConstruction: Iron density corrected (was 7.7 g/cm3)
+- in geant3: overwrite the computed radlength of scintillator 
+	        
 26-03-01  mma (testem3-V03-00-04)
-          - change in histogramming : 1d histo of Edep/Ebeam
-	  in each absorber instead of ntuple, both in G4 and G3.
-	  - interactive command /run/setHisto (in G4) and ffread
-	  data card *histo (in G3) to control the binning of the
-	  histos.
-	  - in G3, new data card cutpr to set bcute, dcute, ppcutm for
-	  each tracking medium
-	  - in gnumakefile : the cpp flag g4nohist=true by default.
-	    --> no histograms in G4 by default. 
+- change in histogramming : 1d histo of Edep/Ebeam
+  in each absorber instead of ntuple, both in G4 and G3.
+- interactive command /run/setHisto (in G4) and ffread
+  data card *histo (in G3) to control the binning of the histos.
+- in G3, new data card CUTPR to set bcute, dcute, ppcutm for each tracking 
+  medium
+- in gnumakefile : the cpp flag g4nohist=true by default.
+  --> no histograms in G4 by default. 
 	  
 	       
 21-02-01  mma (testem3-V03-00-03)
-          - hbook histograms restored
+- hbook histograms restored
 	       
 20-02-01  mma (testem3-V03-00-02)
-          -stepping verbose adapted for STL
-	  -BirkAttenuation function
-	  -save rndm at begin of event
+- stepping verbose adapted for STL
+- BirkAttenuation function
+- save rndm at begin of event
      
 07-12-00  mma (testem3-V02-00-03 & testem-noHist)
-          remove hbook histograms: GNUmakefile,runAction,eventAction
+- remove hbook histograms: GNUmakefile,runAction,eventAction
 				   
 06-12-00  mma (testem3-V02-00-02 & testem-withHist)
-          update of init.mac for new vis commands.
-	  G4UItcsh in the main()
+- update of init.mac for new vis commands.
+- G4UItcsh in the main()
 	  
 25th November 2000 Steve O'Neale (tagset210)
 - Update test outputs for min.delta energy cut and table printout
diff --git a/examples/extended/electromagnetic/TestEm3/README b/examples/extended/electromagnetic/TestEm3/README
index f1b7345941..4ee048f5d8 100644
--- a/examples/extended/electromagnetic/TestEm3/README
+++ b/examples/extended/electromagnetic/TestEm3/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.4 2001/03/30 12:39:56 gcosmo Exp $
+$Id: README,v 1.5 2001/04/13 13:17:29 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -93,6 +93,10 @@ $Id: README,v 1.4 2001/03/30 12:39:56 gcosmo Exp $
  
  	As a homework try to visualize a gamma conversion alone, 
  	or the effect of the multiple scattering.
+	
+	Notice that one can control the maximum step size at tracking time,
+	via G4UserLimit class and the command /tracking/stepMax  
+	(see DetectorConstruction and DetectorMessenger classes)
  	
  6- HOW TO START ?
  
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.cc b/examples/extended/electromagnetic/TestEm3/TestEm3.cc
index 364190bc96..36921fb7f5 100644
--- a/examples/extended/electromagnetic/TestEm3/TestEm3.cc
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm3.cc,v 1.5 2001/03/26 16:01:57 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm3.cc,v 1.5.2.1 2001/06/28 19:06:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm3/TestEm3.out b/examples/extended/electromagnetic/TestEm3/TestEm3.out
index 26c83f2749..579925c303 100644
--- a/examples/extended/electromagnetic/TestEm3/TestEm3.out
+++ b/examples/extended/electromagnetic/TestEm3/TestEm3.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -103,34 +103,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.05  mm.
-
-           material       min.delta energy(keV) 
-
-           Aluminium         82.719
-         liquidArgon         53.268
-                Iron         143.41
-              Copper         153.59
-            Tungsten         210.64
-                Lead         145.79
-             Uranium         197.41
-               Water         54.852
-        Scintillator         55.938
-            Silicium         77.338
-              quartz           77.2
-             NemaG10         69.507
-                 Air           0.99
-             Aerogel         20.477
-         CarbonicGas         6.4196
-          WaterSteam           0.99
-            Galactic           0.99
-                Beam           0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -139,53 +116,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.05  mm.
-
-           material        min.delta energy(keV) 
-
-           Aluminium         82.719
-         liquidArgon         53.268
-                Iron         143.41
-              Copper         153.59
-            Tungsten         210.64
-                Lead         145.79
-             Uranium         197.41
-               Water         54.852
-        Scintillator         55.938
-            Silicium         77.338
-              quartz           77.2
-             NemaG10         69.507
-                 Air           0.99
-             Aerogel         20.477
-         CarbonicGas         6.4196
-          WaterSteam           0.99
-            Galactic           0.99
-                Beam           0.99
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                500 mum         500 mum
@@ -209,7 +163,7 @@ Cut in energy
            Galactic         990 eV          990 eV 
                Beam         990 eV          990 eV 
 ===================================================
-# $Id: TestEm3.out,v 1.12 2001/03/30 09:03:15 stesting Exp $
+# $Id: TestEm3.out,v 1.16 2001/04/26 12:33:36 stesting Exp $
 #
 # Macro file for "exampleN03.cc" 
 # (can be run in batch, without graphic)
@@ -242,19 +196,19 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100
-  User=141.92s Real=151.68s Sys=9.63s
+  User=1.2e+02s Real=1.3e+02s Sys=9.9s
 
 -------------------------------------------------------------
                                    total energy dep            total tracklen 
  
- Absorber0 (        Lead) : 812.12 MeV +- 16.14 MeV       51.89 cm  +-  1.22 cm 
- Absorber1 ( liquidArgon) : 177.04 MeV +- 15.38 MeV       88.78 cm  +-  8.08 cm 
+ Absorber0 (        Lead) : 815.55 MeV +- 13.54 MeV       52.15 cm  +-  1.14 cm 
+ Absorber1 ( liquidArgon) : 173.85 MeV +- 12.77 MeV       86.85 cm  +-  6.62 cm 
 
 -------------------------------------------------------------
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 859140068, 732198684
+ Current couple of seeds = 273622358, 263061346
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/README b/examples/extended/electromagnetic/TestEm3/geant3/README
index 5967a14b78..836e455c2d 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/README
+++ b/examples/extended/electromagnetic/TestEm3/geant3/README
@@ -30,3 +30,8 @@
   *HISTO  id1  nbin  vmin  vmax 
   *HISTO  id2  nbin  vmin  vmax
   ...etc...........
+  
+ It is possible to set the max allowed step size STEMAX,
+ via the data card:
+ STEPMX  stepmax (in cm)
+ (However this value will be taken into account only if auto=0)
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/README b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/README
new file mode 100644
index 0000000000..3c55e98038
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/README
@@ -0,0 +1,23 @@
+
+This program compare the Geant3 and Geant4 dE/dx tables.
+The Geant4 values are read as ffread data cards, as they are printed out
+by TestEm3, according the standard Geant3 binning. 
+One must complete by hand the data cards KINE and MATE; see the file iron.dat 
+as an example.
+The Geant3 values are computed within this program.
+The g4-g3 differences are ploted in the file plmat.paw
+
+ % cd geant3/g4mat
+ % gmakeB           to make an executable  (Batch version) 
+ % gmakeT           to make an executable  (inTeractive version)
+ 
+ To execute:
+  
+ % cd geant3/g4mat
+ % $G4SYSTEM/g4mat.xb (for batch) or g4mat.xt (for interactive)
+ 
+ The program will ask:
+ G3 > gives the filename of the data cards to be read:
+ 
+ iron.dat      (XXX.dat)
+ 
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeB b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeB
new file mode 100755
index 0000000000..82df0e09d6
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeB
@@ -0,0 +1,32 @@
+#
+# @(#) Script to build a Batch geant executable
+#
+set name=g4mat
+
+set extnam=" "
+if ($G4SYSTEM == AIX-AFS) set extnam=-qextname
+#
+mkdir $G4SYSTEM
+cd    $G4SYSTEM
+#
+# fortran compilation
+#
+hepf77  $extnam -c -g -Dbatch  -I/cern/pro/include -I../include ../src/*.F
+
+#
+# Link
+#
+echo 'linking geant3+cernlib libraries ...'
+#
+hepf77  $extnam -g -o $name.xb  *.o \
+   `cernlib geant321 pawlib graflib packlib mathlib kernlib`
+#
+#
+chmod +x $name.xb
+#
+# cleanup
+#
+rm *.o
+echo 'done'  
+exit
+ 
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeT b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeT
new file mode 100755
index 0000000000..2bbc5ead3e
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/gmakeT
@@ -0,0 +1,31 @@
+#
+# @(#) Script to build an inTeractive geant executable
+#
+set name=g4mat
+
+set extnam=" "
+if ($G4SYSTEM == AIX-AFS) set extnam=-qextname
+#
+mkdir $G4SYSTEM
+cd    $G4SYSTEM
+#
+# fortran compilation
+#
+hepf77  $extnam -c -g -I/cern/pro/include -I../include ../src/*.F 
+#
+# Link
+#
+echo 'linking geant3+cernlib libraries...'
+#
+hepf77  $extnam -g -o $name.xt  *.o \
+   `cernlib geant321 pawlib graflib packlib mathlib kernlib`
+#
+#
+chmod +x $name.xt
+#
+# cleanup
+#
+rm *.o
+echo 'done'  
+exit
+ 
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ggvalues.inc b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ggvalues.inc
new file mode 100644
index 0000000000..1629d95560
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ggvalues.inc
@@ -0,0 +1,30 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      COMMON/G4VAL/g4value(200)
+*
+* *** the Geant4 values of de/dx or cross sections are read from
+*     the data card G4VAL. 
+*     The bining is given by ELOW(200)   (common gcmulo)        
+
+      COMMON/G3VAL/g3value(200)
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ugmate.inc b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ugmate.inc
new file mode 100644
index 0000000000..7117a39416
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/include/ugmate.inc
@@ -0,0 +1,24 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      COMMON/UGMATE/Imat
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/iron.dat b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/iron.dat
new file mode 100644
index 0000000000..74c2abad89
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/iron.dat
@@ -0,0 +1,28 @@
+LIST
+C 
+C  dE/dx (MeV/cm) for mu+ in Iron
+C
+KINE  5 (mu+)
+MATE  7 (Iron)
+ERAN  1.00e-05 (ekmin)	1.00e+04 (ekmax)	90 (nekbin)
+CUTS  1.00e-05 (cutgam)	5.82e-05 (cutele)
+G4VAL 
+ 3.554835e+03	3.569445e+03	3.477310e+03	3.237305e+03	2.796011e+03	
+ 2.084330e+03	1.712979e+03	1.526694e+03	1.360668e+03	1.212696e+03	
+ 1.080817e+03	9.632790e+02	8.585233e+02	7.651597e+02	6.693284e+02	
+ 5.732342e+02	4.884958e+02	4.145149e+02	3.504588e+02	2.953827e+02	
+ 2.488385e+02	2.095821e+02	1.761759e+02	1.478571e+02	1.239422e+02	
+ 1.033223e+02	8.482754e+01	6.977993e+01	5.755184e+01	4.762822e+01	
+ 3.958668e+01	3.308135e+01	2.782940e+01	2.359997e+01	2.020495e+01	
+ 1.749131e+01	1.533473e+01	1.363429e+01	1.230805e+01	1.128936e+01	
+ 1.050600e+01	9.895461e+00	9.451831e+00	9.142193e+00	8.938586e+00	
+ 8.817268e+00	8.758231e+00	8.744866e+00	8.763660e+00	8.803896e+00	
+ 8.857303e+00	8.917685e+00	8.980540e+00	9.042708e+00	9.102056e+00	
+ 9.157219e+00	9.207395e+00	9.252183e+00	9.291466e+00	9.325326e+00	
+ 9.353986e+00	9.377759e+00	9.397027e+00	9.412214e+00	9.423776e+00	
+ 9.432188e+00	9.437939e+00	9.441529e+00	9.443463e+00	9.444251e+00	
+ 9.444406e+00	9.444403e+00	9.444400e+00	9.444399e+00	9.444398e+00	
+ 9.444397e+00	9.444397e+00	9.444396e+00	9.444396e+00	9.444396e+00	
+ 9.444396e+00	9.444396e+00	9.444396e+00	9.444396e+00	9.444396e+00	
+ 9.444396e+00	9.444396e+00	9.444396e+00	9.444396e+00	9.444396e+00	
+
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/scin.dat b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/scin.dat
new file mode 100644
index 0000000000..3b97d3eaaf
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/scin.dat
@@ -0,0 +1,27 @@
+LIST
+C 
+C  dE/dx (MeV/cm) for mu+ in Scintillator
+C
+KINE  5  (mu+)
+MATE  14 (Scintillator)
+ERAN  1.00e-05 (ekmin)	1.00e+04 (ekmax)	90 (nekbin)
+CUTS  1.00e-05 (cutgam)	1.00e-05 (cutele)
+G4VAL 
+ 1.047889e+03	9.385819e+02	8.058813e+02	6.050599e+02	5.216658e+02	
+ 4.649352e+02	4.143739e+02	3.693111e+02	3.291489e+02	2.933542e+02	
+ 2.614523e+02	2.330196e+02	2.076789e+02	1.850940e+02	1.599710e+02	
+ 1.336974e+02	1.099616e+02	8.949809e+01	7.283014e+01	5.926274e+01	
+ 4.824740e+01	3.931473e+01	3.205061e+01	2.614325e+01	2.134208e+01	
+ 1.744311e+01	1.427961e+01	1.171519e+01	9.638382e+00	7.958212e+00	
+ 6.600522e+00	5.504944e+00	4.622398e+00	3.913033e+00	3.344527e+00	
+ 2.890696e+00	2.530349e+00	2.246338e+00	2.024783e+00	1.854421e+00	
+ 1.722869e+00	1.619162e+00	1.542631e+00	1.487783e+00	1.449954e+00	
+ 1.425193e+00	1.410187e+00	1.402208e+00	1.399063e+00	1.399041e+00	
+ 1.400851e+00	1.403560e+00	1.406524e+00	1.409325e+00	1.411720e+00	
+ 1.413592e+00	1.414917e+00	1.415740e+00	1.416146e+00	1.416257e+00	
+ 1.416212e+00	1.416152e+00	1.416114e+00	1.416090e+00	1.416074e+00	
+ 1.416065e+00	1.416058e+00	1.416055e+00	1.416052e+00	1.416051e+00	
+ 1.416050e+00	1.416049e+00	1.416049e+00	1.416048e+00	1.416048e+00	
+ 1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	
+ 1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	
+ 1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	1.416048e+00	
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/main.F b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/main.F
new file mode 100644
index 0000000000..08b840833b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/main.F
@@ -0,0 +1,80 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+#ifdef batch  
+
+      PROGRAM main
+*
+*
+      PARAMETER (NGBANK=100000, NHBOOK=10000)
+      COMMON/GCBANK/Q(NGBANK)
+      COMMON/PAWC  /H(NHBOOK)
+*
+      CALL GZEBRA( NGBANK)
+      CALL HLIMIT(-NHBOOK)
+*
+* *** initialize HIGZ
+      CALL HPLINT(0)
+*
+* *** GEANT initialisation
+      CALL UGINIT
+*
+* *** End of RUN
+      CALL UGLAST
+*
+      STOP
+      END
+      
+#else
+
+      PROGRAM main
+*
+*     GEANT main program. To link with the MOTIF user interface
+*     the routine GPAWPP(NWGEAN,NWPAW) should be called, whereas
+*     the routine GPAW(NWGEAN,NWPAW) gives access to the basic
+*     graphics version.
+*
+      PARAMETER (NWGEAN=3000000, NWPAW=1000000)
+      COMMON/GCBANK/GEANT(NWGEAN)
+      COMMON/PAWC  /PAW  (NWPAW)
+*
+*
+      CALL GPAW (NWGEAN,NWPAW)
+*
+      END
+*
+      SUBROUTINE qnext
+      END
+*
+      SUBROUTINE czopen
+      END
+*
+      SUBROUTINE cztcp
+      END
+*
+      SUBROUTINE czclos
+      END
+*
+      SUBROUTINE czputa
+      END
+
+#endif
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ug3g4.F b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ug3g4.F
new file mode 100644
index 0000000000..54845e1880
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ug3g4.F
@@ -0,0 +1,49 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      SUBROUTINE UG3G4                                                         
+*
+*                                                                               
+#include "geant321/gcmulo.inc"
+#include "geant321/gckine.inc"
+#include "ugmate.inc"
+#include "ggvalues.inc"
+*
+*
+* *** fetch Geant3 tables      
+      call gftmat(imat,ikine,'LOSS',nekbin,elow,g3value,dum,idum)
+*
+* *** histograms to plot the difference
+      elow(nek1) = ekmax
+      call HBOOKB (1,'(g4-g3)/g3 in percent',nekbin,elow,0.)
+      call HBOOKB (2,'abs((g4-g3)/g3) in percent',nekbin,elow,0.)           
+*
+* *** compute difference
+      do i=1,nekbin
+        dif = 100*(g4value(i)-g3value(i))/g3value(i)
+	call hfill (1, elow(i), 0., dif)
+	call hfill (2, elow(i), 0., abs(dif))	
+        print *,i,elow(i),g4value(i),g3value(i), 'dif(%)=',dif
+      enddo      
+*                                                                               
+      END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ugimat.F b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ugimat.F
new file mode 100644
index 0000000000..1c49214021
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/ugimat.F
@@ -0,0 +1,101 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      SUBROUTINE UGIMAT                                                          
+*                                                                               
+* *** Define user materials                                               
+*
+#include "geant321/gcbank.inc"                                                                                                                                                                                                                       
+*
+      DIMENSION Aair(2),Zair(2),Wair(2)
+      DIMENSION ACO2(2),ZCO2(2),WCO2(2)
+      DIMENSION AH2O(2),ZH2O(2),WH2O(2)
+      DIMENSION AG10(4),ZG10(4),WG10(4)
+      DIMENSION Asci(2),Zsci(2),Wsci(2)                                              
+*      
+* *** Air compound parameters          
+      DATA Aair/14.01, 16.00/
+      DATA Zair/ 7.  ,  8.  /
+      DATA Wair/ 0.7 ,  0.3 /
+*                                                                               
+* *** CO2 compound parameters
+      DATA ACO2/12.01, 16.00/
+      DATA ZCO2/ 6.  ,  8.  /
+      DATA WCO2/ 1.  ,  2.  /
+*                                                                               
+* *** Water compound parameters
+      DATA AH2O/ 1.01, 16.00/
+      DATA ZH2O/ 1.  ,  8.  /
+      DATA WH2O/ 2.  ,  1.  /
+*                                                                               
+* *** G10 compound parameters
+      DATA AG10/ 1.01, 12.00, 16.00, 28.00/
+      DATA ZG10/ 1.  ,  6.  ,  8.  , 14.  /
+      DATA WG10/ 3.  ,  3.  ,  2.  ,  1.  /      
+*                                                                               
+* *** Scintillator compound parameters
+      DATA Asci/12.01,  1.01/
+      DATA Zsci/ 6.  ,  1.  /
+      DATA Wsci/ 9.  , 10.  /                                                                               
+
+*
+* *** Defines  materials
+      CALL GSMIXT( 1,'Air'      , Aair ,Zair, 1.29E-3, 2   , Wair)
+      CALL GSMIXT( 2,'CO2 gas'  , ACO2 ,ZCO2, 27.0E-3,-2   , WCO2)
+      CALL GSMATE( 3,'H2 Liquid',  1.01,  1., 0.0708 , 865., 790., 0,0)
+      CALL GSMIXT( 4,'Water'    , AH2O ,ZH2O, 1.0    ,-2   , WH2O)
+      CALL GSMATE( 5,'Liquid Ar', 39.95, 18., 1.39   , 14.0, 84.0, 0,0)
+      CALL GSMATE( 6,'Aluminium', 26.98, 13., 2.7    ,  8.9, 37.2, 0,0)
+      CALL GSMATE( 7,'Iron     ', 55.85, 26., 7.87   , 1.76, 17.1, 0,0)
+      CALL GSMATE( 8,'Lead     ',207.19, 82., 11.35  , 0.56, 18.5, 0,0)
+      CALL GSMATE( 9,'Uranium  ',238.03, 92., 18.95  , 0.32, 12. , 0,0)
+      CALL GSMATE(10,'Silicon  ', 28.09, 14.,  2.33  , 9.36, 45.5, 0,0)
+      CALL GSMATE(11,'Tungsten ',183.85, 74., 19.30  , 0.35,  9.6, 0,0)
+      CALL GSMIXT(12,'NemaG10'  , AG10 ,ZG10, 1.7    ,-4   , WG10)
+      CALL GSMATE(13,'Copper   ', 63.55, 29., 8.96   , 1.43, 15.0, 0,0)
+      CALL GSMIXT(14,'Scintilla', Asci ,Zsci, 1.032  ,-2   , Wsci)
+      CALL GSMATE(15,'Gold     ',196.97, 79., 19.32  , 0.33,  9.6, 0,0)
+*
+*     total number of materals
+      mtot = 15            
+* 
+* *** overwrite the computed radlength of some mixture
+      JMA = LQ(JMATE-14)
+      Q(JMA+9) = 42.549            
+*                                               
+*                                                                               
+* *** Defines USER tracking media parameters
+      IFIELD = 0                                                             
+      FIELDM = 0.                                                           
+      TMAXFD = 10.0                                                             
+      STEMAX = 1000.                                                            
+      DEEMAX = 0.20                                                            
+      EPSIL  = 0.001                                                           
+      STMIN  = 0.010                                                           
+*
+      do im =1,mtot                                                                               
+        CALL GSTMED(im,'tracking medium',im, 0 ,IFIELD,FIELDM,TMAXFD,                
+     *                 STEMAX,DEEMAX,EPSIL,STMIN, 0 , 0 )
+      enddo        
+*
+      END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uginit.F b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uginit.F
new file mode 100644
index 0000000000..b5c724da1b
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uginit.F
@@ -0,0 +1,69 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      SUBROUTINE UGINIT                                                         
+*                                                                               
+*     To initialise GEANT/USER  program and read data cards                     
+*
+#include "geant321/gcphys.inc"
+#include "geant321/gccuts.inc"
+#include "ugmate.inc"
+#include "ggvalues.inc"
+*
+      CHARACTER*20 filnam                                                                                                                                                                                                      
+*                                                                               
+* *** Define the GEANT parameters
+      CALL GINIT 
+                                                                          
+* *** read data cards
+      PRINT *, 'G3 > gives the filename of the data cards to be read:'
+      READ (*,'(A)') filnam
+      IF (filnam.EQ.' ') filnam = 'run01.dat'
+      OPEN (unit=5,file=filnam,status='unknown',form='formatted')
+*
+* *** define data cards
+      call FFKEY ('MATE' ,Imat,1,'INTEGER')
+      call FFKEY ('G4VAL',g4value(1),200,'REAL')  
+*                                                                    
+* *** read data cards                                                           
+      CALL GFFGO 
+*
+* *** overwrite some initialization
+      iloss  = 4
+      ppcutm = cutele
+*                                                                                      
+      CALL GZINIT                                                               
+      CALL GPART
+*                                                                               
+* *** materials definition
+      CALL UGIMAT                                                               
+*                                                                               
+* *** Energy loss and cross-sections initialisations
+      CALL GPHYSI                                                               
+*                                                                               
+      CALL GPRINT('MATE',0)
+*
+* *** ready for geant3/geant4 comparison
+      call UG3G4      
+*                                                                               
+      END                                                                       
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uglast.F b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uglast.F
new file mode 100644
index 0000000000..0e216e82f0
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/g4mat/src/uglast.F
@@ -0,0 +1,38 @@
+*    
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
+*    
+
+      SUBROUTINE UGLAST                                                         
+*                                                                               
+*     Termination routine to print histograms and statistics                    
+*            
+*                                                                                                                        
+* *** geant termination                                                                               
+      CALL GLAST
+*
+* *** close HIGZ file
+      CALL HPLEND 
+*
+* *** save histograms
+      call HRPUT(0,'plmat.paw','N')                                                             
+*
+      END
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc b/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
index 90135fb286..788b0561bf 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
+++ b/examples/extended/electromagnetic/TestEm3/geant3/include/calor.inc
@@ -24,3 +24,7 @@
 *  prodcut(k+2) = dcute/m for this medium           (data card CUTPR)
 *  prodcut(k+3) = ppcutm  for this medium           (data card CUTPR)
 *
+
+      COMMON/STEPMAX/stepmax
+*
+*  stepmax = max allowed step length                (data card STMAX)
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/run15.dat b/examples/extended/electromagnetic/TestEm3/geant3/run15.dat
index f38dc36c2a..2f1c0a2e49 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/run15.dat
+++ b/examples/extended/electromagnetic/TestEm3/geant3/run15.dat
@@ -7,7 +7,7 @@ MATE   7 (iron)    14 (Sc)
 THICK  1.4(cm)    0.3 (cm)
 C
 TRIG   20000
-KINE   5 (Itype) 180. (Ekine) 1000. (x0) 0. (y0) 0. (z0) 1. (ux) 0. (uy) 0. (uz)
+KINE   5 (Itype) 20. (Ekine) 1000. (x0) 0. (y0) 0. (z0) 1. (ux) 0. (uy) 0. (uz)
 DEBUG  10  5 1000
 SWIT   0 (draw) 1 (save)
 C
@@ -16,12 +16,28 @@ LOSS   1
 HADR   0
 TIME   2=1.
 C
-CUTS  10.0e-6 (cutgam) 10.0e-6 (cutele)  3*10.e-3 (cutn/h/mu)       
-CUTPR  1. (tmed)   20.5e-6 (bcute/m)    1.2e-3 (dcute/m)   1.2e-3 (ppcutm)
-       2. (tmed)   10.0e-6 (bcute/m)  356.0e-6 (dcute/m) 356.0e-6 (ppcutm)
-C       
-C CUTPR  1. (tmed)   10.0e+3 (bcute/m)  146.0e+0 (dcute/m)  146.0e+0 (ppcutm)
+CUTS  10.0e-6 (cutgam) 10.0e-6 (cutele)  3*10.e-3 (cutn/h/mu)
+C
+C 10 mum       
+CUTPR  1. (tmed)   10.0e-6 (bcute/m)   58.0e-6 (dcute/m)  58.0e-6 (ppcutm)
+       2. (tmed)   10.0e-6 (bcute/m)   10.0e-6 (dcute/m)  10.0e-6 (ppcutm)
+C 100 mum       
+C CUTPR  1. (tmed)   10.0e-6 (bcute/m)  234.0e-6 (dcute/m) 234.0e-6 (ppcutm)
+C        2. (tmed)   10.0e-6 (bcute/m)   85.3e-6 (dcute/m)  85.3e-6 (ppcutm)
+C 1 mm       
+C CUTPR  1. (tmed)   20.8e-6 (bcute/m)    1.3e-3 (dcute/m)   1.3e-3 (ppcutm)
+C        2. (tmed)   10.0e-6 (bcute/m)  356.0e-6 (dcute/m) 356.0e-6 (ppcutm)
+C 1 cm       
+C CUTPR  1. (tmed)   60.4e-6 (bcute/m)   13.0e-3 (dcute/m)   13.0e-3 (ppcutm)
+C        2. (tmed)   10.0e-6 (bcute/m)    2.2e-3 (dcute/m)    2.2e-3 (ppcutm)       
+C
+C 10 cm       
+C CUTPR  1. (tmed)  626.0e-6 (bcute/m)  209.0e-3 (dcute/m)  209.0e-3 (ppcutm)
+C        2. (tmed)   19.0e-6 (bcute/m)   23.4e-3 (dcute/m)   23.4e-3 (ppcutm)       
+C              
+C 100 cm       
+C CUTPR  1. (tmed)   10.0e+3 (bcute/m)  161.0e+0 (dcute/m)  161.0e+0 (ppcutm)
 C        2. (tmed)  842.0e-6 (bcute/m)  318.0e-3 (dcute/m)  318.0e-3 (ppcutm)       
 C       
-*HISTO 1 (idh) 100 (nbin) 0. (Emin/Ebeam) 1.e-2 (Emax/Ebeam)
-*HISTO 2 (idh) 100 (nbin) 0. (Emin/Ebeam) 5.e-4 (Emax/Ebeam)
+*HISTO 1 (idh) 100 (nbin) 0. (Emin/Ebeam) 1.e-1 (Emax/Ebeam)
+*HISTO 2 (idh) 100 (nbin) 0. (Emin/Ebeam) 5.e-3 (Emax/Ebeam)
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/run16.dat b/examples/extended/electromagnetic/TestEm3/geant3/run16.dat
new file mode 100644
index 0000000000..c6fe2f8cbf
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/geant3/run16.dat
@@ -0,0 +1,23 @@
+LIST
+C
+C    Al-Au-Al  1 layer
+C
+CALOR  3 (nbAbs) 1 (nbLay)  1050.e-4 (calorYZ) 0. (field)
+MATE   6 (Al)   15 (Au) 6 (Al)
+THICK  170.e-4 (cm)  23.e-4 (cm)  850.e-4 (cm)
+C
+KINE 3 (Itype) 1.e-3 (Ekine) 1000. (x0) 0. (y0) 0. (z0) 1. (ux) 0. (uy) 0. (uz)
+     0.9 (rbeam)
+C
+CUTS    10.0e-6 (cutgam)     10.0e-6 (cutele)  3*10.e-3 (cutneu/had/muo)
+      2*10.0e-6 (bcute/m)  2*10.0e-6 (dcute/m)
+C      
+AUTO   0
+STEPMX 5.e-4 (cm)      
+ABAN   0
+LOSS   1
+HADR   0
+C
+SWIT   2 (draw) 0 (save)
+DEBUG  10  5 1000
+TRIG   10
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/gukine.F b/examples/extended/electromagnetic/TestEm3/geant3/src/gukine.F
index 40f78c61b3..b094caa055 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/gukine.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/gukine.F
@@ -3,7 +3,9 @@
 *  
 *    Generates Kinematics for primary track
 *
-*    Data card Kine : Itype  Ekine x0  y0  z0  ux  uy  uz
+*    Data card Kine : Itype  Ekine x0  y0  z0  ux  uy  uz rbeam
+*
+*    rbeam : size of the random beam extension in fraction of 0.5*calorYZ
 *
 #include "geant321/gcbank.inc"
 #include "geant321/gcflag.inc"
@@ -11,6 +13,7 @@
 #include "calor.inc"                                                          
 *                                                                               
       DIMENSION VERTEX(3),PLAB(3)
+      dimension rndm(2)
 *
 * *** set/reset default kinematic
       IF ((IKINE.LT.0).or.(abs(PKINE(2)).GT.0.5*worldX)) THEN
@@ -23,9 +26,14 @@
           PKINE(7) = 0.
       ENDIF
 *
+*     random in YZ ?
+      if ((pkine(8).lt.0.).or.(pkine(8).gt.1.)) pkine(8) = 0.
+      rbeam = pkine(8)*0.5*calorYZ
+      call GRNDM (rndm,2)
+*        
       VERTEX(1) = PKINE(2)
-      VERTEX(2) = PKINE(3)
-      VERTEX(3) = PKINE(4)
+      VERTEX(2) = PKINE(3) + (2*rndm(1)-1.)*rbeam
+      VERTEX(3) = PKINE(4) + (2*rndm(2)-1.)*rbeam
 *
       CALL GSVERT(VERTEX,0,0,0,0,NVERT)
 *
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F b/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
index 4c0af24396..ec8cc7b642 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/ugeom.F
@@ -4,6 +4,7 @@
 * *** Define user geometry set up
 *
 #include "calor.inc"
+#include "geant321/gcbank.inc"
 *
       DIMENSION PAR(3)
 
@@ -56,7 +57,12 @@
       CALL GSMATE(11,'Tungsten ',183.85, 74., 19.30  , 0.35,  9.6, 0,0)
       CALL GSMIXT(12,'NemaG10'  , AG10 ,ZG10, 1.7    ,-4   , WG10)
       CALL GSMATE(13,'Copper   ', 63.55, 29., 8.96   , 1.43, 15.0, 0,0)
-      CALL GSMIXT(14,'Scintilla', Asci ,Zsci, 1.032  ,-2   , Wsci)      
+      CALL GSMIXT(14,'Scintilla', Asci ,Zsci, 1.032  ,-2   , Wsci)
+      CALL GSMATE(15,'Gold     ',196.97, 79., 19.32  , 0.33,  9.6, 0,0)      
+* 
+* *** overwrite the computed radlength of some mixture
+      JMA = LQ(JMATE-14)
+      Q(JMA+9) = 42.549            
 *                                               
 *                                                                               
 * *** Defines USER tracking media parameters
@@ -64,7 +70,8 @@
       IF (Field.GT.0.) IFIELD = 3
       FIELDM = 10*Field
       TMAXFD = 10.0                                                             
-      STEMAX = 1000.                                                            
+      STEMAX = 1000.
+      IF (stepmax.gt.0.) STEMAX = stepmax                                                            
       DEEMAX = 0.20                                                            
       EPSIL  = 0.001                                                           
       STMIN  = 0.010                                                           
diff --git a/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F b/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
index c02bef735e..e4120c9e26 100644
--- a/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
+++ b/examples/extended/electromagnetic/TestEm3/geant3/src/uginit.F
@@ -25,9 +25,11 @@
       CALL FFKEY('MATE' ,materAbs(1),MaxAbs,'INTEGER')
       CALL FFKEY('THICK',thickAbs(1),MaxAbs,'REAL')
 * *** production cuts (bcute, dcute and ppcutm) for each absorber       
-      CALL FFKEY('CUTPR',prodcut(1) ,4*MaxAbs,'REAL')
+      CALL FFKEY('CUTPR',prodcut(1) ,4*MaxAbs,'REAL')      
 * *** histograms
-      CALL FFKEY('HISTO',idhist,4,'MIXED')            
+      CALL FFKEY('HISTO',idhist,4,'MIXED')
+* *** max allowed step size       
+      CALL FFKEY('STEPMX',stepmax,1,'REAL')                  
 *
 * *** read data cards
       CALL GFFGO 
@@ -41,7 +43,7 @@
       CALL UGEOM                                                                
 *                                                                               
 * *** Energy loss and cross-sections initialisations                            
-      CALL GPHYSI                                                               
+      CALL GPHYSI                               
 * 
       CALL GPRINT('MATE',0)                                                     
       CALL GPRINT('TMED',0)                                                     
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
index f918bee672..6d1b17c9a4 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3CalorHit.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3CalorHit.hh,v 1.2.4.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
index 9c4b2b4b3f..e168891508 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3CalorimeterSD.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3CalorimeterSD.hh,v 1.2.4.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
index ea22fe18b3..d42b1e3f32 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3DetectorConstruction.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3DetectorConstruction.hh,v 1.3.2.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -24,6 +40,8 @@ class G4LogicalVolume;
 class G4VPhysicalVolume;
 class G4Material;
 class G4UniformMagField;
+class G4UserLimits;
+
 class Em3DetectorMessenger;
 class Em3CalorimeterSD;
 
@@ -47,7 +65,8 @@ class Em3DetectorConstruction : public G4VUserDetectorConstruction
      void SetCalorSizeYZ(G4double);          
      void SetNbOfLayers (G4int);   
       
-     void SetMagField(G4double);
+     void SetMagField   (G4double);
+     void SetMaxStepSize(G4double);
      
      G4VPhysicalVolume* Construct();
 
@@ -105,6 +124,7 @@ class Em3DetectorConstruction : public G4VUserDetectorConstruction
      G4VPhysicalVolume* physiAbsor[MaxAbsor]; //pointer to the physical Absorbers
      
      G4UniformMagField* magField;         //pointer to the magnetic field
+     G4UserLimits*      userLimits;       //pointer to the userLimits class     
      
      Em3DetectorMessenger* detectorMessenger;  //pointer to the Messenger
      Em3CalorimeterSD* calorimeterSD;  //pointer to the sensitive detector
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
index cfec5db8f5..19f3f77cfe 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3DetectorMessenger.hh,v 1.2 1999/12/15 14:49:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3DetectorMessenger.hh,v 1.3.2.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -46,6 +62,7 @@ class Em3DetectorMessenger: public G4UImessenger
     G4UIcmdWithAnInteger*      NbAbsorCmd;
     G4UIcommand*               AbsorCmd;        
     G4UIcmdWithADoubleAndUnit* MagFieldCmd;
+    G4UIcmdWithADoubleAndUnit* MaxStepCmd;
     G4UIcmdWithoutParameter*   UpdateCmd;
 };
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
index ae417182bf..a93729b509 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3EventAction.hh,v 1.3 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3EventAction.hh,v 1.3.2.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
index 6509ef03b4..b848e09876 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3EventActionMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
index df7e3df26c..61fb37eef4 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PhysicsList.hh,v 1.3 2000/04/17 12:06:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PhysicsList.hh,v 1.3.4.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
index 71a02eb4d6..2f6c179d93 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PhysicsListMessenger.hh,v 1.1 2000/04/17 12:06:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PhysicsListMessenger.hh,v 1.1.4.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
index 110028275e..77adac3260 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PrimaryGeneratorAction.hh,v 1.3 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PrimaryGeneratorAction.hh,v 1.4.2.1 2001/06/28 19:06:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -33,13 +49,16 @@ class Em3PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
    ~Em3PrimaryGeneratorAction();
 
   public:
-    void SetDefaultKinematic(); 
+    void SetDefaultKinematic();
+    void SetRndmBeam(G4double val) { rndmBeam = val;} 
     void GeneratePrimaries(G4Event*);
     G4ParticleGun* GetParticleGun() {return particleGun;};
     
   private:
     G4ParticleGun*              particleGun;
-    Em3DetectorConstruction*    Em3Detector; 
+    Em3DetectorConstruction*    Em3Detector;
+    
+    G4double rndmBeam;   //lateral random beam extension in fraction sizeYZ/2   
     
     Em3PrimaryGeneratorMessenger* gunMessenger; 
 };
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
index 529d12341d..aa3b40c92b 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3PrimaryGeneratorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PrimaryGeneratorMessenger.hh,v 1.3.2.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -21,6 +37,7 @@
 
 class Em3PrimaryGeneratorAction;
 class G4UIcmdWithoutParameter;
+class G4UIcmdWithADouble;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -35,6 +52,7 @@ class Em3PrimaryGeneratorMessenger: public G4UImessenger
   private:
     Em3PrimaryGeneratorAction* Em3Action; 
     G4UIcmdWithoutParameter*   DefaultCmd;
+    G4UIcmdWithADouble*        RndmCmd;
 };
 
 #endif
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
index 6f72e5b877..2769d243bd 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3RunAction.hh,v 1.6 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3RunAction.hh,v 1.7.2.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -51,6 +67,8 @@ class Em3RunAction : public G4UserRunAction
 #endif
 
     void SetHisto (G4int id, G4int nbins, G4double vmin, G4double vmax);
+    
+    void PrintDedxTables();
             
   private:
     void bookHisto();
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
index 12e63fd083..4be679c792 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3RunActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3RunActionMessenger.hh,v 1.4 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3RunActionMessenger.hh,v 1.4.2.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
index c30d2c4a44..013731db49 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3SteppingAction.hh,v 1.3 2001/02/20 12:34:43 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3SteppingAction.hh,v 1.3.2.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
index 1533bd5c90..ab4347f657 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3SteppingVerbose.hh,v 1.5 2001/02/19 14:07:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3SteppingVerbose.hh,v 1.5.2.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
index 56e20b7f66..193351dc67 100644
--- a/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm3/include/Em3VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3VisManager.hh,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3VisManager.hh,v 1.2.4.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/run15.mac b/examples/extended/electromagnetic/TestEm3/run15.mac
index 9ae90f7dd3..22b6f70dac 100644
--- a/examples/extended/electromagnetic/TestEm3/run15.mac
+++ b/examples/extended/electromagnetic/TestEm3/run15.mac
@@ -1,4 +1,4 @@
-# $Id: run15.mac,v 1.1 2001/03/26 16:01:57 maire Exp $
+# $Id: run15.mac,v 1.2 2001/04/13 13:17:30 maire Exp $
 #
 # Macro file for "TestEm3.cc" 
 # (can be run in batch, without graphic)
@@ -18,7 +18,7 @@
 /vis/camera/zoom 1.2
 /vis/drawVolume
 #
-/run/particle/setCut 1 mm
+/run/particle/setCut 1 cm
 /run/initialize
 #
 /run/verbose 2
diff --git a/examples/extended/electromagnetic/TestEm3/run16.mac b/examples/extended/electromagnetic/TestEm3/run16.mac
new file mode 100644
index 0000000000..e4311a1fd4
--- /dev/null
+++ b/examples/extended/electromagnetic/TestEm3/run16.mac
@@ -0,0 +1,36 @@
+# $Id: run16.mac,v 1.2 2001/04/13 14:22:27 maire Exp $
+#
+# Macro file for "TestEm3.cc" 
+# (can be run in batch, without graphic)
+#
+# Al-Au-Al  1 layer;
+#
+# G.L.Lockwood et al. SAND79-0414 (1980)
+#
+/control/verbose 2
+#
+/calor/setNbOfLayers 1
+/calor/setNbOfAbsor 3
+/calor/setAbsor 0 Aluminium 170 mum
+/calor/setAbsor 1 Gold 23 mum
+/calor/setAbsor 2 Aluminium 850 mum
+/calor/setSizeYZ 1050 mum
+/calor/update
+/gun/setDefault
+#
+/vis/camera/zoom 1.4
+/vis/drawVolume
+#
+/run/particle/setCut 1 mum
+/run/initialize
+#
+/run/verbose 2
+/event/printModulo 1000
+/event/drawTracks  all
+#
+/gun/particle e-
+/gun/energy 1 MeV
+#
+/tracking/stepMax 5 mum
+/gun/rndm 0.8
+/run/beamOn 10
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
index 65b79dc272..ac237ec50d 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3CalorHit.cc,v 1.2 1999/12/15 14:49:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3CalorHit.cc,v 1.2.4.1 2001/06/28 19:06:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
index 24a7c7414e..2e51797849 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3CalorimeterSD.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3CalorimeterSD.cc,v 1.2.4.1 2001/06/28 19:06:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
index e0dcc850a6..8ef555222e 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3DetectorConstruction.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3DetectorConstruction.cc,v 1.3.2.1 2001/06/28 19:06:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -28,6 +44,7 @@
 #include "G4TransportationManager.hh"
 #include "G4SDManager.hh"
 #include "G4RunManager.hh"
+#include "G4UserLimits.hh"
 
 #include "G4VisAttributes.hh"
 #include "G4Colour.hh"
@@ -57,6 +74,9 @@ Em3DetectorConstruction::Em3DetectorConstruction()
   NbOfLayers        = 50;
   CalorSizeYZ       = 40.*cm;
   ComputeCalorParameters();
+  
+  // create UserLimits
+  userLimits = new G4UserLimits();
 
   // create commands for interactive definition of the calorimeter  
   detectorMessenger = new Em3DetectorMessenger(this);
@@ -65,7 +85,7 @@ Em3DetectorConstruction::Em3DetectorConstruction()
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 Em3DetectorConstruction::~Em3DetectorConstruction()
-{ delete detectorMessenger;}
+{ delete userLimits; delete detectorMessenger;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -132,7 +152,7 @@ density = 1.390*g/cm3;
 a = 39.95*g/mole;
 G4Material* lAr = new G4Material(name="liquidArgon", z=18., a, density);
 
-density = 7.700*g/cm3;
+density = 7.870*g/cm3;
 a = 55.85*g/mole;
 G4Material* Fe = new G4Material(name="Iron"     , z=26., a, density);
 
@@ -144,6 +164,10 @@ density = 19.30*g/cm3;
 a = 183.85*g/mole;
 G4Material* W = new G4Material(name="Tungsten"  , z=74., a, density);
 
+density = 19.32*g/cm3;
+a = 196.97*g/mole;
+G4Material* Au = new G4Material(name="Gold"     , z=79., a, density);
+
 density = 11.35*g/cm3;
 a = 207.19*g/mole;
 G4Material* Pb = new G4Material(name="Lead"     , z=82., a, density);
@@ -322,7 +346,7 @@ G4VPhysicalVolume* Em3DetectorConstruction::ConstructCalorimeter()
   // Absorbers
   //
   for (G4int j=0; j<MaxAbsor; j++)  
-     { solidAbsor[j]=NULL; logicAbsor[j]=NULL; physiAbsor[j]=NULL;}  
+     { solidAbsor[j]=NULL; logicAbsor[j]=NULL; physiAbsor[j]=NULL;}
 
   G4double xfront = -0.5*LayerThickness;  
   for (G4int k=0; k<NbOfAbsor; k++)
@@ -332,6 +356,8 @@ G4VPhysicalVolume* Em3DetectorConstruction::ConstructCalorimeter()
       logicAbsor[k] = new G4LogicalVolume(solidAbsor[k],    //its solid
       			                  AbsorMaterial[k], //its material
       			                  "Absorber");      //its name
+					  
+      logicAbsor[k]->SetUserLimits(userLimits);					  
 
       G4double xcenter = xfront+0.5*AbsorThickness[k];
       xfront += AbsorThickness[k];       			                  
@@ -485,6 +511,20 @@ void Em3DetectorConstruction::SetMagField(G4double fieldValue)
   }
 }
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em3DetectorConstruction::SetMaxStepSize(G4double val)
+{
+  // set the maximum allowed step size
+  //
+  if (val <= DBL_MIN)
+    { G4cout << "\n --->warning from SetMaxStepSize: maxStep " 
+             << val  << " out of range. Command refused" << G4endl;
+      return;
+    }       
+  userLimits->SetMaxAllowedStep(val);
+}  
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
   
 void Em3DetectorConstruction::UpdateGeometry()
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
index aa2b20e378..959c64b58c 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3DetectorMessenger.cc,v 1.2 1999/12/15 14:49:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3DetectorMessenger.cc,v 1.3.2.1 2001/06/28 19:06:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -83,13 +99,20 @@ Em3DetectorMessenger::Em3DetectorMessenger(Em3DetectorConstruction * Em3Det)
   MagFieldCmd->SetGuidance("Magnetic field will be in Z direction.");
   MagFieldCmd->SetParameterName("Bz",false);
   MagFieldCmd->SetUnitCategory("Magnetic flux density");
-  MagFieldCmd->AvailableForStates(Idle); 
+  MagFieldCmd->AvailableForStates(Idle);
      
   UpdateCmd = new G4UIcmdWithoutParameter("/calor/update",this);
   UpdateCmd->SetGuidance("Update calorimeter geometry.");
   UpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" ");
   UpdateCmd->SetGuidance("if you changed geometrical value(s).");
   UpdateCmd->AvailableForStates(Idle);
+      
+  MaxStepCmd = new G4UIcmdWithADoubleAndUnit("/tracking/stepMax",this);
+  MaxStepCmd->SetGuidance("Set max allowed step size");
+  MaxStepCmd->SetParameterName("Size",false);
+  MaxStepCmd->SetRange("Size>0.");
+  MaxStepCmd->SetUnitCategory("Length");
+  MaxStepCmd->AvailableForStates(Idle); 
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -102,6 +125,7 @@ Em3DetectorMessenger::~Em3DetectorMessenger()
   delete AbsorCmd;  
   delete MagFieldCmd;
   delete UpdateCmd;
+  delete MaxStepCmd;
   delete Em3detDir;
 }
 
@@ -136,6 +160,9 @@ void Em3DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
            
   if( command == UpdateCmd )
    { Em3Detector->UpdateGeometry();}
+   
+  if( command == MaxStepCmd )
+   { Em3Detector->SetMaxStepSize(MaxStepCmd->GetNewDoubleValue(newValue));}   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
index aafdd108a7..4502325156 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3EventAction.cc,v 1.8 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3EventAction.cc,v 1.9.2.1 2001/06/28 19:06:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -20,9 +36,6 @@
 #include "Em3DetectorConstruction.hh"
 #include "Em3CalorHit.hh"
 #include "Em3EventActionMessenger.hh"
-
-#include "g4rw/tvordvec.h"
-
 #include "G4Event.hh"
 #include "G4EventManager.hh"
 #include "G4HCofThisEvent.hh"
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
index f3257b57f0..5e15d97a7e 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3EventActionMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
index 1c2b4b7ee1..74f0e880d2 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PhysicsList.cc,v 1.5 2000/04/17 12:05:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PhysicsList.cc,v 1.5.4.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
index b832e6b7a6..e47272f3a0 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PhysicsListMessenger.cc,v 1.1 2000/04/17 12:05:40 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PhysicsListMessenger.cc,v 1.1.4.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
index d0f037365b..93eaf9e989 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PrimaryGeneratorAction.cc,v 1.3.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -22,6 +38,7 @@
 #include "G4ParticleGun.hh"
 #include "G4ParticleTable.hh"
 #include "G4ParticleDefinition.hh"
+#include "Randomize.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -32,6 +49,7 @@ Em3PrimaryGeneratorAction::Em3PrimaryGeneratorAction(
   G4int n_particle = 1;
   particleGun  = new G4ParticleGun(n_particle);
   SetDefaultKinematic();
+  rndmBeam = 0.;
   
   //create a messenger for this class
   gunMessenger = new Em3PrimaryGeneratorMessenger(this);
@@ -65,8 +83,20 @@ void Em3PrimaryGeneratorAction::SetDefaultKinematic()
 void Em3PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
 {
   //this function is called at the begining of event
-  // 
-  particleGun->GeneratePrimaryVertex(anEvent);
+  //
+  //randomize the beam, if requested.
+  if (rndmBeam > 0.) 
+    {
+      G4ThreeVector oldPosition = particleGun->GetParticlePosition();    
+      G4double rbeam = 0.5*(Em3Detector->GetCalorSizeYZ())*rndmBeam;
+      G4double x0 = oldPosition.x();
+      G4double y0 = oldPosition.y() + (2*G4UniformRand()-1.)*rbeam;
+      G4double z0 = oldPosition.z() + (2*G4UniformRand()-1.)*rbeam;
+      particleGun->SetParticlePosition(G4ThreeVector(x0,y0,z0));
+      particleGun->GeneratePrimaryVertex(anEvent);
+      particleGun->SetParticlePosition(oldPosition);      
+    }
+  else  particleGun->GeneratePrimaryVertex(anEvent);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
index df135e1b40..f9b1de339a 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3PrimaryGeneratorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3PrimaryGeneratorMessenger.cc,v 1.3.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -17,6 +33,7 @@
 
 #include "Em3PrimaryGeneratorAction.hh"
 #include "G4UIcmdWithoutParameter.hh"
+#include "G4UIcmdWithADouble.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -26,6 +43,13 @@ Em3PrimaryGeneratorMessenger::Em3PrimaryGeneratorMessenger(Em3PrimaryGeneratorAc
   DefaultCmd = new G4UIcmdWithoutParameter("/gun/setDefault",this);
   DefaultCmd->SetGuidance("set/reset the kinematic defined in PrimaryGenerator");
   DefaultCmd->AvailableForStates(PreInit,Idle);
+  
+  RndmCmd = new G4UIcmdWithADouble("/gun/rndm",this);
+  RndmCmd->SetGuidance("random lateral extension on the beam");
+  RndmCmd->SetGuidance("in fraction of 0.5*sizeYZ");
+  RndmCmd->SetParameterName("rBeam",false);
+  RndmCmd->SetRange("rBeam>=0.&&rBeam<=1.");
+  RndmCmd->AvailableForStates(Idle);  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -33,14 +57,18 @@ Em3PrimaryGeneratorMessenger::Em3PrimaryGeneratorMessenger(Em3PrimaryGeneratorAc
 Em3PrimaryGeneratorMessenger::~Em3PrimaryGeneratorMessenger()
 {
   delete DefaultCmd;
+  delete RndmCmd;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void Em3PrimaryGeneratorMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
+void Em3PrimaryGeneratorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
 { 
   if( command == DefaultCmd )
    { Em3Action->SetDefaultKinematic();}
+   
+  if( command == RndmCmd )
+   { Em3Action->SetRndmBeam(RndmCmd->GetNewDoubleValue(newValue));}   
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
index 3b1f6234e0..fc372e7d9a 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3RunAction.cc,v 1.8 2001/03/26 16:01:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3RunAction.cc,v 1.11.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -86,7 +102,11 @@ void Em3RunAction::BeginOfRunAction(const G4Run* aRun)
     
   //histograms
   //
-  bookHisto();     
+  bookHisto();
+  
+  //example of print dEdx tables
+  //
+  ////PrintDedxTables();     
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -179,3 +199,83 @@ void Em3RunAction::EndOfRunAction(const G4Run* aRun)
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+#include "G4ParticleTable.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4Gamma.hh"
+#include "G4Electron.hh"
+#include "G4EnergyLossTables.hh"
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void Em3RunAction::PrintDedxTables()
+{
+  //Print dE/dx tables with binning identical to the Geant3 JMATE bank.
+  //The printout is readable as Geant3 ffread data cards (by the Geant3 program g4mat).
+  //  
+  const G4double tkmin=10*keV, tkmax=10*TeV;
+  const G4int nbin=90;  
+  G4double tk[nbin];
+    
+  const G4int ncolumn = 5;  
+													      							            
+  //compute the kinetic energies
+  //  
+  const G4double dp = log10(tkmax/tkmin)/nbin;
+  const G4double dt = pow(10.,dp);
+  tk[0] = tkmin;  
+  for (G4int i=1; i<nbin; ++i) tk[i] = tk[i-1]*dt;
+
+  //print the kinetic energies
+  //
+  G4long oldform = G4cout.setf(G4std::ios::fixed,G4std::ios::floatfield);
+  G4int  oldprec = G4cout.precision(3);
+     
+  G4cout << "\n kinetic energies \n ";
+  for (G4int j=0; j<nbin; ++j) {
+    G4cout << G4BestUnit(tk[j],"Energy") << "\t";     
+    if ((j+1)%ncolumn == 0) G4cout << "\n ";
+  }
+  G4cout << G4endl; 
+
+  //print the dE/dx tables
+  //
+  G4cout.setf(G4std::ios::scientific,G4std::ios::floatfield);
+      		    
+  G4ParticleDefinition* 
+  part = G4ParticleTable::GetParticleTable()->FindParticle("mu+");
+  
+  for (G4int iab=0;iab < Detector->GetNbOfAbsor(); iab++)
+     {
+      G4Material* mat = Detector->GetAbsorMaterial(iab);
+      G4cout << "\nLIST";
+      G4cout << "\nC \nC  dE/dx (MeV/cm) for " << part->GetParticleName() << " in "
+             << mat ->GetName() << "\nC";
+      G4cout << "\nKINE   (" << part->GetParticleName() << ")"; 	     
+      G4cout << "\nMATE   (" << mat ->GetName() << ")";
+      G4cout.precision(2);
+      G4cout << "\nERAN  " << tkmin/GeV << " (ekmin)\t"
+                           << tkmax/GeV << " (ekmax)\t"
+			   << nbin      << " (nekbin)";
+      G4double cutgam = (G4Gamma::Gamma()->GetCutsInEnergy())[mat->GetIndex()];
+      if (cutgam < tkmin) cutgam = tkmin; if (cutgam > tkmax) cutgam = tkmax;
+      G4double cutele = (G4Electron::Electron()->GetCutsInEnergy())[mat->GetIndex()];
+      if (cutele < tkmin) cutele = tkmin; if (cutele > tkmax) cutele = tkmax;      			   			   
+      G4cout << "\nCUTS  " << cutgam/GeV << " (cutgam)\t" << cutele/GeV << " (cutele)";
+      			   
+      G4cout.precision(6);            
+      G4cout << "\nG4VAL \n ";
+      for (G4int l=0;l<nbin; ++l)
+         {
+           G4double dedx = G4EnergyLossTables::GetDEDX(part,tk[l],mat);
+           G4cout << dedx/(MeV/cm) << "\t";
+	   if ((l+1)%ncolumn == 0) G4cout << "\n ";
+         }
+      G4cout << G4endl; 
+     }
+     
+  G4cout.precision(oldprec);
+  G4cout.setf(oldform,G4std::ios::floatfield);     
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
index bf3235fb76..07ccd580f6 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3RunActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3RunActionMessenger.cc,v 1.5 2001/03/26 16:01:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3RunActionMessenger.cc,v 1.5.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
index f4c344118b..4f50b9f300 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3SteppingAction.cc,v 1.3 2001/02/20 12:34:44 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3SteppingAction.cc,v 1.3.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
index 9b9cee9080..a78259a635 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3SteppingVerbose.cc,v 1.6 2001/02/19 14:07:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
index 9b878f460b..88b8efda8e 100644
--- a/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm3/src/Em3VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em3VisManager.cc,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em3VisManager.cc,v 1.3.2.1 2001/06/28 19:06:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
@@ -20,6 +36,10 @@
 
 // Supported drivers...
 
+#ifdef G4VIS_USE_ASCIITREE
+#include "G4ASCIITree.hh"
+#endif
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif
@@ -56,8 +76,8 @@
 #include "G4OpenInventorWin32.hh"
 #endif
 
-#ifdef G4VIS_USE_RAYX
-#include "G4RayX.hh"
+#ifdef G4VIS_USE_RAYTRACER
+#include "G4RayTracer.hh"
 #endif
 
 #ifdef G4VIS_USE_VRML
@@ -78,6 +98,10 @@ Em3VisManager::Em3VisManager () {}
 
 void Em3VisManager::RegisterGraphicsSystems () {
 
+#ifdef G4VIS_USE_ASCIITREE
+  RegisterGraphicsSystem (new G4ASCIITree);
+#endif
+
 #ifdef G4VIS_USE_DAWN
   RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif
@@ -114,8 +138,8 @@ void Em3VisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
 
-#ifdef G4VIS_USE_RAYX
-  RegisterGraphicsSystem (new G4RayX);
+#ifdef G4VIS_USE_RAYTRACER
+  RegisterGraphicsSystem (new G4RayTracer);
 #endif
 
 #ifdef G4VIS_USE_VRML
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.cc b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
index eaa12e1309..065e1596eb 100644
--- a/examples/extended/electromagnetic/TestEm4/TestEm4.cc
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm4.cc,v 1.5 2000/12/06 17:22:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm4.cc,v 1.5.4.1 2001/06/28 19:07:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm4/TestEm4.out b/examples/extended/electromagnetic/TestEm4/TestEm4.out
index bed8ebd692..47faa0d030 100644
--- a/examples/extended/electromagnetic/TestEm4/TestEm4.out
+++ b/examples/extended/electromagnetic/TestEm4/TestEm4.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
  Material: FluorCarbonate     density:  1.610 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  22.435 cm 
@@ -29,17 +29,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-      FluorCarbonate         96.588
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -50,7 +44,7 @@ Cut in range                  1 mm            1 mm
 Cut in energy
      FluorCarbonate        3.61 keV         429 keV
 ===================================================
-# $Id: TestEm4.out,v 1.10 2001/03/30 09:03:27 stesting Exp $
+# $Id: TestEm4.out,v 1.14 2001/04/26 12:33:41 stesting Exp $
 #
 # Macro file for "TestEm4.cc"
 # 
@@ -86,11 +80,11 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 50000
-  User=48.18s Real=52.97s Sys=4.71s
+  User=44s Real=49s Sys=4.5s
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 366655687, 245817838
+ Current couple of seeds = 566407188, 1038419059
 ----------------------------------------
 G4 kernel has come to Quit state.
 Deletion of G4 kernel class start.
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
index 8670922ab6..a655faf220 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4DetectorConstruction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
index 0896acfd6a..ae7c6a1afb 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4EventAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4EventAction.hh,v 1.2.4.1 2001/06/28 19:07:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
index 45949f5c64..53c69df7a2 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4EventActionMessenger.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:07:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
index bb92906beb..08bb1fe461 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4PhysicsList.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4PhysicsList.hh,v 1.2.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
index 4e3670c784..2825ecd0c7 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
index 422b946e9d..2c02c250c1 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4RunAction.hh,v 1.5 2001/02/21 10:14:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4RunAction.hh,v 1.5.2.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
index 63fbac1ae0..8c765739ec 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4RunActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4RunActionMessenger.hh,v 1.3 2000/01/20 17:27:56 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4RunActionMessenger.hh,v 1.3.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
index d268e9ef2f..df98c502ab 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4SteppingAction.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4SteppingAction.hh,v 1.2.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
index 083a53457e..68324a1de8 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4SteppingVerbose.hh,v 1.5 2001/02/19 14:01:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4SteppingVerbose.hh,v 1.5.2.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
index 5955808d96..78ff5844a2 100644
--- a/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm4/include/Em4VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4VisManager.hh,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4VisManager.hh,v 1.2.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
index 16262f9d5e..1a2ea983c9 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4DetectorConstruction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4DetectorConstruction.cc,v 1.2.4.1 2001/06/28 19:07:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
index 0c00b22771..a34c270573 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4EventAction.cc,v 1.6 2001/02/21 10:14:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4EventAction.cc,v 1.6.2.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
index 807c2ba1bb..722a88ed7f 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4EventActionMessenger.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
index 7d2363b2d8..f5e75ff1b5 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4PhysicsList.cc,v 1.3 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4PhysicsList.cc,v 1.3.4.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
index 3592488a45..508537a56f 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
index 7af75cc3f9..658c3e7930 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4RunAction.cc,v 1.8 2001/03/26 17:34:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4RunAction.cc,v 1.8.2.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc b/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
index 345d45dbb4..260ee91bf3 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4RunActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4RunActionMessenger.cc,v 1.4 2001/02/20 16:08:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4RunActionMessenger.cc,v 1.4.2.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
index e791759bc5..75b728d5de 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4SteppingAction.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4SteppingAction.cc,v 1.2.4.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
index a101fb3511..dcdf34adda 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4SteppingVerbose.cc,v 1.6 2001/02/19 14:02:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
index 59af8af8e0..4f9623da33 100644
--- a/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm4/src/Em4VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em4VisManager.cc,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em4VisManager.cc,v 1.2.4.1 2001/06/28 19:07:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.cc b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
index b400b832c1..97309532cf 100644
--- a/examples/extended/electromagnetic/TestEm5/TestEm5.cc
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm5.cc,v 1.4 2000/12/06 18:25:54 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm5.cc,v 1.4.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/extended/electromagnetic/TestEm5/TestEm5.out b/examples/extended/electromagnetic/TestEm5/TestEm5.out
index a812c7570a..affe3a307f 100644
--- a/examples/extended/electromagnetic/TestEm5/TestEm5.out
+++ b/examples/extended/electromagnetic/TestEm5/TestEm5.out
@@ -1,10 +1,10 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
-***** Table : Nb of materials = 17 *****
+***** Table : Nb of materials = 18 *****
 
  Material: Beryllium     density:  1.848 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:  35.267 cm 
    --->  Element: Beryllium      Z =  4.0   N =   9.0   A =   9.01 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
@@ -24,6 +24,9 @@
  Material:   Copper     density:  8.960 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   1.436 cm 
    --->  Element:   Copper      Z = 29.0   N =  63.5   A =  63.55 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
 
+ Material: Tungsten     density: 19.300 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.504 mm 
+   --->  Element: Tungsten      Z = 74.0   N = 183.8   A = 183.85 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
+
  Material:     Gold     density: 19.320 g/cm3   temperature: 273.15 K  pressure:   1.00 atm  RadLength:   3.344 mm 
    --->  Element:     Gold      Z = 79.0   N = 197.0   A = 196.97 g/mole  fractionMass: 100.00 %  Abundance 100.00 %
 
@@ -96,33 +99,11 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-           Beryllium         103.96
-           Aluminium         125.02
-             Silicon         116.88
-         liquidArgon         79.954
-                Iron         225.11
-              Copper         239.08
-                Gold         332.49
-                Lead         228.54
-               Water         81.851
-                 Air        0.27455
-            XenonGas         1.7521
-         CarbonicGas        0.54205
-            ArgonCO2        0.41855
-         NewArgonCO2        0.41855
-            ArgonCH4        0.36851
- XenonMethanePropane          1.547
-            Galactic           0.25
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -131,52 +112,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-           Beryllium         103.96
-           Aluminium         125.02
-             Silicon         116.88
-         liquidArgon         79.954
-                Iron         225.11
-              Copper         239.08
-                Gold         332.49
-                Lead         228.54
-               Water         81.851
-                 Air        0.27455
-            XenonGas         1.7521
-         CarbonicGas        0.54205
-            ArgonCO2        0.41855
-         NewArgonCO2        0.41855
-            ArgonCH4        0.36851
- XenonMethanePropane          1.547
-            Galactic           0.25
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  1 mm            1 mm 
@@ -187,6 +146,7 @@ Cut in energy
         liquidArgon        6.15 keV         347 keV
                Iron        20.7 keV        1.29 MeV
              Copper        24.8 keV        1.39 MeV
+           Tungsten         106 keV        2.29 MeV
                Gold         112 keV        2.29 MeV
                Lead         101 keV        1.36 MeV
               Water        2.93 keV         351 keV
@@ -215,8 +175,8 @@ Cut in energy
 /calor/setAbsYZ    10 cm
 /calor/update
 
- The  WORLD   is made of 30.75 mum of Galactic. The transverse size (YZ) of the world is 12 cm 
- The ABSORBER is made of 20.5 mum of Silicon. The transverse size (YZ) is 10 cm 
+ The  WORLD   is made of 31 mum of Galactic. The transverse size (YZ) of the world is 12 cm 
+ The ABSORBER is made of 20 mum of Silicon. The transverse size (YZ) is 10 cm 
  X position of the middle of the absorber 0 fm 
 /gun/setDefault
 #
@@ -244,48 +204,26 @@ phot:  Total cross sections from a parametrisation. Good description from 10 KeV
 
 compt:  Total cross sections from a parametrisation. Good description from 10 KeV to (100/Z) GeV. 
         Scattered gamma energy according Klein-Nishina.
-        PhysicsTables from 10 keV to 100 GeV in 100 bins. 
+        PhysicsTables from 10 keV to 1e+02 GeV in 100 bins. 
 
 conv:  Total cross sections from a parametrisation. Good description from 1.5 MeV to 100 GeV for all Z. 
         e+e- energies according Bethe-Heitler
-        PhysicsTables from 1.022 MeV to 100 GeV in 100 bins. 
+        PhysicsTables from 1 MeV to 1e+02 GeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
         delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
-
- eIoni   Minimum Delta cut in range=0.0007  mm.
-
-           material       min.delta energy(keV) 
-
-           Beryllium         6.1522
-           Aluminium         6.8754
-             Silicon         6.4277
-         liquidArgon         4.2884
-                Iron         11.501
-              Copper         12.024
-                Gold         14.484
-                Lead         10.043
-               Water         3.9978
-                 Air           0.25
-            XenonGas           0.25
-         CarbonicGas           0.25
-            ArgonCO2           0.25
-         NewArgonCO2           0.25
-            ArgonCH4           0.25
- XenonMethanePropane           0.25
-            Galactic           0.25
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
@@ -294,52 +232,30 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
-
- hIoni    Minimum Delta cut in range=0.0007  mm.
-
-           material        min.delta energy(keV) 
-
-           Beryllium         6.1522
-           Aluminium         6.8754
-             Silicon         6.4277
-         liquidArgon         4.2884
-                Iron         11.501
-              Copper         12.024
-                Gold         14.484
-                Lead         10.043
-               Water         3.9978
-                 Air           0.25
-            XenonGas           0.25
-         CarbonicGas           0.25
-            ArgonCO2           0.25
-         NewArgonCO2           0.25
-            ArgonCH4           0.25
- XenonMethanePropane           0.25
-            Galactic           0.25
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range               2.13 mm            7 mum
@@ -350,6 +266,7 @@ Cut in energy
         liquidArgon        8.97 keV        4.88 keV
                Iron        30.6 keV        47.4 keV
              Copper        37.1 keV        49.7 keV
+           Tungsten         135 keV        65.7 keV
                Gold         146 keV        65.1 keV
                Lead         123 keV        46.9 keV
               Water        4.03 keV           4 keV
@@ -400,99 +317,99 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 100000
-  User=137.58s Real=145s Sys=7.23s
+  User=1.1e+02s Real=1.1e+02s Sys=7.7s
  ================== run summary =====================
  end of Run TotNbofEvents = 100000
-    mean charged track length   in absorber=0.0209432 +- 1.3765e-05  mm  
+    mean charged track length   in absorber=0.0209499 +- 1.40951e-05  mm  
 
-            mean energy deposit in absorber=0.00661788 +- 2.01721e-05  MeV 
+            mean energy deposit in absorber=0.0066794 +- 2.04118e-05  MeV 
 
- mean number of steps in absorber (charged) =0.05585 +- 0.00112183      
- mean number of steps in absorber (neutral) =7e-05 +- 2.64566e-05      
+ mean number of steps in absorber (charged) =0.05601 +- 0.00112913      
+ mean number of steps in absorber (neutral) =5e-05 +- 2.23601e-05      
 
-   mean number of charged secondaries = 0.03739 +- 0.000629063
+   mean number of charged secondaries = 0.03743 +- 0.000629674
 
-   mean number of neutral secondaries = 7e-05 +- 2.64566e-05
+   mean number of neutral secondaries = 5e-05 +- 2.23601e-05
 
-   mean number of e-s =0.03739  and e+s =0
+   mean number of e-s =0.03743  and e+s =0
 
-(number) transmission coeff=0.99999  reflection coeff=0.49943
+(number) transmission coeff=0.99999  reflection coeff=0.49967
 
  energy deposit distribution 
-#entries=100000    #underflows=0    #overflows=5677
+#entries=100000    #underflows=0    #overflows=5748
  bin nb      Elow      entries     normalized 
     0         0           0           0
     1    0.0002           0           0
     2    0.0004           0           0
     3    0.0006           0           0
     4    0.0008           1        0.05
-    5     0.001           3        0.15
-    6    0.0012           6         0.3
-    7    0.0014          16         0.8
-    8    0.0016          41        2.05
-    9    0.0018         116         5.8
-   10     0.002         275       13.75
-   11    0.0022         463       23.15
-   12    0.0024         916        45.8
-   13    0.0026        1346        67.3
-   14    0.0028        2008       100.4
-   15     0.003        2726       136.3
-   16    0.0032        3528       176.4
-   17    0.0034        4172       208.6
-   18    0.0036        4626       231.3
-   19    0.0038        4801      240.05
-   20     0.004        5040         252
-   21    0.0042        4830       241.5
-   22    0.0044        4673      233.65
-   23    0.0046        4396       219.8
-   24    0.0048        4045      202.25
-   25     0.005        3650       182.5
-   26    0.0052        3389      169.45
-   27    0.0054        3071      153.55
-   28    0.0056        2791      139.55
-   29    0.0058        2650       132.5
-   30     0.006        2443      122.15
-   31    0.0062        2277      113.85
-   32    0.0064        2089      104.45
-   33    0.0066        1920          96
-   34    0.0068        1837       91.85
-   35     0.007        1656        82.8
-   36    0.0072        1542        77.1
-   37    0.0074        1445       72.25
-   38    0.0076        1343       67.15
-   39    0.0078        1237       61.85
-   40     0.008        1149       57.45
-   41    0.0082        1023       51.15
-   42    0.0084         943       47.15
-   43    0.0086         898        44.9
-   44    0.0088         785       39.25
-   45     0.009         738        36.9
-   46    0.0092         689       34.45
-   47    0.0094         629       31.45
-   48    0.0096         574        28.7
-   49    0.0098         540          27
-   50      0.01         511       25.55
-   51    0.0102         464        23.2
-   52    0.0104         449       22.45
-   53    0.0106         425       21.25
-   54    0.0108         407       20.35
-   55     0.011         354        17.7
-   56    0.0112         343       17.15
-   57    0.0114         339       16.95
-   58    0.0116         272        13.6
-   59    0.0118         243       12.15
-   60     0.012         251       12.55
-   61    0.0122         249       12.45
-   62    0.0124         261       13.05
-   63    0.0126         230        11.5
-   64    0.0128         189        9.45
+    5     0.001           2         0.1
+    6    0.0012           5        0.25
+    7    0.0014           9        0.45
+    8    0.0016          39        1.95
+    9    0.0018          74         3.7
+   10     0.002         229       11.45
+   11    0.0022         401       20.05
+   12    0.0024         783       39.15
+   13    0.0026        1202        60.1
+   14    0.0028        1762        88.1
+   15     0.003        2571      128.55
+   16    0.0032        3372       168.6
+   17    0.0034        3992       199.6
+   18    0.0036        4598       229.9
+   19    0.0038        4723      236.15
+   20     0.004        5070       253.5
+   21    0.0042        4878       243.9
+   22    0.0044        4688       234.4
+   23    0.0046        4477      223.85
+   24    0.0048        4170       208.5
+   25     0.005        3674       183.7
+   26    0.0052        3501      175.05
+   27    0.0054        3191      159.55
+   28    0.0056        2842       142.1
+   29    0.0058        2686       134.3
+   30     0.006        2486       124.3
+   31    0.0062        2293      114.65
+   32    0.0064        2113      105.65
+   33    0.0066        1994        99.7
+   34    0.0068        1869       93.45
+   35     0.007        1695       84.75
+   36    0.0072        1610        80.5
+   37    0.0074        1412        70.6
+   38    0.0076        1389       69.45
+   39    0.0078        1257       62.85
+   40     0.008        1154        57.7
+   41    0.0082        1060          53
+   42    0.0084         988        49.4
+   43    0.0086         919       45.95
+   44    0.0088         816        40.8
+   45     0.009         724        36.2
+   46    0.0092         726        36.3
+   47    0.0094         598        29.9
+   48    0.0096         601       30.05
+   49    0.0098         536        26.8
+   50      0.01         545       27.25
+   51    0.0102         462        23.1
+   52    0.0104         451       22.55
+   53    0.0106         436        21.8
+   54    0.0108         393       19.65
+   55     0.011         380          19
+   56    0.0112         352        17.6
+   57    0.0114         330        16.5
+   58    0.0116         291       14.55
+   59    0.0118         253       12.65
+   60     0.012         240          12
+   61    0.0122         269       13.45
+   62    0.0124         237       11.85
+   63    0.0126         239       11.95
+   64    0.0128         194         9.7
 
  Emp =           0.004   width=         0.0028  MeV 
 
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 1527606189, 1848314746
+ Current couple of seeds = 301564722, 909059154
 ----------------------------------------
 #
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
index be299a2115..5795374bc8 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5CalorHit.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5CalorHit.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
index ad09ee8d94..66aab8f1c1 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5CalorimeterSD.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5CalorimeterSD.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
index d60f479f74..2ef442bc84 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5DetectorConstruction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
index 8af3d14a14..2a6b5b591b 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5DetectorMessenger.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
index c6915c72f2..92bfceb3fb 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5EventAction.hh,v 1.2 1999/12/15 14:49:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5EventAction.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
index 9af1c89452..edaade7107 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5EventActionMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:07:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
index cd9df9d341..37f451bde0 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PhysicsList.hh,v 1.3 2001/01/09 12:36:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PhysicsList.hh,v 1.3.2.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
index 5a8a6df6c7..99f23fa233 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PhysicsListMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PhysicsListMessenger.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
index 4c15e97068..c65fac3e04 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
index a6c547209e..89af98dec5 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5PrimaryGeneratorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PrimaryGeneratorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
index b805c8c454..c2b4cde542 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5RunAction.hh,v 1.5 2001/02/21 14:44:33 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5RunAction.hh,v 1.5.2.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
index 0f03f02fe9..424c5e3bb5 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5RunMessenger.hh
@@ -1,13 +1,29 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: Em5RunMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: Em5RunMessenger.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh b/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
index 1ae8374a09..4643103393 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5StepCut.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5StepCut.hh,v 1.3 2001/01/09 12:36:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5StepCut.hh,v 1.3.2.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
index d0b4e37e48..3aefc34d64 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingAction.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingAction.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
index d2fd01d716..6161eb7170 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingMessenger.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingMessenger.hh,v 1.2.4.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
index 44a407a859..bdfa6bf480 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingVerbose.hh,v 1.5 2001/02/19 14:08:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingVerbose.hh,v 1.5.2.1 2001/06/28 19:07:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
index c5829180ea..f7f7831864 100644
--- a/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm5/include/Em5VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5VisManager.hh,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5VisManager.hh,v 1.2.4.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
index 5de053d348..4a93db770f 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5CalorHit.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5CalorHit.cc,v 1.2.4.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
index 7f226376ee..442f231072 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5CalorimeterSD.cc,v 1.2 1999/12/15 14:49:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5CalorimeterSD.cc,v 1.2.4.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
index 7d5338a78c..9a0dbb6759 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5DetectorConstruction.cc,v 1.5 2001/03/27 09:24:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5DetectorConstruction.cc,v 1.5.2.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
index 5f31eb7925..17be8a44cb 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5DetectorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
index 6b36a62b72..e46a9894d3 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5EventAction.cc,v 1.4 2001/02/20 16:26:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5EventAction.cc,v 1.4.2.1 2001/06/28 19:07:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
index 0a7a454d1f..853bd7644c 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5EventActionMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
index d5b89b7ad0..352c203870 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PhysicsList.cc,v 1.7 2001/01/09 12:36:38 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PhysicsList.cc,v 1.7.2.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
index 8da1eb9d12..865d5187be 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PhysicsListMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PhysicsListMessenger.cc,v 1.2.4.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
index 2e1c2a76e4..3a95a4bc83 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
index bbc771aab4..e92c1c8b38 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5PrimaryGeneratorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5PrimaryGeneratorMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5PrimaryGeneratorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
index 84031cc928..3b1e79036b 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5RunAction.cc,v 1.8 2001/03/27 09:24:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5RunAction.cc,v 1.8.2.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
index 4d45009a00..e516b0716c 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5RunMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5RunMessenger.cc,v 1.3 2001/02/20 16:26:50 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5RunMessenger.cc,v 1.3.2.1 2001/06/28 19:07:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
index aadebf2e46..1de66c6c4c 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingAction.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingAction.cc,v 1.2.4.1 2001/06/28 19:07:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
index 33657a3b9b..de7e256b65 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingMessenger.cc,v 1.2 1999/12/15 14:49:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingMessenger.cc,v 1.2.4.1 2001/06/28 19:07:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
index aa7a77c88b..e2616489ec 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5SteppingVerbose.cc,v 1.6 2001/02/19 14:08:39 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:07:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
index f99c5d57be..60634f3f05 100644
--- a/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm5/src/Em5VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em5VisManager.cc,v 1.2 1999/12/15 14:49:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em5VisManager.cc,v 1.2.4.1 2001/06/28 19:07:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.cc b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
index a8d2f44dff..7ff528b3dd 100644
--- a/examples/extended/electromagnetic/TestEm8/TestEm8.cc
+++ b/examples/extended/electromagnetic/TestEm8/TestEm8.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TestEm8.cc,v 1.1 2000/01/07 14:49:19 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TestEm8.cc,v 1.1.4.2 2001/06/28 20:18:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - TestEm8 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //     
diff --git a/examples/extended/electromagnetic/TestEm8/TestEm8.out b/examples/extended/electromagnetic/TestEm8/TestEm8.out
index 1508696ad2..44eaee28f3 100644
--- a/examples/extended/electromagnetic/TestEm8/TestEm8.out
+++ b/examples/extended/electromagnetic/TestEm8/TestEm8.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -137,52 +137,18 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-           Aluminium         125.02
-               Mylar         119.05
-       Polypropelene         111.68
-                  Kr         1.0737
-               Argon           0.99
-                  N2           0.99
-                  O2           0.99
-                 Air           0.99
-               Xenon         1.9491
-                 CO2           0.99
-             Xe20CO2         1.6715
-             Kr20CO2          1.088
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-           Aluminium         125.02
-               Mylar         119.05
-       Polypropelene         111.68
-                  Kr         1.0737
-               Argon           0.99
-                  N2           0.99
-                  O2           0.99
-                 Air           0.99
-               Xenon         1.9491
-                 CO2           0.99
-             Xe20CO2         1.6715
-             Kr20CO2          1.088
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
-total time(SetCuts)=18.25 s 
+total time(SetCuts)=18.24 s 
 #
 # Macro file 'run11.mac' for the initialization phase of "TestEm8.cc"
 #
@@ -259,28 +225,28 @@ Start Run processing.
 Run terminated.
 Run Summary
   Number of events processed : 1000
-  User=201.16s Real=203.45s Sys=1.35s
+  User=193.73s Real=194.91s Sys=1.17s
  ================== run summary =====================
  end of Run TotNbofEvents = 1000
-    mean charged track length   in absorber=72.4217 +- 1.01247  mm  
+    mean charged track length   in absorber=71.241 +- 0.985414  mm  
 
-            mean energy deposit in absorber=0.0888196 +- 0.000843106  MeV 
+            mean energy deposit in absorber=0.0887952 +- 0.000833776  MeV 
 
- mean number of steps in absorber (charged) =430.074 +- 1.91795      
- mean number of steps in absorber (neutral) =5.176 +- 0.0754124      
+ mean number of steps in absorber (charged) =430.968 +- 2.02252      
+ mean number of steps in absorber (neutral) =5.182 +- 0.072958      
 
-   mean number of charged secondaries = 1.405 +- 0.0372958
+   mean number of charged secondaries = 1.352 +- 0.0381588
 
-   mean number of neutral secondaries = 0.052 +- 0.00743613
+   mean number of neutral secondaries = 0.051 +- 0.00709923
 
-   mean number of e-s =1.405  and e+s =0
+   mean number of e-s =1.352  and e+s =0
 
-(number) transmission coeff=0.534  reflection coeff=0.004
+(number) transmission coeff=0.51  reflection coeff=0.004
 
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 605696309, 189660433
+ Current couple of seeds = 927669596, 1366032175
 ----------------------------------------
 #
 #
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
index 3d6ebed356..d68c8c3d8a 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8CalorHit.hh,v 1.2 2000/06/27 13:29:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8CalorHit.hh,v 1.2.4.1 2001/06/28 19:07:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
index 3979e5964b..87a5d1fcc2 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8CalorimeterSD.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8CalorimeterSD.hh,v 1.2.4.1 2001/06/28 19:07:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
index 6c7714dcbc..20ae8b25aa 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8DetectorConstruction.hh,v 1.3 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8DetectorConstruction.hh,v 1.3.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
index 6e39196d0d..bfcdf75cb2 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8DetectorMessenger.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
index 0ce9d65881..96d63b86d1 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8EventAction.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8EventAction.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
index 874719bb2b..080e35c49c 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8EventActionMessenger.hh,v 1.2 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
index ca144e636c..3d94d64f42 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PhysicsList.hh,v 1.3 2000/06/27 13:29:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PhysicsList.hh,v 1.3.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef Em8PhysicsList_h
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
index ece0edaa5b..08f0129956 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PhysicsListMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PhysicsListMessenger.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
index d4206ef3ac..d4a00441d9 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PrimaryGeneratorAction.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
index 044ff92346..37472da167 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8PrimaryGeneratorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PrimaryGeneratorMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PrimaryGeneratorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
index dfbc4906e8..bcc4705464 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8RunAction.hh,v 1.3 2000/06/28 09:55:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8RunAction.hh,v 1.3.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
index 184c82b7a6..bb2722e8bf 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8RunMessenger.hh
@@ -1,13 +1,29 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: Em8RunMessenger.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: Em8RunMessenger.hh,v 1.2.4.1 2001/06/28 19:07:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
index 70da45d34e..285ef22cc4 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8StepCut.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8StepCut.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8StepCut.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
index a8685331e2..aef974597f 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingAction.hh,v 1.2 2000/06/27 13:29:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingAction.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
index f9484df7bd..4b23a93a55 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingMessenger.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingMessenger.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
index 4ed6722e44..78adaa171b 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingVerbose.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingVerbose.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
index 9971635ac0..70c0af54b1 100644
--- a/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/Em8VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8VisManager.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8VisManager.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
index 9f8c86cc3c..6212927d3d 100644
--- a/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTDetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TRTDetectorConstruction.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TRTDetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
index dd716b7d62..9cecf4061b 100644
--- a/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
+++ b/examples/extended/electromagnetic/TestEm8/include/TRTMaterials.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: TRTMaterials.hh,v 1.2 2000/06/27 13:29:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: TRTMaterials.hh,v 1.2.4.1 2001/06/28 19:07:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
index cd54a50fb7..932f36f636 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8CalorHit.cc,v 1.2 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8CalorHit.cc,v 1.2.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
index a8f2df12f1..40f6e42354 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8CalorimeterSD.cc,v 1.3 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8CalorimeterSD.cc,v 1.3.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
index 9b5f5f02b4..71b75b12fe 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8DetectorConstruction.cc,v 1.5 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8DetectorConstruction.cc,v 1.5.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
index 67c4077d65..5543d6475e 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8DetectorMessenger.cc,v 1.2 2000/06/27 13:29:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
index 6585bcb026..535c330368 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8EventAction.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8EventAction.cc,v 1.3.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
index f887c66561..a2cbf40a5e 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8EventActionMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
index 2d6c0e9a20..4c1ff1a6d8 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PhysicsList.cc,v 1.4 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PhysicsList.cc,v 1.4.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 
 #include "G4Timer.hh"
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
index bd3ce47190..23bc57f9b7 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PhysicsListMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PhysicsListMessenger.cc,v 1.2.4.1 2001/06/28 19:07:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
index 7c64b9682b..a001420de3 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PrimaryGeneratorAction.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PrimaryGeneratorAction.cc,v 1.3.4.1 2001/06/28 19:07:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
index f0f1c73bb6..4d4a5a02f9 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8PrimaryGeneratorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8PrimaryGeneratorMessenger.cc,v 1.2 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8PrimaryGeneratorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
index 4c66f0b687..0b23d34c74 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8RunAction.cc,v 1.5 2000/06/28 09:55:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8RunAction.cc,v 1.5.4.1 2001/06/28 19:07:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
index 7394adefbc..0aaa9dcf1b 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8RunMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8RunMessenger.cc,v 1.3 2000/06/27 13:29:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8RunMessenger.cc,v 1.3.4.1 2001/06/28 19:07:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
index b89c72a2c4..754cdfa5a4 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8StepCut.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8StepCut.cc,v 1.3 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8StepCut.cc,v 1.3.4.1 2001/06/28 19:07:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "Em8StepCut.hh"
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
index 2b896cd6bc..86bf79749b 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingAction.cc,v 1.3 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingAction.cc,v 1.3.4.1 2001/06/28 19:07:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
index a3eee856e1..0d842e3de8 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingMessenger.cc,v 1.2 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingMessenger.cc,v 1.2.4.1 2001/06/28 19:07:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
index 6e4b726dec..03296e20c0 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8SteppingVerbose.cc,v 1.4 2001/02/09 02:57:12 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8SteppingVerbose.cc,v 1.4.2.1 2001/06/28 19:07:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
index bab7fcb0d7..dc055cac29 100644
--- a/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
+++ b/examples/extended/electromagnetic/TestEm8/src/Em8VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Em8VisManager.cc,v 1.2 2000/06/27 13:29:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Em8VisManager.cc,v 1.2.4.1 2001/06/28 19:07:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.cc b/examples/extended/g3tog4/clGeometry/clGeometry.cc
index 1e10bb023f..2996750ab4 100644
--- a/examples/extended/g3tog4/clGeometry/clGeometry.cc
+++ b/examples/extended/g3tog4/clGeometry/clGeometry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: clGeometry.cc,v 1.1 2000/07/24 11:23:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: clGeometry.cc,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/clGeometry.out b/examples/extended/g3tog4/clGeometry/clGeometry.out
index 45af563839..e35531d358 100644
--- a/examples/extended/g3tog4/clGeometry/clGeometry.out
+++ b/examples/extended/g3tog4/clGeometry/clGeometry.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (23-Feb-2001)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
@@ -76,27 +76,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.2  mm.
-
-           material       min.delta energy(keV) 
-
-HYDROGEN                     41.322
-DEUTERIUM                     65.86
-HELIUM                       37.951
-LITHIUM                      75.845
-BERILLIUM                    157.35
-CARBON                        189.5
-NITROGEN                     100.11
-NEON                         120.85
-ALUMINIUM                    191.86
-IRON                         358.11
-COPPER                       381.87
-TUNGSTEN                     557.83
-LEAD                         368.12
-URANIUM                      521.92
-                 AIR           0.99
-VACUUM                         0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -114,27 +93,6 @@ msc:   Tables of transport mean free paths.
           displacement of the particle , too.
         PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.2  mm.
-
-           material        min.delta energy(keV) 
-
-HYDROGEN                     41.322
-DEUTERIUM                     65.86
-HELIUM                       37.951
-LITHIUM                      75.845
-BERILLIUM                    157.35
-CARBON                        189.5
-NITROGEN                     100.11
-NEON                         120.85
-ALUMINIUM                    191.86
-IRON                         358.11
-COPPER                       381.87
-TUNGSTEN                     557.83
-LEAD                         368.12
-URANIUM                      521.92
-                 AIR           0.99
-VACUUM                         0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -203,14 +161,15 @@ Cut in energy
                 AIR         990 eV          990 eV 
  VACUUM                       990 eV          990 eV 
 ===================================================
-Idle> #
-Idle> # Initialize GEANT4
-Idle> #
-Idle> /gun/position   0. -1.5 0. mm
-Idle> /gun/direction  0.  1.   0.
-Idle> /gun/energy 1 GeV
-Idle> /gun/particle mu-
-Idle> /run/beamOn 1
+/control/execute /afs/cern.ch/sw/geant4/stt/dev2/src/geant4/tests/test601/test601.in
+#
+# Initialize GEANT4
+#
+/gun/position   0. -1.5 0. mm
+/gun/direction  0.  1.   0.
+/gun/energy 1 GeV
+/gun/particle mu-
+/run/beamOn 1
 ### Run 0 start.
 Start Run processing.
 >>>>>>>> Primary direction: (0,1,0)
@@ -221,17 +180,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0     -1.5        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      202       202        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       362        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1        0     -1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0s Real=0.06s Sys=0.01s
-Idle> /gun/particle mu+
-Idle> /run/beamOn 1
+  User=0s Real=0.07s Sys=0s
+/gun/particle mu+
+/run/beamOn 1
 ### Run 1 start.
 Start Run processing.
 >>>>>>>> Primary direction: (0,1,0)
@@ -242,17 +200,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0     -1.5        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      202       202        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       362        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1        0     -1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.01s Real=0.01s Sys=0s
-Idle> /gun/particle e-
-Idle> /run/beamOn 1
+  User=0s Real=0s Sys=0s
+/gun/particle e-
+/run/beamOn 1
 ### Run 2 start.
 Start Run processing.
 >>>>>>>> Primary direction: (0,1,0)
@@ -263,17 +220,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0     -1.5        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      202       202        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       362        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1        0     -1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
   User=0s Real=0s Sys=0s
-Idle> /gun/particle e+
-Idle> /run/beamOn 1
+/gun/particle e+
+/run/beamOn 1
 ### Run 3 start.
 Start Run processing.
 >>>>>>>> Primary direction: (0,1,0)
@@ -284,21 +240,20 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0     -1.5        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      202       202        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       362        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1        0     -1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0s Real=0s Sys=0s
-Idle> #
-Idle> /gun/position   0. 1.5 0. mm
-Idle> /gun/direction  1.  0.   0.
-Idle> /gun/energy 1 GeV
-Idle> /gun/particle mu-
-Idle> /run/beamOn 1
+  User=0.01s Real=0.01s Sys=0s
+#
+/gun/position   0. 1.5 0. mm
+/gun/direction  1.  0.   0.
+/gun/energy 1 GeV
+/gun/particle mu-
+/run/beamOn 1
 ### Run 4 start.
 Start Run processing.
 >>>>>>>> Primary direction: (1,0,0)
@@ -309,17 +264,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      1.5        0     1e+03        0        0         0        TBD1 initStep
-    1      200      1.5        0     1e+03        0      200       200        TBD2 Transportation
-    2      360      1.5        0     1e+03        0      160       360        HALL Transportation
-    3    4e+03      1.5        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1    1e-09      1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2    4e+03      1.5        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
   User=0s Real=0s Sys=0s
-Idle> /gun/particle mu+
-Idle> /run/beamOn 1
+/gun/particle mu+
+/run/beamOn 1
 ### Run 5 start.
 Start Run processing.
 >>>>>>>> Primary direction: (1,0,0)
@@ -330,17 +284,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      1.5        0     1e+03        0        0         0        TBD1 initStep
-    1      200      1.5        0     1e+03        0      200       200        TBD2 Transportation
-    2      360      1.5        0     1e+03        0      160       360        HALL Transportation
-    3    4e+03      1.5        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1    1e-09      1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2    4e+03      1.5        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.01s Real=0.01s Sys=0s
-Idle> /gun/particle e-
-Idle> /run/beamOn 1
+  User=0s Real=0s Sys=0s
+/gun/particle e-
+/run/beamOn 1
 ### Run 6 start.
 Start Run processing.
 >>>>>>>> Primary direction: (1,0,0)
@@ -351,17 +304,16 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      1.5        0     1e+03        0        0         0        TBD1 initStep
-    1      200      1.5        0     1e+03        0      200       200        TBD2 Transportation
-    2      360      1.5        0     1e+03        0      160       360        HALL Transportation
-    3    4e+03      1.5        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1    1e-09      1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2    4e+03      1.5        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
   User=0s Real=0s Sys=0s
-Idle> /gun/particle e+
-Idle> /run/beamOn 1
+/gun/particle e+
+/run/beamOn 1
 ### Run 7 start.
 Start Run processing.
 >>>>>>>> Primary direction: (1,0,0)
@@ -372,16 +324,17 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      1.5        0     1e+03        0        0         0        TBD1 initStep
-    1      200      1.5        0     1e+03        0      200       200        TBD2 Transportation
-    2      360      1.5        0     1e+03        0      160       360        HALL Transportation
-    3    4e+03      1.5        0     1e+03        0 3.64e+03     4e+03  OutOfWorld Transportation
+    1    1e-09      1.5        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2    4e+03      1.5        0     1e+03        0    4e+03     4e+03  OutOfWorld Transportation
 >>> Event 0
     1 trajectories stored in this event.
 Run terminated.
 Run Summary
   Number of events processed : 1
   User=0s Real=0s Sys=0s
-Idle> #
-Idle> # Termination
-Idle> #
-Idle> G4 kernel has come to Quit state.
+#
+# Termination
+#
+exit
+
+G4 kernel has come to Quit state.
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
index 8bc30e72a5..d8613e55a6 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4DetectorConstruction.hh,v 1.1 2000/07/24 11:23:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4DetectorConstruction.hh,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G3toG4DetectorConstruction_h
 #define G3toG4DetectorConstruction_h 1
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
index 15d0afc998..c1b89d28ed 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventAction.hh,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
index 06f2d825e8..f1b551162a 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventActionMessenger.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventActionMessenger.hh,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
index 2f4b4057e7..a7bab341c8 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PhysicsList.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PhysicsList.hh,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
index 0518835314..7f9f2554a7 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1.4.1 2001/06/28 19:07:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G3toG4PrimaryGeneratorAction_h
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
index 0a0876d7da..7afd6f4fb3 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RunAction.hh,v 1.1 2000/07/24 11:23:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RunAction.hh,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G3toG4RunAction_h
diff --git a/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh b/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
index 97204e39b3..45c236ce32 100644
--- a/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
+++ b/examples/extended/g3tog4/clGeometry/include/G3toG4VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4VisManager.hh,v 1.1 2000/07/24 11:23:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4VisManager.hh,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
index 1eaf4d2524..0339ed9f3c 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4DetectorConstruction.cc,v 1.1 2000/07/24 11:23:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4DetectorConstruction.cc,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //--------------------------------------------------------------------------
 // G3toG4DetectorConstruction. Most the work is Done in
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
index 455d1f5f50..65dbe07407 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventAction.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventAction.cc,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
index f333bf8086..efcd57ed9c 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventActionMessenger.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventActionMessenger.cc,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
index 4b6cb062e0..6a5e249b93 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PhysicsList.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PhysicsList.cc,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
index e192a0de61..1c3842e341 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2 2000/08/01 09:44:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
index b5e99c8589..bbab272704 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RunAction.cc,v 1.1 2000/07/24 11:23:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RunAction.cc,v 1.1.4.1 2001/06/28 19:07:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc b/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
index 6d217c5e72..68e11a5bf3 100644
--- a/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
+++ b/examples/extended/g3tog4/clGeometry/src/G3toG4VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4VisManager.cc,v 1.1 2000/07/24 11:23:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4VisManager.cc,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/g3tog4/cltog4/cltog4.cc b/examples/extended/g3tog4/cltog4/cltog4.cc
index 8937447b3b..31ffff3baf 100644
--- a/examples/extended/g3tog4/cltog4/cltog4.cc
+++ b/examples/extended/g3tog4/cltog4/cltog4.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: cltog4.cc,v 1.1 2000/07/24 11:23:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: cltog4.cc,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/cltog4/cltog4.out b/examples/extended/g3tog4/cltog4/cltog4.out
index 10e83f45dd..5d848bbfdc 100644
--- a/examples/extended/g3tog4/cltog4/cltog4.out
+++ b/examples/extended/g3tog4/cltog4/cltog4.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (23-Feb-2001)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 Instantiated G3toG4DetectorConstruction using call list file "/afs/cern.ch/sw/geant4/stt/dev2/src/geant4/examples/extended/g3tog4/data/testmodel.dat"
@@ -71,27 +71,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.2  mm.
-
-           material       min.delta energy(keV) 
-
-HYDROGEN                     41.322
-DEUTERIUM                     65.86
-HELIUM                       37.951
-LITHIUM                      75.845
-BERILLIUM                    157.35
-CARBON                        189.5
-NITROGEN                     100.11
-NEON                         120.85
-ALUMINIUM                    191.86
-IRON                         358.11
-COPPER                       381.87
-TUNGSTEN                     557.83
-LEAD                         368.12
-URANIUM                      521.92
-                 AIR           0.99
-VACUUM                         0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -107,27 +86,6 @@ msc:   Tables of transport mean free paths.
           displacement of the particle , too.
         PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.2  mm.
-
-           material        min.delta energy(keV) 
-
-HYDROGEN                     41.322
-DEUTERIUM                     65.86
-HELIUM                       37.951
-LITHIUM                      75.845
-BERILLIUM                    157.35
-CARBON                        189.5
-NITROGEN                     100.11
-NEON                         120.85
-ALUMINIUM                    191.86
-IRON                         358.11
-COPPER                       381.87
-TUNGSTEN                     557.83
-LEAD                         368.12
-URANIUM                      521.92
-                 AIR           0.99
-VACUUM                         0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -171,18 +129,19 @@ Cut in energy
                 AIR         990 eV          990 eV 
  VACUUM                       990 eV          990 eV 
 ===================================================
-Idle> /control/verbose 1
-Idle> /tracking/verbose 1
-Idle> #
-Idle> # Initialize GEANT4
-Idle> #
-Idle> /run/initialize
-Idle> #
-Idle> /gun/position   0. -1.5 0.
-Idle> /gun/direction  0.  1.   0.
-Idle> /gun/energy 1 GeV
-Idle> /gun/particle chargedgeantino
-Idle> /run/beamOn 10
+/control/execute /afs/cern.ch/sw/geant4/stt/dev2/src/geant4/tests/test602/test602.in
+/control/verbose 1
+/tracking/verbose 1
+#
+# Initialize GEANT4
+#
+/run/initialize
+#
+/gun/position   0. -1.5 0.
+/gun/direction  0.  1.   0.
+/gun/energy 1 GeV
+/gun/particle chargedgeantino
+/run/beamOn 10
 ### Run 0 start.
 Start Run processing.
 >>>>>>>> Primary direction: (0,1,0)
@@ -193,9 +152,8 @@ Start Run processing.
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -204,9 +162,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -215,9 +172,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -226,9 +182,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -237,9 +192,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -248,9 +202,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -259,9 +212,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -270,9 +222,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -281,9 +232,8 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 >>>>>>>> Primary direction: (0,1,0)
 
 *********************************************************************************************************
@@ -292,14 +242,15 @@ Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolu
 
 Step#    X(mm)    Y(mm)    Z(mm) KinE(MeV)  dE(MeV) StepLeng TrackLeng  NextVolume ProcName
     0        0      -15        0     1e+03        0        0         0        TBD1 initStep
-    1        0      200        0     1e+03        0      215       215        TBD2 Transportation
-    2        0      360        0     1e+03        0      160       375        HALL Transportation
-    3        0    4e+03        0     1e+03        0 3.64e+03  4.02e+03  OutOfWorld Transportation
+    1        0      -15        0     1e+03        0    1e-09     1e-09        HALL Transportation
+    2        0    4e+03        0     1e+03        0 4.01e+03  4.02e+03  OutOfWorld Transportation
 Run terminated.
 Run Summary
   Number of events processed : 10
-  User=0.02s Real=0.11s Sys=0.01s
-Idle> #
-Idle> # Termination
-Idle> #
-Idle> G4 kernel has come to Quit state.
+  User=0.02s Real=0.03s Sys=0s
+#
+# Termination
+#
+exit
+
+G4 kernel has come to Quit state.
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
index 893be7fdd0..44550ad01b 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4DetectorConstruction.hh,v 1.1 2000/07/24 11:23:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4DetectorConstruction.hh,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G3toG4DetectorConstruction_h
 #define G3toG4DetectorConstruction_h 1
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
index 01481d8474..64cb55a77e 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventAction.hh,v 1.1 2000/07/24 11:23:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventAction.hh,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
index f8c16ead88..bdacf5a1bb 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventActionMessenger.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventActionMessenger.hh,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
index e2eb43d3f7..e4450bc83a 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PhysicsList.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PhysicsList.hh,v 1.1.4.1 2001/06/28 19:07:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
index 43deb10628..3b800d5ce2 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PrimaryGeneratorAction.hh,v 1.1.4.1 2001/06/28 19:07:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G3toG4PrimaryGeneratorAction_h
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
index faf739882c..53331793f7 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RunAction.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RunAction.hh,v 1.1.4.1 2001/06/28 19:07:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G3toG4RunAction_h
diff --git a/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh b/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
index f73008e067..c44c588c27 100644
--- a/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
+++ b/examples/extended/g3tog4/cltog4/include/G3toG4VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4VisManager.hh,v 1.1 2000/07/24 11:23:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4VisManager.hh,v 1.1.4.1 2001/06/28 19:07:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
index 04491c0b0f..d6e50c68f1 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4DetectorConstruction.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4DetectorConstruction.cc,v 1.1.4.1 2001/06/28 19:07:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //--------------------------------------------------------------------------
 // G3toG4DetectorConstruction. Most the work is Done in
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
index fe894c7c7e..c0e0ef10af 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventAction.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventAction.cc,v 1.1.4.1 2001/06/28 19:07:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
index 381c2a2ef6..1eb33a23fa 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4EventActionMessenger.cc,v 1.1 2000/07/24 11:23:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4EventActionMessenger.cc,v 1.1.4.1 2001/06/28 19:07:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
index dc27676ae9..c92dc4debe 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PhysicsList.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PhysicsList.cc,v 1.1.4.1 2001/06/28 19:07:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
index 8fba4ab240..641e0a3a26 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2 2000/08/01 09:44:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
index b41274288f..9acace5881 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RunAction.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RunAction.cc,v 1.1.4.1 2001/06/28 19:07:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4ios.hh"
diff --git a/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc b/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
index b400e204ec..65f4217355 100644
--- a/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
+++ b/examples/extended/g3tog4/cltog4/src/G3toG4VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4VisManager.cc,v 1.1 2000/07/24 11:23:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4VisManager.cc,v 1.1.4.1 2001/06/28 19:07:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/extended/persistency/PersistentEx01/GNUmakefile b/examples/extended/persistency/PersistentEx01/GNUmakefile
index e8748bf869..67a9160958 100644
--- a/examples/extended/persistency/PersistentEx01/GNUmakefile
+++ b/examples/extended/persistency/PersistentEx01/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 1999/12/01 15:46:30 morita Exp $
+# $Id: GNUmakefile,v 1.5 2001/03/15 22:56:27 morita Exp $
 # --------------------------------------------------------------
 # GNUmakefile for tests module.  Gabriele Cosmo, 27/06/98.
 # --------------------------------------------------------------
@@ -10,25 +10,23 @@ name := PersistentEx01
 G4ODBMS := true
 G4TARGET := $(name)
 G4EXLIB := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 
-.PHONY: all doall
+.PHONY: all
 
-all: cleandb headers
-	@(G4ODBMS_DEPEND=1; export G4ODBMS_DEPEND; $(MAKE) doall)
-
-doall: lib bin
+all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
 G4OODDLX_BOOT := $(G4EXAMPLE_BOOT)
 
-include $(G4INSTALL)/config/binmake.gmk
-
   CPPFLAGS += \
-              -Iinclude \
+              -I$(PWD)/include \
               -I$(G4TMPDIR)
 
+include $(G4INSTALL)/config/binmake.gmk
+
diff --git a/examples/extended/persistency/PersistentEx01/History b/examples/extended/persistency/PersistentEx01/History
index cba0c0ecdd..c455680556 100644
--- a/examples/extended/persistency/PersistentEx01/History
+++ b/examples/extended/persistency/PersistentEx01/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.10 2000/06/17 12:37:42 stesting Exp $
+$Id: History,v 1.12 2001/06/19 15:07:44 morita Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,12 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+June 20, 2001      Y.Morita (PersistentEx01-V03-01-00)
+- New setup scripts for SUN-CC5 and gcc-2.95.2.
+
+March 15, 2001      Y.Morita (PersistentEx01-V03-00-00)
+- Updated GNUmakefile for new config.
+
 June 17, 2000  John Allison  (PersistentEx01-V01-00-01)
 - Updated PersistentEx01.out for geant4-01-01-ref-06.
 
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.cc b/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
index 940f2cd0f0..fb7ce8a44c 100644
--- a/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
+++ b/examples/extended/persistency/PersistentEx01/PersistentEx01.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersistentEx01.cc,v 1.5 1999/12/15 14:49:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersistentEx01.cc,v 1.5.4.2 2001/06/28 20:18:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------
 //      GEANT4 - PersistentEx01
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/extended/persistency/PersistentEx01/PersistentEx01.out b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
index f1dc17071b..817a307b92 100644
--- a/examples/extended/persistency/PersistentEx01/PersistentEx01.out
+++ b/examples/extended/persistency/PersistentEx01/PersistentEx01.out
@@ -14,8 +14,8 @@ OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/example
 
 Opening federated database OO_FD_BOOT.
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (23-Feb-2001)
+ Geant4 version $Name: PersistentEx01-V03-01-00 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 #
@@ -50,14 +50,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-           Aluminium         125.02
-                Lead         228.53
-                 Air           0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -73,14 +65,6 @@ msc:   Tables of transport mean free paths.
           displacement of the particle , too.
         PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-           Aluminium         125.02
-                Lead         228.53
-                 Air           0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -113,90 +97,90 @@ Transaction is committed on /Geometry/GeomContainer/
 >>> Event 0
 Event : 0
 mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 34.266
+  Edep of the first Hit 34.1915
 mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 5.5545
+  Edep of the first Hit 5.53475
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 0 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 1
 Event : 1
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 23.89
-mySD/OddCollection     Number of hits       9
-  Edep of the first Hit 79.701
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 23.2999
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 29.1522
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 1 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 2
 Event : 2
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 1.9165
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 4.8478
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 14.3968
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 65.8934
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 2 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 3
 Event : 3
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 2.7206
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 19.452
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 49.9221
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 21.264
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 3 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 4
 Event : 4
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 0.0075332
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 39.335
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 13.3126
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 16.2155
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 4 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 5
 Event : 5
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 8.6101
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 21.639
+mySD/EvenCollection    Number of hits       25
+  Edep of the first Hit 41.9428
+mySD/OddCollection     Number of hits       27
+  Edep of the first Hit 7.70035
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 5 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 6
 Event : 6
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 30.514
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 26.07
+mySD/EvenCollection    Number of hits       30
+  Edep of the first Hit 48.9032
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 10.2197
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 6 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 7
 Event : 7
-mySD/EvenCollection    Number of hits       31
-  Edep of the first Hit 5.7609
-mySD/OddCollection     Number of hits       23
-  Edep of the first Hit 21.21
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 1.93499
+mySD/OddCollection     Number of hits       46
+  Edep of the first Hit 10.5944
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 7 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 8
 Event : 8
-mySD/EvenCollection    Number of hits       31
-  Edep of the first Hit 3.1874
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 10.518
+mySD/EvenCollection    Number of hits       16
+  Edep of the first Hit 19.969
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 13.4286
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 8 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
 >>> Event 9
 Event : 9
-mySD/EvenCollection    Number of hits       33
-  Edep of the first Hit 20.604
-mySD/OddCollection     Number of hits       19
-  Edep of the first Hit 0.083018
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 31.4189
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 43.0041
 Transaction started for /Events/EventContainer/ with non-sustained mode.
  -- G4PEvent 9 stored in /Events/EventContainer/
 Transaction is committed on /Events/EventContainer/
diff --git a/examples/extended/persistency/PersistentEx01/README b/examples/extended/persistency/PersistentEx01/README
index 83651e7e06..da734b873b 100644
--- a/examples/extended/persistency/PersistentEx01/README
+++ b/examples/extended/persistency/PersistentEx01/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.7 1999/12/05 22:22:25 morita Exp $
+$Id: README,v 1.8 2001/06/19 15:03:58 morita Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -91,7 +91,7 @@ such as
 
 in your .cshrc file.
 
-For zsh and alike, copy "g4odbms_setup.csh" to your local directory, 
+For zsh and alike, copy "g4odbms_setup.sh" to your local directory, 
 edit the version numbers, then put a line such as
 
    . g4odbms_setup.sh
diff --git a/examples/extended/persistency/PersistentEx01/g4odbms_setup.csh b/examples/extended/persistency/PersistentEx01/g4odbms_setup.csh
index 6aa3f7ba86..c4eaf51c73 100644
--- a/examples/extended/persistency/PersistentEx01/g4odbms_setup.csh
+++ b/examples/extended/persistency/PersistentEx01/g4odbms_setup.csh
@@ -12,18 +12,50 @@
 
 setenv G4USE_HEPODBMS 1
 
-# ----- Objectivity variables setup
+# ----- LHCXX related variables
 
-if ( ! $?OBJY_VERS ) then
-  setenv OBJY_VERS 5.1
+if( ! $?LHCXXTOP ) then
+  setenv LHCXXTOP /afs/cern.ch/sw/lhcxx
 endif
 
-if ( -r /afs/cern.ch/rd45/objectivity/objyenv.csh ) then 
-  echo "Setting up OBJY_VERS $OBJY_VERS ..."
-  source /afs/cern.ch/rd45/objectivity/objyenv.csh 
-endif 
+switch ($G4SYSTEM)
+  case SUN-CC5:
+    setenv PLATF         sol7
+    setenv CC_COMP       CC-5.2
+    setenv OBJY_VERS     6.1.3
+    setenv HEP_ODBMS_VER 0.3.2.10
+    breaksw
+  case Linux-g++:
+    setenv PLATF         @sys
+    setenv CC_COMP       gcc-2.95.2
+    setenv OBJY_VERS     6.0
+    setenv HEP_ODBMS_VER 0.3.2.3
+    breaksw
+  default:
+    echo "Objectivity and HepODBMS versions not specified for G4SYSTEM = $G4SYSTEM."
+    breaksw
+endsw
+
+if(! $?CC_COMP )then
+  setenv CC_COMP ""
+else
+  if( "x${CC_COMP}" != "x" ) then
+    setenv CC_COMP ${CC_COMP}/
+  endif
+endif
 
 # ----- HepODBMS variables setup
 
-setenv HEP_ODBMS_DIR       /afs/cern.ch/sw/lhcxx/specific/@sys/HepODBMS/0.3.0.1
+setenv HEP_ODBMS_DIR $LHCXXTOP/specific/$PLATF/${CC_COMP}HepODBMS/${HEP_ODBMS_VER}
 setenv HEP_ODBMS_INCLUDES  ${HEP_ODBMS_DIR}/include
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$HEP_ODBMS_DIR/lib
+
+# ----- Objectivity variables setup
+
+if ( -r /afs/cern.ch/rd45/objectivity/objyenv.csh ) then 
+  setenv OBJY_DIR $LHCXXTOP/specific/$PLATF/${CC_COMP}Objectivity/${OBJY_VERS}
+  source /afs/cern.ch/rd45/objectivity/objyenv.csh 
+else
+  echo "/afs/cern.ch/rd45/objectivity/objyenv.csh not found!"
+endif 
+
diff --git a/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh b/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh
index 8bb89255ac..f9004fb7db 100644
--- a/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh
+++ b/examples/extended/persistency/PersistentEx01/g4odbms_setup.sh
@@ -10,23 +10,43 @@
 
 # ----- Use HepODBMS
 
-G4USE_HEPODBMS=1; export G4USE_HEPODBMS
+export G4USE_HEPODBMS=1
 
-# ----- Objectivity variables setup
+# ----- LHCXX related variables
 
-if [ -z "$OBJY_VERS" ] ; then
-  OBJY_VERS=5.1
-  export OBJY_VERS
+if [ -z "$LHCXXTOP" ] ; then
+  export LHCXXTOP=/afs/cern.ch/sw/lhcxx
 fi
 
-if [ -r /afs/cern.ch/rd45/objectivity/objyenv.sh ] ; then 
-  echo "Setting up OBJY_VERS $OBJY_VERS ..."
-  . /afs/cern.ch/rd45/objectivity/objyenv.sh 
-fi 
+export CC_COMP=""
+case $G4SYSTEM in
+SUN-CC5)
+    export PLATF=sol7
+    export CC_COMP=CC-5.2/
+    export OBJY_VERS=6.1.3
+    export HEP_ODBMS_VER=0.3.2.10
+    ;;
+Linux-g++)
+    export PLATF=@sys
+    export CC_COMP=gcc-2.95.2/
+    export OBJY_VERS=6.0
+    export HEP_ODBMS_VER=0.3.2.3
+    ;;
+default)
+    echo "Objectivity and HepODBMS versions not specified for G4SYSTEM = $G4SYSTEM."
+    ;;
+esac
 
 # ----- HepODBMS variables setup
 
-HEP_ODBMS_DIR=/afs/cern.ch/sw/lhcxx/specific/@sys/HepODBMS/0.3.0.1
-export HEP_ODBMS_DIR
-HEP_ODBMS_INCLUDES=${HEP_ODBMS_DIR}/include
-export HEP_ODBMS_INCLUDES
+export HEP_ODBMS_DIR=$LHCXXTOP/specific/$PLATF/${CC_COMP}HepODBMS/${HEP_ODBMS_VER}
+export HEP_ODBMS_INCLUDES=${HEP_ODBMS_DIR}/include
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$HEP_ODBMS_DIR/lib
+
+# ----- Objectivity variables setup
+
+if [ -r /afs/cern.ch/rd45/objectivity/objyenv.sh ] ; then 
+  export OBJY_DIR=$LHCXXTOP/specific/$PLATF/${CC_COMP}Objectivity/${OBJY_VERS}
+  . /afs/cern.ch/rd45/objectivity/objyenv.sh
+fi
+
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01DetectorConstruction.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01DetectorConstruction.hh
index 34c5b6f219..f5f282e819 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01DetectorConstruction.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01DetectorConstruction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01DetectorConstruction_h
 #define PersEx01DetectorConstruction_h 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01EventAction.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01EventAction.hh
index 670c071224..334902746d 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01EventAction.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01EventAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01EventAction_h
 #define PersEx01EventAction_h 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01PhysicsList.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01PhysicsList.hh
index 6da24a247c..9ddac45f1b 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01PhysicsList.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01PhysicsList.hh
@@ -1,4 +1,26 @@
-// $Id: PersEx01PhysicsList.hh,v 1.2 1999/11/04 12:54:26 morita Exp $
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// $Id: PersEx01PhysicsList.hh,v 1.2.10.1 2001/06/28 19:07:21 gunter Exp $
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01PrimaryGeneratorAction.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01PrimaryGeneratorAction.hh
index 9619c8ced3..cf8da35bcb 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01PrimaryGeneratorAction.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01PrimaryGeneratorAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01PrimaryGeneratorAction_h
 #define PersEx01PrimaryGeneratorAction_h 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01RunAction.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01RunAction.hh
index cae2c35156..c25de26647 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01RunAction.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01RunAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01RunAction_h
 #define PersEx01RunAction_h 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01StackingAction.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01StackingAction.hh
index 827eb76397..8323d983f1 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01StackingAction.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01StackingAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01StackingAction_H
 #define PersEx01StackingAction_H 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerHit.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerHit.hh
index 1523a85557..943fad05cc 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerHit.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerHit.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01TrackerHit_h
 #define PersEx01TrackerHit_h 1
diff --git a/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerSD.hh b/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerSD.hh
index 38b87ffde2..3860f91d26 100644
--- a/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerSD.hh
+++ b/examples/extended/persistency/PersistentEx01/include/PersEx01TrackerSD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef PersEx01TrackerSD_h
 #define PersEx01TrackerSD_h 1
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
index 3fa39109b9..84276da4f4 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01DetectorConstruction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01DetectorConstruction.hh"
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
index e542b562a2..f1559c1c59 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01EventAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01EventAction.hh"
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
index 40e2ff5982..3eaf392b84 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01PhysicsList.cc
@@ -1,4 +1,26 @@
-// $Id: PersEx01PhysicsList.cc,v 1.3 1999/12/15 14:49:17 gunter Exp $
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// $Id: PersEx01PhysicsList.cc,v 1.3.4.1 2001/06/28 19:07:22 gunter Exp $
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01PrimaryGeneratorAction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01PrimaryGeneratorAction.cc
index 476425c53f..a81eb21aff 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01PrimaryGeneratorAction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01PrimaryGeneratorAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01PrimaryGeneratorAction.hh"
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01RunAction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01RunAction.cc
index 33f50302b3..331019a78b 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01RunAction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01RunAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01RunAction.hh"
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01StackingAction.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01StackingAction.cc
index 21dc09bff3..ca2c25a55d 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01StackingAction.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01StackingAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01StackingAction.hh"
 #include "G4Track.hh"
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerHit.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerHit.cc
index eb0f927908..40e078f5b6 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerHit.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerHit.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01TrackerHit.hh"
 
diff --git a/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerSD.cc b/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerSD.cc
index 782cd4d810..abcf5c64c6 100644
--- a/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerSD.cc
+++ b/examples/extended/persistency/PersistentEx01/src/PersEx01TrackerSD.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "PersEx01TrackerSD.hh"
 #include "PersEx01TrackerHit.hh"
diff --git a/examples/extended/persistency/PersistentEx02/GNUmakefile b/examples/extended/persistency/PersistentEx02/GNUmakefile
index d5af5a13cf..c7f7bf1446 100644
--- a/examples/extended/persistency/PersistentEx02/GNUmakefile
+++ b/examples/extended/persistency/PersistentEx02/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.4 1999/12/01 15:29:08 morita Exp $
+# $Id: GNUmakefile,v 1.5 2001/03/15 22:57:02 morita Exp $
 # --------------------------------------------------------------
 # GNUmakefile for tests module.  Gabriele Cosmo, 27/06/98.
 # --------------------------------------------------------------
@@ -10,25 +10,23 @@ name := PersistentEx02
 G4ODBMS := true
 G4TARGET := $(name)
 G4EXLIB := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 
-.PHONY: all doall
+.PHONY: all
 
-all: cleandb headers
-	@(G4ODBMS_DEPEND=1; export G4ODBMS_DEPEND; $(MAKE) doall)
-
-doall: lib bin
+all: lib bin
 
 include $(G4INSTALL)/config/architecture.gmk
 
 G4OODDLX_BOOT := $(G4EXAMPLE_BOOT)
 
-include $(G4INSTALL)/config/binmake.gmk
-
   CPPFLAGS += \
-              -Iinclude \
+              -I$(PWD)/include \
               -I$(G4TMPDIR)
 
+include $(G4INSTALL)/config/binmake.gmk
+
diff --git a/examples/extended/persistency/PersistentEx02/History b/examples/extended/persistency/PersistentEx02/History
index 3c2c6215ff..a7f0365645 100644
--- a/examples/extended/persistency/PersistentEx02/History
+++ b/examples/extended/persistency/PersistentEx02/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.9 2000/06/17 12:39:54 stesting Exp $
+$Id: History,v 1.12 2001/06/21 14:20:47 morita Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,15 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+21 June, 01    Y.Morita (PersistentEx02-V03-01-00)
+- new tag for release 3.2
+
+April 28, 2001      Y.Morita
+- Change NULL to 0
+
+March 15, 2001      Y.Morita (PersistentEx02-V03-00-00)
+- Updated GNUmakefile for new config.
+
 June 17, 2000  John Allison  (PersistentEx02-V01-00-01)
 - Updated PersistentEx02.out for geant4-01-01-ref-06.
 
diff --git a/examples/extended/persistency/PersistentEx02/PersistentEx02.cc b/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
index cd462db128..2f682c0701 100644
--- a/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
+++ b/examples/extended/persistency/PersistentEx02/PersistentEx02.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersistentEx02.cc,v 1.3 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersistentEx02.cc,v 1.3.4.2 2001/06/28 20:18:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------
 //      GEANT4 - PersistentEx02
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/extended/persistency/PersistentEx02/PersistentEx02.out b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
index 58d2f83776..d7476ac354 100644
--- a/examples/extended/persistency/PersistentEx02/PersistentEx02.out
+++ b/examples/extended/persistency/PersistentEx02/PersistentEx02.out
@@ -14,8 +14,8 @@ OO_FD_BOOT is set to /afs/cern.ch/sw/geant4/stt/dev2/SUN-CC/debug_NONISO/example
 
 Opening federated database OO_FD_BOOT.
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (23-Feb-2001)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 #
@@ -50,14 +50,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-           Aluminium         125.02
-                Lead         228.53
-                 Air           0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -73,14 +65,6 @@ msc:   Tables of transport mean free paths.
           displacement of the particle , too.
         PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-           Aluminium         125.02
-                Lead         228.53
-                 Air           0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -114,722 +98,722 @@ Transaction started for /Events/EventContainer/ with sustained mode.
 >>> Event 0
 Event : 0
 mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 34.266
+  Edep of the first Hit 34.1915
 mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 5.5545
+  Edep of the first Hit 5.53475
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 0 stored in /Events/EventContainer/ (sustained)
 >>> Event 1
 Event : 1
-mySD/EvenCollection    Number of hits       29
-  Edep of the first Hit 23.89
-mySD/OddCollection     Number of hits       9
-  Edep of the first Hit 79.701
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 23.2999
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 29.1522
  -- G4PEvent 1 stored in /Events/EventContainer/ (sustained)
 >>> Event 2
 Event : 2
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 1.9165
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 4.8478
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 14.3968
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 65.8934
  -- G4PEvent 2 stored in /Events/EventContainer/ (sustained)
 >>> Event 3
 Event : 3
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 2.7206
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 19.452
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 49.9221
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 21.264
  -- G4PEvent 3 stored in /Events/EventContainer/ (sustained)
 >>> Event 4
 Event : 4
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 0.0075332
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 39.335
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 13.3126
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 16.2155
  -- G4PEvent 4 stored in /Events/EventContainer/ (sustained)
 >>> Event 5
 Event : 5
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 8.6101
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 21.639
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 41.9428
+mySD/OddCollection     Number of hits       27
+  Edep of the first Hit 7.70035
  -- G4PEvent 5 stored in /Events/EventContainer/ (sustained)
 >>> Event 6
 Event : 6
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 30.514
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 26.07
+mySD/EvenCollection    Number of hits       29
+  Edep of the first Hit 48.9032
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 10.2197
  -- G4PEvent 6 stored in /Events/EventContainer/ (sustained)
 >>> Event 7
 Event : 7
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 5.7609
-mySD/OddCollection     Number of hits       23
-  Edep of the first Hit 21.21
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 1.93499
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 10.5944
  -- G4PEvent 7 stored in /Events/EventContainer/ (sustained)
 >>> Event 8
 Event : 8
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 3.1874
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 10.518
+mySD/EvenCollection    Number of hits       16
+  Edep of the first Hit 19.969
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 13.4286
  -- G4PEvent 8 stored in /Events/EventContainer/ (sustained)
 >>> Event 9
 Event : 9
-mySD/EvenCollection    Number of hits       32
-  Edep of the first Hit 20.604
-mySD/OddCollection     Number of hits       19
-  Edep of the first Hit 0.083018
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 31.4189
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 43.0041
  -- G4PEvent 9 stored in /Events/EventContainer/ (sustained)
 >>> Event 10
 Event : 10
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 56.761
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 37.056
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 30.8409
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 28.0611
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 10 stored in /Events/EventContainer/ (sustained)
 >>> Event 11
 Event : 11
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 27.247
-mySD/OddCollection     Number of hits       45
-  Edep of the first Hit 10.33
+mySD/EvenCollection    Number of hits       22
+  Edep of the first Hit 32.4305
+mySD/OddCollection     Number of hits       25
+  Edep of the first Hit 8.81217
  -- G4PEvent 11 stored in /Events/EventContainer/ (sustained)
 >>> Event 12
 Event : 12
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 4.5263
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 21.012
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 11.5257
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 46.3586
  -- G4PEvent 12 stored in /Events/EventContainer/ (sustained)
 >>> Event 13
 Event : 13
-mySD/EvenCollection    Number of hits       20
-  Edep of the first Hit 6.0642
-mySD/OddCollection     Number of hits       26
-  Edep of the first Hit 26.13
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 12.5938
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 0.741625
  -- G4PEvent 13 stored in /Events/EventContainer/ (sustained)
 >>> Event 14
 Event : 14
-mySD/EvenCollection    Number of hits       32
-  Edep of the first Hit 19.883
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 0.64362
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 3.63532
+mySD/OddCollection     Number of hits       25
+  Edep of the first Hit 13.5259
  -- G4PEvent 14 stored in /Events/EventContainer/ (sustained)
 >>> Event 15
 Event : 15
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 22.02
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 1.0133
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 19.0235
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 37.7258
  -- G4PEvent 15 stored in /Events/EventContainer/ (sustained)
 >>> Event 16
 Event : 16
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 10.689
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 21.419
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 1.24717
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 5.86464
  -- G4PEvent 16 stored in /Events/EventContainer/ (sustained)
 >>> Event 17
 Event : 17
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 5.514
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 12.06
+mySD/EvenCollection    Number of hits       32
+  Edep of the first Hit 13.2498
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 51.8571
  -- G4PEvent 17 stored in /Events/EventContainer/ (sustained)
 >>> Event 18
 Event : 18
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 5.0775
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 37.576
+  Edep of the first Hit 21.9788
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 53.1987
  -- G4PEvent 18 stored in /Events/EventContainer/ (sustained)
 >>> Event 19
 Event : 19
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 27.35
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 20.238
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 26.0022
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 53.1515
  -- G4PEvent 19 stored in /Events/EventContainer/ (sustained)
 >>> Event 20
 Event : 20
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 17.728
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 37.015
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 18.0813
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 4.29183
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 20 stored in /Events/EventContainer/ (sustained)
 >>> Event 21
 Event : 21
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 56.905
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 6.6167
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 18.6669
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 33.1752
  -- G4PEvent 21 stored in /Events/EventContainer/ (sustained)
 >>> Event 22
 Event : 22
 mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 0.45028
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 0.54982
+  Edep of the first Hit 4.21294
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 4.36274
  -- G4PEvent 22 stored in /Events/EventContainer/ (sustained)
 >>> Event 23
 Event : 23
-mySD/EvenCollection    Number of hits       25
-  Edep of the first Hit 65.862
-mySD/OddCollection     Number of hits       22
-  Edep of the first Hit 14.964
+mySD/EvenCollection    Number of hits       26
+  Edep of the first Hit 3.97331
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 108.262
  -- G4PEvent 23 stored in /Events/EventContainer/ (sustained)
 >>> Event 24
 Event : 24
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 20.565
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 55.449
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 22.8391
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 31.2467
  -- G4PEvent 24 stored in /Events/EventContainer/ (sustained)
 >>> Event 25
 Event : 25
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 16.844
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 31.598
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 76.5024
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 7.2116
  -- G4PEvent 25 stored in /Events/EventContainer/ (sustained)
 >>> Event 26
 Event : 26
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 11.96
-mySD/OddCollection     Number of hits       25
-  Edep of the first Hit 9.078
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 22.4802
+mySD/OddCollection     Number of hits       34
+  Edep of the first Hit 2.86032
  -- G4PEvent 26 stored in /Events/EventContainer/ (sustained)
 >>> Event 27
 Event : 27
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 52.562
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 72.814
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 61.5559
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 47.3304
  -- G4PEvent 27 stored in /Events/EventContainer/ (sustained)
 >>> Event 28
 Event : 28
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 68.624
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 5.4009
+mySD/EvenCollection    Number of hits       22
+  Edep of the first Hit 12.3259
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 41.0559
  -- G4PEvent 28 stored in /Events/EventContainer/ (sustained)
 >>> Event 29
 Event : 29
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 95.877
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 17.071
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 7.85987
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 7.0312
  -- G4PEvent 29 stored in /Events/EventContainer/ (sustained)
 >>> Event 30
 Event : 30
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 84.22
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 43.408
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 45.8915
+mySD/OddCollection     Number of hits       24
+  Edep of the first Hit 37.9709
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 30 stored in /Events/EventContainer/ (sustained)
 >>> Event 31
 Event : 31
-mySD/EvenCollection    Number of hits       29
-  Edep of the first Hit 7.2273
-mySD/OddCollection     Number of hits       24
-  Edep of the first Hit 22.637
+mySD/EvenCollection    Number of hits       14
+  Edep of the first Hit 9.81858
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 12.5792
  -- G4PEvent 31 stored in /Events/EventContainer/ (sustained)
 >>> Event 32
 Event : 32
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 4.0929
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 8.9806
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 29.7844
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 16.2709
  -- G4PEvent 32 stored in /Events/EventContainer/ (sustained)
 >>> Event 33
 Event : 33
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 5.3198
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 10.067
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 43.2617
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 17.3373
  -- G4PEvent 33 stored in /Events/EventContainer/ (sustained)
 >>> Event 34
 Event : 34
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 12.521
-mySD/OddCollection     Number of hits       19
-  Edep of the first Hit 41.506
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 128.462
+mySD/OddCollection     Number of hits       49
+  Edep of the first Hit 21.6578
  -- G4PEvent 34 stored in /Events/EventContainer/ (sustained)
 >>> Event 35
 Event : 35
-mySD/EvenCollection    Number of hits       33
-  Edep of the first Hit 15.274
-mySD/OddCollection     Number of hits       17
-  Edep of the first Hit 1.872
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 18.9519
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 14.4698
  -- G4PEvent 35 stored in /Events/EventContainer/ (sustained)
 >>> Event 36
 Event : 36
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 117.42
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 39.012
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 8.77704
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 52.7854
  -- G4PEvent 36 stored in /Events/EventContainer/ (sustained)
 >>> Event 37
 Event : 37
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 11.275
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 15.736
+mySD/EvenCollection    Number of hits       29
+  Edep of the first Hit 62.5802
+mySD/OddCollection     Number of hits       19
+  Edep of the first Hit 34.1562
  -- G4PEvent 37 stored in /Events/EventContainer/ (sustained)
 >>> Event 38
 Event : 38
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 4.6425
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 3.874
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 28.1323
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 30.3472
  -- G4PEvent 38 stored in /Events/EventContainer/ (sustained)
 >>> Event 39
 Event : 39
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 24.682
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 5.5627
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 8.2046
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 112.965
  -- G4PEvent 39 stored in /Events/EventContainer/ (sustained)
 >>> Event 40
 Event : 40
-mySD/EvenCollection    Number of hits       26
-  Edep of the first Hit 4.9304
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 3.6689
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 53.3963
+mySD/OddCollection     Number of hits       22
+  Edep of the first Hit 0.520498
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 40 stored in /Events/EventContainer/ (sustained)
 >>> Event 41
 Event : 41
-mySD/EvenCollection    Number of hits       19
-  Edep of the first Hit 26.355
-mySD/OddCollection     Number of hits       22
-  Edep of the first Hit 11.793
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 56.9513
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 5.62534
  -- G4PEvent 41 stored in /Events/EventContainer/ (sustained)
 >>> Event 42
 Event : 42
-mySD/EvenCollection    Number of hits       24
-  Edep of the first Hit 0.26423
-mySD/OddCollection     Number of hits       31
-  Edep of the first Hit 18.678
+mySD/EvenCollection    Number of hits       12
+  Edep of the first Hit 7.69654
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 31.1215
  -- G4PEvent 42 stored in /Events/EventContainer/ (sustained)
 >>> Event 43
 Event : 43
 mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 64.542
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 12.654
+  Edep of the first Hit 24.6901
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 47.9073
  -- G4PEvent 43 stored in /Events/EventContainer/ (sustained)
 >>> Event 44
 Event : 44
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 0.29066
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 36.856
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 90.0128
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 7.85146
  -- G4PEvent 44 stored in /Events/EventContainer/ (sustained)
 >>> Event 45
 Event : 45
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 17.313
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 129.88
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 72.4869
+mySD/OddCollection     Number of hits       15
+  Edep of the first Hit 17.1856
  -- G4PEvent 45 stored in /Events/EventContainer/ (sustained)
 >>> Event 46
 Event : 46
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 8.5612
-mySD/OddCollection     Number of hits       30
-  Edep of the first Hit 113.93
+mySD/EvenCollection    Number of hits       17
+  Edep of the first Hit 2.63679
+mySD/OddCollection     Number of hits       32
+  Edep of the first Hit 7.76861
  -- G4PEvent 46 stored in /Events/EventContainer/ (sustained)
 >>> Event 47
 Event : 47
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 58.835
-mySD/OddCollection     Number of hits       47
-  Edep of the first Hit 30.319
+mySD/EvenCollection    Number of hits       15
+  Edep of the first Hit 0.677309
+mySD/OddCollection     Number of hits       24
+  Edep of the first Hit 14.3137
  -- G4PEvent 47 stored in /Events/EventContainer/ (sustained)
 >>> Event 48
 Event : 48
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 28.194
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 43.718
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 19.7269
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 2.05634
  -- G4PEvent 48 stored in /Events/EventContainer/ (sustained)
 >>> Event 49
 Event : 49
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 11.664
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 22.5794
 mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 67.442
+  Edep of the first Hit 58.4931
  -- G4PEvent 49 stored in /Events/EventContainer/ (sustained)
 >>> Event 50
 Event : 50
-mySD/EvenCollection    Number of hits       15
-  Edep of the first Hit 5.1898
-mySD/OddCollection     Number of hits       48
-  Edep of the first Hit 3.887
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 104.528
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 85.0795
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 50 stored in /Events/EventContainer/ (sustained)
 >>> Event 51
 Event : 51
-mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 57.018
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 40.94
+mySD/EvenCollection    Number of hits       15
+  Edep of the first Hit 20.1566
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 32.7288
  -- G4PEvent 51 stored in /Events/EventContainer/ (sustained)
 >>> Event 52
 Event : 52
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 2.0228
-mySD/OddCollection     Number of hits       31
-  Edep of the first Hit 18.913
+mySD/EvenCollection    Number of hits       4
+  Edep of the first Hit 8.73571
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 7.87425
  -- G4PEvent 52 stored in /Events/EventContainer/ (sustained)
 >>> Event 53
 Event : 53
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 0.41212
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 14.7
+mySD/EvenCollection    Number of hits       33
+  Edep of the first Hit 10.2809
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 67.4227
  -- G4PEvent 53 stored in /Events/EventContainer/ (sustained)
 >>> Event 54
 Event : 54
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 2.3345
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 18.687
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 45.236
+mySD/OddCollection     Number of hits       40
+  Edep of the first Hit 20.834
  -- G4PEvent 54 stored in /Events/EventContainer/ (sustained)
 >>> Event 55
 Event : 55
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 11.878
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 46.4083
 mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 31.531
+  Edep of the first Hit 23.7436
  -- G4PEvent 55 stored in /Events/EventContainer/ (sustained)
 >>> Event 56
 Event : 56
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 9.1227
-mySD/OddCollection     Number of hits       45
-  Edep of the first Hit 4.1692
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 2.14152
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 27.842
  -- G4PEvent 56 stored in /Events/EventContainer/ (sustained)
 >>> Event 57
 Event : 57
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 46.142
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 21.799
+mySD/EvenCollection    Number of hits       5
+  Edep of the first Hit 70.4385
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 4.52298
  -- G4PEvent 57 stored in /Events/EventContainer/ (sustained)
 >>> Event 58
 Event : 58
-mySD/EvenCollection    Number of hits       25
-  Edep of the first Hit 73.826
-mySD/OddCollection     Number of hits       20
-  Edep of the first Hit 61.423
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 41.055
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 54.3162
  -- G4PEvent 58 stored in /Events/EventContainer/ (sustained)
 >>> Event 59
 Event : 59
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 6.5228
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 45.921
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 39.9691
+mySD/OddCollection     Number of hits       27
+  Edep of the first Hit 27.0996
  -- G4PEvent 59 stored in /Events/EventContainer/ (sustained)
 >>> Event 60
 Event : 60
-mySD/EvenCollection    Number of hits       31
-  Edep of the first Hit 46.107
-mySD/OddCollection     Number of hits       21
-  Edep of the first Hit 38.81
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 14.0926
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 28.9825
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 60 stored in /Events/EventContainer/ (sustained)
 >>> Event 61
 Event : 61
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 63.965
-mySD/OddCollection     Number of hits       45
-  Edep of the first Hit 37.453
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 17.7827
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 9.79498
  -- G4PEvent 61 stored in /Events/EventContainer/ (sustained)
 >>> Event 62
 Event : 62
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 21.839
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 1.9311
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 37.9211
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 2.99622
  -- G4PEvent 62 stored in /Events/EventContainer/ (sustained)
 >>> Event 63
 Event : 63
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 18.338
-mySD/OddCollection     Number of hits       44
-  Edep of the first Hit 14.612
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 15.661
+mySD/OddCollection     Number of hits       18
+  Edep of the first Hit 11.8508
  -- G4PEvent 63 stored in /Events/EventContainer/ (sustained)
 >>> Event 64
 Event : 64
-mySD/EvenCollection    Number of hits       30
-  Edep of the first Hit 12.908
-mySD/OddCollection     Number of hits       13
-  Edep of the first Hit 15.228
+mySD/EvenCollection    Number of hits       28
+  Edep of the first Hit 52.2113
+mySD/OddCollection     Number of hits       12
+  Edep of the first Hit 8.51693
  -- G4PEvent 64 stored in /Events/EventContainer/ (sustained)
 >>> Event 65
 Event : 65
-mySD/EvenCollection    Number of hits       31
-  Edep of the first Hit 19.111
-mySD/OddCollection     Number of hits       23
-  Edep of the first Hit 2.722
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 68.6264
+mySD/OddCollection     Number of hits       51
+  Edep of the first Hit 13.9765
  -- G4PEvent 65 stored in /Events/EventContainer/ (sustained)
 >>> Event 66
 Event : 66
-mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 12.998
-mySD/OddCollection     Number of hits       34
-  Edep of the first Hit 20.792
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 75.2143
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 0.350296
  -- G4PEvent 66 stored in /Events/EventContainer/ (sustained)
 >>> Event 67
 Event : 67
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 6.0136
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 12.6045
 mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 64.005
+  Edep of the first Hit 106.09
  -- G4PEvent 67 stored in /Events/EventContainer/ (sustained)
 >>> Event 68
 Event : 68
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 10.996
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 5.5241
+mySD/EvenCollection    Number of hits       34
+  Edep of the first Hit 10.7006
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 5.95943
  -- G4PEvent 68 stored in /Events/EventContainer/ (sustained)
 >>> Event 69
 Event : 69
-mySD/EvenCollection    Number of hits       4
-  Edep of the first Hit 5.2663
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 66.258
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 19.4701
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 94.7252
  -- G4PEvent 69 stored in /Events/EventContainer/ (sustained)
 >>> Event 70
 Event : 70
-mySD/EvenCollection    Number of hits       13
-  Edep of the first Hit 45.079
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 9.66376
 mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 21.543
+  Edep of the first Hit 10.4491
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 70 stored in /Events/EventContainer/ (sustained)
 >>> Event 71
 Event : 71
-mySD/EvenCollection    Number of hits       33
-  Edep of the first Hit 3.2396
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 15.341
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 6.57662
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 4.00586
  -- G4PEvent 71 stored in /Events/EventContainer/ (sustained)
 >>> Event 72
 Event : 72
-mySD/EvenCollection    Number of hits       9
-  Edep of the first Hit 42.564
-mySD/OddCollection     Number of hits       45
-  Edep of the first Hit 3.5303
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 18.2989
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 17.4929
  -- G4PEvent 72 stored in /Events/EventContainer/ (sustained)
 >>> Event 73
 Event : 73
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 16.245
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 4.8676
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 9.80981
+mySD/OddCollection     Number of hits       39
+  Edep of the first Hit 43.2404
  -- G4PEvent 73 stored in /Events/EventContainer/ (sustained)
 >>> Event 74
 Event : 74
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 33.658
-mySD/OddCollection     Number of hits       35
-  Edep of the first Hit 125.43
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 29.7958
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 1.15918
  -- G4PEvent 74 stored in /Events/EventContainer/ (sustained)
 >>> Event 75
 Event : 75
-mySD/EvenCollection    Number of hits       24
-  Edep of the first Hit 11.25
-mySD/OddCollection     Number of hits       24
-  Edep of the first Hit 7.3928
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 2.63033
+mySD/OddCollection     Number of hits       45
+  Edep of the first Hit 18.7
  -- G4PEvent 75 stored in /Events/EventContainer/ (sustained)
 >>> Event 76
 Event : 76
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 5.0371
-mySD/OddCollection     Number of hits       42
-  Edep of the first Hit 1.2719
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 19.0416
+mySD/OddCollection     Number of hits       17
+  Edep of the first Hit 67.1248
  -- G4PEvent 76 stored in /Events/EventContainer/ (sustained)
 >>> Event 77
 Event : 77
-mySD/EvenCollection    Number of hits       20
-  Edep of the first Hit 8.1984
-mySD/OddCollection     Number of hits       12
-  Edep of the first Hit 26.406
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 48.1326
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 53.2688
  -- G4PEvent 77 stored in /Events/EventContainer/ (sustained)
 >>> Event 78
 Event : 78
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 21.99
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 48.568
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 8.98802
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 9.27606
  -- G4PEvent 78 stored in /Events/EventContainer/ (sustained)
 >>> Event 79
 Event : 79
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 81.662
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 82.0629
 mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 1.9005
+  Edep of the first Hit 26.4362
  -- G4PEvent 79 stored in /Events/EventContainer/ (sustained)
 >>> Event 80
 Event : 80
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 49.948
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 18.8341
 mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 28.802
+  Edep of the first Hit 37.8026
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 80 stored in /Events/EventContainer/ (sustained)
 >>> Event 81
 Event : 81
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 105.52
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 15.1
+mySD/EvenCollection    Number of hits       27
+  Edep of the first Hit 14.3923
+mySD/OddCollection     Number of hits       15
+  Edep of the first Hit 28.4391
  -- G4PEvent 81 stored in /Events/EventContainer/ (sustained)
 >>> Event 82
 Event : 82
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 46.57
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 73.187
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 0.794183
+mySD/OddCollection     Number of hits       44
+  Edep of the first Hit 19.7649
  -- G4PEvent 82 stored in /Events/EventContainer/ (sustained)
 >>> Event 83
 Event : 83
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 30.216
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 3.7834
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 34.5293
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 11.0381
  -- G4PEvent 83 stored in /Events/EventContainer/ (sustained)
 >>> Event 84
 Event : 84
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 69.815
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 41.518
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 21.777
+mySD/OddCollection     Number of hits       31
+  Edep of the first Hit 39.3528
  -- G4PEvent 84 stored in /Events/EventContainer/ (sustained)
 >>> Event 85
 Event : 85
-mySD/EvenCollection    Number of hits       33
-  Edep of the first Hit 23.846
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 69.098
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 27.0443
+mySD/OddCollection     Number of hits       41
+  Edep of the first Hit 35.3737
  -- G4PEvent 85 stored in /Events/EventContainer/ (sustained)
 >>> Event 86
 Event : 86
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 27.901
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 45.093
+mySD/EvenCollection    Number of hits       31
+  Edep of the first Hit 0.0305549
+mySD/OddCollection     Number of hits       20
+  Edep of the first Hit 24.6963
  -- G4PEvent 86 stored in /Events/EventContainer/ (sustained)
 >>> Event 87
 Event : 87
 mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 18.889
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 36.675
+  Edep of the first Hit 83.564
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 12.1307
  -- G4PEvent 87 stored in /Events/EventContainer/ (sustained)
 >>> Event 88
 Event : 88
 mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 17.299
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 14.991
+  Edep of the first Hit 40.0056
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 12.7231
  -- G4PEvent 88 stored in /Events/EventContainer/ (sustained)
 >>> Event 89
 Event : 89
-mySD/EvenCollection    Number of hits       10
-  Edep of the first Hit 48.015
-mySD/OddCollection     Number of hits       41
-  Edep of the first Hit 11.476
+mySD/EvenCollection    Number of hits       11
+  Edep of the first Hit 5.4018
+mySD/OddCollection     Number of hits       35
+  Edep of the first Hit 27.4816
  -- G4PEvent 89 stored in /Events/EventContainer/ (sustained)
 >>> Event 90
 Event : 90
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 16.099
-mySD/OddCollection     Number of hits       43
-  Edep of the first Hit 3.2642
+mySD/EvenCollection    Number of hits       6
+  Edep of the first Hit 62.386
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 1.56992
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Events/EventContainer/ with sustained mode.
  -- G4PEvent 90 stored in /Events/EventContainer/ (sustained)
 >>> Event 91
 Event : 91
-mySD/EvenCollection    Number of hits       8
-  Edep of the first Hit 3.689
-mySD/OddCollection     Number of hits       39
-  Edep of the first Hit 13.049
+mySD/EvenCollection    Number of hits       10
+  Edep of the first Hit 32.4751
+mySD/OddCollection     Number of hits       38
+  Edep of the first Hit 82.1078
  -- G4PEvent 91 stored in /Events/EventContainer/ (sustained)
 >>> Event 92
 Event : 92
-mySD/EvenCollection    Number of hits       12
-  Edep of the first Hit 3.0583
-mySD/OddCollection     Number of hits       32
-  Edep of the first Hit 58.855
+mySD/EvenCollection    Number of hits       24
+  Edep of the first Hit 13.8439
+mySD/OddCollection     Number of hits       28
+  Edep of the first Hit 10.2436
  -- G4PEvent 92 stored in /Events/EventContainer/ (sustained)
 >>> Event 93
 Event : 93
-mySD/EvenCollection    Number of hits       5
-  Edep of the first Hit 46.456
-mySD/OddCollection     Number of hits       33
-  Edep of the first Hit 50.997
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 29.5644
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 72.0211
  -- G4PEvent 93 stored in /Events/EventContainer/ (sustained)
 >>> Event 94
 Event : 94
-mySD/EvenCollection    Number of hits       6
-  Edep of the first Hit 40.024
-mySD/OddCollection     Number of hits       36
-  Edep of the first Hit 114.89
+mySD/EvenCollection    Number of hits       9
+  Edep of the first Hit 5.24109
+mySD/OddCollection     Number of hits       32
+  Edep of the first Hit 27.6502
  -- G4PEvent 94 stored in /Events/EventContainer/ (sustained)
 >>> Event 95
 Event : 95
 mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 12.246
-mySD/OddCollection     Number of hits       38
-  Edep of the first Hit 44.227
+  Edep of the first Hit 18.4752
+mySD/OddCollection     Number of hits       42
+  Edep of the first Hit 21.1629
  -- G4PEvent 95 stored in /Events/EventContainer/ (sustained)
 >>> Event 96
 Event : 96
-mySD/EvenCollection    Number of hits       26
-  Edep of the first Hit 63.321
-mySD/OddCollection     Number of hits       24
-  Edep of the first Hit 54.303
+mySD/EvenCollection    Number of hits       8
+  Edep of the first Hit 9.37571
+mySD/OddCollection     Number of hits       43
+  Edep of the first Hit 1.81649
  -- G4PEvent 96 stored in /Events/EventContainer/ (sustained)
 >>> Event 97
 Event : 97
-mySD/EvenCollection    Number of hits       28
-  Edep of the first Hit 13.714
-mySD/OddCollection     Number of hits       16
-  Edep of the first Hit 54.194
+mySD/EvenCollection    Number of hits       7
+  Edep of the first Hit 94.2912
+mySD/OddCollection     Number of hits       37
+  Edep of the first Hit 77.0715
  -- G4PEvent 97 stored in /Events/EventContainer/ (sustained)
 >>> Event 98
 Event : 98
-mySD/EvenCollection    Number of hits       7
-  Edep of the first Hit 43.008
-mySD/OddCollection     Number of hits       40
-  Edep of the first Hit 42.129
+mySD/EvenCollection    Number of hits       13
+  Edep of the first Hit 2.81038
+mySD/OddCollection     Number of hits       36
+  Edep of the first Hit 6.01062
  -- G4PEvent 98 stored in /Events/EventContainer/ (sustained)
 >>> Event 99
 Event : 99
-mySD/EvenCollection    Number of hits       11
-  Edep of the first Hit 19.068
-mySD/OddCollection     Number of hits       37
-  Edep of the first Hit 23.959
+mySD/EvenCollection    Number of hits       35
+  Edep of the first Hit 3.09663
+mySD/OddCollection     Number of hits       16
+  Edep of the first Hit 58.8186
  -- G4PEvent 99 stored in /Events/EventContainer/ (sustained)
 Transaction is committed on /Events/EventContainer/
 Transaction started for /Runs/RunContainer/ with non-sustained mode.
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
index 34233133f4..1f30606a0d 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02DetectorConstruction.hh,v 1.3 1999/11/29 18:15:28 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02DetectorConstruction.hh,v 1.3.8.1 2001/06/28 19:07:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02DetectorConstruction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
index 1a4ecfc972..f2819a8b7b 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02EventAction.hh,v 1.3 1999/11/29 18:23:31 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02EventAction.hh,v 1.3.8.1 2001/06/28 19:07:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
index 40dfe4937a..300a34720b 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02PhysicsList.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02PhysicsList.hh,v 1.3.8.1 2001/06/28 19:07:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02PhysicsList_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
index f4a25bc6f2..03ea3178a0 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02PrimaryGeneratorAction.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02PrimaryGeneratorAction.hh,v 1.3.8.1 2001/06/28 19:07:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02PrimaryGeneratorAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
index f1234e06fc..c2c328fca2 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02RunAction.hh,v 1.3 1999/11/29 18:23:32 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02RunAction.hh,v 1.3.8.1 2001/06/28 19:07:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02RunAction_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
index 03b15f78dd..3d2e7dadd2 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02StackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02StackingAction.hh,v 1.2 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02StackingAction.hh,v 1.2.8.1 2001/06/28 19:07:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02StackingAction_H
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
index 4665af6ce9..45a974d82e 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHit.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerHit.ddl,v 1.4 1999/11/29 19:27:52 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerHit.ddl,v 1.4.8.1 2001/06/28 19:07:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02TrackerHit_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
index 7f00be2fda..0b8364ace6 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerHitsCollection.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerHitsCollection.ddl,v 1.3 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerHitsCollection.ddl,v 1.3.8.1 2001/06/28 19:07:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02TrackerHitsCollection_h
diff --git a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
index 9b99eab6b2..9657a821ff 100644
--- a/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
+++ b/examples/extended/persistency/PersistentEx02/include/PersEx02TrackerSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerSD.hh,v 1.3 1999/11/29 18:23:33 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerSD.hh,v 1.3.8.1 2001/06/28 19:07:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef PersEx02TrackerSD_h
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
index 3ccf7839b8..0d25d23158 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02DetectorConstruction.cc,v 1.4 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02DetectorConstruction.cc,v 1.4.4.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02DetectorConstruction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
index 689d26a586..bff59518f6 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02EventAction.cc,v 1.4 1999/12/15 14:49:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02EventAction.cc,v 1.5.2.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02EventAction.hh"
@@ -68,7 +84,7 @@ void PersEx02EventAction::EndOfEventAction(const G4Event* evt)
   if( pTHC2->size() > 0 )
   {
     HepRef(PersEx02TrackerHit) aHit = pTHC2->element(0);
-    assert(aHit!=NULL);
+    assert(aHit!=0);
     G4cout << "  Edep of the first Hit " << aHit->GetEdep() << G4endl;
   }
 
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
index 695cd400b5..53e0a3ec54 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02PhysicsList.cc,v 1.4 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02PhysicsList.cc,v 1.4.4.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "globals.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
index 7579762241..4f0073648f 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02PrimaryGeneratorAction.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02PrimaryGeneratorAction.cc,v 1.3.8.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02PrimaryGeneratorAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
index 4bce3ffbf1..e8f40c4aee 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02RunAction.cc,v 1.3 1999/11/29 18:33:28 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02RunAction.cc,v 1.3.8.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02RunAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
index 869625ea7d..7621e40306 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02StackingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02StackingAction.cc,v 1.2 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02StackingAction.cc,v 1.2.8.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02StackingAction.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
index 8020677993..57244e9fea 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerHit.cc,v 1.3 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerHit.cc,v 1.3.8.1 2001/06/28 19:07:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02TrackerHit.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
index bcd72ae5ee..8e29515d15 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerHitsCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerHitsCollection.cc,v 1.3 1999/11/29 18:33:29 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerHitsCollection.cc,v 1.3.8.1 2001/06/28 19:07:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "PersEx02TrackerHitsCollection.hh"
diff --git a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
index 02fcd22f90..6ec7f4ad8d 100644
--- a/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
+++ b/examples/extended/persistency/PersistentEx02/src/PersEx02TrackerSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PersEx02TrackerSD.cc,v 1.4 1999/12/02 17:05:17 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PersEx02TrackerSD.cc,v 1.5.2.1 2001/06/28 19:07:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include <assert.h>
@@ -30,7 +46,7 @@ PersEx02TrackerSD::PersEx02TrackerSD(G4String name)
 
   f_hitMan = G4PersistentHitMan::GetPersistentHitMan();
   hitContainer = f_hitMan->GetContainer();
-  assert(hitContainer != NULL);
+  assert(hitContainer != 0);
 }
 
 PersEx02TrackerSD::~PersEx02TrackerSD(){;}
diff --git a/examples/novice/N01/exampleN01.cc b/examples/novice/N01/exampleN01.cc
index bac705c4e5..a5b6b02043 100644
--- a/examples/novice/N01/exampleN01.cc
+++ b/examples/novice/N01/exampleN01.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: exampleN01.cc,v 1.2 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: exampleN01.cc,v 1.2.4.2 2001/06/28 20:18:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - exampleN01 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/novice/N01/exampleN01.out b/examples/novice/N01/exampleN01.out
index b815cdfcb2..627d319465 100644
--- a/examples/novice/N01/exampleN01.out
+++ b/examples/novice/N01/exampleN01.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 Start Run processing.
@@ -193,5 +193,5 @@ Terminate current event processing.
 Run terminated.
 Run Summary
   Number of events processed : 3
-  User=0.06s Real=0.1s Sys=0s
+  User=0.04s Real=0.06s Sys=0s
 G4 kernel has come to Quit state.
diff --git a/examples/novice/N01/include/ExN01DetectorConstruction.hh b/examples/novice/N01/include/ExN01DetectorConstruction.hh
index bd20920b54..0e6597aae0 100644
--- a/examples/novice/N01/include/ExN01DetectorConstruction.hh
+++ b/examples/novice/N01/include/ExN01DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01DetectorConstruction.hh,v 1.2 1999/12/15 14:49:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN01DetectorConstruction_H
diff --git a/examples/novice/N01/include/ExN01PhysicsList.hh b/examples/novice/N01/include/ExN01PhysicsList.hh
index d7880301e2..06f1cf7e6d 100644
--- a/examples/novice/N01/include/ExN01PhysicsList.hh
+++ b/examples/novice/N01/include/ExN01PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01PhysicsList.hh,v 1.3 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01PhysicsList.hh,v 1.3.4.1 2001/06/28 19:07:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
index 55f82ea8dc..c27746c8b1 100644
--- a/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
+++ b/examples/novice/N01/include/ExN01PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN01PrimaryGeneratorAction_h
diff --git a/examples/novice/N01/src/ExN01DetectorConstruction.cc b/examples/novice/N01/src/ExN01DetectorConstruction.cc
index 4d03287e54..87adbd78c5 100644
--- a/examples/novice/N01/src/ExN01DetectorConstruction.cc
+++ b/examples/novice/N01/src/ExN01DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01DetectorConstruction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01DetectorConstruction.cc,v 1.2.4.1 2001/06/28 19:07:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN01DetectorConstruction.hh"
diff --git a/examples/novice/N01/src/ExN01PhysicsList.cc b/examples/novice/N01/src/ExN01PhysicsList.cc
index faf11fadf0..39c2fe8a56 100644
--- a/examples/novice/N01/src/ExN01PhysicsList.cc
+++ b/examples/novice/N01/src/ExN01PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01PhysicsList.cc,v 1.3 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01PhysicsList.cc,v 1.3.4.1 2001/06/28 19:07:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
index fa1f51de7e..6815f5da6c 100644
--- a/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
+++ b/examples/novice/N01/src/ExN01PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN01PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:19 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN01PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN01PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N02/exampleN02.cc b/examples/novice/N02/exampleN02.cc
index c450cb6c44..494e84306d 100644
--- a/examples/novice/N02/exampleN02.cc
+++ b/examples/novice/N02/exampleN02.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: exampleN02.cc,v 1.4 2000/12/04 16:24:03 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: exampleN02.cc,v 1.4.4.1 2001/06/28 19:07:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/exampleN02.large_N.out b/examples/novice/N02/exampleN02.large_N.out
index 0f0634f735..64f0c6466b 100644
--- a/examples/novice/N02/exampleN02.large_N.out
+++ b/examples/novice/N02/exampleN02.large_N.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
+ Geant4 version $Name: geant4-03-00-ref-03 $
                                 (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
diff --git a/examples/novice/N02/exampleN02.out b/examples/novice/N02/exampleN02.out
index d25b900c89..43f9be4103 100644
--- a/examples/novice/N02/exampleN02.out
+++ b/examples/novice/N02/exampleN02.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -48,61 +48,43 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air         6.2457
-                  Al         572.17
-                  Pb         1332.1
-            XenonGas         9.4278
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
         PhysicsTables from 10 keV to 10 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air         6.2457
-                  Al         572.17
-                  Pb         1332.1
-            XenonGas         9.4278
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  1 cm            1 cm 
@@ -120,739 +102,993 @@ Cut in energy
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
     0      0 fm      0 fm  -2.91 m     200 MeV     0 eV      0 fm      0 fm    WorldPV    initStep
-    1  -32.2 mum -1.27 mum -2.86 m     200 MeV  7.66 keV  4.79 cm   4.79 cm    WorldPV       eIoni
-    2   -185 mum   115 mum -2.45 m     200 MeV  94.2 keV  41.2 cm     46 cm    WorldPV  Transportation
-    3   -182 mum   100 mum -2.45 m     147 MeV  3.66 MeV   682 mum  46.1 cm   TargetPV       eBrem
-    4   -180 mum    99 mum -2.45 m     143 MeV   418 keV   204 mum  46.1 cm   TargetPV       eBrem
-    5   -178 mum   101 mum -2.45 m     143 MeV   116 keV    95 mum  46.1 cm   TargetPV       eBrem
-    6   -168 mum   119 mum -2.45 m    78.4 MeV   877 keV   570 mum  46.2 cm   TargetPV       eBrem
-    7  -67.8 mum   165 mum -2.45 m    76.1 MeV  1.33 MeV  1.06 mm   46.3 cm   TargetPV       eBrem
-    8  -92.5 mum   137 mum -2.45 m    75.1 MeV   225 keV   225 mum  46.3 cm   TargetPV       eBrem
-    9   -121 mum    68 mum -2.45 m      74 MeV   847 keV   698 mum  46.4 cm   TargetPV       eBrem
-   10   -547 mum  -369 mum -2.44 m      66 MeV  4.28 MeV  3.46 mm   46.7 cm   TargetPV       eBrem
-   11   -829 mum -1.83 mm  -2.44 m    60.8 MeV  4.87 MeV  3.08 mm     47 cm   TargetPV       eBrem
-   12   -807 mum -1.99 mm  -2.44 m    35.9 MeV   555 keV   409 mum    47 cm   TargetPV       eBrem
-   13   -884 mum -3.14 mm  -2.44 m    20.9 MeV  3.08 MeV   2.3 mm   47.3 cm   TargetPV       eBrem
-   14   -707 mum -3.53 mm  -2.44 m    18.1 MeV  1.62 MeV  1.09 mm   47.4 cm   TargetPV       eBrem
-   15   -943 mum -3.64 mm  -2.44 m      13 MeV   646 keV   660 mum  47.5 cm   TargetPV       eBrem
-   16   -944 mum -3.64 mm  -2.44 m    10.3 MeV   617 eV   3.71 mum  47.5 cm   TargetPV       eBrem
-   17  -1.41 mm  -4.95 mm  -2.44 m    7.97 MeV  2.31 MeV   1.9 mm   47.6 cm   TargetPV       eIoni
-   18  -1.65 mm  -5.73 mm  -2.44 m    3.43 MeV   949 keV   914 mum  47.7 cm   TargetPV       eBrem
-   19  -1.66 mm  -6.36 mm  -2.44 m    2.31 MeV  1.13 MeV   864 mum  47.8 cm   TargetPV       eIoni
-   20  -1.62 mm  -6.64 mm  -2.43 m    1.08 MeV  1.23 MeV   673 mum  47.9 cm   TargetPV       eIoni
-   21  -1.49 mm  -6.56 mm  -2.43 m     488 keV   591 keV   440 mum  47.9 cm   TargetPV       eIoni
-   22  -1.45 mm   -6.6 mm  -2.43 m     155 keV   333 keV   269 mum    48 cm   TargetPV       eIoni
-   23  -1.44 mm   -6.6 mm  -2.43 m       0 eV    155 keV  51.9 mum    48 cm   TargetPV       eIoni
-   24  -1.44 mm   -6.6 mm  -2.43 m       0 eV      0 eV      0 fm     48 cm   TargetPV     annihil
+    1  -32.2 mum -1.27 mum -2.86 m     200 MeV  7.67 keV  4.79 cm   4.79 cm    WorldPV       eIoni
+    2   -185 mum   115 mum -2.45 m     200 MeV  94.7 keV  41.2 cm     46 cm    WorldPV  Transportation
+    3   -173 mum   108 mum -2.45 m     191 MeV  5.63 MeV   682 mum  46.1 cm   TargetPV       eBrem
+    4   -178 mum   107 mum -2.45 m     190 MeV   539 keV   277 mum  46.1 cm   TargetPV       eBrem
+    5   -204 mum   116 mum -2.45 m     180 MeV   557 keV   363 mum  46.1 cm   TargetPV       eBrem
+    6   -238 mum   116 mum -2.45 m     170 MeV   558 keV   379 mum  46.2 cm   TargetPV       eBrem
+    7   -245 mum   115 mum -2.45 m     162 MeV  81.5 keV  72.9 mum  46.2 cm   TargetPV       eBrem
+    8   -356 mum  35.1 mum -2.45 m     156 MeV  2.86 MeV  2.02 mm   46.4 cm   TargetPV       eBrem
+    9   -389 mum  17.6 mum -2.45 m     155 MeV   378 keV   346 mum  46.4 cm   TargetPV       eBrem
+   10   -461 mum -38.2 mum -2.45 m     153 MeV  1.18 MeV   796 mum  46.5 cm   TargetPV       eBrem
+   11   -481 mum -47.1 mum -2.44 m    72.6 MeV   338 keV   261 mum  46.5 cm   TargetPV       eBrem
+   12   -681 mum   409 nm  -2.44 m    66.9 MeV  3.74 MeV  1.34 mm   46.7 cm   TargetPV       eBrem
+   13   -944 mum  -136 mum -2.44 m    64.7 MeV  1.21 MeV  1.06 mm   46.8 cm   TargetPV       eBrem
+   14   -1.3 mm   -269 mum -2.44 m    39.5 MeV   1.6 MeV  1.26 mm   46.9 cm   TargetPV       eBrem
+   15  -1.63 mm   -225 mum -2.44 m    30.4 MeV  1.86 MeV  1.24 mm     47 cm   TargetPV       eBrem
+   16  -1.76 mm   -261 mum -2.44 m      27 MeV   327 keV   268 mum    47 cm   TargetPV       eBrem
+   17  -1.95 mm   -507 mum -2.44 m    25.1 MeV   717 keV   661 mum  47.1 cm   TargetPV       eBrem
+   18  -2.96 mm  -2.38 mm  -2.44 m    20.4 MeV  4.21 MeV  3.63 mm   47.5 cm   TargetPV       eBrem
+   19  -3.06 mm  -2.46 mm  -2.44 m    15.7 MeV   386 keV   198 mum  47.5 cm   TargetPV       eBrem
+   20  -3.98 mm  -3.37 mm  -2.44 m    11.9 MeV  1.65 MeV  1.49 mm   47.6 cm   TargetPV       eBrem
+   21  -4.09 mm  -3.43 mm  -2.44 m    10.8 MeV   357 keV   307 mum  47.7 cm   TargetPV       eBrem
+   22  -4.09 mm  -3.43 mm  -2.44 m    10.3 MeV  1.18 keV  3.07 mum  47.7 cm   TargetPV       eBrem
+   23  -4.38 mm  -3.33 mm  -2.44 m    4.88 MeV   685 keV   388 mum  47.7 cm   TargetPV       eBrem
+   24  -5.11 mm  -3.02 mm  -2.43 m     2.5 MeV  2.38 MeV  1.09 mm   47.8 cm   TargetPV       eIoni
+   25  -5.23 mm  -3.28 mm  -2.43 m    1.85 MeV   654 keV   707 mum  47.9 cm   TargetPV       eIoni
+   26  -5.46 mm  -3.23 mm  -2.43 m    1.33 MeV   513 keV   591 mum  47.9 cm   TargetPV       eIoni
+   27  -5.31 mm  -3.06 mm  -2.43 m     932 keV   402 keV   493 mum    48 cm   TargetPV       eIoni
+   28  -5.41 mm  -3.18 mm  -2.43 m     552 keV   380 keV   407 mum    48 cm   TargetPV       eIoni
+   29  -5.41 mm   -3.2 mm  -2.43 m       0 eV    552 keV   296 mum  48.1 cm   TargetPV       eIoni
+   30  -5.41 mm   -3.2 mm  -2.43 m       0 eV      0 eV      0 fm   48.1 cm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.41 mm   -3.2 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.68 mm   2.18 cm  -2.44 m       0 eV    511 keV  2.54 cm   2.54 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -5.41 mm   -3.2 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.33 mm  -1.16 cm  -2.43 m       0 eV    511 keV   8.5 mm    8.5 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.38 mm  -3.33 mm  -2.44 m    4.74 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.03 cm   3.34 mm  -2.42 m     660 keV  4.08 MeV  1.81 cm   1.81 cm   TargetPV       compt
+    2  -9.94 mm   4.81 mm  -2.42 m       0 eV    660 keV  1.52 mm   1.97 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 22,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.09 mm  -3.43 mm  -2.44 m     501 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.59 mm  -2.36 mm  -2.43 m     479 keV  21.3 keV  3.67 mm   3.67 mm   TargetPV       compt
+    2  -9.82 mm  -2.37 mm  -2.43 m     387 keV  91.8 keV  4.72 mm    8.4 mm   TargetPV       compt
+    3  -1.43 cm   4.64 mm  -2.42 m       0 eV    387 keV  1.08 cm   1.92 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 21,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -4.09 mm  -3.43 mm  -2.44 m     736 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.41 mm  -3.17 mm  -2.44 m     255 keV   481 keV   557 mum   557 mum  TargetPV       compt
+    2  -4.71 mm  -3.44 mm  -2.44 m       0 eV    255 keV   506 mum  1.06 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 20,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.98 mm  -3.37 mm  -2.44 m    2.19 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.99 mm  -3.62 mm  -2.43 m     1.3 MeV   890 keV  1.94 mm   1.94 mm   TargetPV       compt
+    2  -1.08 cm  -6.01 mm  -2.43 m     978 keV   317 keV  6.91 mm   8.85 mm   TargetPV       compt
+    3  -1.45 cm   -9.5 mm  -2.42 m     606 keV   371 keV  7.98 mm   1.68 cm   TargetPV       compt
+    4  -2.03 cm  -1.01 cm  -2.42 m       0 eV    606 keV  5.95 mm   2.28 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 19,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -1.44 mm   -6.6 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.13 mm  -2.45 cm  -2.44 m       0 eV    511 keV  1.88 cm   1.88 cm   TargetPV        phot
+    0  -3.06 mm  -2.46 mm  -2.44 m    4.26 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.22 cm  -9.66 mm  -2.42 m       0 eV   3.24 MeV  1.72 cm   1.72 cm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 26,   Parent ID = 19
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.22 cm  -9.66 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.22 cm  -9.66 mm  -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 26
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.22 cm  -9.66 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.24 cm  -9.68 mm  -2.42 m       0 eV    511 keV   374 mum   374 mum  TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 26
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.22 cm  -9.66 mm  -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.12 cm  -9.55 mm  -2.42 m       0 eV    511 keV  1.63 mm   1.63 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 18,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -1.44 mm   -6.6 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -5.16 mm   1.93 cm  -2.43 m       0 eV    511 keV  2.72 cm   2.72 cm   TargetPV        phot
+    0  -2.96 mm  -2.38 mm  -2.44 m     515 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.73 mm  -5.81 mm  -2.43 m     478 keV  36.9 keV  6.89 mm   6.89 mm   TargetPV       compt
+    2  -6.77 mm  -5.86 mm  -2.43 m       0 eV    478 keV  74.9 mum  6.96 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 17,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -1.65 mm  -5.73 mm  -2.44 m    3.59 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -1.47 mm  -7.07 mm  -2.44 m     324 keV  3.26 MeV  1.56 mm   1.56 mm   TargetPV       compt
-    2    107 mum -6.81 mm  -2.43 m       0 eV    324 keV  2.89 mm   4.45 mm   TargetPV        phot
+    0  -1.95 mm   -507 mum -2.44 m    1.14 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.37 mm  -1.32 mm  -2.44 m     665 keV   472 keV  3.37 mm   3.37 mm   TargetPV       compt
+    2   -373 mum  -8.4 mm  -2.43 m     533 keV   133 keV  1.13 cm   1.47 cm   TargetPV       compt
+    3   3.69 mm  -9.92 mm  -2.42 m       0 eV    533 keV  5.35 mm      2 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 16,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -944 mum -3.64 mm  -2.44 m    2.68 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -3.99 mm  -8.53 mm  -2.42 m    2.46 MeV   218 keV  1.72 cm   1.72 cm   TargetPV       compt
-    2  -6.35 mm  -1.87 cm   -2.4 m    2.46 MeV     0 eV   2.28 cm      4 cm   TargetPV  Transportation
-    3    -56 cm   -2.4 m    2.37 m    2.46 MeV     0 eV   5.36 m     5.4 m     Tracker  Transportation
-    4  -62.3 cm  -2.67 m    2.91 m    2.46 MeV     0 eV   60.5 cm   6.01 m  OutOfWorld  Transportation
+    0  -1.76 mm   -261 mum -2.44 m    3.09 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.54 mm  -3.77 mm  -2.43 m       0 eV   2.07 MeV  1.17 cm   1.17 cm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 29,   Parent ID = 16
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.54 mm  -3.77 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -6.54 mm  -3.77 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 31,   Parent ID = 29
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.54 mm  -3.77 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -7.89 mm  -6.32 mm  -2.43 m       0 eV    511 keV  3.58 mm   3.58 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 29
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -6.54 mm  -3.77 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.54 mm   -1.9 mm  -2.43 m       0 eV    511 keV  2.64 mm   2.64 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 15,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -943 mum -3.64 mm  -2.44 m    4.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -1.49 mm  -4.38 mm  -2.43 m    1.17 MeV  3.37 MeV  2.95 mm   2.95 mm   TargetPV       compt
-    2  -1.61 mm  -3.86 mm  -2.43 m     858 keV   313 keV   952 mum   3.9 mm   TargetPV       compt
-    3  -4.06 mm   8.46 mm  -2.43 m     438 keV   419 keV  1.37 cm   1.76 cm   TargetPV       compt
-    4  -5.55 mm   8.78 mm  -2.43 m     248 keV   190 keV  1.55 mm   1.91 cm   TargetPV       compt
-    5  -7.95 mm   6.01 mm  -2.43 m     158 keV  89.9 keV  6.53 mm   2.57 cm   TargetPV       compt
-    6   -8.2 mm   5.49 mm  -2.43 m       0 eV    158 keV   798 mum  2.65 cm   TargetPV        phot
+    0  -1.63 mm   -225 mum -2.44 m    7.31 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.18 cm  -5.48 mm   -2.4 m    7.31 MeV     0 eV   4.52 cm   4.52 cm   TargetPV  Transportation
+    2   -2.4 m   -62.5 cm   2.33 m    7.31 MeV     0 eV   5.33 m    5.38 m     Tracker  Transportation
+    3  -2.69 m   -70.1 cm   2.91 m    7.31 MeV     0 eV     65 cm   6.03 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 14,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -707 mum -3.53 mm  -2.44 m    1.18 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -817 mum -3.52 mm  -2.44 m     996 keV   183 keV   312 mum   312 mum  TargetPV       compt
-    2  -3.54 mm   -507 mum -2.43 m     805 keV   191 keV  7.29 mm    7.6 mm   TargetPV       compt
-    3  -4.26 mm    381 mum -2.43 m       0 eV    805 keV  1.29 mm   8.89 mm   TargetPV        phot
+    0   -1.3 mm   -269 mum -2.44 m    23.6 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.37 cm  -3.28 mm   -2.4 m       0 eV      0 eV   3.86 cm   3.86 cm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 33,   Parent ID = 14
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm  -3.28 mm   -2.4 m    8.94 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.37 cm  -3.28 mm   -2.4 m     8.1 MeV   536 keV   458 mum   458 mum  TargetPV       eBrem
+    2  -1.44 cm   -2.4 mm   -2.4 m    4.81 MeV  1.73 MeV  1.58 mm   2.04 mm   TargetPV       eBrem
+    3   -1.5 cm  -2.99 mm   -2.4 m    3.37 MeV  1.44 MeV  1.08 mm   3.12 mm   TargetPV       eIoni
+    4  -1.51 cm  -3.01 mm   -2.4 m    2.29 MeV  1.08 MeV   853 mum  3.97 mm   TargetPV       eIoni
+    5  -1.53 cm  -3.03 mm   -2.4 m    1.45 MeV   301 keV   232 mum  4.21 mm   TargetPV       eBrem
+    6  -1.51 cm   -3.1 mm   -2.4 m     839 keV   614 keV   517 mum  4.72 mm   TargetPV       eIoni
+    7  -1.51 cm  -3.04 mm   -2.4 m     245 keV   594 keV   384 mum  5.11 mm   TargetPV       eIoni
+    8  -1.51 cm  -3.04 mm   -2.4 m       0 eV    245 keV   107 mum  5.21 mm   TargetPV       eIoni
+    9  -1.51 cm  -3.04 mm   -2.4 m       0 eV      0 eV      0 fm   5.21 mm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.51 cm  -3.04 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.5 cm   3.03 mm  -2.41 m     511 keV     0 eV   1.29 cm   1.29 cm   TargetPV  Transportation
+    2  -89.7 cm   53.7 cm  -2.91 m     511 keV     0 eV   1.14 m    1.15 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 37,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.51 cm  -3.04 mm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1     -1 cm  -6.16 mm   -2.4 m     511 keV     0 eV   6.65 mm   6.65 mm   TargetPV  Transportation
+    2    2.4 m   -1.48 m   -1.01 m     511 keV     0 eV   3.15 m    3.16 m     Tracker  Transportation
+    3   2.91 m    -1.8 m     -72 cm    511 keV     0 eV   66.6 cm   3.82 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 36,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.53 cm  -3.03 mm   -2.4 m     534 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.41 cm   -357 mum -2.41 m       0 eV    534 keV  7.46 mm   7.46 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.44 cm   -2.4 mm   -2.4 m    1.57 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.5 cm  -5.94 mm  -2.41 m    1.57 MeV     0 eV   1.13 cm   1.13 cm   TargetPV  Transportation
+    2  -2.91 m   -96.9 cm   -2.9 m    1.57 MeV     0 eV   3.08 m    3.09 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 33
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm  -3.28 mm   -2.4 m     299 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.57 cm  -2.59 mm   -2.4 m       0 eV    299 keV  4.44 mm   4.44 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 32,   Parent ID = 14
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.37 cm  -3.28 mm   -2.4 m    13.6 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.38 cm  -3.33 mm   -2.4 m    12.3 MeV   645 keV   303 mum   303 mum  TargetPV       eBrem
+    2  -1.33 cm  -3.57 mm   -2.4 m     8.4 MeV  3.93 MeV  2.14 mm   2.44 mm   TargetPV       eIoni
+    3  -1.32 cm  -2.74 mm   -2.4 m    6.43 MeV  1.97 MeV  1.59 mm   4.03 mm   TargetPV       eIoni
+    4   -1.3 cm  -2.42 mm   -2.4 m    5.62 MeV   388 keV   413 mum  4.44 mm   TargetPV       eBrem
+    5  -1.24 cm  -1.87 mm   -2.4 m    3.73 MeV  1.16 MeV   922 mum  5.36 mm   TargetPV       eBrem
+    6  -1.22 cm  -1.66 mm   -2.4 m    3.07 MeV   351 keV   384 mum  5.75 mm   TargetPV       eBrem
+    7  -1.23 cm  -1.78 mm   -2.4 m    1.98 MeV   664 keV   582 mum  6.33 mm   TargetPV       eBrem
+    8  -1.22 cm  -1.74 mm   -2.4 m    1.14 MeV   846 keV   607 mum  6.93 mm   TargetPV       eIoni
+    9   -1.2 cm  -1.72 mm   -2.4 m     744 keV   393 keV   449 mum  7.38 mm   TargetPV       eIoni
+   10   -1.2 cm  -1.75 mm   -2.4 m     254 keV   490 keV   357 mum  7.74 mm   TargetPV       eIoni
+   11   -1.2 cm  -1.75 mm   -2.4 m       0 eV    254 keV   117 mum  7.86 mm   TargetPV       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 43,   Parent ID = 32
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.23 cm  -1.78 mm   -2.4 m     419 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.23 cm   -2.5 mm   -2.4 m     419 keV     0 eV   2.04 mm   2.04 mm   TargetPV  Transportation
+    2  -2.88 cm  -60.3 cm    -80 cm    419 keV     0 eV   1.71 m    1.71 m     Tracker  Transportation
+    3  -3.07 cm  -67.2 cm  -61.5 cm    419 keV     0 eV   19.7 cm   1.91 m     Chamber  Transportation
+    4   -3.7 cm  -90.3 cm      0 fm    419 keV     0 eV   65.7 cm   2.57 m     Tracker  Transportation
+    5  -3.91 cm  -97.8 cm     20 cm    419 keV     0 eV   21.4 cm   2.78 m     Chamber  Transportation
+    6  -4.53 cm   -1.2 m      80 cm    419 keV     0 eV   64.1 cm   3.42 m     Tracker  Transportation
+    7  -4.73 cm  -1.28 m       1 m     419 keV     0 eV   21.4 cm   3.63 m     Chamber  Transportation
+    8  -5.35 cm   -1.5 m     1.6 m     419 keV     0 eV   64.1 cm   4.27 m     Tracker  Transportation
+    9  -5.55 cm  -1.58 m     1.8 m     419 keV     0 eV   21.4 cm   4.49 m     Chamber  Transportation
+   10  -6.17 cm   -1.8 m     2.4 m     419 keV     0 eV   64.1 cm   5.13 m     Tracker  Transportation
+   11   -6.7 cm  -1.99 m    2.91 m     419 keV     0 eV   54.5 cm   5.67 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 32
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.22 cm  -1.66 mm   -2.4 m     313 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.16 cm  -2.53 mm   -2.4 m       0 eV    313 keV  1.35 mm   1.35 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 41,   Parent ID = 32
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.24 cm  -1.87 mm   -2.4 m     733 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.59 mm  -1.17 mm   -2.4 m     554 keV   178 keV  6.92 mm   6.92 mm   TargetPV       compt
+    2  -3.87 mm   -924 mum  -2.4 m       0 eV    554 keV   2.4 mm   9.33 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 40,   Parent ID = 32
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.3 cm  -2.42 mm   -2.4 m     423 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.23 cm   3.36 mm   -2.4 m       0 eV    423 keV  5.82 mm   5.82 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 32
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.38 cm  -3.33 mm   -2.4 m     626 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.41 cm  -3.29 mm   -2.4 m       0 eV    626 keV  1.08 mm   1.08 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 13,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -884 mum -3.14 mm  -2.44 m    11.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -900 mum -3.28 mm  -2.44 m     730 keV  11.1 MeV   323 mum   323 mum  TargetPV       compt
-    2  -1.13 cm  -1.39 cm  -2.44 m     632 keV  98.1 keV  1.48 cm   1.51 cm   TargetPV       compt
-    3  -1.85 cm  -1.69 cm  -2.44 m       0 eV    632 keV  8.07 mm   2.32 cm   TargetPV        phot
+    0   -944 mum  -136 mum -2.44 m    1.01 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.2 cm  -2.24 mm  -2.41 m       0 eV   1.01 MeV  3.19 cm   3.19 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 12,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -807 mum -1.99 mm  -2.44 m    24.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -469 mum -2.98 mm  -2.44 m    10.6 MeV     0 eV   2.48 mm   2.48 mm   TargetPV       compt
-    2   1.67 mm  -6.27 mm  -2.43 m    7.75 MeV     0 eV   6.64 mm   9.12 mm   TargetPV       compt
-    3   1.51 cm  -2.07 cm  -2.41 m       0 eV    620 keV  2.78 cm    3.7 cm   TargetPV        conv
+    0   -681 mum   409 nm  -2.44 m    1.93 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.16 mm  -1.95 mm  -2.43 m       0 eV    911 keV  1.87 cm   1.87 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 22,   Parent ID = 12
+* G4Track Information:   Particle = e+,   Track ID = 44,   Parent ID = 12
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.51 cm  -2.07 cm  -2.41 m    6.11 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.61 cm  -2.09 cm  -2.41 m    4.45 MeV  1.66 MeV  1.28 mm   1.28 mm   TargetPV       eIoni
-    2   1.54 cm  -2.11 cm  -2.41 m    2.88 MeV  1.57 MeV  1.03 mm   2.31 mm   TargetPV       eIoni
-    3   1.52 cm  -2.13 cm  -2.41 m    1.99 MeV   889 keV   771 mum  3.08 mm   TargetPV       eIoni
-    4   1.49 cm  -2.15 cm  -2.41 m    1.41 MeV   580 keV   617 mum   3.7 mm   TargetPV       eIoni
-    5   1.49 cm  -2.16 cm  -2.41 m     295 keV  95.2 keV  79.3 mum  3.78 mm   TargetPV       eBrem
-    6   1.49 cm  -2.16 cm  -2.41 m       0 eV    295 keV   142 mum  3.92 mm   TargetPV       eIoni
-    7   1.49 cm  -2.16 cm  -2.41 m       0 eV      0 eV      0 fm   3.92 mm   TargetPV     annihil
+    0  -5.16 mm  -1.95 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.16 mm  -1.95 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 25,   Parent ID = 22
+* G4Track Information:   Particle = gamma,   Track ID = 46,   Parent ID = 44
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.49 cm  -2.16 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.52 cm  -2.17 cm  -2.41 m     239 keV   272 keV   331 mum   331 mum  TargetPV       compt
-    2   1.54 cm  -2.06 cm  -2.41 m     126 keV   113 keV   1.1 mm   1.43 mm   TargetPV       compt
-    3   1.54 cm  -2.06 cm  -2.41 m       0 eV    126 keV  43.8 mum  1.48 mm   TargetPV        phot
+    0  -5.16 mm  -1.95 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.4 cm   3.45 mm  -2.43 m     354 keV   157 keV   1.3 cm    1.3 cm   TargetPV       compt
+    2  -1.72 cm   -480 mum -2.44 m       0 eV    354 keV  8.84 mm   2.18 cm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 24,   Parent ID = 22
+* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 44
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.49 cm  -2.16 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   7.01 mm  -1.88 cm  -2.42 m     249 keV   262 keV  8.76 mm   8.76 mm   TargetPV       compt
-    2   6.79 mm  -1.93 cm  -2.42 m       0 eV    249 keV   592 mum  9.35 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 23,   Parent ID = 22
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.49 cm  -2.16 cm  -2.41 m    1.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.41 cm   -2.5 cm  -2.41 m    1.02 MeV     0 eV   3.76 mm   3.76 mm   TargetPV  Transportation
-    2    -31 cm   -1.4 m   -2.91 m    1.02 MeV     0 eV   1.49 m     1.5 m  OutOfWorld  Transportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 21,   Parent ID = 12
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.67 mm  -6.27 mm  -2.43 m    2.84 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.34 mm  -6.25 mm  -2.43 m    1.81 MeV  1.03 MeV   753 mum   753 mum  TargetPV       eIoni
-    2   1.22 mm  -6.47 mm  -2.43 m     1.3 MeV   513 keV   577 mum  1.33 mm   TargetPV       eIoni
-    3   1.07 mm  -6.54 mm  -2.43 m     666 keV   632 keV   481 mum  1.81 mm   TargetPV       eIoni
-    4   1.04 mm  -6.51 mm  -2.43 m       0 eV    666 keV   334 mum  2.15 mm   TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 20,   Parent ID = 12
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -469 mum -2.98 mm  -2.44 m    13.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    402 mum  -3.4 mm  -2.44 m      11 MeV  2.28 MeV  1.99 mm   1.99 mm   TargetPV       eBrem
-    2    966 mum  -2.6 mm  -2.44 m    6.81 MeV  1.51 MeV  1.37 mm   3.36 mm   TargetPV       eBrem
-    3    963 mum  -2.6 mm  -2.44 m    5.63 MeV  15.1 keV  18.4 mum  3.38 mm   TargetPV       eBrem
-    4   1.41 mm  -2.79 mm  -2.43 m    4.15 MeV  1.48 MeV  1.18 mm   4.56 mm   TargetPV       eIoni
-    5    997 mum -2.85 mm  -2.43 m     3.1 MeV   431 keV   514 mum  5.08 mm   TargetPV       eBrem
-    6    579 mum -2.71 mm  -2.43 m    1.72 MeV   633 keV   636 mum  5.71 mm   TargetPV       eBrem
-    7    563 mum -2.54 mm  -2.43 m     369 keV  1.35 MeV   560 mum  6.27 mm   TargetPV       eIoni
-    8    554 mum -2.55 mm  -2.43 m       0 eV    369 keV   199 mum  6.47 mm   TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 30,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    579 mum -2.71 mm  -2.43 m     749 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -9.05 mm    2.4 mm  -2.44 m       0 eV    749 keV  1.09 cm   1.09 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 29,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    997 mum -2.85 mm  -2.43 m     623 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -1.83 mm  -1.29 mm  -2.43 m       0 eV    623 keV  4.13 mm   4.13 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 28,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    963 mum  -2.6 mm  -2.44 m    1.17 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   54.2 mum  2.72 mm  -2.41 m       0 eV   1.17 MeV  2.37 cm   2.37 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 27,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    966 mum  -2.6 mm  -2.44 m    2.66 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -3.88 mm   6.75 mm   -2.4 m    2.66 MeV     0 eV    3.7 cm    3.7 cm   TargetPV  Transportation
-    2  -11.3 cm   21.8 cm   -1.6 m    2.66 MeV     0 eV   83.5 cm   87.2 cm    Tracker  Transportation
-    3  -12.5 cm     24 cm  -1.52 m    2.66 MeV     0 eV   8.64 cm   95.8 cm    Chamber  Transportation
-    4  -22.3 cm   42.9 cm    -80 cm   2.66 MeV     0 eV   74.8 cm   1.71 m     Tracker  Transportation
-    5    -25 cm   48.2 cm    -60 cm   2.66 MeV     0 eV   20.9 cm   1.91 m     Chamber  Transportation
-    6  -33.2 cm   64.1 cm -0.114 fm   2.66 MeV     0 eV   62.6 cm   2.54 m     Tracker  Transportation
-    7    -36 cm   69.4 cm     20 cm   2.66 MeV     0 eV   20.9 cm   2.75 m     Chamber  Transportation
-    8  -44.2 cm   85.2 cm     80 cm   2.66 MeV     0 eV   62.6 cm   3.38 m     Tracker  Transportation
-    9  -46.9 cm   90.5 cm      1 m    2.66 MeV     0 eV   20.9 cm   3.58 m     Chamber  Transportation
-   10  -55.1 cm   1.06 m     1.6 m    2.66 MeV     0 eV   62.6 cm   4.21 m     Tracker  Transportation
-   11  -57.9 cm   1.12 m     1.8 m    2.66 MeV     0 eV   20.9 cm   4.42 m     Chamber  Transportation
-   12  -66.1 cm   1.27 m     2.4 m    2.66 MeV     0 eV   62.6 cm   5.04 m     Tracker  Transportation
-   13  -73.1 cm   1.41 m    2.91 m    2.66 MeV     0 eV   53.2 cm   5.58 m  OutOfWorld  Transportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 26,   Parent ID = 20
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    402 mum  -3.4 mm  -2.44 m     551 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    701 mum -3.29 mm  -2.44 m     544 keV  7.42 keV   404 mum   404 mum  TargetPV       compt
-    2   1.53 mm  -3.17 mm  -2.44 m     178 keV   366 keV   1.1 mm    1.5 mm   TargetPV       compt
-    3   1.49 mm  -3.16 mm  -2.44 m       0 eV    178 keV  61.3 mum  1.57 mm   TargetPV        phot
+    0  -5.16 mm  -1.95 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.24 mm  -5.88 mm  -2.42 m       0 eV    511 keV  9.43 mm   9.43 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -829 mum -1.83 mm  -2.44 m     287 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -820 mum -1.91 mm  -2.44 m       0 eV    287 keV   231 mum   231 mum  TargetPV        phot
+    0   -481 mum -47.1 mum -2.44 m    80.5 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.11 mm   -111 mum -2.44 m       0 eV      0 eV   6.68 mm   6.68 mm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 48,   Parent ID = 11
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.11 mm   -111 mum -2.44 m    59.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.23 mm   -105 mum -2.44 m    57.3 MeV   852 keV   764 mum   764 mum  TargetPV       eBrem
+    2  -1.32 mm   61.5 mum -2.44 m    49.1 MeV   502 keV   342 mum  1.11 mm   TargetPV       eBrem
+    3  -1.52 mm    319 mum -2.44 m    43.3 MeV   672 keV   537 mum  1.64 mm   TargetPV       eBrem
+    4  -2.12 mm    891 mum -2.44 m    37.5 MeV  1.76 MeV  1.61 mm   3.25 mm   TargetPV       eBrem
+    5  -2.21 mm   2.19 mm  -2.43 m    3.82 MeV  4.33 MeV  2.74 mm   5.99 mm   TargetPV       eBrem
+    6  -2.63 mm   2.67 mm  -2.43 m    2.68 MeV  1.14 MeV   927 mum  6.92 mm   TargetPV       eIoni
+    7  -2.23 mm   2.73 mm  -2.43 m    1.92 MeV   761 keV   738 mum  7.66 mm   TargetPV       eIoni
+    8  -2.21 mm   2.88 mm  -2.43 m    1.05 MeV   872 keV   605 mum  8.26 mm   TargetPV       eIoni
+    9  -2.17 mm   2.71 mm  -2.43 m     627 keV   424 keV   434 mum  8.69 mm   TargetPV       eIoni
+   10  -2.23 mm   2.72 mm  -2.43 m     349 keV   278 keV   323 mum  9.02 mm   TargetPV       eIoni
+   11  -2.21 mm   2.72 mm  -2.43 m  1.11e-10 eV    349 keV   181 mum   9.2 mm   TargetPV       eIoni
+   12  -2.21 mm   2.72 mm  -2.43 m  1.11e-10 eV      0 eV      0 fm    9.2 mm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.21 mm   2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.53 mm   2.24 mm  -2.43 m       0 eV    511 keV  1.58 mm   1.58 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.21 mm   2.72 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.26 mm   4.13 mm  -2.44 m     486 keV  24.9 keV  4.63 mm   4.63 mm   TargetPV       compt
+    2    155 mum  5.28 mm  -2.44 m       0 eV    486 keV  2.96 mm   7.59 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.21 mm   2.19 mm  -2.43 m    29.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.27 mm   2.74 mm  -2.43 m       0 eV   2.21 MeV  1.29 mm   1.29 mm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 56,   Parent ID = 53
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.27 mm   2.74 mm  -2.43 m    26.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.3 mm   3.27 mm  -2.43 m    24.8 MeV  1.08 MeV   925 mum   925 mum  TargetPV       eBrem
+    2  -2.39 mm    3.4 mm  -2.43 m      16 MeV   412 keV   289 mum  1.21 mm   TargetPV       eBrem
+    3  -3.11 mm   3.33 mm  -2.43 m    11.3 MeV  3.03 MeV  2.69 mm    3.9 mm   TargetPV       eBrem
+    4  -3.27 mm   3.54 mm  -2.43 m    10.3 MeV   652 keV   412 mum  4.32 mm   TargetPV       eBrem
+    5  -3.63 mm    4.1 mm  -2.43 m    7.94 MeV  1.35 MeV  1.28 mm    5.6 mm   TargetPV       eBrem
+    6  -3.79 mm   3.85 mm  -2.43 m    6.36 MeV  1.57 MeV  1.56 mm   7.16 mm   TargetPV       eIoni
+    7  -3.74 mm   4.03 mm  -2.43 m    4.96 MeV   269 keV   218 mum  7.37 mm   TargetPV       eBrem
+    8  -2.89 mm   3.91 mm  -2.43 m    3.05 MeV  1.91 MeV  1.11 mm   8.48 mm   TargetPV       eIoni
+    9  -2.42 mm   4.23 mm  -2.43 m    2.34 MeV   716 keV   801 mum  9.28 mm   TargetPV       eIoni
+   10  -2.64 mm   3.86 mm  -2.43 m    1.41 MeV   926 keV   679 mum  9.96 mm   TargetPV       eIoni
+   11   -2.8 mm      4 mm  -2.43 m     650 keV   761 keV   509 mum  1.05 cm   TargetPV       eIoni
+   12  -2.85 mm   4.07 mm  -2.43 m     336 keV   314 keV   331 mum  1.08 cm   TargetPV       eIoni
+   13  -2.83 mm   4.08 mm  -2.43 m  5.55e-11 eV    336 keV   172 mum   1.1 cm   TargetPV       eIoni
+   14  -2.83 mm   4.08 mm  -2.43 m  5.55e-11 eV      0 eV      0 fm    1.1 cm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.83 mm   4.08 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.01 mm    5.5 mm  -2.43 m     214 keV   297 keV   1.7 mm    1.7 mm   TargetPV       compt
+    2  -2.09 mm   5.48 mm  -2.43 m       0 eV    214 keV   103 mum  1.81 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 63,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.83 mm   4.08 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.64 mm   2.67 mm  -2.43 m       0 eV    511 keV   1.7 mm    1.7 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.74 mm   4.03 mm  -2.43 m    1.13 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.33 mm   4.03 mm  -2.43 m       0 eV   1.13 MeV   729 mum   729 mum  TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.63 mm    4.1 mm  -2.43 m    1.03 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.75 mm   3.75 mm  -2.43 m     654 keV   379 keV  3.87 mm   3.87 mm   TargetPV       compt
+    2  -3.51 mm   -693 mum -2.44 m     466 keV   188 keV  9.83 mm   1.37 cm   TargetPV       compt
+    3  -3.28 mm  -1.54 mm  -2.44 m       0 eV    466 keV   943 mum  1.46 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.27 mm   3.54 mm  -2.43 m     348 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.65 mm   3.76 mm  -2.43 m       0 eV    348 keV   635 mum   635 mum  TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 59,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.11 mm   3.33 mm  -2.43 m    1.63 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.65 cm    2.5 cm  -2.41 m    1.63 MeV     0 eV    3.3 cm    3.3 cm   TargetPV  Transportation
+    2  -2.12 cm   3.26 cm   -2.4 m    1.63 MeV     0 eV   1.16 cm   4.46 cm    WorldPV  Transportation
+    3  -1.48 m     2.4 m   -10.6 cm   1.63 MeV     0 eV   3.61 m    3.65 m     Tracker  Transportation
+    4   -1.8 m    2.91 m    38.9 cm   1.63 MeV     0 eV   77.7 cm   4.43 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 58,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.39 mm    3.4 mm  -2.43 m    8.37 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.13 cm   1.69 cm   -2.4 m     812 keV     0 eV   3.39 cm   3.39 cm   TargetPV       compt
+    2  -1.25 cm   1.59 cm   -2.4 m     812 keV     0 eV   1.86 mm   3.58 cm   TargetPV  Transportation
+    3   -2.4 m   -2.12 m   -25.8 cm    812 keV     0 eV   3.85 m    3.89 m     Tracker  Transportation
+    4  -2.91 m   -2.57 m      20 cm    812 keV     0 eV   82.3 cm   4.71 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 65,   Parent ID = 58
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.13 cm   1.69 cm   -2.4 m    7.56 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.14 cm   1.69 cm   -2.4 m    6.75 MeV   480 keV   263 mum   263 mum  TargetPV       eBrem
+    2  -1.17 cm   1.71 cm   -2.4 m    5.25 MeV  1.51 MeV  1.34 mm    1.6 mm   TargetPV  Transportation
+    3  -1.17 cm   1.71 cm   -2.4 m    5.25 MeV     0 eV      0 fm    1.6 mm    Tracker  Transportation
+    4  -1.18 cm   1.71 cm   -2.4 m     1.3 MeV   137 keV   122 mum  1.73 mm   TargetPV       eBrem
+    5  -1.19 cm    1.7 cm   -2.4 m     806 keV   490 keV   481 mum  2.21 mm   TargetPV       eIoni
+    6  -1.19 cm    1.7 cm   -2.4 m     218 keV   220 keV   225 mum  2.43 mm   TargetPV       eBrem
+    7  -1.19 cm    1.7 cm   -2.4 m       0 eV    218 keV  92.7 mum  2.53 mm   TargetPV       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 65
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.19 cm    1.7 cm   -2.4 m     368 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.19 cm    1.7 cm   -2.4 m     368 keV     0 eV   32.9 mum  32.9 mum  TargetPV  Transportation
+    2  -13.5 cm  -7.47 cm   -1.6 m     368 keV     0 eV   81.5 cm   81.5 cm    Tracker  Transportation
+    3  -16.6 cm  -9.76 cm   -1.4 m     368 keV     0 eV   20.4 cm   1.02 m     Chamber  Transportation
+    4  -25.9 cm  -16.6 cm    -80 cm    368 keV     0 eV   61.1 cm   1.63 m     Tracker  Transportation
+    5    -29 cm  -18.9 cm    -60 cm    368 keV     0 eV   20.4 cm   1.83 m     Chamber  Transportation
+    6  -38.3 cm  -25.8 cm      0 fm    368 keV     0 eV   61.1 cm   2.44 m     Tracker  Transportation
+    7  -41.4 cm  -28.1 cm     20 cm    368 keV     0 eV   20.4 cm   2.65 m     Chamber  Transportation
+    8  -50.6 cm    -35 cm     80 cm    368 keV     0 eV   61.1 cm   3.26 m     Tracker  Transportation
+    9  -53.7 cm  -37.3 cm      1 m     368 keV     0 eV   20.4 cm   3.46 m     Chamber  Transportation
+   10    -63 cm  -44.1 cm    1.6 m     368 keV     0 eV   61.1 cm   4.07 m     Tracker  Transportation
+   11  -66.1 cm  -46.4 cm    1.8 m     368 keV     0 eV   20.4 cm   4.28 m     Chamber  Transportation
+   12  -75.4 cm  -53.3 cm    2.4 m     368 keV     0 eV   61.1 cm   4.89 m     Tracker  Transportation
+   13  -83.2 cm  -59.2 cm   2.91 m     368 keV     0 eV   51.9 cm   5.41 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 65
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.18 cm   1.71 cm   -2.4 m    3.81 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.27 cm   1.73 cm   -2.4 m       0 eV    585 keV  1.09 mm   1.09 mm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 69,   Parent ID = 67
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.27 cm   1.73 cm   -2.4 m    2.21 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.28 cm   1.73 cm   -2.4 m     924 keV   573 keV   508 mum   508 mum  TargetPV       eBrem
+    2  -1.29 cm   1.73 cm   -2.4 m     498 keV   426 keV   405 mum   913 mum  TargetPV       eIoni
+    3  -1.28 cm   1.73 cm   -2.4 m    98.4 keV   399 keV   273 mum  1.19 mm   TargetPV       eIoni
+    4  -1.28 cm   1.73 cm   -2.4 m       0 eV   98.4 keV  24.7 mum  1.21 mm   TargetPV       eIoni
+    5  -1.28 cm   1.73 cm   -2.4 m       0 eV      0 eV      0 fm   1.21 mm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 72,   Parent ID = 69
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.28 cm   1.73 cm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -9.13 mm   1.57 cm  -2.42 m       0 eV    511 keV  1.94 cm   1.94 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 71,   Parent ID = 69
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.28 cm   1.73 cm   -2.4 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -1.3 cm   1.74 cm   -2.4 m     511 keV     0 eV    765 mum   765 mum  TargetPV  Transportation
+    2  -16.8 cm   8.52 cm   -1.6 m     511 keV     0 eV   81.8 cm   81.8 cm    Tracker  Transportation
+    3  -20.7 cm   10.2 cm   -1.4 m     511 keV     0 eV   20.4 cm   1.02 m     Chamber  Transportation
+    4  -32.3 cm   15.3 cm    -80 cm    511 keV     0 eV   61.3 cm   1.64 m     Tracker  Transportation
+    5  -36.2 cm     17 cm    -60 cm    511 keV     0 eV   20.4 cm   1.84 m     Chamber  Transportation
+    6  -47.8 cm   22.1 cm      0 fm    511 keV     0 eV   61.3 cm   2.45 m     Tracker  Transportation
+    7  -51.6 cm   23.8 cm     20 cm    511 keV     0 eV   20.4 cm   2.66 m     Chamber  Transportation
+    8  -63.3 cm   28.9 cm     80 cm    511 keV     0 eV   61.3 cm   3.27 m     Tracker  Transportation
+    9  -67.1 cm   30.6 cm      1 m     511 keV     0 eV   20.4 cm   3.48 m     Chamber  Transportation
+   10  -78.8 cm   35.7 cm    1.6 m     511 keV     0 eV   61.3 cm   4.09 m     Tracker  Transportation
+   11  -82.6 cm   37.3 cm    1.8 m     511 keV     0 eV   20.4 cm   4.29 m     Chamber  Transportation
+   12  -94.3 cm   42.4 cm    2.4 m     511 keV     0 eV   61.3 cm   4.91 m     Tracker  Transportation
+   13  -1.04 m    46.8 cm   2.91 m     511 keV     0 eV   52.1 cm   5.43 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 69
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.28 cm   1.73 cm   -2.4 m     710 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.45 cm    2.5 cm   -2.4 m     710 keV     0 eV   7.91 mm   7.91 mm   TargetPV  Transportation
+    2  -65.9 cm   2.91 m   -2.57 m     710 keV     0 eV   2.96 m    2.97 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 66,   Parent ID = 65
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.14 cm   1.69 cm   -2.4 m     323 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.14 cm   1.69 cm   -2.4 m     203 keV   120 keV  8.77 mum  8.77 mum  TargetPV       compt
+    2   -1.2 cm   1.71 cm   -2.4 m       0 eV    203 keV   641 mum   650 mum  TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 57,   Parent ID = 56
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -2.3 mm   3.27 mm  -2.43 m     302 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.61 mm   5.72 mm  -2.43 m       0 eV    302 keV  5.83 mm   5.83 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.12 mm    891 mum -2.44 m    4.04 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.99 mm   2.49 mm  -2.43 m       0 eV   3.02 MeV  3.67 mm   3.67 mm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 73,   Parent ID = 52
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.99 mm   2.49 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.99 mm   2.49 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 75,   Parent ID = 73
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.99 mm   2.49 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.38 mm    2.9 mm  -2.43 m     404 keV   107 keV  1.18 mm   1.18 mm   TargetPV       compt
+    2  -9.07 mm   9.27 mm  -2.44 m     291 keV   114 keV     9 mm   1.02 cm   TargetPV       compt
+    3  -1.15 cm   8.53 mm  -2.44 m     252 keV  38.6 keV  3.45 mm   1.36 cm   TargetPV       compt
+    4  -1.15 cm   8.52 mm  -2.44 m     170 keV  82.1 keV  9.29 mum  1.36 cm   TargetPV       compt
+    5  -1.17 cm   8.47 mm  -2.44 m       0 eV    170 keV   223 mum  1.39 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 74,   Parent ID = 73
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.99 mm   2.49 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.22 mm    661 mum -2.43 m     174 keV   337 keV  5.24 mm   5.24 mm   TargetPV       compt
+    2  -1.61 mm    692 mum -2.43 m     124 keV  49.5 keV   825 mum  6.07 mm   TargetPV       compt
+    3  -1.62 mm    693 mum -2.43 m       0 eV    124 keV  13.7 mum  6.08 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.52 mm    319 mum -2.44 m     5.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.42 cm   1.81 cm  -2.41 m       0 eV   4.08 MeV  3.79 cm   3.79 cm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 76,   Parent ID = 51
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.42 cm   1.81 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.42 cm   1.81 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 78,   Parent ID = 76
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.42 cm   1.81 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.38 cm   2.01 cm  -2.41 m     367 keV   144 keV  2.06 mm   2.06 mm   TargetPV       compt
+    2  -9.94 mm   2.21 cm  -2.41 m       0 eV    367 keV  4.34 mm    6.4 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 77,   Parent ID = 76
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.42 cm   1.81 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.43 cm   1.77 cm  -2.41 m     424 keV  86.8 keV   378 mum   378 mum  TargetPV       compt
+    2  -2.11 cm   1.05 cm  -2.41 m     360 keV  64.5 keV  1.07 cm   1.11 cm   TargetPV       compt
+    3  -2.18 cm   1.03 cm  -2.41 m       0 eV    360 keV   810 mum  1.19 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 50,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.32 mm   61.5 mum -2.44 m     7.7 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.69 mm   2.29 mm  -2.43 m       0 eV   6.68 MeV  4.38 mm   4.38 mm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 79,   Parent ID = 50
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.69 mm   2.29 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.69 mm   2.29 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 81,   Parent ID = 79
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.69 mm   2.29 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.55 mm   2.18 mm  -2.43 m     492 keV  18.9 keV   233 mum   233 mum  TargetPV       compt
+    2   2.08 cm  -1.84 cm  -2.45 m     229 keV   263 keV   3.4 cm   3.42 cm   TargetPV       compt
+    3   2.08 cm  -1.65 cm  -2.45 m       0 eV    229 keV  2.55 mm   3.67 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 80,   Parent ID = 79
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -2.69 mm   2.29 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.25 mm   2.73 mm  -2.43 m       0 eV    511 keV   914 mum   914 mum  TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 49,   Parent ID = 48
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.23 mm   -105 mum -2.44 m     1.7 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.24 cm   2.02 cm  -2.41 m     1.3 MeV   401 keV  3.96 cm   3.96 cm   TargetPV       compt
+    2  -1.26 cm   2.13 cm   -2.4 m     1.3 MeV     0 eV   5.43 mm    4.5 cm   TargetPV  Transportation
+    3     -4 cm   18.8 cm   -1.6 m     1.3 MeV     0 eV   81.8 cm   86.3 cm    Tracker  Transportation
+    4  -4.69 cm   22.9 cm   -1.4 m     1.3 MeV     0 eV   20.4 cm   1.07 m     Chamber  Transportation
+    5  -6.75 cm   35.4 cm    -80 cm    1.3 MeV     0 eV   61.3 cm   1.68 m     Tracker  Transportation
+    6  -7.44 cm   39.6 cm    -60 cm    1.3 MeV     0 eV   20.4 cm   1.88 m     Chamber  Transportation
+    7  -9.49 cm     52 cm      0 fm    1.3 MeV     0 eV   61.3 cm    2.5 m     Tracker  Transportation
+    8  -10.2 cm   56.2 cm     20 cm    1.3 MeV     0 eV   20.4 cm    2.7 m     Chamber  Transportation
+    9  -12.2 cm   68.7 cm     80 cm    1.3 MeV     0 eV   61.3 cm   3.32 m     Tracker  Transportation
+   10  -12.9 cm   72.8 cm      1 m     1.3 MeV     0 eV   20.4 cm   3.52 m     Chamber  Transportation
+   11    -15 cm   85.3 cm    1.6 m     1.3 MeV     0 eV   61.3 cm   4.13 m     Tracker  Transportation
+   12  -15.7 cm   89.5 cm    1.8 m     1.3 MeV     0 eV   20.4 cm   4.34 m     Chamber  Transportation
+   13  -17.7 cm   1.02 m     2.4 m     1.3 MeV     0 eV   61.3 cm   4.95 m     Tracker  Transportation
+   14  -19.5 cm   1.13 m    2.91 m     1.3 MeV     0 eV   52.1 cm   5.47 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 47,   Parent ID = 11
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.11 mm   -111 mum -2.44 m    19.6 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.12 mm   -105 mum -2.44 m    15.8 MeV  96.2 keV   101 mum   101 mum  TargetPV       eBrem
+    2  -1.19 mm   -376 mum -2.44 m    14.1 MeV  1.09 MeV   818 mum   919 mum  TargetPV       eBrem
+    3   -1.2 mm   -389 mum -2.44 m    13.7 MeV  11.9 keV  19.4 mum   938 mum  TargetPV       eBrem
+    4  -1.29 mm   -709 mum -2.44 m    12.1 MeV   509 keV   496 mum  1.43 mm   TargetPV       eBrem
+    5  -1.87 mm  -1.05 mm  -2.44 m    10.3 MeV  1.25 MeV  1.05 mm   2.49 mm   TargetPV       eBrem
+    6  -1.43 mm   -1.7 mm  -2.44 m    1.55 MeV  1.69 MeV  1.41 mm    3.9 mm   TargetPV       eBrem
+    7  -1.58 mm  -1.78 mm  -2.44 m    1.05 MeV   496 keV   530 mum  4.43 mm   TargetPV       eIoni
+    8  -1.48 mm  -1.73 mm  -2.44 m     360 keV   695 keV   431 mum  4.86 mm   TargetPV       eIoni
+    9  -1.48 mm  -1.74 mm  -2.44 m       0 eV    360 keV   192 mum  5.05 mm   TargetPV       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 87,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.43 mm   -1.7 mm  -2.44 m    7.07 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.27 cm  -1.11 cm  -2.43 m     325 keV  6.74 MeV  1.52 cm   1.52 cm   TargetPV       compt
+    2  -1.29 cm  -1.06 cm  -2.43 m       0 eV    325 keV   588 mum  1.58 cm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 86,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.87 mm  -1.05 mm  -2.44 m     567 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.53 mm   -3.5 mm  -2.43 m       0 eV    567 keV  3.99 mm   3.99 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 85,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.29 mm   -709 mum -2.44 m     1.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.35 mm  -3.25 mm  -2.43 m     488 keV   608 keV  4.17 mm   4.17 mm   TargetPV       compt
+    2  -5.37 mm   -700 mum -2.43 m       0 eV    488 keV  5.83 mm   9.99 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 84,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -1.2 mm   -389 mum -2.44 m     319 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.89 mm  -1.51 mm  -2.44 m     238 keV  80.8 keV  1.67 mm   1.67 mm   TargetPV       compt
+    2  -2.83 mm  -1.88 mm  -2.44 m       0 eV    238 keV  1.05 mm   2.72 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 83,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.19 mm   -376 mum -2.44 m     647 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.58 mm   -992 mum -2.44 m     330 keV   318 keV   871 mum   871 mum  TargetPV       compt
+    2  -4.06 mm    649 mum -2.44 m       0 eV    330 keV  3.36 mm   4.23 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 82,   Parent ID = 47
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.12 mm   -105 mum -2.44 m    3.74 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -4.64 mm  -2.43 mm   -2.4 m    3.74 MeV     0 eV   3.83 cm   3.83 cm   TargetPV  Transportation
+    2  -7.86 cm  -5.12 cm   -1.6 m    3.74 MeV     0 eV   80.5 cm   84.3 cm    Tracker  Transportation
+    3  -9.71 cm  -6.34 cm   -1.4 m    3.74 MeV     0 eV   20.1 cm   1.04 m     Chamber  Transportation
+    4  -15.3 cm    -10 cm    -80 cm   3.74 MeV     0 eV   60.4 cm   1.65 m     Tracker  Transportation
+    5  -17.1 cm  -11.2 cm    -60 cm   3.74 MeV     0 eV   20.1 cm   1.85 m     Chamber  Transportation
+    6  -22.7 cm  -14.9 cm      0 fm   3.74 MeV     0 eV   60.4 cm   2.45 m     Tracker  Transportation
+    7  -24.5 cm  -16.1 cm     20 cm   3.74 MeV     0 eV   20.1 cm   2.65 m     Chamber  Transportation
+    8  -30.1 cm  -19.8 cm     80 cm   3.74 MeV     0 eV   60.4 cm   3.26 m     Tracker  Transportation
+    9  -31.9 cm    -21 cm      1 m    3.74 MeV     0 eV   20.1 cm   3.46 m     Chamber  Transportation
+   10  -37.5 cm  -24.7 cm    1.6 m    3.74 MeV     0 eV   60.4 cm   4.06 m     Tracker  Transportation
+   11  -39.3 cm  -25.9 cm    1.8 m    3.74 MeV     0 eV   20.1 cm   4.26 m     Chamber  Transportation
+   12  -44.9 cm  -29.5 cm    2.4 m    3.74 MeV     0 eV   60.4 cm   4.87 m     Tracker  Transportation
+   13  -49.6 cm  -32.6 cm   2.91 m    3.74 MeV     0 eV   51.3 cm   5.38 m  OutOfWorld  Transportation
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -547 mum  -369 mum -2.44 m    3.69 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -4.11 mm  -1.04 cm  -2.42 m     340 keV  3.35 MeV  2.76 cm   2.76 cm   TargetPV       compt
-    2  -4.94 mm  -1.05 cm  -2.42 m       0 eV    340 keV   980 mum  2.86 cm   TargetPV        phot
+    0   -461 mum -38.2 mum -2.45 m     845 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.38 mm   -550 mum -2.43 m       0 eV    845 keV  1.19 cm   1.19 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 9,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -121 mum    68 mum -2.45 m     312 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -158 mum  38.1 mum -2.45 m       0 eV    312 keV   261 mum   261 mum  TargetPV        phot
+    0   -389 mum  17.6 mum -2.45 m     563 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -522 mum -49.9 mum -2.44 m     358 keV   205 keV  1.22 mm   1.22 mm   TargetPV       compt
+    2   -832 mum -5.35 mm  -2.44 m     260 keV  97.5 keV  5.88 mm    7.1 mm   TargetPV       compt
+    3   -2.1 mm  -5.77 mm  -2.44 m       0 eV    260 keV  1.43 mm   8.53 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -92.5 mum   137 mum -2.45 m     778 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -516 mum  -569 mum -2.44 m     577 keV   200 keV  5.47 mm   5.47 mm   TargetPV       compt
-    2    204 mum  -790 mum -2.44 m     525 keV  52.5 keV  1.26 mm   6.73 mm   TargetPV       compt
-    3   5.31 mm  -1.47 mm  -2.44 m       0 eV    525 keV  5.96 mm   1.27 cm   TargetPV        phot
+    0   -356 mum  35.1 mum -2.45 m     2.7 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -406 mum  10.8 mum -2.45 m       0 eV    732 keV   433 mum   433 mum  TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 88,   Parent ID = 8
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -406 mum  10.8 mum -2.45 m     946 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -292 mum  57.4 mum -2.45 m     521 keV   425 keV   410 mum   410 mum  TargetPV       eIoni
+    2   -289 mum   115 mum -2.45 m     202 keV   319 keV   283 mum   693 mum  TargetPV       eIoni
+    3   -287 mum   112 mum -2.45 m  2.78e-11 eV    202 keV    79 mum   772 mum  TargetPV       eIoni
+    4   -287 mum   112 mum -2.45 m  2.78e-11 eV      0 eV      0 fm    772 mum  TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 90,   Parent ID = 88
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -287 mum   112 mum -2.45 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   1.96 mm    268 mum -2.45 m       0 eV    511 keV   3.2 mm    3.2 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 89,   Parent ID = 88
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -287 mum   112 mum -2.45 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.22 mm  -92.1 mum -2.44 m       0 eV     88 keV  4.19 mm   4.19 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 91,   Parent ID = 89
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -3.22 mm  -92.1 mum -2.44 m     423 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.23 mm  -92.9 mum -2.44 m       0 eV    423 keV   235 mum   235 mum  TargetPV       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -67.8 mum   165 mum -2.45 m     945 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -1.3 mm  -1.62 mm  -2.43 m     322 keV   623 keV   1.4 cm    1.4 cm   TargetPV       compt
-    2  -1.46 mm  -1.64 mm  -2.43 m       0 eV    322 keV   160 mum  1.42 cm   TargetPV        phot
+    0   -245 mum   115 mum -2.45 m    7.62 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -2.06 mm  -45.3 mum -2.43 m    4.16 MeV  3.46 MeV  2.24 cm   2.24 cm   TargetPV       compt
+    2  -4.68 mm   -308 mum -2.42 m     568 keV  3.59 MeV  6.51 mm   2.89 cm   TargetPV       compt
+    3  -5.36 mm    893 mum -2.42 m       0 eV    568 keV  1.38 mm   3.03 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -168 mum   119 mum -2.45 m    63.3 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -7.54 mum   155 mum -2.44 m       0 eV      0 eV   3.67 mm   3.67 mm   TargetPV        conv
+    0   -238 mum   116 mum -2.45 m    10.1 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -3.1 mm   -214 mum -2.41 m       0 eV   9.07 MeV  3.83 cm   3.83 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 32,   Parent ID = 6
+* G4Track Information:   Particle = e+,   Track ID = 92,   Parent ID = 6
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -7.54 mum   155 mum -2.44 m    25.5 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.11 mm   -289 mum -2.44 m    6.39 MeV  4.19 MeV  3.35 mm   3.35 mm   TargetPV       eBrem
-    2    1.4 mm   -359 mum -2.44 m    4.67 MeV  1.22 MeV   928 mum  4.28 mm   TargetPV       eBrem
-    3   1.41 mm   -348 mum -2.44 m       0 eV   32.5 keV  28.7 mum  4.31 mm   TargetPV     annihil
+    0   -3.1 mm   -214 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -3.1 mm   -214 mum -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 36,   Parent ID = 32
+* G4Track Information:   Particle = gamma,   Track ID = 94,   Parent ID = 92
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.41 mm   -348 mum -2.44 m    1.22 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1      2 mm  -1.13 mm  -2.44 m     234 keV   990 keV  1.44 mm   1.44 mm   TargetPV       compt
-    2   1.38 mm   -1.2 mm  -2.44 m       0 eV    234 keV   892 mum  2.33 mm   TargetPV        phot
+    0   -3.1 mm   -214 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -2.1 mm  -2.38 mm  -2.41 m       0 eV    511 keV  4.45 mm   4.45 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 35,   Parent ID = 32
+* G4Track Information:   Particle = gamma,   Track ID = 93,   Parent ID = 92
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.41 mm   -348 mum -2.44 m    4.43 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   3.83 mm   2.99 mm  -2.44 m       0 eV   3.41 MeV   6.9 mm    6.9 mm   TargetPV        conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 37,   Parent ID = 35
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   3.83 mm   2.99 mm  -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
-    1   3.83 mm   2.99 mm  -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 39,   Parent ID = 37
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   3.83 mm   2.99 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.43 cm  -6.87 mm  -2.45 m     367 keV   144 keV     2 cm      2 cm   TargetPV       compt
-    2   1.75 cm  -7.93 mm  -2.45 m     255 keV   111 keV  3.31 mm   2.33 cm   TargetPV       compt
-    3   1.76 cm  -7.93 mm  -2.45 m       0 eV    255 keV   421 mum  2.37 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 38,   Parent ID = 37
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   3.83 mm   2.99 mm  -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.52 mm   4.22 mm  -2.43 m     346 keV   165 keV  2.48 mm   2.48 mm   TargetPV       compt
-    2   4.42 mm   5.69 mm  -2.43 m     154 keV   192 keV  4.49 mm   6.97 mm   TargetPV       compt
-    3   4.27 mm   5.75 mm  -2.43 m       0 eV    154 keV   278 mum  7.25 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 34,   Parent ID = 32
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    1.4 mm   -359 mum -2.44 m     500 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.48 mm   -279 mum -2.44 m       0 eV    500 keV   306 mum   306 mum  TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 33,   Parent ID = 32
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.11 mm   -289 mum -2.44 m    14.9 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    790 mum  1.08 cm  -2.41 m       0 eV   13.9 MeV  3.31 cm   3.31 cm   TargetPV        conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 40,   Parent ID = 33
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    790 mum  1.08 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
-    1    790 mum  1.08 cm  -2.41 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 42,   Parent ID = 40
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    790 mum  1.08 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    867 mum   1.1 cm  -2.41 m       0 eV    511 keV   237 mum   237 mum  TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 41,   Parent ID = 40
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    790 mum  1.08 cm  -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -1.12 mm   5.55 mm  -2.41 m     368 keV   143 keV  5.87 mm   5.87 mm   TargetPV       compt
-    2  -2.68 mm   4.39 mm  -2.41 m       0 eV    368 keV  2.11 mm   7.98 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 31,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -7.54 mum   155 mum -2.44 m    36.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    420 mum   791 mum -2.44 m    14.1 MeV   4.5 MeV  3.13 mm   3.13 mm   TargetPV       eBrem
-    2    778 mum   985 mum -2.44 m    12.3 MeV   774 keV   728 mum  3.86 mm   TargetPV       eBrem
-    3    912 mum   975 mum -2.44 m    10.1 MeV   483 keV   288 mum  4.14 mm   TargetPV       eBrem
-    4    1.6 mm   1.19 mm  -2.44 m    5.93 MeV  1.35 MeV  1.26 mm    5.4 mm   TargetPV       eBrem
-    5   1.67 mm   1.29 mm  -2.44 m    4.83 MeV   669 keV   590 mum  5.99 mm   TargetPV       eBrem
-    6   1.85 mm   1.45 mm  -2.44 m    3.85 MeV   543 keV   290 mum  6.28 mm   TargetPV       eBrem
-    7   2.14 mm    1.5 mm  -2.44 m     2.7 MeV  1.15 MeV   913 mum  7.19 mm   TargetPV       eIoni
-    8    1.9 mm   1.28 mm  -2.44 m    1.97 MeV   724 keV   728 mum  7.92 mm   TargetPV       eIoni
-    9   1.71 mm   1.09 mm  -2.44 m    1.23 MeV   736 keV   605 mum  8.53 mm   TargetPV       eIoni
-   10   1.56 mm   1.14 mm  -2.44 m     803 keV   431 keV   469 mum     9 mm   TargetPV       eIoni
-   11    1.6 mm   1.15 mm  -2.44 m       0 eV    803 keV   373 mum  9.37 mm   TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 48,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.85 mm   1.45 mm  -2.44 m     434 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.04 cm   2.88 mm  -2.44 m     314 keV   120 keV  8.99 mm   8.99 mm   TargetPV       compt
-    2   1.09 cm   4.04 mm  -2.44 m     284 keV  29.8 keV  1.55 mm   1.05 cm   TargetPV       compt
-    3   1.29 cm   5.45 mm  -2.44 m       0 eV    284 keV  2.68 mm   1.32 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 47,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.67 mm   1.29 mm  -2.44 m     435 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   4.52 mm   3.03 mm  -2.44 m       0 eV    435 keV  3.35 mm   3.35 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 46,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    1.6 mm   1.19 mm  -2.44 m    2.83 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    3.9 mm   2.18 mm  -2.44 m     629 keV   2.2 MeV  3.49 mm   3.49 mm   TargetPV       compt
-    2   3.61 mm   1.91 mm  -2.44 m       0 eV    629 keV     1 mm   4.49 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 45,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    912 mum   975 mum -2.44 m    1.74 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.66 mm   2.14 mm  -2.43 m     716 keV  1.02 MeV  9.21 mm   9.21 mm   TargetPV       compt
-    2   -897 mum  7.85 mm  -2.43 m     303 keV   413 keV  8.33 mm   1.75 cm   TargetPV       compt
-    3   -993 mum  2.26 mm  -2.42 m     214 keV  89.2 keV  8.83 mm   2.64 cm   TargetPV       compt
-    4   -973 mum   2.3 mm  -2.42 m       0 eV    214 keV  77.6 mum  2.64 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 44,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    778 mum   985 mum -2.44 m     949 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.21 mm    395 mum -2.44 m       0 eV    949 keV  3.82 mm   3.82 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 43,   Parent ID = 31
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    420 mum   791 mum -2.44 m    18.2 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   4.64 mm    565 mum -2.44 m       0 eV      0 eV   7.85 mm   7.85 mm   TargetPV        conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 50,   Parent ID = 43
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   4.64 mm    565 mum -2.44 m    9.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    5.6 mm    491 mum -2.43 m    7.54 MeV  1.31 MeV  1.14 mm   1.14 mm   TargetPV       eBrem
-    2   6.02 mm    544 mum -2.43 m    6.28 MeV   479 keV   474 mum  1.62 mm   TargetPV       eBrem
-    3   7.11 mm    236 mum -2.43 m    4.36 MeV  1.92 MeV  1.31 mm   2.93 mm   TargetPV       eIoni
-    4   7.48 mm    549 mum -2.43 m     3.3 MeV   562 keV   544 mum  3.47 mm   TargetPV       eBrem
-    5    6.9 mm    401 mum -2.43 m    1.94 MeV  1.35 MeV   841 mum  4.31 mm   TargetPV       eIoni
-    6   6.79 mm    190 mum -2.43 m    1.22 MeV   334 keV   404 mum  4.72 mm   TargetPV       eBrem
-    7   6.69 mm   30.9 mum -2.43 m     696 keV   528 keV   471 mum  5.19 mm   TargetPV       eIoni
-    8   6.75 mm    100 mum -2.43 m     368 keV   328 keV   345 mum  5.53 mm   TargetPV       eIoni
-    9   6.75 mm    114 mum -2.43 m       0 eV    368 keV   196 mum  5.73 mm   TargetPV       eIoni
-   10   6.75 mm    114 mum -2.43 m       0 eV      0 eV      0 fm   5.73 mm   TargetPV     annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 56,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   6.75 mm    114 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   7.03 mm  -87.6 mum -2.44 m     186 keV   325 keV  1.02 mm   1.02 mm   TargetPV       compt
-    2   6.99 mm   -243 mum -2.44 m       0 eV    186 keV   321 mum  1.34 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 55,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   6.75 mm    114 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   5.24 mm   1.18 mm  -2.43 m       0 eV    511 keV   5.4 mm    5.4 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 54,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   6.79 mm    190 mum -2.43 m     383 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   8.19 mm  -1.43 mm  -2.44 m       0 eV    383 keV  2.42 mm   2.42 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 53,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   7.48 mm    549 mum -2.43 m     502 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.15 mm   2.45 mm  -2.44 m       0 eV    502 keV  6.05 mm   6.05 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 52,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   6.02 mm    544 mum -2.43 m     783 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    1.5 cm    671 mum -2.43 m     722 keV  61.5 keV  9.29 mm   9.29 mm   TargetPV       compt
-    2    1.6 cm    579 mum -2.43 m     662 keV  59.4 keV  1.27 mm   1.06 cm   TargetPV       compt
-    3   1.86 cm   34.6 mum -2.43 m     592 keV  70.7 keV  2.73 mm   1.33 cm   TargetPV       compt
-    4    2.5 cm    684 mum -2.43 m     592 keV     0 eV   6.44 mm   1.97 cm   TargetPV  Transportation
-    5   2.91 m    29.4 cm  -2.58 m     592 keV     0 eV    2.9 m    2.92 m  OutOfWorld  Transportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 51,   Parent ID = 50
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    5.6 mm    491 mum -2.43 m     697 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   6.15 mm    938 mum -2.43 m       0 eV    697 keV   900 mum   900 mum  TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 49,   Parent ID = 43
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   4.64 mm    565 mum -2.44 m    7.64 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1    4.9 mm   1.26 mm  -2.43 m       5 MeV  2.64 MeV  1.48 mm   1.48 mm   TargetPV       eIoni
-    2   4.65 mm    870 mum -2.43 m    3.64 MeV   996 keV   989 mum  2.47 mm   TargetPV       eBrem
-    3   4.93 mm    569 mum -2.43 m    2.36 MeV  1.28 MeV   881 mum  3.35 mm   TargetPV       eIoni
-    4    4.8 mm    813 mum -2.43 m    1.75 MeV   619 keV   673 mum  4.02 mm   TargetPV       eIoni
-    5      5 mm    788 mum -2.43 m    1.04 MeV   704 keV   565 mum  4.59 mm   TargetPV       eIoni
-    6   4.98 mm    719 mum -2.43 m     528 keV   514 keV   428 mum  5.02 mm   TargetPV       eIoni
-    7   4.94 mm    697 mum -2.43 m     201 keV   327 keV   286 mum   5.3 mm   TargetPV       eIoni
-    8   4.95 mm    694 mum -2.43 m       0 eV    201 keV  81.8 mum  5.38 mm   TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 57,   Parent ID = 49
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   4.65 mm    870 mum -2.43 m     369 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   4.19 mm    585 mum -2.44 m       0 eV    369 keV  6.46 mm   6.46 mm   TargetPV        phot
+    0   -3.1 mm   -214 mum -2.41 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -5.65 mm   5.29 mm  -2.42 m     182 keV   329 keV  1.13 cm   1.13 cm   TargetPV       compt
+    2   -5.6 mm   5.32 mm  -2.42 m       0 eV    182 keV   183 mum  1.15 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 5,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -178 mum   101 mum -2.45 m     744 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -16.4 mum   133 mum -2.44 m       0 eV    744 keV  5.06 mm   5.06 mm   TargetPV        phot
+    0   -204 mum   116 mum -2.45 m    9.16 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.52 mm   30.6 mum -2.43 m       0 eV   8.14 MeV  1.65 cm   1.65 cm   TargetPV        conv
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e+,   Track ID = 95,   Parent ID = 5
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.52 mm   30.6 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.52 mm   30.6 mum -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 97,   Parent ID = 95
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.52 mm   30.6 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.71 mm    183 mum -2.43 m       0 eV    511 keV  1.51 mm   1.51 mm   TargetPV        phot
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 96,   Parent ID = 95
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0  -1.52 mm   30.6 mum -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.48 mm  -2.66 mum -2.43 m       0 eV    511 keV   329 mum   329 mum  TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -180 mum    99 mum -2.45 m    2.82 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -113 mum   127 mum -2.45 m     831 keV  1.99 MeV  2.58 mm   2.58 mm   TargetPV       compt
-    2  -5.03 mm  -2.78 mm  -2.44 m     829 keV  1.67 keV  7.07 mm   9.64 mm   TargetPV       compt
-    3  -5.41 mm  -3.03 mm  -2.44 m       0 eV    829 keV   549 mum  1.02 cm   TargetPV        phot
+    0   -178 mum   107 mum -2.45 m     633 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   -912 mum   341 mum -2.44 m     390 keV   243 keV  1.27 cm   1.27 cm   TargetPV       compt
+    2    138 mum  1.55 mm  -2.44 m       0 eV    390 keV  1.88 mm   1.46 cm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = gamma,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -182 mum   100 mum -2.45 m    49.6 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -188 mum  96.6 mum -2.45 m       0 eV      0 eV   2.76 mm   2.76 mm   TargetPV        conv
+    0   -173 mum   108 mum -2.45 m    3.03 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.12 mm   29.1 mum -2.42 m       0 eV   2.01 MeV  3.36 cm   3.36 cm   TargetPV        conv
 
 *********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 59,   Parent ID = 3
+* G4Track Information:   Particle = e+,   Track ID = 98,   Parent ID = 3
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -188 mum  96.6 mum -2.45 m    25.4 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -932 mum   289 mum -2.44 m    3.09 MeV   3.5 MeV  2.64 mm   2.64 mm   TargetPV       eBrem
-    2 -1e+03 mum  -144 mum -2.44 m    1.65 MeV  1.45 MeV   807 mum  3.45 mm   TargetPV       eIoni
-    3  -1.01 mm  -4.03 mum -2.44 m     245 keV   1.4 MeV   554 mum     4 mm   TargetPV       eIoni
-    4  -1.01 mm  -11.9 mum -2.44 m  1.11e-10 eV    245 keV   107 mum  4.11 mm   TargetPV       eIoni
-    5  -1.01 mm  -11.9 mum -2.44 m  1.11e-10 eV      0 eV      0 fm   4.11 mm   TargetPV     annihil
+    0  -1.12 mm   29.1 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -1.12 mm   29.1 mum -2.42 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 62,   Parent ID = 59
+* G4Track Information:   Particle = gamma,   Track ID = 100,   Parent ID = 98
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -1.01 mm  -11.9 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -2.56 mm   1.23 mm  -2.45 m       0 eV    511 keV  2.76 mm   2.76 mm   TargetPV        phot
+    0  -1.12 mm   29.1 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1  -3.28 mm  -3.74 mm  -2.42 m       0 eV    511 keV  4.41 mm   4.41 mm   TargetPV        phot
 
 *********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 61,   Parent ID = 59
+* G4Track Information:   Particle = gamma,   Track ID = 99,   Parent ID = 98
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -1.01 mm  -11.9 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -224 mum  -650 mum -2.44 m     244 keV   267 keV  1.42 mm   1.42 mm   TargetPV       compt
-    2   -559 mum  -140 mum -2.44 m       0 eV    244 keV   782 mum   2.2 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 60,   Parent ID = 59
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -932 mum   289 mum -2.44 m    18.8 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -5.98 mm  -1.97 mm  -2.43 m       0 eV   17.7 MeV  1.49 cm   1.49 cm   TargetPV        conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 63,   Parent ID = 60
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -5.98 mm  -1.97 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -5.98 mm  -1.97 mm  -2.43 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 65,   Parent ID = 63
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -5.98 mm  -1.97 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -5.51 mm   -2.7 mm  -2.43 m       0 eV    511 keV  1.37 mm   1.37 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 64,   Parent ID = 63
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -5.98 mm  -1.97 mm  -2.43 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -6.2 mm  -1.62 mm  -2.43 m       0 eV    511 keV   652 mum   652 mum  TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 58,   Parent ID = 3
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -188 mum  96.6 mum -2.45 m    23.2 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -183 mum -83.3 mum -2.45 m    17.3 MeV  1.06 MeV   858 mum   858 mum  TargetPV       eBrem
-    2    243 mum  -881 mum -2.44 m    7.31 MeV  2.99 MeV  1.93 mm   2.79 mm   TargetPV       eBrem
-    3    464 mum  -892 mum -2.44 m    5.46 MeV   300 keV   229 mum  3.02 mm   TargetPV       eBrem
-    4    857 mum  -956 mum -2.44 m    2.44 MeV   703 keV   450 mum  3.47 mm   TargetPV       eBrem
-    5    486 mum -1.05 mm  -2.44 m    1.84 MeV   605 keV   687 mum  4.16 mm   TargetPV       eIoni
-    6    687 mum -1.23 mm  -2.44 m    1.26 MeV   577 keV   582 mum  4.74 mm   TargetPV       eIoni
-    7    572 mum -1.34 mm  -2.44 m     614 keV   649 keV   474 mum  5.21 mm   TargetPV       eIoni
-    8    601 mum -1.32 mm  -2.44 m     195 keV  61.7 keV  70.7 mum  5.28 mm   TargetPV       eBrem
-    9    601 mum -1.31 mm  -2.44 m  8.33e-11 eV    195 keV  78.5 mum  5.36 mm   TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 70,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    601 mum -1.32 mm  -2.44 m     357 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   34.4 mum -1.16 mm  -2.45 m       0 eV    357 keV  1.39 mm   1.39 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 69,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    857 mum  -956 mum -2.44 m    2.32 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   -2.5 cm  -1.03 cm  -2.42 m    2.32 MeV     0 eV   3.62 cm   3.62 cm   TargetPV  Transportation
-    2  -4.77 cm  -1.84 cm   -2.4 m    2.32 MeV     0 eV   3.17 cm   6.79 cm    WorldPV  Transportation
-    3   -2.4 m   -86.5 cm  -25.8 cm   2.32 MeV     0 eV   3.29 m    3.36 m     Tracker  Transportation
-    4  -2.91 m   -1.05 m    20.7 cm   2.32 MeV     0 eV   71.4 cm   4.07 m  OutOfWorld  Transportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 68,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    464 mum  -892 mum -2.44 m    1.54 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.65 cm   4.13 mm  -2.45 m     591 keV   953 keV  1.69 cm   1.69 cm   TargetPV       compt
-    2   1.83 cm   3.63 mm  -2.45 m       0 eV     88 keV  4.31 mm   2.12 cm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 71,   Parent ID = 68
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   1.83 cm   3.63 mm  -2.45 m     503 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   1.83 cm   3.66 mm  -2.45 m     228 keV   274 keV   275 mum   275 mum  TargetPV       eIoni
-    2   1.83 cm   3.66 mm  -2.45 m       0 eV    228 keV  99.3 mum   374 mum  TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 67,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0    243 mum  -881 mum -2.44 m    7.02 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.02 mm   -421 mum -2.44 m       0 eV      6 MeV  1.84 mm   1.84 mm   TargetPV        conv
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e+,   Track ID = 72,   Parent ID = 67
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   2.02 mm   -421 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV    initStep
-    1   2.02 mm   -421 mum -2.44 m       0 eV      0 eV      0 fm      0 fm   TargetPV     annihil
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 74,   Parent ID = 72
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   2.02 mm   -421 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -3.23 mm  -1.95 mm  -2.45 m     511 keV     0 eV   8.12 mm   8.12 mm   TargetPV  Transportation
-    2  -40.7 cm  -11.9 cm  -2.91 m     511 keV     0 eV   62.3 cm   63.1 cm OutOfWorld  Transportation
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 73,   Parent ID = 72
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   2.02 mm   -421 mum -2.44 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   5.72 mm    656 mum -2.44 m     464 keV  47.3 keV  5.72 mm   5.72 mm   TargetPV       compt
-    2   5.91 mm    687 mum -2.44 m       0 eV     88 keV   205 mum  5.92 mm   TargetPV        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 75,   Parent ID = 73
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   5.91 mm    687 mum -2.44 m     376 keV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1   5.93 mm    684 mum -2.44 m    70.1 keV   306 keV   204 mum   204 mum  TargetPV       eIoni
-    2   5.93 mm    683 mum -2.44 m  4.16e-11 eV   70.1 keV  15.5 mum   219 mum  TargetPV       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 66,   Parent ID = 58
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   -183 mum -83.3 mum -2.45 m    4.84 MeV     0 eV      0 fm      0 fm   TargetPV    initStep
-    1  -1.66 mm  -3.69 mm  -2.43 m    2.17 MeV  2.68 MeV     2 cm      2 cm   TargetPV       compt
-    2  -3.18 mm   3.87 mm   -2.4 m    1.09 MeV  1.08 MeV   2.3 cm    4.3 cm   TargetPV       compt
-    3  -7.78 mm   8.23 mm   -2.4 m    1.09 MeV     0 eV   7.74 mm   5.07 cm   TargetPV  Transportation
-    4   -2.4 m    2.28 m   -8.99 cm   1.09 MeV     0 eV   4.03 m    4.08 m     Tracker  Transportation
-    5  -2.91 m    2.76 m    40.3 cm   1.09 MeV     0 eV   85.8 cm   4.93 m  OutOfWorld  Transportation
+    0  -1.12 mm   29.1 mum -2.42 m     511 keV     0 eV      0 fm      0 fm   TargetPV    initStep
+    1   3.74 mm   8.51 mm  -2.41 m       0 eV    511 keV  9.92 mm   9.92 mm   TargetPV        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
@@ -860,10 +1096,9 @@ Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
     0  -32.2 mum -1.27 mum -2.86 m    10.5 keV     0 eV      0 fm      0 fm    WorldPV    initStep
-    1   -698 mum  -105 mum -2.86 m    6.11 keV  4.39 keV   798 mum   798 mum   WorldPV       eIoni
-    2   -284 mum -93.4 mum -2.86 m    4.72 keV  1.39 keV   480 mum  1.28 mm    WorldPV       eIoni
-    3   24.5 mum  -192 mum -2.86 m    2.24 keV  2.47 keV   393 mum  1.67 mm    WorldPV       eIoni
-    4  -2.23 mum  -293 mum -2.86 m       0 eV   2.24 keV   186 mum  1.86 mm    WorldPV       eIoni
+    1   -690 mum  -257 mum -2.86 m    8.36 keV  2.13 keV   798 mum   798 mum   WorldPV       eIoni
+    2   -727 mum  -810 mum -2.86 m    6.66 keV  1.71 keV   630 mum  1.43 mm    WorldPV       eIoni
+    3   -529 mum -1.07 mm  -2.86 m  8.67e-13 eV   6.66 keV   515 mum  1.94 mm    WorldPV       eIoni
 >>> Event 0
     0 trajectories stored in this event.
 ### Run 1 start.
@@ -874,247 +1109,151 @@ Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
     0      0 fm      0 fm  -2.91 m       1 TeV     0 eV      0 fm      0 fm    WorldPV    initStep
-    1      0 fm      0 fm  -2.45 m   1e+03 GeV   100 keV    46 cm     46 cm    WorldPV  Transportation
-    2   28.2 nm  -9.83 Ang  -2.4 m   1e+03 GeV  89.5 MeV     5 cm     51 cm   TargetPV  Transportation
-    3  -2.24 mum  1.03 mum  -1.6 m   1e+03 GeV   195 keV    80 cm   1.31 m     Tracker  Transportation
-    4  -2.79 mum  1.42 mum  -1.4 m   1e+03 GeV   165 keV    20 cm   1.51 m     Chamber  Transportation
-    5  -3.05 mum  1.74 mum -1.27 m   1e+03 GeV  30.9 keV  13.5 cm   1.64 m     Tracker      MuIoni
-    6  -3.26 mum  1.98 mum -1.16 m   1e+03 GeV  27.3 keV  10.9 cm   1.75 m     Tracker      MuIoni
-    7  -3.53 mum  2.38 mum -1.01 m   1e+03 GeV  29.2 keV  14.2 cm    1.9 m     Tracker      MuIoni
-    8  -4.02 mum  2.97 mum   -80 cm  1e+03 GeV  46.3 keV  21.4 cm   2.11 m     Tracker  Transportation
-    9  -4.46 mum  3.49 mum   -60 cm  1e+03 GeV   158 keV    20 cm   2.31 m     Chamber  Transportation
-   10  -4.51 mum  4.73 mum -30.2 cm  1e+03 GeV  67.4 keV  29.8 cm   2.61 m     Tracker      MuIoni
-   11  -4.71 mum  5.96 mum0.0568 fm  1e+03 GeV  73.9 keV  30.2 cm   2.91 m     Tracker  Transportation
-   12  -4.65 mum  6.82 mum  19.8 cm  1e+03 GeV   227 keV  19.8 cm   3.11 m     Chamber      MuIoni
-   13  -4.65 mum  6.83 mum    20 cm  1e+03 GeV   565 eV   1.64 mm   3.11 m     Chamber  Transportation
-   14  -5.58 mum  9.02 mum    80 cm  1e+03 GeV   147 keV    60 cm   3.71 m     Tracker  Transportation
-   15  -5.91 mum   9.9 mum     1 m   1e+03 GeV   183 keV    20 cm   3.91 m     Chamber  Transportation
-   16  -6.09 mum  10.6 mum  1.08 m   1e+03 GeV  22.8 keV  7.96 cm   3.99 m     Tracker      MuIoni
-   17  -7.24 mum  14.9 mum   1.6 m   1e+03 GeV   125 keV    52 cm   4.51 m     Tracker  Transportation
-   18  -7.73 mum  16.7 mum   1.8 m   1e+03 GeV   214 keV    20 cm   4.71 m     Chamber  Transportation
-   19  -10.2 mum  21.2 mum  2.27 m   1e+03 GeV   118 keV  47.1 cm   5.18 m     Tracker      MuIoni
-   20    -11 mum  22.6 mum   2.4 m   1e+03 GeV  28.2 keV  12.9 cm   5.31 m     Tracker  Transportation
-   21  -13.9 mum    28 mum  2.91 m   1e+03 GeV   118 keV    51 cm   5.82 m  OutOfWorld  Transportation
+    1  -56.4 nm   65.7 nm  -2.65 m   1e+03 GeV    64 keV  25.9 cm   25.9 cm    WorldPV      MuIoni
+    2   -113 nm   -159 nm  -2.45 m   1e+03 GeV    45 keV  20.1 cm     46 cm    WorldPV  Transportation
+    3   -128 nm   -211 nm   -2.4 m   1e+03 GeV  72.7 MeV     5 cm     51 cm   TargetPV  Transportation
+    4   18.5 mum -5.87 mum -2.24 m   1e+03 GeV  33.9 keV  16.3 cm   67.3 cm    Tracker      MuIoni
+    5   91.5 mum -27.4 mum  -1.6 m   1e+03 GeV   145 keV  63.7 cm   1.31 m     Tracker  Transportation
+    6    113 mum -33.8 mum -1.41 m   1e+03 GeV   175 keV  19.3 cm    1.5 m     Chamber      MuIoni
+    7    114 mum   -34 mum  -1.4 m   1e+03 GeV  6.69 keV   7.5 mm   1.51 m     Chamber  Transportation
+    8    184 mum -53.2 mum   -80 cm  1e+03 GeV   157 keV    60 cm   2.11 m     Tracker  Transportation
+    9    207 mum -59.7 mum   -60 cm  1e+03 GeV   126 keV    20 cm   2.31 m     Chamber  Transportation
+   10    277 mum -79.1 mum     0 fm  1e+03 GeV   137 keV    60 cm   2.91 m     Tracker  Transportation
+   11    300 mum   -86 mum    20 cm  1e+03 GeV   146 keV    20 cm   3.11 m     Chamber  Transportation
+   12    368 mum  -105 mum    80 cm  1e+03 GeV   139 keV    60 cm   3.71 m     Tracker  Transportation
+   13    391 mum  -111 mum     1 m   1e+03 GeV   175 keV    20 cm   3.91 m     Chamber  Transportation
+   14    459 mum  -129 mum   1.6 m   1e+03 GeV   137 keV    60 cm   4.51 m     Tracker  Transportation
+   15    472 mum  -132 mum  1.71 m   1e+03 GeV  91.1 keV  10.8 cm   4.62 m     Chamber      MuIoni
+   16    482 mum  -135 mum   1.8 m   1e+03 GeV  60.2 keV  9.22 cm   4.71 m     Chamber  Transportation
+   17    503 mum  -141 mum  1.98 m   1e+03 GeV  46.3 keV  18.1 cm   4.89 m     Tracker      MuIoni
+   18    548 mum  -153 mum  2.38 m   1e+03 GeV  86.5 keV  39.6 cm   5.29 m     Tracker      MuIoni
+   19    550 mum  -153 mum   2.4 m   1e+03 GeV  4.05 keV  2.23 cm   5.31 m     Tracker  Transportation
+   20    559 mum  -156 mum  2.48 m   1e+03 GeV  15.8 keV  7.56 cm   5.39 m     WorldPV      MuIoni
+   21    576 mum  -160 mum  2.63 m   1e+03 GeV  35.8 keV  15.2 cm   5.54 m     WorldPV      MuIoni
+   22    608 mum  -169 mum  2.91 m   1e+03 GeV  56.4 keV  28.2 cm   5.82 m  OutOfWorld  Transportation
+
+*********************************************************************************************************
+* G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 1
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0    576 mum  -160 mum  2.63 m    9.53 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1    606 mum   496 mum  2.63 m    7.84 keV  1.69 keV   720 mum   720 mum   WorldPV       eIoni
+    2    775 mum  1.02 mm   2.63 m    6.18 keV  1.66 keV   594 mum  1.31 mm    WorldPV       eIoni
+    3    653 mum   985 mum  2.63 m    5.05 keV  1.13 keV   484 mum   1.8 mm    WorldPV       eIoni
+    4    823 mum   778 mum  2.63 m    3.69 keV  1.35 keV   414 mum  2.21 mm    WorldPV       eIoni
+    5    999 mum   932 mum  2.63 m    1.36 keV  2.33 keV   326 mum  2.54 mm    WorldPV       eIoni
+    6   1.01 mm    943 mum  2.63 m       0 eV   1.36 keV  88.8 mum  2.63 mm    WorldPV       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 8,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -10.2 mum  21.2 mum  2.27 m    8.95 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1    564 mum   144 mum  2.27 m    7.91 keV  1.04 keV   676 mum   676 mum   Tracker       eIoni
-    2     66 mum   147 mum  2.27 m    6.34 keV  1.57 keV   599 mum  1.27 mm    Tracker       eIoni
-    3   -393 mum   168 mum  2.27 m     3.6 keV  2.73 keV   495 mum  1.77 mm    Tracker       eIoni
-    4   -601 mum   217 mum  2.27 m     633 eV   2.97 keV   320 mum  2.09 mm    Tracker       eIoni
-    5   -605 mum   224 mum  2.27 m  1.08e-13 eV    633 eV   33.7 mum  2.12 mm    Tracker       eIoni
+    0    559 mum  -156 mum  2.48 m    15.8 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1    404 mum -1.24 mm   2.48 m      13 keV  2.76 keV  1.32 mm   1.32 mm    WorldPV       eIoni
+    2    728 mum -2.08 mm   2.48 m    11.3 keV  1.78 keV  1.03 mm   2.35 mm    WorldPV       eIoni
+    3   1.08 mm  -2.78 mm   2.48 m    6.85 keV  4.41 keV   864 mum  3.21 mm    WorldPV       eIoni
+    4   1.13 mm  -2.81 mm   2.48 m    3.24 keV  3.61 keV   527 mum  3.74 mm    WorldPV       eIoni
+    5   1.18 mm   -2.9 mm   2.48 m     1.1 keV  2.14 keV   291 mum  4.03 mm    WorldPV       eIoni
+    6   1.18 mm  -2.93 mm   2.48 m  4.34e-13 eV    1.1 keV  65.7 mum   4.1 mm    WorldPV       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 7,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -6.09 mum  10.6 mum  1.08 m    8.79 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1    484 mum   359 mum  1.08 m    6.48 keV  2.31 keV   663 mum   663 mum   Tracker       eIoni
-    2    745 mum   268 mum  1.08 m       0 eV   6.48 keV   504 mum  1.17 mm    Tracker       eIoni
+    0    548 mum  -153 mum  2.38 m     9.3 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   1.11 mm  -63.7 mum  2.38 m    8.16 keV  1.14 keV   702 mum   702 mum   Tracker       eIoni
+    2    1.6 mm   -179 mum  2.38 m  1.73e-12 eV   8.16 keV   617 mum  1.32 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 6,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -4.65 mum  6.82 mum  19.8 cm    1.4 MeV     0 eV      0 fm      0 fm    Chamber    initStep
-    1    1.4 mm  -16.8 mum    20 cm    1.4 MeV   338 eV   2.17 mm   2.17 mm    Chamber  Transportation
-    2   18.6 cm  -4.98 cm   62.2 cm   1.28 MeV  68.7 keV  46.8 cm   47.1 cm    Tracker       eIoni
-    3   31.3 cm  -9.75 cm     80 cm   1.24 MeV  39.3 keV  22.7 cm   69.8 cm    Tracker  Transportation
-    4   39.4 cm  -10.8 cm   86.2 cm   1.06 MeV  51.9 keV  11.2 cm     81 cm    Chamber       eIoni
-    5   44.5 cm  -17.8 cm      1 m     890 keV   167 keV  30.3 cm   1.11 m     Chamber  Transportation
-    6   44.5 cm  -17.8 cm      1 m     890 keV     0 eV      0 fm   1.11 m     Tracker  Transportation
-    7     50 cm  -4.47 cm   95.4 cm    769 keV   122 keV  26.8 cm   1.38 m     Chamber       eIoni
-    8   49.9 cm   -4.3 cm   95.4 cm    745 keV   875 eV   2.23 mm   1.38 m     Chamber       eBrem
-    9   48.5 cm  -3.24 cm   95.6 cm    576 keV  9.77 keV  1.83 cm    1.4 m     Chamber       eIoni
-   10     50 cm  -2.22 mm      1 m     528 keV    48 keV  8.88 cm   1.49 m     Chamber  Transportation
-   11   26.6 cm  -5.03 cm    1.3 m     457 keV  70.8 keV  39.6 cm   1.89 m     Tracker       eIoni
-   12   52.5 cm   12.1 cm   1.29 m     384 keV  72.5 keV  32.2 cm   2.21 m     Tracker       eIoni
-   13   59.6 cm   34.6 cm   1.24 m     337 keV  47.6 keV  24.9 cm   2.46 m     Tracker       eIoni
-   14   56.5 cm   45.4 cm    1.1 m     301 keV    36 keV  20.4 cm   2.66 m     Tracker       eIoni
-   15     56 cm   52.4 cm      1 m     278 keV  22.5 keV    13 cm   2.79 m     Tracker  Transportation
-   16   55.4 cm   53.9 cm   97.7 cm    249 keV  29.1 keV   5.2 cm   2.84 m     Chamber       eIoni
-   17   55.6 cm     52 cm   98.4 cm    221 keV  27.8 keV   4.4 cm   2.89 m     Chamber       eIoni
-   18   54.2 cm   50.3 cm   98.4 cm    199 keV  22.5 keV  3.65 cm   2.93 m     Chamber       eIoni
-   19   53.3 cm   49.4 cm   97.9 cm    175 keV  23.6 keV  3.09 cm   2.96 m     Chamber       eIoni
-   20   52.1 cm   48.4 cm   98.1 cm    149 keV  26.5 keV  2.53 cm   2.98 m     Chamber       eIoni
-   21   51.2 cm   47.8 cm   98.8 cm    136 keV  13.1 keV  1.94 cm      3 m     Chamber       eIoni
-   22   51.9 cm   48.3 cm     99 cm    114 keV  22.2 keV  1.67 cm   3.02 m     Chamber       eIoni
-   23   52.3 cm   47.8 cm   98.7 cm   81.1 keV  32.5 keV  1.25 cm   3.03 m     Chamber       eIoni
-   24   52.3 cm   47.4 cm   98.5 cm   76.1 keV  4.99 keV  7.29 mm   3.04 m     Chamber       eIoni
-   25   52.3 cm   47.1 cm   98.8 cm   67.7 keV  8.34 keV  6.57 mm   3.04 m     Chamber       eIoni
-   26   52.5 cm   46.8 cm   98.6 cm   46.1 keV  21.6 keV  5.49 mm   3.05 m     Chamber       eIoni
-   27   52.5 cm   46.8 cm   98.8 cm   41.4 keV  4.74 keV  3.04 mm   3.05 m     Chamber       eIoni
-   28   52.6 cm   46.8 cm   98.7 cm   38.7 keV  2.71 keV  2.59 mm   3.06 m     Chamber       eIoni
-   29   52.7 cm   46.9 cm   98.7 cm   17.5 keV  21.2 keV  2.34 mm   3.06 m     Chamber       eIoni
-   30   52.7 cm   46.9 cm   98.8 cm   16.5 keV  1.01 keV   849 mum  3.06 m     Chamber       eIoni
-   31   52.7 cm   46.9 cm   98.8 cm   13.6 keV  2.91 keV   799 mum  3.06 m     Chamber       eIoni
-   32   52.7 cm   46.8 cm   98.9 cm   11.3 keV  2.27 keV   661 mum  3.06 m     Chamber       eIoni
-   33   52.7 cm   46.8 cm   98.9 cm   9.38 keV  1.93 keV   564 mum  3.06 m     Chamber       eIoni
-   34   52.7 cm   46.8 cm   98.9 cm   6.84 keV  2.54 keV   487 mum  3.06 m     Chamber       eIoni
-   35   52.7 cm   46.8 cm   98.9 cm   5.58 keV  1.26 keV   389 mum  3.06 m     Chamber       eIoni
-   36   52.8 cm   46.8 cm   98.9 cm   2.15 keV  3.43 keV   338 mum  3.06 m     Chamber       eIoni
-   37   52.8 cm   46.8 cm   98.9 cm      0 eV   2.15 keV   114 mum  3.06 m     Chamber       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 12,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   48.5 cm  -3.24 cm   95.6 cm    160 keV     0 eV      0 fm      0 fm    Chamber    initStep
-    1   49.8 cm  -2.66 cm     96 cm    138 keV  22.1 keV  2.17 cm   2.17 cm    Chamber       eIoni
-    2   49.1 cm  -2.43 cm   96.9 cm    115 keV  22.5 keV  1.71 cm   3.89 cm    Chamber       eIoni
-    3   48.7 cm  -1.65 cm   97.1 cm    103 keV  11.9 keV  1.28 cm   5.17 cm    Chamber       eIoni
-    4   48.8 cm  -9.08 mm     97 cm   91.7 keV  11.7 keV  1.08 cm   6.25 cm    Chamber       eIoni
-    5   48.4 cm  -1.41 cm   97.1 cm   88.6 keV  3.13 keV  8.85 mm   7.13 cm    Chamber       eIoni
-    6   48.5 cm   -8.5 mm   96.9 cm   78.7 keV  9.89 keV  8.39 mm   7.97 cm    Chamber       eIoni
-    7   48.1 cm  -9.63 mm   96.8 cm   72.3 keV  6.41 keV  6.95 mm   8.67 cm    Chamber       eIoni
-    8   48.5 cm  -9.95 mm   96.7 cm   64.2 keV  8.14 keV  6.08 mm   9.27 cm    Chamber       eIoni
-    9   48.4 cm  -6.63 mm   96.6 cm   57.6 keV  6.55 keV  5.03 mm   9.78 cm    Chamber       eIoni
-   10   48.5 cm  -4.15 mm   96.6 cm     52 keV  5.57 keV  4.27 mm   10.2 cm    Chamber       eIoni
-   11   48.5 cm  -2.59 mm   96.7 cm   48.3 keV  3.71 keV  3.64 mm   10.6 cm    Chamber       eIoni
-   12   48.6 cm  -4.71 mm   96.7 cm   40.3 keV  7.99 keV  3.26 mm   10.9 cm    Chamber       eIoni
-   13   48.8 cm   -4.3 mm   96.7 cm   36.9 keV  3.44 keV  2.49 mm   11.1 cm    Chamber       eIoni
-   14   48.9 cm  -5.06 mm   96.7 cm   33.9 keV  3.02 keV  2.18 mm   11.4 cm    Chamber       eIoni
-   15   48.9 cm  -4.11 mm   96.7 cm   14.3 keV  19.6 keV  1.94 mm   11.6 cm    Chamber       eIoni
-   16   48.9 cm  -3.78 mm   96.7 cm   10.8 keV   3.5 keV   693 mum  11.6 cm    Chamber       eIoni
-   17   48.9 cm  -3.64 mm   96.7 cm   9.01 keV  1.79 keV   543 mum  11.7 cm    Chamber       eIoni
-   18   48.9 cm  -3.62 mm   96.7 cm   1.42 keV  7.59 keV   473 mum  11.7 cm    Chamber       eIoni
-   19   48.9 cm  -3.62 mm   96.8 cm      0 eV   1.42 keV  64.7 mum  11.7 cm    Chamber       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = gamma,   Track ID = 11,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   49.9 cm   -4.3 cm   95.4 cm   22.6 keV     0 eV      0 fm      0 fm    Chamber    initStep
-    1   48.7 cm  -3.84 cm     96 cm      0 eV   22.6 keV  1.42 cm   1.42 cm    Chamber        phot
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 10,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   39.4 cm  -10.8 cm   86.2 cm    131 keV     0 eV      0 fm      0 fm    Chamber    initStep
-    1   39.9 cm  -9.98 cm   85.7 cm    120 keV  11.3 keV  1.57 cm   1.57 cm    Chamber       eIoni
-    2   39.6 cm  -9.24 cm   86.2 cm    103 keV  17.1 keV  1.36 cm   2.94 cm    Chamber       eIoni
-    3   39.6 cm  -9.44 cm   85.5 cm   88.7 keV  13.8 keV  1.06 cm      4 cm    Chamber       eIoni
-    4   39.2 cm  -9.19 cm   85.1 cm   79.8 keV   8.9 keV  8.41 mm   4.84 cm    Chamber       eIoni
-    5   39.4 cm  -8.75 cm   85.3 cm   72.5 keV  7.34 keV  7.11 mm   5.55 cm    Chamber       eIoni
-    6   39.1 cm  -8.46 cm   85.2 cm   67.1 keV  5.34 keV   6.1 mm   6.16 cm    Chamber       eIoni
-    7   38.8 cm  -8.19 cm   85.1 cm   61.1 keV  6.04 keV  5.41 mm    6.7 cm    Chamber       eIoni
-    8   38.6 cm  -8.05 cm   85.1 cm     54 keV  7.13 keV  4.67 mm   7.17 cm    Chamber       eIoni
-    9   38.4 cm  -8.22 cm     85 cm   48.9 keV  5.11 keV  3.85 mm   7.55 cm    Chamber       eIoni
-   10   38.2 cm  -8.36 cm   85.1 cm   42.4 keV  6.46 keV  3.31 mm   7.88 cm    Chamber       eIoni
-   11   38.3 cm  -8.43 cm   84.9 cm   28.1 keV  14.3 keV  2.68 mm   8.15 cm    Chamber       eIoni
-   12   38.4 cm  -8.45 cm   84.8 cm   25.1 keV     3 keV   1.5 mm    8.3 cm    Chamber       eIoni
-   13   38.4 cm  -8.43 cm   84.8 cm   21.4 keV  3.74 keV   1.3 mm   8.43 cm    Chamber       eIoni
-   14   38.5 cm  -8.43 cm   84.9 cm   18.4 keV  2.97 keV  1.06 mm   8.54 cm    Chamber       eIoni
-   15   38.5 cm  -8.42 cm     85 cm   15.5 keV  2.88 keV   899 mum  8.63 cm    Chamber       eIoni
-   16   38.5 cm  -8.41 cm     85 cm   10.8 keV  4.73 keV   752 mum   8.7 cm    Chamber       eIoni
-   17   38.5 cm  -8.41 cm     85 cm   7.03 keV  3.77 keV   543 mum  8.76 cm    Chamber       eIoni
-   18   38.6 cm  -8.41 cm     85 cm   5.59 keV  1.44 keV   396 mum   8.8 cm    Chamber       eIoni
-   19   38.6 cm   -8.4 cm     85 cm   3.16 keV  2.43 keV   338 mum  8.83 cm    Chamber       eIoni
-   20   38.6 cm   -8.4 cm     85 cm 2.17e-12 eV   3.16 keV   195 mum  8.85 cm    Chamber       eIoni
-
-*********************************************************************************************************
-* G4Track Information:   Particle = e-,   Track ID = 9,   Parent ID = 6
-*********************************************************************************************************
-
-Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0   18.6 cm  -4.98 cm   62.2 cm   47.8 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1   18.6 cm  -4.31 cm   62.5 cm   41.5 keV   6.3 keV  7.67 mm   7.67 mm    Tracker       eIoni
-    2   18.5 cm  -3.87 cm   62.8 cm   38.2 keV  3.27 keV     6 mm   1.37 cm    Tracker       eIoni
-    3   18.7 cm  -3.45 cm   63.1 cm   33.7 keV   4.5 keV  5.22 mm   1.89 cm    Tracker       eIoni
-    4   18.8 cm  -3.67 cm   63.4 cm   31.5 keV  2.27 keV  4.23 mm   2.31 cm    Tracker       eIoni
-    5   18.8 cm  -3.74 cm   63.7 cm   28.8 keV  2.67 keV  3.76 mm   2.69 cm    Tracker       eIoni
-    6   18.9 cm   -3.9 cm     64 cm   25.6 keV  3.22 keV  3.25 mm   3.01 cm    Tracker       eIoni
-    7   18.9 cm  -3.64 cm     64 cm   20.2 keV  5.39 keV  2.68 mm   3.28 cm    Tracker       eIoni
-    8   18.8 cm  -3.58 cm   64.1 cm   16.2 keV  4.01 keV  1.87 mm   3.47 cm    Tracker       eIoni
-    9   18.8 cm  -3.52 cm   64.2 cm   14.6 keV  1.62 keV  1.36 mm   3.61 cm    Tracker       eIoni
-   10   18.8 cm  -3.42 cm   64.2 cm   11.8 keV  2.77 keV  1.18 mm   3.72 cm    Tracker       eIoni
-   11   18.9 cm  -3.35 cm   64.3 cm   10.1 keV  1.68 keV   909 mum  3.81 cm    Tracker       eIoni
-   12   18.9 cm  -3.34 cm   64.2 cm   7.72 keV  2.39 keV   765 mum  3.89 cm    Tracker       eIoni
-   13   18.9 cm  -3.39 cm   64.2 cm   5.73 keV  1.99 keV   586 mum  3.95 cm    Tracker       eIoni
-   14     19 cm  -3.41 cm   64.2 cm   3.64 keV  2.09 keV   455 mum  3.99 cm    Tracker       eIoni
-   15     19 cm  -3.44 cm   64.2 cm   2.05 keV  1.59 keV   322 mum  4.03 cm    Tracker       eIoni
-   16     19 cm  -3.43 cm   64.2 cm      0 eV   2.05 keV   162 mum  4.04 cm    Tracker       eIoni
+    0    503 mum  -141 mum  1.98 m    12.5 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1   -148 mum  -789 mum  1.98 m      11 keV  1.55 keV   980 mum   980 mum   Tracker       eIoni
+    2   -836 mum  -789 mum  1.98 m    9.68 keV  1.31 keV   841 mum  1.82 mm    Tracker       eIoni
+    3   -1.5 mm   -815 mum  1.98 m    7.15 keV  2.53 keV   731 mum  2.55 mm    Tracker       eIoni
+    4  -1.86 mm   -977 mum  1.98 m    5.16 keV  1.99 keV   547 mum   3.1 mm    Tracker       eIoni
+    5  -1.83 mm   -736 mum  1.98 m     3.5 keV  1.66 keV   421 mum  3.52 mm    Tracker       eIoni
+    6  -2.01 mm   -670 mum  1.98 m    2.16 keV  1.34 keV   312 mum  3.83 mm    Tracker       eIoni
+    7   -2.1 mm   -642 mum  1.98 m       0 eV   2.16 keV   176 mum  4.01 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 5,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -4.51 mum  4.73 mum -30.2 cm   14.3 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1    718 mum  -809 mum -30.2 cm   12.6 keV  1.67 keV  1.15 mm   1.15 mm    Tracker       eIoni
-    2   1.51 mm  -1.23 mm  -30.2 cm   10.4 keV  2.24 keV   986 mum  2.14 mm    Tracker       eIoni
-    3   1.75 mm  -1.87 mm  -30.2 cm   8.22 keV  2.15 keV   787 mum  2.92 mm    Tracker       eIoni
-    4   2.17 mm  -1.67 mm  -30.2 cm   7.17 keV  1.05 keV   620 mum  3.54 mm    Tracker       eIoni
-    5   2.69 mm   -1.7 mm  -30.2 cm   4.94 keV  2.23 keV   548 mum  4.09 mm    Tracker       eIoni
-    6   2.85 mm  -1.71 mm  -30.2 cm   3.58 keV  1.36 keV   407 mum   4.5 mm    Tracker       eIoni
-    7   2.78 mm  -1.88 mm  -30.2 cm    365 eV   3.22 keV   318 mum  4.81 mm    Tracker       eIoni
-    8   2.77 mm  -1.89 mm  -30.2 cm      0 eV    365 eV   19.9 mum  4.83 mm    Tracker       eIoni
+    0    472 mum  -132 mum  1.71 m     295 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   -8.3 mm   3.47 mm   1.72 m     273 keV  13.8 keV  2.16 cm   2.16 cm    Chamber       eBrem
+    2  -3.74 cm  -6.02 mm   1.74 m     247 keV    26 keV  5.06 cm   7.22 cm    Chamber       eIoni
+    3  -1.03 cm   1.26 mm   1.75 m     213 keV  34.3 keV  4.34 cm   11.6 cm    Chamber       eIoni
+    4   9.34 mm  -1.14 cm   1.75 m     162 keV  50.6 keV  3.44 cm     15 cm    Chamber       eIoni
+    5  -5.22 mm  -1.62 cm   1.75 m     146 keV  16.5 keV  2.23 cm   17.2 cm    Chamber       eIoni
+    6  -5.81 mm  -2.23 cm   1.76 m     122 keV  23.4 keV  1.88 cm   19.1 cm    Chamber       eIoni
+    7  -1.42 cm  -2.26 cm   1.76 m     110 keV  12.7 keV  1.42 cm   20.5 cm    Chamber       eIoni
+    8  -2.11 cm  -1.84 cm   1.77 m    97.1 keV  12.6 keV  1.18 cm   21.7 cm    Chamber       eIoni
+    9  -1.59 cm  -2.28 cm   1.77 m    93.5 keV  3.61 keV  9.73 mm   22.7 cm    Chamber       eIoni
+   10  -2.19 cm  -2.15 cm   1.76 m      83 keV  10.5 keV  9.14 mm   23.6 cm    Chamber       eIoni
+   11   -2.1 cm  -2.66 cm   1.76 m      76 keV  7.02 keV  7.58 mm   24.4 cm    Chamber       eIoni
+   12  -1.85 cm  -2.38 cm   1.76 m    44.9 keV  31.1 keV  6.56 mm     25 cm    Chamber       eIoni
+   13  -1.67 cm   -2.3 cm   1.76 m    38.9 keV  5.98 keV  2.91 mm   25.3 cm    Chamber       eIoni
+   14  -1.56 cm  -2.41 cm   1.76 m    34.6 keV  4.34 keV  2.36 mm   25.5 cm    Chamber       eIoni
+   15  -1.69 cm  -2.42 cm   1.76 m    26.4 keV  8.22 keV  1.99 mm   25.7 cm    Chamber       eIoni
+   16  -1.67 cm  -2.36 cm   1.76 m    22.4 keV     4 keV  1.38 mm   25.9 cm    Chamber       eIoni
+   17  -1.63 cm  -2.33 cm   1.77 m      17 keV  5.32 keV  1.12 mm     26 cm    Chamber       eIoni
+   18  -1.63 cm  -2.28 cm   1.77 m    13.6 keV  3.42 keV   825 mum  26.1 cm    Chamber       eIoni
+   19  -1.61 cm  -2.28 cm   1.77 m    8.49 keV  5.12 keV   662 mum  26.1 cm    Chamber       eIoni
+   20   -1.6 cm  -2.27 cm   1.77 m    2.66 keV  5.83 keV   452 mum  26.2 cm    Chamber       eIoni
+   21   -1.6 cm  -2.27 cm   1.77 m       0 eV   2.66 keV   154 mum  26.2 cm    Chamber       eIoni
+
+*********************************************************************************************************
+* G4Track Information:   Particle = gamma,   Track ID = 10,   Parent ID = 5
+*********************************************************************************************************
+
+Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
+    0   -8.3 mm   3.47 mm   1.72 m    7.73 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1  -8.99 mm   3.61 mm   1.72 m       0 eV   7.73 keV   989 mum   989 mum   Chamber        phot
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 4,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -3.53 mum  2.38 mum -1.01 m    12.1 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1   -831 mum  -142 mum -1.01 m    9.94 keV  2.14 keV   935 mum   935 mum   Tracker       eIoni
-    2   -831 mum  -770 mum -1.01 m    9.04 keV   900 eV    751 mum  1.69 mm    Tracker       eIoni
-    3  -1.04 mm  -1.36 mm  -1.01 m     6.6 keV  2.44 keV   682 mum  2.37 mm    Tracker       eIoni
-    4  -1.49 mm   -1.3 mm  -1.01 m    3.72 keV  2.88 keV   511 mum  2.88 mm    Tracker       eIoni
-    5  -1.66 mm  -1.21 mm  -1.01 m    2.38 keV  1.34 keV   328 mum  3.21 mm    Tracker       eIoni
-    6  -1.62 mm   -1.2 mm  -1.01 m  8.67e-13 eV   2.38 keV   205 mum  3.41 mm    Tracker       eIoni
+    0    113 mum -33.8 mum -1.41 m    40.5 keV     0 eV      0 fm      0 fm    Chamber    initStep
+    1   1.09 mm    301 mum -1.41 m    8.13 keV  32.4 keV  2.51 mm   2.51 mm    Chamber       eIoni
+    2   1.07 mm    452 mum -1.41 m    5.66 keV  2.47 keV   438 mum  2.95 mm    Chamber       eIoni
+    3   1.15 mm    468 mum -1.41 m    4.24 keV  1.41 keV   341 mum  3.29 mm    Chamber       eIoni
+    4   1.06 mm    500 mum -1.41 m       4 keV   239 eV    272 mum  3.56 mm    Chamber       eIoni
+    5   1.04 mm    520 mum -1.41 m       0 eV      4 keV   258 mum  3.82 mm    Chamber       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 3,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -3.26 mum  1.98 mum -1.16 m     106 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1   1.98 cm  -1.54 cm  -1.14 m    84.9 keV  20.8 keV  3.04 cm   3.04 cm    Tracker       eIoni
-    2   3.72 cm  -2.49 cm  -1.14 m    76.7 keV  8.13 keV  2.08 cm   5.12 cm    Tracker       eIoni
-    3   4.11 cm  -4.06 cm  -1.13 m    69.4 keV  7.33 keV  1.74 cm   6.85 cm    Tracker       eIoni
-    4   5.02 cm  -5.12 cm  -1.14 m    60.3 keV  9.12 keV  1.47 cm   8.32 cm    Tracker       eIoni
-    5   4.98 cm   -5.6 cm  -1.13 m    46.2 keV  14.1 keV  1.14 cm   9.47 cm    Tracker       eIoni
-    6   5.23 cm  -5.91 cm  -1.12 m    41.1 keV  5.09 keV  7.22 mm   10.2 cm    Tracker       eIoni
-    7   4.96 cm  -6.29 cm  -1.12 m    38.7 keV  2.39 keV  5.91 mm   10.8 cm    Tracker       eIoni
-    8   4.95 cm   -6.8 cm  -1.12 m    32.8 keV  5.97 keV  5.34 mm   11.3 cm    Tracker       eIoni
-    9   4.89 cm  -7.16 cm  -1.12 m    27.5 keV  5.29 keV  4.03 mm   11.7 cm    Tracker       eIoni
-   10   4.95 cm     -7 cm  -1.12 m    19.7 keV  7.79 keV  3.02 mm     12 cm    Tracker       eIoni
-   11   5.01 cm  -7.03 cm  -1.12 m    17.5 keV  2.17 keV   1.8 mm   12.2 cm    Tracker       eIoni
-   12   5.09 cm  -7.09 cm  -1.12 m    15.5 keV  1.97 keV  1.51 mm   12.3 cm    Tracker       eIoni
-   13    5.1 cm  -7.18 cm  -1.12 m    11.6 keV  3.94 keV  1.29 mm   12.5 cm    Tracker       eIoni
-   14   5.07 cm  -7.24 cm  -1.12 m    9.14 keV  2.46 keV   893 mum  12.6 cm    Tracker       eIoni
-   15   5.05 cm  -7.18 cm  -1.12 m    7.68 keV  1.46 keV   690 mum  12.6 cm    Tracker       eIoni
-   16      5 cm  -7.17 cm  -1.12 m    4.95 keV  2.73 keV   584 mum  12.7 cm    Tracker       eIoni
-   17   4.98 cm  -7.17 cm  -1.12 m    3.45 keV   1.5 keV   408 mum  12.7 cm    Tracker       eIoni
-   18   4.98 cm  -7.17 cm  -1.12 m     406 eV   3.04 keV   308 mum  12.8 cm    Tracker       eIoni
-   19   4.98 cm  -7.17 cm  -1.12 m       0 eV    406 eV   21.8 mum  12.8 cm    Tracker       eIoni
+    0   18.5 mum -5.87 mum -2.24 m      10 keV     0 eV      0 fm      0 fm    Tracker    initStep
+    1    613 mum  -366 mum -2.24 m    8.63 keV  1.39 keV   757 mum   757 mum   Tracker       eIoni
+    2    885 mum  -901 mum -2.24 m    5.88 keV  2.75 keV   651 mum  1.41 mm    Tracker       eIoni
+    3    730 mum -1.29 mm  -2.24 m    2.61 keV  3.27 keV   465 mum  1.87 mm    Tracker       eIoni
+    4    706 mum -1.14 mm  -2.24 m    1.56 keV  1.05 keV   232 mum  2.11 mm    Tracker       eIoni
+    5    687 mum -1.09 mm  -2.24 m  2.17e-13 eV   1.56 keV   108 mum  2.21 mm    Tracker       eIoni
 
 *********************************************************************************************************
 * G4Track Information:   Particle = e-,   Track ID = 2,   Parent ID = 1
 *********************************************************************************************************
 
 Step#      X         Y         Z        KineE    dEStep   StepLeng  TrakLeng    Volume     Process
-    0  -3.05 mum  1.74 mum -1.27 m    28.6 keV     0 eV      0 fm      0 fm    Tracker    initStep
-    1   2.78 mm   -1.3 mm  -1.27 m    24.1 keV  4.55 keV  3.23 mm   3.23 mm    Tracker       eIoni
-    2   4.69 mm  -2.61 mm  -1.27 m    21.6 keV  2.54 keV  2.45 mm   5.67 mm    Tracker       eIoni
-    3   6.58 mm  -2.31 mm  -1.27 m    19.5 keV  2.01 keV  2.06 mm   7.73 mm    Tracker       eIoni
-    4    7.5 mm   -957 mum -1.27 m    17.5 keV  2.04 keV  1.78 mm   9.51 mm    Tracker       eIoni
-    5   7.27 mm    520 mum -1.27 m    11.1 keV  6.37 keV  1.51 mm    1.1 cm    Tracker       eIoni
-    6    7.2 mm    1.2 mm  -1.27 m    9.23 keV   1.9 keV   853 mum  1.19 cm    Tracker       eIoni
-    7   6.74 mm   1.22 mm  -1.27 m    7.77 keV  1.46 keV   697 mum  1.26 cm    Tracker       eIoni
-    8   6.95 mm    1.4 mm  -1.27 m    5.98 keV  1.79 keV   590 mum  1.32 cm    Tracker       eIoni
-    9    7.2 mm   1.65 mm  -1.27 m    1.46 keV  4.53 keV   472 mum  1.36 cm    Tracker       eIoni
-   10   7.23 mm    1.7 mm  -1.27 m  6.51e-13 eV   1.46 keV  97.7 mum  1.37 cm    Tracker       eIoni
+    0  -56.4 nm   65.7 nm  -2.65 m    11.2 keV     0 eV      0 fm      0 fm    WorldPV    initStep
+    1   -292 mum  -715 mum -2.65 m    9.66 keV  1.58 keV   862 mum   862 mum   WorldPV       eIoni
+    2   -112 mum -1.24 mm  -2.65 m    7.93 keV  1.73 keV   729 mum  1.59 mm    WorldPV       eIoni
+    3   -534 mum -1.49 mm  -2.65 m       6 keV  1.93 keV   601 mum  2.19 mm    WorldPV       eIoni
+    4   -844 mum -1.67 mm  -2.65 m    4.31 keV  1.68 keV   473 mum  2.66 mm    WorldPV       eIoni
+    5  -1.07 mm  -1.89 mm  -2.65 m    2.58 keV  1.73 keV   368 mum  3.03 mm    WorldPV       eIoni
+    6  -1.15 mm     -2 mm  -2.65 m     439 eV   2.14 keV   229 mum  3.26 mm    WorldPV       eIoni
+    7  -1.15 mm  -2.01 mm  -2.65 m  5.42e-14 eV    439 eV   23.4 mum  3.28 mm    WorldPV       eIoni
 >>> Event 0
     0 trajectories stored in this event.
 ### Run 2 start.
diff --git a/examples/novice/N02/include/ExN02ChamberParameterisation.hh b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
index 5af7079665..66a4dae4b6 100644
--- a/examples/novice/N02/include/ExN02ChamberParameterisation.hh
+++ b/examples/novice/N02/include/ExN02ChamberParameterisation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02ChamberParameterisation.hh,v 1.3 2000/12/04 16:24:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02ChamberParameterisation.hh,v 1.3.4.1 2001/06/28 19:07:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  A parameterisation that describes a series of boxes along Z
diff --git a/examples/novice/N02/include/ExN02DetectorConstruction.hh b/examples/novice/N02/include/ExN02DetectorConstruction.hh
index fbad5e88ef..b93a8f7d86 100644
--- a/examples/novice/N02/include/ExN02DetectorConstruction.hh
+++ b/examples/novice/N02/include/ExN02DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02DetectorConstruction.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02DetectorConstruction.hh,v 1.3.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
diff --git a/examples/novice/N02/include/ExN02DetectorMessenger.hh b/examples/novice/N02/include/ExN02DetectorMessenger.hh
index b625301253..e830bdef2e 100644
--- a/examples/novice/N02/include/ExN02DetectorMessenger.hh
+++ b/examples/novice/N02/include/ExN02DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02DetectorMessenger.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02DetectorMessenger.hh,v 1.3.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02EventAction.hh b/examples/novice/N02/include/ExN02EventAction.hh
index 3d22096313..baea4975b8 100644
--- a/examples/novice/N02/include/ExN02EventAction.hh
+++ b/examples/novice/N02/include/ExN02EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02EventAction.hh,v 1.4 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02EventAction.hh,v 1.4.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02MagneticField.hh b/examples/novice/N02/include/ExN02MagneticField.hh
index 471d716a88..598c3223b6 100644
--- a/examples/novice/N02/include/ExN02MagneticField.hh
+++ b/examples/novice/N02/include/ExN02MagneticField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02MagneticField.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02MagneticField.hh,v 1.3.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //    A class for control of the Magnetic Field of the detector.
diff --git a/examples/novice/N02/include/ExN02PhysicsList.hh b/examples/novice/N02/include/ExN02PhysicsList.hh
index 5fd26d7ce2..79c70ed67c 100644
--- a/examples/novice/N02/include/ExN02PhysicsList.hh
+++ b/examples/novice/N02/include/ExN02PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02PhysicsList.hh,v 1.7 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02PhysicsList.hh,v 1.7.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
index e056494f96..a311fc89ab 100644
--- a/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
+++ b/examples/novice/N02/include/ExN02PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02PrimaryGeneratorAction.hh,v 1.3 2000/12/04 16:24:05 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02PrimaryGeneratorAction.hh,v 1.3.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02RunAction.hh b/examples/novice/N02/include/ExN02RunAction.hh
index 05f1425907..79c8a913ad 100644
--- a/examples/novice/N02/include/ExN02RunAction.hh
+++ b/examples/novice/N02/include/ExN02RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02RunAction.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02RunAction.hh,v 1.4.4.1 2001/06/28 19:07:28 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02SteppingAction.hh b/examples/novice/N02/include/ExN02SteppingAction.hh
index 42110829d6..e260107e8f 100644
--- a/examples/novice/N02/include/ExN02SteppingAction.hh
+++ b/examples/novice/N02/include/ExN02SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02SteppingAction.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02SteppingAction.hh,v 1.4.4.1 2001/06/28 19:07:29 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02SteppingVerbose.hh b/examples/novice/N02/include/ExN02SteppingVerbose.hh
index 169d18ecd5..bec0451467 100644
--- a/examples/novice/N02/include/ExN02SteppingVerbose.hh
+++ b/examples/novice/N02/include/ExN02SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02SteppingVerbose.hh,v 1.4 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02SteppingVerbose.hh,v 1.4.4.1 2001/06/28 19:07:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   This class manages the verbose outputs in G4SteppingManager. 
 //   It inherits from G4SteppingVerbose.
diff --git a/examples/novice/N02/include/ExN02TrackerHit.hh b/examples/novice/N02/include/ExN02TrackerHit.hh
index 85fb2b7489..6035a83788 100644
--- a/examples/novice/N02/include/ExN02TrackerHit.hh
+++ b/examples/novice/N02/include/ExN02TrackerHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02TrackerHit.hh,v 1.3 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02TrackerHit.hh,v 1.3.4.1 2001/06/28 19:07:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02TrackerSD.hh b/examples/novice/N02/include/ExN02TrackerSD.hh
index 486114a1b6..4c5ce8eda2 100644
--- a/examples/novice/N02/include/ExN02TrackerSD.hh
+++ b/examples/novice/N02/include/ExN02TrackerSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02TrackerSD.hh,v 1.3 2000/12/04 16:24:06 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02TrackerSD.hh,v 1.3.4.1 2001/06/28 19:07:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/include/ExN02VisManager.hh b/examples/novice/N02/include/ExN02VisManager.hh
index 185b00bfd5..7cedba623d 100644
--- a/examples/novice/N02/include/ExN02VisManager.hh
+++ b/examples/novice/N02/include/ExN02VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02VisManager.hh,v 1.3 1999/12/15 14:49:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02VisManager.hh,v 1.3.4.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N02/src/ExN02ChamberParameterisation.cc b/examples/novice/N02/src/ExN02ChamberParameterisation.cc
index d062e3d59b..c2f1c5d65d 100644
--- a/examples/novice/N02/src/ExN02ChamberParameterisation.cc
+++ b/examples/novice/N02/src/ExN02ChamberParameterisation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02ChamberParameterisation.cc,v 1.4 2001/01/31 18:05:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02ChamberParameterisation.cc,v 1.4.2.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02DetectorConstruction.cc b/examples/novice/N02/src/ExN02DetectorConstruction.cc
index b3bcc4cc16..bef1cc44e7 100644
--- a/examples/novice/N02/src/ExN02DetectorConstruction.cc
+++ b/examples/novice/N02/src/ExN02DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02DetectorConstruction.cc,v 1.6 2001/01/31 18:05:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02DetectorConstruction.cc,v 1.6.2.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02DetectorMessenger.cc b/examples/novice/N02/src/ExN02DetectorMessenger.cc
index a421a601fc..157eeafb84 100644
--- a/examples/novice/N02/src/ExN02DetectorMessenger.cc
+++ b/examples/novice/N02/src/ExN02DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02DetectorMessenger.cc,v 1.3 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02DetectorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02EventAction.cc b/examples/novice/N02/src/ExN02EventAction.cc
index 397ab28f99..5959c0eb3a 100644
--- a/examples/novice/N02/src/ExN02EventAction.cc
+++ b/examples/novice/N02/src/ExN02EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02EventAction.cc,v 1.5 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02EventAction.cc,v 1.5.4.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo..... 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02MagneticField.cc b/examples/novice/N02/src/ExN02MagneticField.cc
index cc4ec96821..db2ea53f08 100644
--- a/examples/novice/N02/src/ExN02MagneticField.cc
+++ b/examples/novice/N02/src/ExN02MagneticField.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02MagneticField.cc,v 1.4 2000/12/04 16:24:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02MagneticField.cc,v 1.4.4.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //  
 //   User Field class implementation.
 //
diff --git a/examples/novice/N02/src/ExN02PhysicsList.cc b/examples/novice/N02/src/ExN02PhysicsList.cc
index 402466b414..375551c4d9 100644
--- a/examples/novice/N02/src/ExN02PhysicsList.cc
+++ b/examples/novice/N02/src/ExN02PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02PhysicsList.cc,v 1.9 2001/01/09 14:34:34 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02PhysicsList.cc,v 1.9.2.1 2001/06/28 19:07:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
index a60bbbe285..e2576347de 100644
--- a/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
+++ b/examples/novice/N02/src/ExN02PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02PrimaryGeneratorAction.cc,v 1.3 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02PrimaryGeneratorAction.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02RunAction.cc b/examples/novice/N02/src/ExN02RunAction.cc
index 6430473fe5..e9f7819d15 100644
--- a/examples/novice/N02/src/ExN02RunAction.cc
+++ b/examples/novice/N02/src/ExN02RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02RunAction.cc,v 1.4 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02RunAction.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02SteppingAction.cc b/examples/novice/N02/src/ExN02SteppingAction.cc
index 7ba95745b0..84bf3227df 100644
--- a/examples/novice/N02/src/ExN02SteppingAction.cc
+++ b/examples/novice/N02/src/ExN02SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02SteppingAction.cc,v 1.4 2000/12/04 16:24:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02SteppingAction.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02SteppingVerbose.cc b/examples/novice/N02/src/ExN02SteppingVerbose.cc
index ccbc7c4aa2..780b79312b 100644
--- a/examples/novice/N02/src/ExN02SteppingVerbose.cc
+++ b/examples/novice/N02/src/ExN02SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02SteppingVerbose.cc,v 1.6 2001/02/08 08:33:31 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02SteppingVerbose.cc,v 1.6.2.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02TrackerHit.cc b/examples/novice/N02/src/ExN02TrackerHit.cc
index 4e9efc75af..c51b189e6b 100644
--- a/examples/novice/N02/src/ExN02TrackerHit.cc
+++ b/examples/novice/N02/src/ExN02TrackerHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02TrackerHit.cc,v 1.4 2000/12/06 07:54:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02TrackerHit.cc,v 1.4.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02TrackerSD.cc b/examples/novice/N02/src/ExN02TrackerSD.cc
index c8fb58f46a..b6e6f56549 100644
--- a/examples/novice/N02/src/ExN02TrackerSD.cc
+++ b/examples/novice/N02/src/ExN02TrackerSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02TrackerSD.cc,v 1.3 2000/12/04 16:24:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02TrackerSD.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N02/src/ExN02VisManager.cc b/examples/novice/N02/src/ExN02VisManager.cc
index 2f4b3598bf..2d953ed275 100644
--- a/examples/novice/N02/src/ExN02VisManager.cc
+++ b/examples/novice/N02/src/ExN02VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN02VisManager.cc,v 1.3 1999/12/15 14:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN02VisManager.cc,v 1.3.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/examples/novice/N03/History b/examples/novice/N03/History
index 2676f5eace..e681d1f3e0 100644
--- a/examples/novice/N03/History
+++ b/examples/novice/N03/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.35 2001/02/09 01:17:54 asaim Exp $
+$Id: History,v 1.36 2001/06/21 06:28:03 stanaka Exp $
 --------------------------------------------------
 
      =========================================================
@@ -15,6 +15,15 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+21-06-01 Satoshi Tanaka (exampleN03-V03-00-02)
+- visTutor/*.mac updated
+- Commands /vis/set/XXX's are replaced with /vis/viewer/set/XXX
+- Commands /vis/camera/XXX's are replaced with /vis/viewer/XXX
+  except for /vis/camera/spin.
+- exN03Tree0.mac for ASCII DTREE and exN03Tree1.mac for GAG DTREE
+  are created.
+ 
+
 06-02-01 M.Asai (exampleN03-V03-00-01)
 - Migration to STL vector classes
  affected : ExN03SteppingVerbose.cc
diff --git a/examples/novice/N03/exampleN03.cc b/examples/novice/N03/exampleN03.cc
index 4b7b480040..74e50d6659 100644
--- a/examples/novice/N03/exampleN03.cc
+++ b/examples/novice/N03/exampleN03.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: exampleN03.cc,v 1.13 2000/11/21 10:59:41 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: exampleN03.cc,v 1.13.4.2 2001/06/28 20:18:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - exampleN03 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/novice/N03/exampleN03.out b/examples/novice/N03/exampleN03.out
index 1520661468..ec8d16f0c8 100644
--- a/examples/novice/N03/exampleN03.out
+++ b/examples/novice/N03/exampleN03.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -83,79 +83,43 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-           Aluminium         125.02
-         liquidArgon         79.954
-              Copper         239.08
-                Lead         228.53
-               Water         81.851
-        Scintillator         83.337
-              quartz         116.29
-                 Air           0.99
-             Aerogel         30.338
-         CarbonicGas         9.5961
-          WaterSteam           0.99
-            Galactic           0.99
-                Beam           0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
         Gamma energy sampled from a parametrised formula.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 annihil:  Total cross section from Heilter formula (annihilation into 2 photons).
         gamma energies sampled according Heitler
         PhysicsTables from 10 keV to 10 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-           Aluminium         125.02
-         liquidArgon         79.954
-              Copper         239.08
-                Lead         228.53
-               Water         81.851
-        Scintillator         83.337
-              quartz         116.29
-                 Air           0.99
-             Aerogel         30.338
-         CarbonicGas         9.5961
-          WaterSteam           0.99
-            Galactic           0.99
-                Beam           0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-        PhysicsTables from 1 keV to 100 TeV in 100 bins. 
+        PhysicsTables from 1 keV to 1e+02 TeV in 100 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuIoni:  knock-on electron cross sections .
           Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
-      PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+      PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 msc:   Tables of transport mean free paths.
           New model of MSC , computes the lateral 
           displacement of the particle , too.
-        PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
+        PhysicsTables from 1e+02 eV  to 1e+02 TeV in 100 bins. 
 
 MuBrems:  theoretical cross section 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 
 MuPairProd:  theoretical cross sections 
           Good description up to 1000 PeV.
-    PhysicsTables from 1 keV to 1000 PeV in 150 bins. 
+    PhysicsTables from 1 keV to 1e+03 PeV in 150 bins. 
 ============= The cut Energy ==============================
                             gamma              e-    
 Cut in range                  1 mm            1 mm 
@@ -184,10 +148,10 @@ Cut in energy
  Current couple of seeds = 9876, 54321
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:   275.7 MeV       total track length:  15.744 cm 
-        Gap: total energy:   15.91 MeV       total track length:  8.5146 cm 
+   Absorber: total energy: 2.8e+02 MeV       total track length:      17 cm 
+        Gap: total energy:     8.2 MeV       total track length:     4.1 cm 
 
-     8 hits are stored in ExN03CalorHitsCollection.
+     9 hits are stored in ExN03CalorHitsCollection.
 #
 # list the existing physics processes
      Transportation,              hIoni,                msc,              eIoni
@@ -202,11 +166,11 @@ Cut in energy
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 977297571, 951316126
+ Current couple of seeds = 1007375238, 624422740
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:  281.73 MeV       total track length:  15.949 cm 
-        Gap: total energy:  13.208 MeV       total track length:  7.3282 cm 
+   Absorber: total energy: 2.7e+02 MeV       total track length:      15 cm 
+        Gap: total energy:      19 MeV       total track length:     9.9 cm 
 
      10 hits are stored in ExN03CalorHitsCollection.
 #
@@ -231,10 +195,10 @@ Cut in energy
 
 --------- Ranecu engine status ---------
  Initial seed (index) = 0
- Current couple of seeds = 627130152, 879601547
+ Current couple of seeds = 1472867459, 1074604418
 ----------------------------------------
 ---> End of event: 0
-   Absorber: total energy:  393.49 MeV       total track length:  90.749 cm 
-        Gap: total energy:  100.38 MeV       total track length:  2.7952 m  
+   Absorber: total energy: 4.1e+02 MeV       total track length:      95 cm 
+        Gap: total energy:      81 MeV       total track length:     2.2 m  
 
-     28 hits are stored in ExN03CalorHitsCollection.
+     25 hits are stored in ExN03CalorHitsCollection.
diff --git a/examples/novice/N03/include/ExN03CalorHit.hh b/examples/novice/N03/include/ExN03CalorHit.hh
index 25bf257d6b..597badca4b 100644
--- a/examples/novice/N03/include/ExN03CalorHit.hh
+++ b/examples/novice/N03/include/ExN03CalorHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03CalorHit.hh,v 1.2 1999/12/15 14:49:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03CalorHit.hh,v 1.2.4.1 2001/06/28 19:07:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03CalorimeterSD.hh b/examples/novice/N03/include/ExN03CalorimeterSD.hh
index 43734a03db..cf7b52c6fb 100644
--- a/examples/novice/N03/include/ExN03CalorimeterSD.hh
+++ b/examples/novice/N03/include/ExN03CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03CalorimeterSD.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03CalorimeterSD.hh,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorConstruction.hh b/examples/novice/N03/include/ExN03DetectorConstruction.hh
index c4234ddead..a2fffa06d2 100644
--- a/examples/novice/N03/include/ExN03DetectorConstruction.hh
+++ b/examples/novice/N03/include/ExN03DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03DetectorConstruction.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03DetectorMessenger.hh b/examples/novice/N03/include/ExN03DetectorMessenger.hh
index d676f2da17..259641d006 100644
--- a/examples/novice/N03/include/ExN03DetectorMessenger.hh
+++ b/examples/novice/N03/include/ExN03DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03DetectorMessenger.hh,v 1.2 1999/12/15 14:49:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventAction.hh b/examples/novice/N03/include/ExN03EventAction.hh
index db2fdc0af6..d09270d522 100644
--- a/examples/novice/N03/include/ExN03EventAction.hh
+++ b/examples/novice/N03/include/ExN03EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03EventAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03EventAction.hh,v 1.4.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03EventActionMessenger.hh b/examples/novice/N03/include/ExN03EventActionMessenger.hh
index f246dbb34d..adcb060ce2 100644
--- a/examples/novice/N03/include/ExN03EventActionMessenger.hh
+++ b/examples/novice/N03/include/ExN03EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03EventActionMessenger.hh,v 1.3 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03EventActionMessenger.hh,v 1.3.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PhysicsList.hh b/examples/novice/N03/include/ExN03PhysicsList.hh
index 8f42c99430..377057baa5 100644
--- a/examples/novice/N03/include/ExN03PhysicsList.hh
+++ b/examples/novice/N03/include/ExN03PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PhysicsList.hh,v 1.6 2000/06/05 09:54:37 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PhysicsList.hh,v 1.6.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
index 82aeedb0ac..edf5fba682 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
index 61a0792a98..89b2807829 100644
--- a/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
+++ b/examples/novice/N03/include/ExN03PrimaryGeneratorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.2 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03RunAction.hh b/examples/novice/N03/include/ExN03RunAction.hh
index 85c58e4bf3..0bf4cedaad 100644
--- a/examples/novice/N03/include/ExN03RunAction.hh
+++ b/examples/novice/N03/include/ExN03RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03RunAction.hh,v 1.4 1999/12/15 14:49:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03RunAction.hh,v 1.4.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingAction.hh b/examples/novice/N03/include/ExN03SteppingAction.hh
index a80a58b428..8d494316c3 100644
--- a/examples/novice/N03/include/ExN03SteppingAction.hh
+++ b/examples/novice/N03/include/ExN03SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03SteppingAction.hh,v 1.4 2000/12/05 14:52:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03SteppingAction.hh,v 1.4.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/include/ExN03SteppingVerbose.hh b/examples/novice/N03/include/ExN03SteppingVerbose.hh
index 23ea6cc810..26b87f9794 100644
--- a/examples/novice/N03/include/ExN03SteppingVerbose.hh
+++ b/examples/novice/N03/include/ExN03SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03SteppingVerbose.hh,v 1.4 2001/01/22 17:04:46 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03SteppingVerbose.hh,v 1.4.2.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N03/include/ExN03VisManager.hh b/examples/novice/N03/include/ExN03VisManager.hh
index 21a15f630f..e05f7474c8 100644
--- a/examples/novice/N03/include/ExN03VisManager.hh
+++ b/examples/novice/N03/include/ExN03VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03VisManager.hh,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03VisManager.hh,v 1.3.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03CalorHit.cc b/examples/novice/N03/src/ExN03CalorHit.cc
index 73d0009ebb..a2054563e3 100644
--- a/examples/novice/N03/src/ExN03CalorHit.cc
+++ b/examples/novice/N03/src/ExN03CalorHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03CalorHit.cc,v 1.2 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03CalorHit.cc,v 1.2.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03CalorimeterSD.cc b/examples/novice/N03/src/ExN03CalorimeterSD.cc
index abf9c08153..7ce313cf27 100644
--- a/examples/novice/N03/src/ExN03CalorimeterSD.cc
+++ b/examples/novice/N03/src/ExN03CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03CalorimeterSD.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03CalorimeterSD.cc,v 1.3.4.1 2001/06/28 19:07:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03DetectorConstruction.cc b/examples/novice/N03/src/ExN03DetectorConstruction.cc
index 73e23fa43c..3f94ea88be 100644
--- a/examples/novice/N03/src/ExN03DetectorConstruction.cc
+++ b/examples/novice/N03/src/ExN03DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03DetectorConstruction.cc,v 1.4 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03DetectorConstruction.cc,v 1.4.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03DetectorMessenger.cc b/examples/novice/N03/src/ExN03DetectorMessenger.cc
index 8723cd67a2..76f5bcd582 100644
--- a/examples/novice/N03/src/ExN03DetectorMessenger.cc
+++ b/examples/novice/N03/src/ExN03DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03DetectorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03DetectorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03EventAction.cc b/examples/novice/N03/src/ExN03EventAction.cc
index 766e9a20bd..dd0d4f192d 100644
--- a/examples/novice/N03/src/ExN03EventAction.cc
+++ b/examples/novice/N03/src/ExN03EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03EventAction.cc,v 1.11 2000/11/21 10:59:44 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03EventAction.cc,v 1.12.2.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -18,8 +34,6 @@
 #include "ExN03CalorHit.hh"
 #include "ExN03EventActionMessenger.hh"
 
-#include "g4rw/tvordvec.h"
-
 #include "G4Event.hh"
 #include "G4EventManager.hh"
 #include "G4HCofThisEvent.hh"
diff --git a/examples/novice/N03/src/ExN03EventActionMessenger.cc b/examples/novice/N03/src/ExN03EventActionMessenger.cc
index 176c4358f2..882bba67a6 100644
--- a/examples/novice/N03/src/ExN03EventActionMessenger.cc
+++ b/examples/novice/N03/src/ExN03EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03EventActionMessenger.cc,v 1.4 2000/11/21 10:59:44 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03EventActionMessenger.cc,v 1.4.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PhysicsList.cc b/examples/novice/N03/src/ExN03PhysicsList.cc
index f6b303ad18..2fc08eda2a 100644
--- a/examples/novice/N03/src/ExN03PhysicsList.cc
+++ b/examples/novice/N03/src/ExN03PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PhysicsList.cc,v 1.9 2000/11/10 19:41:01 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PhysicsList.cc,v 1.9.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
index fa0d707c8d..0271dd59eb 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PrimaryGeneratorAction.cc,v 1.3 2000/11/21 10:59:45 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PrimaryGeneratorAction.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
index 96d936fac3..a1aa798ed0 100644
--- a/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
+++ b/examples/novice/N03/src/ExN03PrimaryGeneratorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.3 1999/12/15 14:49:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03PrimaryGeneratorMessenger.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03RunAction.cc b/examples/novice/N03/src/ExN03RunAction.cc
index 22224771c5..02bd37f55d 100644
--- a/examples/novice/N03/src/ExN03RunAction.cc
+++ b/examples/novice/N03/src/ExN03RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03RunAction.cc,v 1.7 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03RunAction.cc,v 1.7.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03SteppingAction.cc b/examples/novice/N03/src/ExN03SteppingAction.cc
index 798fb29518..f44f3e1f1d 100644
--- a/examples/novice/N03/src/ExN03SteppingAction.cc
+++ b/examples/novice/N03/src/ExN03SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03SteppingAction.cc,v 1.3 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03SteppingAction.cc,v 1.3.4.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N03/src/ExN03SteppingVerbose.cc b/examples/novice/N03/src/ExN03SteppingVerbose.cc
index 31edaf923b..002d086c80 100644
--- a/examples/novice/N03/src/ExN03SteppingVerbose.cc
+++ b/examples/novice/N03/src/ExN03SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03SteppingVerbose.cc,v 1.5 2001/02/08 08:33:01 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03SteppingVerbose.cc,v 1.5.2.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
diff --git a/examples/novice/N03/src/ExN03VisManager.cc b/examples/novice/N03/src/ExN03VisManager.cc
index c43ca00d1a..624aa8fa25 100644
--- a/examples/novice/N03/src/ExN03VisManager.cc
+++ b/examples/novice/N03/src/ExN03VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN03VisManager.cc,v 1.4 2000/06/29 07:16:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN03VisManager.cc,v 1.5.2.1 2001/06/28 19:07:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
@@ -20,6 +36,10 @@
 
 // Supported drivers...
 
+#ifdef G4VIS_USE_ASCIITREE
+#include "G4ASCIITree.hh"
+#endif
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif
@@ -56,6 +76,10 @@
 #include "G4OpenInventorWin32.hh"
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+#include "G4RayTracer.hh"
+#endif
+
 #ifdef G4VIS_USE_VRML
 #include "G4VRML1.hh"
 #include "G4VRML2.hh"
@@ -66,10 +90,6 @@
 #include "G4VRML2File.hh"
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-#include "G4RayTracer.hh"
-#endif
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 ExN03VisManager::ExN03VisManager () {}
@@ -78,6 +98,10 @@ ExN03VisManager::ExN03VisManager () {}
 
 void ExN03VisManager::RegisterGraphicsSystems () {
 
+#ifdef G4VIS_USE_ASCIITREE
+  RegisterGraphicsSystem (new G4ASCIITree);
+#endif
+
 #ifdef G4VIS_USE_DAWN
   RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif
@@ -114,6 +138,10 @@ void ExN03VisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+  RegisterGraphicsSystem (new G4RayTracer);
+#endif
+
 #ifdef G4VIS_USE_VRML
   RegisterGraphicsSystem (new G4VRML1);
   RegisterGraphicsSystem (new G4VRML2);
@@ -124,10 +152,6 @@ void ExN03VisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4VRML2File);
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-  RegisterGraphicsSystem (new G4RayTracer);
-#endif
-
   if (fVerbose > 0) {
     G4cout <<
       "\nYou have successfully chosen to use the following graphics systems."
diff --git a/examples/novice/N03/visTutor/exN03Tree0.mac b/examples/novice/N03/visTutor/exN03Tree0.mac
new file mode 100644
index 0000000000..9e5e5fc3f3
--- /dev/null
+++ b/examples/novice/N03/visTutor/exN03Tree0.mac
@@ -0,0 +1,66 @@
+#######################################################################
+#  MACRO FILE NAME: exN03Tree0.mac                                    #
+#                                                                     #
+#  AUTHOR(S): Satoshi Tanaka                                          #
+#                                                                     #
+#  DATE:                                                              #
+#        June     20, 2001                                            #
+#                                                                     #
+#  CONTENTS: A macro to demonstrate ASCII DTREE                       #
+#                                                                     #
+#  USAGE:                                                             #
+#          % $G4BINDIR/exampleN03                                     #
+#          Idle> /control/execute visTutor/exN03Tree0.mac             #
+#                                                                     #
+#  REQUIRED PLATFORMS & SOFTWARES: Unix / Windows                     #
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
+#                                                                     #
+#    % setenv  G4VIS_BUILD_ASCIITREE_DRIVER  1                        #
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
+#  (See geant4/source/visualization/README for details.)              #
+#                                                                     #
+#    %   setenv  G4VIS_USE_ASCIITREE       1                          #
+#                                                                     # 
+#  VERBOSE LEVEL:                                                     #
+#                                                                     # 
+#    <  10: - does not print daughters of repeated logical volumes.   #
+#           - does not repeat replicas.                               #
+#    >= 10: prints all physical volumes.                              #
+#    For level of detail add:                                         #
+#    >=  0: prints physical volume name.                              #
+#    >=  1: prints logical volume name.                               #
+#    >=  2: prints solid name and type.                               #
+#                                                                     #
+#  ADDITIONAL NOTES:                                                  #
+#    * The geometry tree is displayed in the stdout.                  #
+#                                                                     # 
+#    * The compound command                                           # 
+#      "/vis/drawTree [<physical-volume-name>] [<system>]"            # 
+#     is equivalent to the following set of commands:                 #
+#        /vis/open                 system                             #
+#        /vis/drawVolume           PV-name                            #
+#                                                                     # 
+#     The PV-name "world" is always means the world volume,           #
+#     whatever its real name, e.g., "World" in example N03, is.       #      
+#                                                                     # 
+#######################################################################
+
+# Draw the whole geometry tree
+/vis/drawTree 
+
+# Draw a part of tree
+/vis/drawTree Gap 
+
+# Change the level to display details 
+/vis/ASCIITree/verbose 1
+/vis/drawTree
+
+# Change the level to display details
+/vis/ASCIITree/verbose 2
+/vis/drawTree
+
+# Change the level to display details
+/vis/ASCIITree/verbose 10
+/vis/drawTree
diff --git a/examples/novice/N03/visTutor/exN03Tree1.mac b/examples/novice/N03/visTutor/exN03Tree1.mac
new file mode 100644
index 0000000000..b40a5984a4
--- /dev/null
+++ b/examples/novice/N03/visTutor/exN03Tree1.mac
@@ -0,0 +1,67 @@
+#######################################################################
+#  MACRO FILE NAME: exN03Tree0.mac                                    #
+#                                                                     #
+#  AUTHOR(S): Satoshi Tanaka                                          #
+#                                                                     #
+#  DATE:                                                              #
+#        June     20, 2001                                            #
+#                                                                     #
+#  CONTENTS: A macro to demonstrate GAG DTREE                         #
+#                                                                     #
+#  USAGE:                                                             #
+#          * Edit exampleN03.cc to use the GAG interface              #
+#          % $G4BINDIR/exampleN03                                     #
+#          Idle> /control/execute visTutor/exN03Tree1.mac             #
+#                                                                     #
+#  REQUIRED PLATFORMS & SOFTWARES: Unix/Windows, GAG (Java version)   #
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR INSTALLATION:               #
+#                                                                     #
+#    % setenv  G4VIS_BUILD_GAGTREE_DRIVER    1                        #
+#                                                                     #
+#  ENVIRONMENTAL VARIABLES (C-MACROS) FOR COMPILATION:                #
+#  (See geant4/source/visualization/README for details.)              #
+#                                                                     #
+#    %   setenv  G4VIS_USE_GAGTREE         1                          #
+#                                                                     # 
+#  VERBOSE LEVEL:                                                     #
+#                                                                     # 
+#    <  10: - does not print daughters of repeated logical volumes.   #
+#           - does not repeat replicas.                               #
+#    >= 10: prints all physical volumes.                              #
+#    For level of detail add:                                         #
+#    >=  0: prints physical volume name.                              #
+#    >=  1: prints logical volume name.                               #
+#    >=  2: prints solid name and type.                               #
+#                                                                     #
+#  ADDITIONAL NOTES:                                                  #
+#    * The geometry tree is displayed in the stdout.                  #
+#                                                                     # 
+#    * The compound command                                           # 
+#      "/vis/drawTree [<physical-volume-name>] [<system>]"            # 
+#     is equivalent to the following set of commands:                 #
+#        /vis/open                 system                             #
+#        /vis/drawVolume           PV-name                            #
+#                                                                     # 
+#     The PV-name "world" is always means the world volume,           #
+#     whatever its real name, e.g., "World" in example N03, is.       #      
+#                                                                     # 
+#######################################################################
+
+# Draw the whole geometry tree
+/vis/drawTree world GAGTree
+
+# Draw a part of tree
+/vis/drawTree Gap GAGTree
+
+# Change the level to display details 
+/vis/GAGTree/verbose 1
+/vis/drawTree world GAGTree
+
+# Change the level to display details
+/vis/GAGTree/verbose 2
+/vis/drawTree world GAGTree
+
+# Change the level to display details
+/vis/GAGTree/verbose 10
+/vis/drawTree world GAGTree
diff --git a/examples/novice/N03/visTutor/exN03Vis0.mac b/examples/novice/N03/visTutor/exN03Vis0.mac
index 1f471f3472..a6a9c1592b 100644
--- a/examples/novice/N03/visTutor/exN03Vis0.mac
+++ b/examples/novice/N03/visTutor/exN03Vis0.mac
@@ -3,11 +3,13 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: November 10, 1999                                            #
-#        May      20, 2000                                            # 
-#        June     06, 2000                                            # 
-#        October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            #
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
+#        June     06, 2000                                            # 
+#        May      20, 2000                                            # 
+#        November 10, 1999                                            #
 #                                                                     #
 #  CONTENTS: A simplest macro to demonstrate visualization of         #
 #            detector geometry and events                             #
@@ -34,7 +36,7 @@
 #    % setenv G4VIS_USE_DAWNFILE           1                          #
 #                                                                     #
 #  ADDITIONAL NOTES:                                                  #
-#    The compound command "/vis/open <graphics-system-name>"          #
+#    The compound command "/vis/open <vis-driver-name>"               #
 #    is equivalent to the following set of commands:                  #
 #                                                                     #
 #      /vis/sceneHandler/create $1                                    #
@@ -48,11 +50,10 @@
 #      /vis/sceneHandler/attach                                       #
 #      /vis/viewer/refresh                                            #
 #                                                                     #
-#    WARNING: You need one more command "/vis/viewer/update" for      #
-#             flushing in using post-processin visualization drivers  #
+#    WARNING: You should execute "/vis/viewer/update"  after          #
+#             "/vis/drawVolume" in order to complete visualization    #
+#             when you use  post-processin visualization drivers      #
 #             such as the DAWNFILE, VRMLFILE, OpenGL Motif drivers.   #
-#             You can execute, e.g. "/vis/draw/axes" before executing #
-#             "/vis/viewer/update" to visualize coordinate axes.      #
 #                                                                     #
 #######################################################################
 
@@ -65,10 +66,8 @@
 /vis/open OGLIX
 
 # Set camera 
-#  Note: Camera setting should be done
-#        for each scene handler.
-/vis/camera/reset 
-#/vis/camera/viewpoint 70 20
+/vis/viewer/reset 
+/vis/viewer/viewpointThetaPhi 70 20
 
 # Visualize of the whole detector geometry
 /vis/drawVolume
@@ -83,7 +82,7 @@
 #  * In order to make the file "g4_XX.eps" printable, 
 #    append the "showpage" PostScript command to the file. 
 #    You can do it with the 4th page of the DAWN GUI panel 
-#    or by editing the file by hand.
+#    or by editing the EPS file by hand.
 #
 #  * Set an environmental variable if you wish to 
 #    skip DAWN GUI:
@@ -110,11 +109,9 @@
 /vis/sceneHandler/attach 
 
 # Set camera 
-#  Note: Camera setting should be done 
-#        for each scene handler.
-/vis/camera/reset 
-/vis/camera/zoom      1.2
-/vis/camera/viewpoint 20 70
+/vis/viewer/reset 
+/vis/viewer/zoom              1.5
+/vis/viewer/viewpointThetaPhi 70 20
 
 # Visualize events added to the current scene
 /tracking/storeTrajectory 1
diff --git a/examples/novice/N03/visTutor/exN03Vis1.mac b/examples/novice/N03/visTutor/exN03Vis1.mac
index 3c521e92ff..e60af295e8 100644
--- a/examples/novice/N03/visTutor/exN03Vis1.mac
+++ b/examples/novice/N03/visTutor/exN03Vis1.mac
@@ -3,11 +3,13 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: November 10, 1999                                            #
-#        May      20, 2000                                            # 
-#        June     06, 2000                                            # 
-#        October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            #
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
+#        June     06, 2000                                            # 
+#        May      20, 2000                                            # 
+#        November 10, 1999                                            #
 #                                                                     #
 #  CONTENTS: A basic macro for visualization of detector geometry     #
 #                                                                     #
@@ -33,7 +35,7 @@
 #    % setenv G4VIS_USE_DAWNFILE           1                          #
 #                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
-#    The compound command "/vis/open <graphics-system-name>"          #
+#    The compound command "/vis/open <vis-driver-name>"               #
 #    is equivalent to the following set of commands:                  #
 #                                                                     #
 #      /vis/sceneHandler/create $1                                    #
@@ -47,11 +49,10 @@
 #      /vis/sceneHandler/attach                                       #
 #      /vis/viewer/refresh                                            #
 #                                                                     #
-#    WARNING: You need one more command "/vis/viewer/update" for      #
-#             flushing in using post-processin visualization drivers  #
+#    WARNING: You should execute "/vis/viewer/update"  after          #
+#             "/vis/drawVolume" in order to complete visualization    #
+#             when you use  post-processin visualization drivers      #
 #             such as the DAWNFILE, VRMLFILE, OpenGL Motif drivers.   #
-#             You can execute, e.g. "/vis/draw/axes" before executing #
-#             "/vis/viewer/update" to visualize coordinate axes.      #
 #                                                                     #
 #######################################################################
 
@@ -65,16 +66,16 @@
 
 # Visualize the detector geometry 
 #  with the defalut camera parameters
-/vis/camera/reset
+/vis/viewer/reset
 /vis/drawVolume
 /vis/viewer/update
 
 # Slide show (spinning) of the view visualized above.
 #  Draw 60 frames with steps of 3 degrees.
-/vis/camera/reset
-/vis/camera/viewpoint  20 20
-/vis/camera/zoom       0.8 
-/vis/camera/spin       60 3
+/vis/viewer/reset
+/vis/viewer/viewpointThetaPhi  20 20
+/vis/viewer/zoom               0.8 
+/vis/camera/spin               60 3
 
 # Bird's-eye view of the detector geometry 
 #
@@ -84,15 +85,14 @@
 #     x-axis:red,  y-axis:green,  z-axis:blue
 #     origin: (0,0,0),  length: 500
 #
-/vis/camera/reset
-/vis/camera/viewpoint  20 70
-/vis/camera/zoom       0.8 
+/vis/viewer/reset
+/vis/viewer/viewpointThetaPhi  20 70
+/vis/viewer/zoom               0.8 
 /vis/drawVolume
-/vis/draw/axes         0 0 0 500
 /vis/viewer/update
 
 ##########################################################
-# Visualization with DAWNFILE driver
+# Visualization with the DAWNFILE driver
 #
 #  * Each visualized view is saved to a file "g4_XX.eps"  
 #    with the "vectorized" PostScript format.
@@ -100,7 +100,7 @@
 #  * In order to make the file "g4_XX.eps" printable, 
 #    append the "showpage" PostScript command to the file. 
 #    You can do it with the 4th page of the DAWN GUI panel 
-#    or by editing the file by hand.
+#    or by editing the EPS file by hand.
 #
 #  * Set an environmental variable if you wish to 
 #    skip DAWN GUI:
@@ -112,43 +112,52 @@
 
 # Bird's-eye view of a detector component (Absorber)
 #  viewpoint  : (theta,phi) = (35*deg, 35*deg), 
-#  zoom factor: 0.9 of the full screen size
+#  zoom factor: 1.1 of the full screen size
 #  coordinate axes:
 #     x-axis:red,  y-axis:green,  z-axis:blue
 #     origin: (0,0,0),  length: 500
 #
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/drawVolume        Absorber 
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm  50 -100 -200   Absorber 
+/vis/viewer/reset
+/vis/viewer/zoom               1.1
+/vis/viewer/viewpointThetaPhi  35 35
+/vis/scene/create                                              
+/vis/scene/add/volume    Absorber 
+/vis/scene/add/axes      0 0 0 500
+/vis/scene/add/text      0 0 0 mm  40 -100 -120   Absorber 
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
 # Bird's-eye view of a detector component (Gap)
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/drawVolume        Gap 
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm 50 -100 -200   Gap
+/vis/viewer/reset
+/vis/viewer/zoom               1.1
+/vis/viewer/viewpointThetaPhi  35 35
+/vis/scene/create                                              
+/vis/scene/add/volume     Gap 
+/vis/scene/add/axes  	  0 0 0 500
+/vis/scene/add/text       0 0 0 mm  50 -100 -120   Gap 
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
 # Bird's-eye view of the whole detector components
 #  * The argument "world" of the command 
 #    "/vis/scene/add/volume" is omittable.
-#  * "/vis/set/culling off" makes the invisible 
+#  * "/vis/viewer/set/culling false" makes the invisible 
 #    world volume visible.
 #    (The invisibility of the world volume is set 
 #     in ExN03DetectorConstruction.cc.)
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/set/culling       off
-/vis/drawVolume
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm 50 -50 -200   world
+/vis/viewer/reset
+/vis/viewer/zoom               1.1
+/vis/viewer/viewpointThetaPhi  35 35
+/vis/viewer/set/culling         global false
+/vis/scene/create                                              
+/vis/scene/add/volume 
+/vis/scene/add/axes      0 0 0 500
+/vis/scene/add/text      0 0 0 mm 50 -100 -190   World
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
 # Make the culling on for next visualization
-/vis/set/culling       on
+/vis/viewer/set/culling       global true
diff --git a/examples/novice/N03/visTutor/exN03Vis2.mac b/examples/novice/N03/visTutor/exN03Vis2.mac
index d8ec12a813..2bc24565f7 100644
--- a/examples/novice/N03/visTutor/exN03Vis2.mac
+++ b/examples/novice/N03/visTutor/exN03Vis2.mac
@@ -3,11 +3,13 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: November 10, 1999                                            #
-#        May      20, 2000                                            #
-#        June     06, 2000                                            # 
-#        October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            # 
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
+#        June     06, 2000                                            # 
+#        May      20, 2000                                            #
+#        November 10, 1999                                            #
 #                                                                     #
 #  CONTENTS: A basic macro for visualization of events                #
 #                                                                     #
@@ -33,7 +35,7 @@
 #    % setenv G4VIS_USE_DAWNFILE           1                          #
 #                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
-#    The compound command "/vis/open <graphics-system-name>"          #
+#    The compound command "/vis/open <vis-driver-name>"               #
 #    is equivalent to the following set of commands:                  #
 #                                                                     #
 #      /vis/sceneHandler/create $1                                    #
@@ -46,9 +48,9 @@
 #################################################
 /tracking/storeTrajectory 1
 
-#####################################################
-# Visualization with OGLSX (OpenGL Stored X) driver
-#####################################################
+#######################################################
+# Visualization with the OGLSX (OpenGL Stored X) driver
+#######################################################
 
 # Invoke the OGLSX driver 
 /vis/open OGLSX
@@ -56,10 +58,10 @@
 # Create a new scene 
 /vis/scene/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 
-# Attach the current visualization driver 
+# Attach the current scene handler
 # to the current scene (omitable)
 /vis/sceneHandler/attach
 
@@ -69,18 +71,17 @@
 #        described in the event action.
 #/vis/scene/add/trajectories
 
-# Set drawing style to "surface"
-/vis/viewer/set/style surface
-
-# Set camera 
+# Set viewing parameters
 #  viewpoint  : (theta,phi) = (10*deg, 10*deg).
 #  zoom factor: 0.9 x (full screen size)
-/vis/camera/reset
-/vis/camera/viewpoint   10  10
-/vis/camera/zoom        0.9 
+#  drawing style: surface
+/vis/viewer/reset
+/vis/viewer/set/style surface
+/vis/viewer/viewpointThetaPhi   10  10
+/vis/viewer/zoom                0.9 
 
 # Generate one event and visualize it.
-/run/beamOn 1
+/run/beamOn  1
 
 # Slide show (spinning). 
 #  Draw 18 frames with steps of 20 degrees.
@@ -92,7 +93,7 @@
 
 
 ##########################################################
-# Visualization with DAWNFILE driver
+# Visualization with the DAWNFILE driver
 #
 #  * Each visualized view is saved to a file "g4_XX.eps"  
 #    with the "vectorized" PostScript format.
@@ -100,7 +101,7 @@
 #  * In order to make the file "g4_XX.eps" printable, 
 #    append the "showpage" PostScript command to the file 
 #    You can do it with the 4th page of the DAWN GUI panel
-#    or by editing the file by hand.
+#    or by editing the EPS file by hand.
 #
 #  * Set an environmental variable if you wish to 
 #    skip DAWN GUI:
@@ -113,10 +114,10 @@
 # Create a new scene
 /vis/scene/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 
-# Attach the current visualization driver 
+# Attach the current scene handler
 # to the current scene (omitable)
 /vis/sceneHandler/attach
 
@@ -126,22 +127,21 @@
 #        described in the event action.
 #/vis/scene/add/trajectories
 
-# Set the drawing style to "wireframe". 
-/vis/viewer/set/style  wireframe
-
 # Visualize many events (bird's eye view)
 #  viewpoint  : (theta,phi) = (45*deg, 45*deg) 
 #  zoom factor: 1.5 x (full screen size)
-/vis/camera/reset
-/vis/camera/viewpoint   45 45
-/vis/camera/zoom        1.5
+#  drawing style: wireframe
+/vis/viewer/reset
+/vis/viewer/set/style  wireframe
+/vis/viewer/viewpointThetaPhi   45 45
+/vis/viewer/zoom        1.5
 /run/beamOn             50
 
 # Visualize many events (zoomed-up view)
 #  viewpoint  : (theta,phi) = (90*deg, 0) 
 #  zoom factor: 5 x (full screen size)
-/vis/camera/reset
-/vis/camera/viewpoint   90 0
-/vis/camera/zoom        5
+/vis/viewer/reset
+/vis/viewer/set/style  wireframe
+/vis/viewer/viewpointThetaPhi   90 0
+/vis/viewer/zoom        5
 /run/beamOn             50
-
diff --git a/examples/novice/N03/visTutor/exN03Vis3.mac b/examples/novice/N03/visTutor/exN03Vis3.mac
index a236f1bb2f..e79afae78d 100644
--- a/examples/novice/N03/visTutor/exN03Vis3.mac
+++ b/examples/novice/N03/visTutor/exN03Vis3.mac
@@ -3,11 +3,13 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: November 10, 1999                                            #
-#        May      20, 2000                                            # 
-#        June     06, 2000                                            # 
-#        October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            #
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
+#        June     06, 2000                                            # 
+#        May      20, 2000                                            # 
+#        November 10, 1999                                            #
 #                                                                     #
 #  CONTENTS: A basic macro for demonstrating various drawing styles   #
 #                                                                     #
@@ -33,7 +35,7 @@
 #    % setenv G4VIS_USE_DAWNFILE           1                          #
 #                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
-#    The compound command "/vis/open <graphics-system-name>"          #
+#    The compound command "/vis/open <vis-driver-name>"               #
 #    is equivalent to the following set of commands:                  #
 #                                                                     #
 #      /vis/sceneHandler/create $1                                    #
@@ -46,9 +48,9 @@
 ##############################################
 /tracking/storeTrajectory 1
 
-######################################################
-# Visualization with OGLIX (OpenGL Immediate X) driver
-######################################################
+###########################################################
+# Visualization with the OGLIX (OpenGL Immediate X) driver
+###########################################################
 
 # Invoke the OGLIX driver 
 /vis/open OGLIX
@@ -56,10 +58,10 @@
 # Create a new scene
 /vis/scene/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 
-# Attach the current visualization driver 
+# Attach the current scene handler
 # to the current scene (omitable)
 /vis/sceneHandler/attach
 
@@ -71,13 +73,13 @@
 
 # Bird-eye view of events with 
 #  the hidden-surface drawing style
-/vis/camera/reset
-/vis/camera/viewpoint    45 45 
-/vis/viewer/set/style    surface
-/run/beamOn              10
+/vis/viewer/reset
+/vis/viewer/viewpointThetaPhi  45 45 
+/vis/viewer/set/style          surface
+/run/beamOn                    10
 
 ##########################################################
-# Visualization with DAWNFILE driver
+# Visualization with the DAWNFILE driver
 #
 #  * Each visualized view is saved to a file "g4_XX.eps"  
 #    with the "vectorized" PostScript format.
@@ -85,7 +87,7 @@
 #  * In order to make the file "g4_XX.eps" printable, 
 #    append the "showpage" PostScript command to the file. 
 #    You can do it with the 4th page of the DAWN GUI panel
-#    or by editing the file by hand.
+#    or by editing the EPS file by hand.
 #
 #  * Set an environmental variable if you wish to 
 #    skip DAWN GUI:
@@ -99,10 +101,10 @@
 # Create a new scene
 /vis/scene/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 
-# Attach the current visualization driver 
+# Attach the current scene handler
 # to the current scene (omitable)
 /vis/sceneHandler/attach
 
@@ -112,28 +114,25 @@
 #        described in the event action.
 #/vis/scene/add/trajectories
 
-# Set camera 
-#  Camera is zoomed up by 1.5 times of the standard setting.
-/vis/camera/reset 
-/vis/camera/zoom 1.5
-/vis/camera/viewpoint    45 45 
-
 # Bird-eye view of events with the 
 #  wireframe drawing style
-/vis/viewer/set/style    wireframe
-/run/beamOn              5
+/vis/viewer/reset 
+/vis/viewer/zoom               1.5
+/vis/viewer/viewpointThetaPhi  45 45 
+/vis/viewer/set/style          wireframe
+/run/beamOn                    5
 
 # Bird-eye view of events with the 
 #  hidden-surface drawing style
-/vis/viewer/set/style    surface
-/run/beamOn              50
+/vis/viewer/set/style          surface
+/run/beamOn                    50
 
 # Cull detector geometry and show only trajectories.
-/vis/camera/reset 
-/vis/set/culling         on 
-/vis/set/cull_by_density on 999
-/vis/viewer/set/style    wireframe
-/run/beamOn              10
+/vis/viewer/reset 
+/vis/viewer/set/culling     global  true
+/vis/viewer/set/culling     density true 999
+/vis/viewer/set/style       wireframe
+/run/beamOn                 10
 
 # Reset the culling policy for next visualization
 #  The default culling policy is:
@@ -141,5 +140,4 @@
 #   invisible       : on 
 #   low density     : off 
 #   covered daughter: off
-/vis/set/cull_by_density off
-
+/vis/viewer/set/culling  density false
diff --git a/examples/novice/N03/visTutor/exN03Vis4.mac b/examples/novice/N03/visTutor/exN03Vis4.mac
index 4ea46ca390..1d66517c6d 100644
--- a/examples/novice/N03/visTutor/exN03Vis4.mac
+++ b/examples/novice/N03/visTutor/exN03Vis4.mac
@@ -3,9 +3,11 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: June     06, 2000                                            # 
-#        October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            # 
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
+#        June     06, 2000                                            # 
 #                                                                     #
 #  CONTENTS: An example for the compound command,                     #
 #            "/vis/specify  <logical_volume_name>"                    #
@@ -29,7 +31,7 @@
 #    % setenv G4VIS_USE_DAWNFILE           1                          #
 #                                                                     # 
 #  ADDITIONAL NOTES:                                                  #
-#    The compound command "/vis/open <graphics-system-name>"          #
+#    The compound command "/vis/open <vis-driver-name>"               #
 #    is equivalent to the following set of commands:                  #
 #                                                                     #
 #      /vis/sceneHandler/create $1                                    #
@@ -44,16 +46,31 @@
 #      /vis/viewer/refresh                                            #
 #      /geometry/print $1                                             #
 #                                                                     #
-#    WARNING: You need one more command "/vis/viewer/update" for      #
-#             flushing in using post-processin visualization drivers  #
+#    WARNING: You should execute "/vis/viewer/update"  after          #
+#             "/vis/specify" in order to complete visualization       #
+#             when you use  post-processin visualization drivers      #
 #             such as the DAWNFILE, VRMLFILE, OpenGL Motif drivers.   #
-#             You can execute, e.g. "/vis/draw/axes" before executing #
-#             "/vis/viewer/update" to visualize coordinate axes.      #
 #                                                                     #
 #######################################################################
 
 ##########################################################
-# Visualization with DAWNFILE driver
+# Visualization with the OGLIX driver
+##########################################################
+
+# Invoke the OGLIX driver 
+/vis/open OGLIX
+
+# Set camera 
+/vis/viewer/reset
+/vis/viewer/zoom       0.9 
+/vis/viewer/viewpointThetaPhi  35 35
+
+# Visualize a selected logical volume
+/vis/specify           Absorber 
+/vis/viewer/update
+
+##########################################################
+# Visualization with the DAWNFILE driver
 #
 #  * Each visualized view is saved to a file "g4_XX.eps"  
 #    with the "vectorized" PostScript format.
@@ -61,32 +78,36 @@
 #  * In order to make the file "g4_XX.eps" printable, 
 #    append the "showpage" PostScript command to the file. 
 #    You can do it with the 4th page of the DAWN GUI panel 
-#    or by editing the file by hand.
+#    or by editing the EPS file by hand.
 #
 #  * Set an environmental variable if you wish to 
 #    skip DAWN GUI:
 #     % setenv G4DAWNFILE_VIEWER "dawn -d"
 ##########################################################
-
-
 # Invoke the DAWNFILE driver 
 /vis/open DAWNFILE
 
 # Set camera 
-#  Note: Camera setting should be done
-#        for each scene handler.
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
+/vis/viewer/reset
+/vis/viewer/zoom       0.9 
+/vis/viewer/viewpointThetaPhi  35 35
 
 # Visualize a selected logical volume (1)
-/vis/specify           Absorber 
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm  40 -100 -200   LogVol:Absorber 
+/vis/scene/create                                              
+/vis/scene/add/logicalVolume  Absorber                                 
+/vis/scene/add/axes    0 0 0 500
+/vis/scene/add/text    0 0 0 mm  40 -100 -200   LogVol:Absorber 
+/vis/sceneHandler/attach 
+/vis/viewer/refresh                                            
+/geometry/print 
 /vis/viewer/update
 
 # Visualize a selected logical volume (2)
-/vis/specify           Gap
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm  40 -100 -200   LogVol:Gap
+/vis/scene/create                                              
+/vis/scene/add/logicalVolume  Gap
+/vis/scene/add/axes    0 0 0 500
+/vis/scene/add/text    0 0 0 mm  40 -100 -200   LogVol:Gap
+/vis/sceneHandler/attach 
+/vis/viewer/refresh                                            
+/geometry/print 
 /vis/viewer/update
diff --git a/examples/novice/N03/visTutor/exN03Vis5.mac b/examples/novice/N03/visTutor/exN03Vis5.mac
index 269ca16581..b67af9d5b0 100644
--- a/examples/novice/N03/visTutor/exN03Vis5.mac
+++ b/examples/novice/N03/visTutor/exN03Vis5.mac
@@ -44,14 +44,14 @@
 /vis/sceneHandler/create Xo
 /vis/viewer/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 /tracking/storeTrajectory 1
 #/vis/scene/add/trajectories
 
 # Bird-eye view of events
-/vis/camera/reset
-/vis/camera/viewpoint    45 45 
+/vis/viewer/reset 
+/vis/viewer/viewpointThetaPhi   45 45 
 
 /run/beamOn 1
 
diff --git a/examples/novice/N03/visTutor/exN03Vis6.mac b/examples/novice/N03/visTutor/exN03Vis6.mac
index 0e088b4bf4..93c5901911 100644
--- a/examples/novice/N03/visTutor/exN03Vis6.mac
+++ b/examples/novice/N03/visTutor/exN03Vis6.mac
@@ -34,14 +34,14 @@
 /vis/sceneHandler/create OIX
 /vis/viewer/create
 
-# Add detector geometry to the current scene
+# Add the world volume to the current scene
 /vis/scene/add/volume
 #/vis/scene/add/trajectories
 /tracking/storeTrajectory 1
 
 # Bird-eye view of events
-/vis/camera/reset
-/vis/camera/viewpoint    45 45 
+/vis/viewer/reset
+/vis/viewer/viewpointThetaPhi   45 45 
 
 # Attach the just created Go scene graph to the viewer.
 /vis/viewer/update
diff --git a/examples/novice/N03/visTutor/exN03Vis7.mac b/examples/novice/N03/visTutor/exN03Vis7.mac
index 818da78b85..435eabc9a8 100644
--- a/examples/novice/N03/visTutor/exN03Vis7.mac
+++ b/examples/novice/N03/visTutor/exN03Vis7.mac
@@ -3,8 +3,10 @@
 #                                                                     #
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
-#  DATE: October  17, 2000                                            # 
+#  DATE:                                                              #
+#        June     20, 2001                                            #
 #        November 26, 2000                                            #
+#        October  17, 2000                                            #  
 #                                                                     #
 #  CONTENTS: A macro to demonstrate the VRMLFILE driver               #
 #                                                                     #
@@ -34,15 +36,18 @@
 #     ( The default value is "1".)                                    #
 #                                                                     #
 #  ADDITIONAL NOTES:                                                  #
+#   The VRML-file viewer "vrmlview" is obtainable from the following  #
+#   Web site:                                                         #
+#      http://www.sim.no/downloads.html                               #
 #                                                                     #
 #######################################################################
 
 ###################################################
-# Visualization of detector geometry and events 
+# Visualization of detector geometry and events  
 # with the VRML2FILE driver.
 #
-# Note: "/vis/viewer/set/style wireframe" means 
-#       "half-transparent" in the VRML2FILE driver. 
+# Note: "/vis/viewer/set/style wireframe" means  
+#       "half-transparent" in the VRML2FILE driver.  
 #       It is a convention of this driver.
 ###################################################
 
@@ -52,12 +57,12 @@
 # Invoke the VRML2FILE driver
 /vis/open VRML2FILE
 
-# Create a new scene 
+# Create a new scene  
 /vis/scene/create
 
-# Attach the current scene handler 
+# Attach the current scene handler  
 # to the current scene
-/vis/sceneHandler/attach 
+/vis/sceneHandler/attach  
 
 # Add the world volume to the current scene
 /vis/scene/add/volume
@@ -65,7 +70,7 @@
 # Visualize one event added to the current scene
 #  Note: The command /vis/scene/add/trajectories
 #        is not necessary in exampleN03,
-#        since the C++ method DrawTrajectory() is 
+#        since the C++ method DrawTrajectory() is  
 #        described in the event action.
 #/vis/scene/add/trajectories
 /vis/viewer/set/style wireframe
diff --git a/examples/novice/N03/visTutor/exN03Vis8.mac b/examples/novice/N03/visTutor/exN03Vis8.mac
index 50afac18c1..1add800898 100644
--- a/examples/novice/N03/visTutor/exN03Vis8.mac
+++ b/examples/novice/N03/visTutor/exN03Vis8.mac
@@ -4,8 +4,9 @@
 #  AUTHOR(S): Satoshi Tanaka                                          #
 #                                                                     #
 #  DATE:                                                              #
-#        October  17, 2000                                            # 
+#        June     20, 2001                                            #
 #        November 26, 2000                                            #
+#        October  17, 2000                                            # 
 #                                                                     #
 #  CONTENTS: A macro to demonstrate creation of a "multi-page"        #
 #            PostScript file                                          #
@@ -49,33 +50,38 @@
 # Invoke the DAWNFILE driver 
 /vis/open DAWNFILE
 
-# Generate page 1
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/drawVolume        Absorber 
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm  50 -150 -200   Page1/3:Absorber 
+# Set viewing parameters
+/vis/viewer/reset
+/vis/viewer/zoom               0.9 
+/vis/viewer/viewpointThetaPhi  35 35
+
+# Generate page 1: Absorber
+/vis/scene/create                                              
+/vis/scene/add/volume     Absorber 
+/vis/scene/add/axes       0 0 0 500
+/vis/scene/add/text       0 0 0 mm  30 -150 -200   Page1/3:Absorber 
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
-# Generate page 2
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/drawVolume        Gap 
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm 50 -100 -200   Page2/3:Gap
+# Generate page 2: Gap
+/vis/scene/create                                              
+/vis/scene/add/volume     Gap
+/vis/scene/add/axes       0 0 0 500
+/vis/scene/add/text       0 0 0 mm 30 -100 -200   Page2/3:Gap
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
-# Generate page 3
-/vis/camera/reset
-/vis/camera/zoom       0.9 
-/vis/camera/viewpoint  35 35
-/vis/set/culling       off
-/vis/drawVolume
-/vis/draw/axes         0 0 0 500
-/vis/draw/text         0 0 0 mm 50 -100 -200   Page3/3:world
+# Generate page 3: World
+/vis/viewer/set/culling   global  false
+/vis/scene/create                                              
+/vis/scene/add/volume     
+/vis/scene/add/axes       0 0 0 500
+/vis/scene/add/text       0 0 0 mm 50 -100 -200   Page3/3:world
+/vis/sceneHandler/attach
+/vis/viewer/refresh
 /vis/viewer/update
 
 # Make the culling on for next visualization
-/vis/set/culling       on
+/vis/viewer/set/culling   global  true
diff --git a/examples/novice/N04/exampleN04.EMtest.large_N.out b/examples/novice/N04/exampleN04.EMtest.large_N.out
index b5b90b495c..508fc29f79 100644
--- a/examples/novice/N04/exampleN04.EMtest.large_N.out
+++ b/examples/novice/N04/exampleN04.EMtest.large_N.out
@@ -1,5 +1,5 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
+ Geant4 version $Name: geant4-03-00-ref-03 $
                                 (15-Dec-2000)
              Copyright : Geant4 Collaboration
 **********************************************
diff --git a/examples/novice/N04/exampleN04.EMtest.out b/examples/novice/N04/exampleN04.EMtest.out
index cbf5910a4d..e2ed2ec461 100644
--- a/examples/novice/N04/exampleN04.EMtest.out
+++ b/examples/novice/N04/exampleN04.EMtest.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 MuonMinusCaptureAtRest is created 
@@ -23,17 +23,6 @@ eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data l
         Gamma energy sampled from a parametrised formula.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-                Lead         228.53
-            ArgonGas           0.99
-             Silicon         116.88
-        Scintillator         83.337
-            dummyMat         126.97
-
 eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
@@ -51,17 +40,6 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
         gamma energies sampled according Heitler
         PhysicsTables from 10 keV to 10 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-                Lead         228.53
-            ArgonGas           0.99
-             Silicon         116.88
-        Scintillator         83.337
-            dummyMat         126.97
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -92,21 +70,21 @@ msc:   Tables of transport mean free paths.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     36 hits are stored in ExN04TrackerHitsCollection.
-     5 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.26878 (GeV)
+     10 hits are stored in ExN04TrackerHitsCollection.
+     4 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.343686 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     5 hits are stored in ExN04TrackerHitsCollection.
-     22 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 23.425 (GeV)
+     13 hits are stored in ExN04TrackerHitsCollection.
+     16 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 8.03057 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 1
-     12 hits are stored in ExN04TrackerHitsCollection.
-     21 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 10.138 (GeV)
+     5 hits are stored in ExN04TrackerHitsCollection.
+     10 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 1.07491 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
diff --git a/examples/novice/N04/exampleN04.cc b/examples/novice/N04/exampleN04.cc
index 55ed497cd8..c422696497 100644
--- a/examples/novice/N04/exampleN04.cc
+++ b/examples/novice/N04/exampleN04.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: exampleN04.cc,v 1.2 1999/12/15 14:49:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: exampleN04.cc,v 1.2.4.2 2001/06/28 20:18:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - exampleN04
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
diff --git a/examples/novice/N04/exampleN04.out b/examples/novice/N04/exampleN04.out
index 0907724255..97976b8a5f 100644
--- a/examples/novice/N04/exampleN04.out
+++ b/examples/novice/N04/exampleN04.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 MuonMinusCaptureAtRest is created 
@@ -23,17 +23,6 @@ eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data l
         Gamma energy sampled from a parametrised formula.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-                Lead         228.53
-            ArgonGas           0.99
-             Silicon         116.88
-        Scintillator         83.337
-            dummyMat         126.97
-
 eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to 100 GeV.
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
@@ -51,17 +40,6 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
         gamma energies sampled according Heitler
         PhysicsTables from 10 keV to 10 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-                Lead         228.53
-            ArgonGas           0.99
-             Silicon         116.88
-        Scintillator         83.337
-            dummyMat         126.97
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -93,9 +71,9 @@ msc:   Tables of transport mean free paths.
 Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 1 isolated muon found.
 >>> Event 0
-     117 hits are stored in ExN04TrackerHitsCollection.
-     58 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.77854 (GeV)
+     149 hits are stored in ExN04TrackerHitsCollection.
+     46 hits are stored in ExN04CalorimeterHitsCollection.
+     Total energy deposition in calorimeter : 0.637807 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 Stage 0->1 : 0 hits found in the muon chamber.
 ++++++++ event aborted
@@ -108,8 +86,8 @@ Stage 0->1 : 1 hits found in the muon chamber.
 Stage 1->2 : 0 isolated muon found.
 ++++++++ event aborted
 >>> Event 2
-     99 hits are stored in ExN04TrackerHitsCollection.
+     91 hits are stored in ExN04TrackerHitsCollection.
      13 hits are stored in ExN04CalorimeterHitsCollection.
-     Total energy deposition in calorimeter : 0.34399 (GeV)
+     Total energy deposition in calorimeter : 0.334183 (GeV)
      1 hits are stored in ExN04MuonHitsCollection.
 #
diff --git a/examples/novice/N04/include/ExN04CalorimeterHit.hh b/examples/novice/N04/include/ExN04CalorimeterHit.hh
index da571033fd..3b902165ba 100644
--- a/examples/novice/N04/include/ExN04CalorimeterHit.hh
+++ b/examples/novice/N04/include/ExN04CalorimeterHit.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04CalorimeterHit_h
 #define ExN04CalorimeterHit_h 1
diff --git a/examples/novice/N04/include/ExN04CalorimeterParametrisation.hh b/examples/novice/N04/include/ExN04CalorimeterParametrisation.hh
index d160db8a75..435e817f03 100644
--- a/examples/novice/N04/include/ExN04CalorimeterParametrisation.hh
+++ b/examples/novice/N04/include/ExN04CalorimeterParametrisation.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04CalorimeterParametrisation_H
 #define ExN04CalorimeterParametrisation_H 1
diff --git a/examples/novice/N04/include/ExN04CalorimeterROGeometry.hh b/examples/novice/N04/include/ExN04CalorimeterROGeometry.hh
index 56724e177e..b48798df80 100644
--- a/examples/novice/N04/include/ExN04CalorimeterROGeometry.hh
+++ b/examples/novice/N04/include/ExN04CalorimeterROGeometry.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef ExN04CalorimeterROGeometry_h
 #define ExN04CalorimeterROGeometry_h 1
 
diff --git a/examples/novice/N04/include/ExN04CalorimeterSD.hh b/examples/novice/N04/include/ExN04CalorimeterSD.hh
index c1ffc94dd1..32c01e0383 100644
--- a/examples/novice/N04/include/ExN04CalorimeterSD.hh
+++ b/examples/novice/N04/include/ExN04CalorimeterSD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04CalorimeterSD_h
 #define ExN04CalorimeterSD_h 1
diff --git a/examples/novice/N04/include/ExN04DetectorConstruction.hh b/examples/novice/N04/include/ExN04DetectorConstruction.hh
index 38f3b12edc..3601f184e5 100644
--- a/examples/novice/N04/include/ExN04DetectorConstruction.hh
+++ b/examples/novice/N04/include/ExN04DetectorConstruction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04DetectorConstruction_h
 #define ExN04DetectorConstruction_h 1
diff --git a/examples/novice/N04/include/ExN04DetectorParameterDef.hh b/examples/novice/N04/include/ExN04DetectorParameterDef.hh
index a58bda9fcd..d26e656d67 100644
--- a/examples/novice/N04/include/ExN04DetectorParameterDef.hh
+++ b/examples/novice/N04/include/ExN04DetectorParameterDef.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
      G4double expHall_x;
      G4double expHall_y;
diff --git a/examples/novice/N04/include/ExN04DummySD.hh b/examples/novice/N04/include/ExN04DummySD.hh
index 44b99ef344..eeed0dd0df 100644
--- a/examples/novice/N04/include/ExN04DummySD.hh
+++ b/examples/novice/N04/include/ExN04DummySD.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 // Dummy sensitive used only to flag sensitivity
 // in cells of RO geometry.
 //
diff --git a/examples/novice/N04/include/ExN04EMPhysics.hh b/examples/novice/N04/include/ExN04EMPhysics.hh
index bee3e2b112..b522d17e00 100644
--- a/examples/novice/N04/include/ExN04EMPhysics.hh
+++ b/examples/novice/N04/include/ExN04EMPhysics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04EMPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04EMPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N04/include/ExN04EventAction.hh b/examples/novice/N04/include/ExN04EventAction.hh
index 5eb01533c2..96b251bcdb 100644
--- a/examples/novice/N04/include/ExN04EventAction.hh
+++ b/examples/novice/N04/include/ExN04EventAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04EventAction_h
 #define ExN04EventAction_h 1
diff --git a/examples/novice/N04/include/ExN04Field.hh b/examples/novice/N04/include/ExN04Field.hh
index 1db4b4c00b..efa14063d0 100644
--- a/examples/novice/N04/include/ExN04Field.hh
+++ b/examples/novice/N04/include/ExN04Field.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04Field_H
 #define ExN04Field_H 1
diff --git a/examples/novice/N04/include/ExN04GeneralPhysics.hh b/examples/novice/N04/include/ExN04GeneralPhysics.hh
index d1140b65cb..3ec5071efe 100644
--- a/examples/novice/N04/include/ExN04GeneralPhysics.hh
+++ b/examples/novice/N04/include/ExN04GeneralPhysics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04GeneralPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04GeneralPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N04/include/ExN04HadronPhysics.hh b/examples/novice/N04/include/ExN04HadronPhysics.hh
index 91fa9a771c..55c4271057 100644
--- a/examples/novice/N04/include/ExN04HadronPhysics.hh
+++ b/examples/novice/N04/include/ExN04HadronPhysics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04HadronPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04HadronPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N04/include/ExN04IonPhysics.hh b/examples/novice/N04/include/ExN04IonPhysics.hh
index 2cee1564ba..d38cdac1c2 100644
--- a/examples/novice/N04/include/ExN04IonPhysics.hh
+++ b/examples/novice/N04/include/ExN04IonPhysics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04IonPhysics.hh,v 1.1 2001/01/06 06:56:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04IonPhysics.hh,v 1.1.2.1 2001/06/28 19:07:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N04/include/ExN04MuonHit.hh b/examples/novice/N04/include/ExN04MuonHit.hh
index a871df6b2a..2b6607cf81 100644
--- a/examples/novice/N04/include/ExN04MuonHit.hh
+++ b/examples/novice/N04/include/ExN04MuonHit.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04MuonHit_h
 #define ExN04MuonHit_h 1
diff --git a/examples/novice/N04/include/ExN04MuonPhysics.hh b/examples/novice/N04/include/ExN04MuonPhysics.hh
index 2489f87eb7..e5e89ab279 100644
--- a/examples/novice/N04/include/ExN04MuonPhysics.hh
+++ b/examples/novice/N04/include/ExN04MuonPhysics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04MuonPhysics.hh,v 1.2 2001/03/06 10:11:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04MuonPhysics.hh,v 1.2.2.1 2001/06/28 19:07:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/examples/novice/N04/include/ExN04MuonSD.hh b/examples/novice/N04/include/ExN04MuonSD.hh
index 1118d67287..1f0c39e381 100644
--- a/examples/novice/N04/include/ExN04MuonSD.hh
+++ b/examples/novice/N04/include/ExN04MuonSD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04MuonSD_h
 #define ExN04MuonSD_h 1
diff --git a/examples/novice/N04/include/ExN04PhysicsList.hh b/examples/novice/N04/include/ExN04PhysicsList.hh
index fefc2ca582..445ac20653 100644
--- a/examples/novice/N04/include/ExN04PhysicsList.hh
+++ b/examples/novice/N04/include/ExN04PhysicsList.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef ExN04PhysicsList_h
 #define ExN04PhysicsList_h 1
 
diff --git a/examples/novice/N04/include/ExN04PrimaryGeneratorAction.hh b/examples/novice/N04/include/ExN04PrimaryGeneratorAction.hh
index 68f9b4925a..2568cf38a1 100644
--- a/examples/novice/N04/include/ExN04PrimaryGeneratorAction.hh
+++ b/examples/novice/N04/include/ExN04PrimaryGeneratorAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04PrimaryGeneratorAction_h
 #define ExN04PrimaryGeneratorAction_h 1
diff --git a/examples/novice/N04/include/ExN04PrimaryGeneratorMessenger.hh b/examples/novice/N04/include/ExN04PrimaryGeneratorMessenger.hh
index 005b1fdfb0..f51be77447 100644
--- a/examples/novice/N04/include/ExN04PrimaryGeneratorMessenger.hh
+++ b/examples/novice/N04/include/ExN04PrimaryGeneratorMessenger.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04PrimaryGeneratorMessenger_h
 #define ExN04PrimaryGeneratorMessenger_h 1
diff --git a/examples/novice/N04/include/ExN04StackingAction.hh b/examples/novice/N04/include/ExN04StackingAction.hh
index 4b1c0fd72e..6fa030f3a7 100644
--- a/examples/novice/N04/include/ExN04StackingAction.hh
+++ b/examples/novice/N04/include/ExN04StackingAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04StackingAction_H
 #define ExN04StackingAction_H 1
@@ -5,7 +27,6 @@
 #include "globals.hh"
 #include "G4UserStackingAction.hh"
 #include "G4ThreeVector.hh"
-#include "g4rw/tpordvec.h"
 
 class G4Track;
 
diff --git a/examples/novice/N04/include/ExN04StackingActionMessenger.hh b/examples/novice/N04/include/ExN04StackingActionMessenger.hh
index 4f7559da60..38da86a685 100644
--- a/examples/novice/N04/include/ExN04StackingActionMessenger.hh
+++ b/examples/novice/N04/include/ExN04StackingActionMessenger.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04StackingActionMessenger_h
 #define ExN04StackingActionMessenger_h 1
diff --git a/examples/novice/N04/include/ExN04SteppingAction.hh b/examples/novice/N04/include/ExN04SteppingAction.hh
index a54a278dd3..aafc85416e 100644
--- a/examples/novice/N04/include/ExN04SteppingAction.hh
+++ b/examples/novice/N04/include/ExN04SteppingAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04SteppingAction_H
 #define ExN04SteppingAction_H 1
diff --git a/examples/novice/N04/include/ExN04TrackerHit.hh b/examples/novice/N04/include/ExN04TrackerHit.hh
index 17a4e4ef7f..8731dadeb6 100644
--- a/examples/novice/N04/include/ExN04TrackerHit.hh
+++ b/examples/novice/N04/include/ExN04TrackerHit.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04TrackerHit_h
 #define ExN04TrackerHit_h 1
diff --git a/examples/novice/N04/include/ExN04TrackerParametrisation.hh b/examples/novice/N04/include/ExN04TrackerParametrisation.hh
index e9ce30bb4a..16b87365af 100644
--- a/examples/novice/N04/include/ExN04TrackerParametrisation.hh
+++ b/examples/novice/N04/include/ExN04TrackerParametrisation.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04TrackerParametrisation_H
 #define ExN04TrackerParametrisation_H 1
diff --git a/examples/novice/N04/include/ExN04TrackerSD.hh b/examples/novice/N04/include/ExN04TrackerSD.hh
index b9e85539e1..57068a1950 100644
--- a/examples/novice/N04/include/ExN04TrackerSD.hh
+++ b/examples/novice/N04/include/ExN04TrackerSD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04TrackerSD_h
 #define ExN04TrackerSD_h 1
diff --git a/examples/novice/N04/include/ExN04TrackingAction.hh b/examples/novice/N04/include/ExN04TrackingAction.hh
index a8c64ac9ab..9007f2bd85 100644
--- a/examples/novice/N04/include/ExN04TrackingAction.hh
+++ b/examples/novice/N04/include/ExN04TrackingAction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef ExN04TrackingAction_h
 #define ExN04TrackingAction_h 1
diff --git a/examples/novice/N04/src/ExN04CalorimeterHit.cc b/examples/novice/N04/src/ExN04CalorimeterHit.cc
index 9952be26a0..180f378bc4 100644
--- a/examples/novice/N04/src/ExN04CalorimeterHit.cc
+++ b/examples/novice/N04/src/ExN04CalorimeterHit.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04CalorimeterHit.hh"
 #include "G4ios.hh"
diff --git a/examples/novice/N04/src/ExN04CalorimeterParametrisation.cc b/examples/novice/N04/src/ExN04CalorimeterParametrisation.cc
index 732641305f..c054aaa3eb 100644
--- a/examples/novice/N04/src/ExN04CalorimeterParametrisation.cc
+++ b/examples/novice/N04/src/ExN04CalorimeterParametrisation.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04CalorimeterParametrisation.hh"
 
diff --git a/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc b/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc
index b0d2cc1881..79957f1f35 100644
--- a/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc
+++ b/examples/novice/N04/src/ExN04CalorimeterROGeometry.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "ExN04CalorimeterROGeometry.hh"
 #include "ExN04DummySD.hh"
 
diff --git a/examples/novice/N04/src/ExN04CalorimeterSD.cc b/examples/novice/N04/src/ExN04CalorimeterSD.cc
index 147b86587a..3ef9c96cad 100644
--- a/examples/novice/N04/src/ExN04CalorimeterSD.cc
+++ b/examples/novice/N04/src/ExN04CalorimeterSD.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04CalorimeterSD.hh"
 #include "ExN04CalorimeterHit.hh"
diff --git a/examples/novice/N04/src/ExN04DetectorConstruction.cc b/examples/novice/N04/src/ExN04DetectorConstruction.cc
index 4fa99eab98..1cdaddbd89 100644
--- a/examples/novice/N04/src/ExN04DetectorConstruction.cc
+++ b/examples/novice/N04/src/ExN04DetectorConstruction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04DetectorConstruction.hh"
 #include "ExN04TrackerSD.hh"
diff --git a/examples/novice/N04/src/ExN04DetectorParameterDef.icc b/examples/novice/N04/src/ExN04DetectorParameterDef.icc
index 512058c07c..6f7364f101 100644
--- a/examples/novice/N04/src/ExN04DetectorParameterDef.icc
+++ b/examples/novice/N04/src/ExN04DetectorParameterDef.icc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
   expHall_x = 600.*cm;
   expHall_y = 600.*cm;
diff --git a/examples/novice/N04/src/ExN04EMPhysics.cc b/examples/novice/N04/src/ExN04EMPhysics.cc
index f5b8dfe008..7c95477548 100644
--- a/examples/novice/N04/src/ExN04EMPhysics.cc
+++ b/examples/novice/N04/src/ExN04EMPhysics.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04EMPhysics.cc,v 1.1 2001/01/06 06:56:17 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04EMPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04EventAction.cc b/examples/novice/N04/src/ExN04EventAction.cc
index f7a7cdf862..ea0f0fdfcd 100644
--- a/examples/novice/N04/src/ExN04EventAction.cc
+++ b/examples/novice/N04/src/ExN04EventAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04EventAction.hh"
 
diff --git a/examples/novice/N04/src/ExN04Field.cc b/examples/novice/N04/src/ExN04Field.cc
index 1f685869c1..fa8abd7c8c 100644
--- a/examples/novice/N04/src/ExN04Field.cc
+++ b/examples/novice/N04/src/ExN04Field.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04Field.hh"
 
diff --git a/examples/novice/N04/src/ExN04GeneralPhysics.cc b/examples/novice/N04/src/ExN04GeneralPhysics.cc
index 1539057838..4203e213db 100644
--- a/examples/novice/N04/src/ExN04GeneralPhysics.cc
+++ b/examples/novice/N04/src/ExN04GeneralPhysics.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04GeneralPhysics.cc,v 1.1 2001/01/06 06:56:17 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04GeneralPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04HadronPhysics.cc b/examples/novice/N04/src/ExN04HadronPhysics.cc
index 213e2f18f4..5f22a66263 100644
--- a/examples/novice/N04/src/ExN04HadronPhysics.cc
+++ b/examples/novice/N04/src/ExN04HadronPhysics.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04HadronPhysics.cc,v 1.1 2001/01/06 06:56:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04HadronPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04IonPhysics.cc b/examples/novice/N04/src/ExN04IonPhysics.cc
index 60a380acbd..3d454a621a 100644
--- a/examples/novice/N04/src/ExN04IonPhysics.cc
+++ b/examples/novice/N04/src/ExN04IonPhysics.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04IonPhysics.cc,v 1.1 2001/01/06 06:56:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04IonPhysics.cc,v 1.1.2.1 2001/06/28 19:07:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04MuonHit.cc b/examples/novice/N04/src/ExN04MuonHit.cc
index a0e9429028..ca82efb025 100644
--- a/examples/novice/N04/src/ExN04MuonHit.cc
+++ b/examples/novice/N04/src/ExN04MuonHit.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04MuonHit.hh"
 #include "G4VVisManager.hh"
diff --git a/examples/novice/N04/src/ExN04MuonPhysics.cc b/examples/novice/N04/src/ExN04MuonPhysics.cc
index b72dce58c2..f8f71ca125 100644
--- a/examples/novice/N04/src/ExN04MuonPhysics.cc
+++ b/examples/novice/N04/src/ExN04MuonPhysics.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04MuonPhysics.cc,v 1.2 2001/03/06 10:11:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04MuonPhysics.cc,v 1.2.2.1 2001/06/28 19:07:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04MuonSD.cc b/examples/novice/N04/src/ExN04MuonSD.cc
index 520fe2fda8..c5e5f35a92 100644
--- a/examples/novice/N04/src/ExN04MuonSD.cc
+++ b/examples/novice/N04/src/ExN04MuonSD.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04MuonSD.hh"
 #include "ExN04MuonHit.hh"
diff --git a/examples/novice/N04/src/ExN04PhysicsList.cc b/examples/novice/N04/src/ExN04PhysicsList.cc
index 2425a6e871..928a672345 100644
--- a/examples/novice/N04/src/ExN04PhysicsList.cc
+++ b/examples/novice/N04/src/ExN04PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN04PhysicsList.cc,v 1.9 2001/01/06 06:56:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN04PhysicsList.cc,v 1.9.2.1 2001/06/28 19:07:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N04/src/ExN04PrimaryGeneratorAction.cc b/examples/novice/N04/src/ExN04PrimaryGeneratorAction.cc
index fc392167a8..0f3023b19f 100644
--- a/examples/novice/N04/src/ExN04PrimaryGeneratorAction.cc
+++ b/examples/novice/N04/src/ExN04PrimaryGeneratorAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04PrimaryGeneratorAction.hh"
 
diff --git a/examples/novice/N04/src/ExN04PrimaryGeneratorMessenger.cc b/examples/novice/N04/src/ExN04PrimaryGeneratorMessenger.cc
index deae77984a..72f0db3bf1 100644
--- a/examples/novice/N04/src/ExN04PrimaryGeneratorMessenger.cc
+++ b/examples/novice/N04/src/ExN04PrimaryGeneratorMessenger.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04PrimaryGeneratorMessenger.hh"
 #include "ExN04PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N04/src/ExN04StackingAction.cc b/examples/novice/N04/src/ExN04StackingAction.cc
index a0cb8ce4a2..3c843ddf03 100644
--- a/examples/novice/N04/src/ExN04StackingAction.cc
+++ b/examples/novice/N04/src/ExN04StackingAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04StackingAction.hh"
 #include "G4SDManager.hh"
diff --git a/examples/novice/N04/src/ExN04StackingActionMessenger.cc b/examples/novice/N04/src/ExN04StackingActionMessenger.cc
index eb2a06570c..64244bb9a6 100644
--- a/examples/novice/N04/src/ExN04StackingActionMessenger.cc
+++ b/examples/novice/N04/src/ExN04StackingActionMessenger.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04StackingActionMessenger.hh"
 #include "ExN04StackingAction.hh"
diff --git a/examples/novice/N04/src/ExN04SteppingAction.cc b/examples/novice/N04/src/ExN04SteppingAction.cc
index cc138ff4b6..dfbb1ce4d9 100644
--- a/examples/novice/N04/src/ExN04SteppingAction.cc
+++ b/examples/novice/N04/src/ExN04SteppingAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04SteppingAction.hh"
 #include "G4SteppingManager.hh"
diff --git a/examples/novice/N04/src/ExN04TrackerHit.cc b/examples/novice/N04/src/ExN04TrackerHit.cc
index 769bc95bf6..f6094b7618 100644
--- a/examples/novice/N04/src/ExN04TrackerHit.cc
+++ b/examples/novice/N04/src/ExN04TrackerHit.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04TrackerHit.hh"
 #include "G4VVisManager.hh"
diff --git a/examples/novice/N04/src/ExN04TrackerParametrisation.cc b/examples/novice/N04/src/ExN04TrackerParametrisation.cc
index 4564bd49df..55b3ff1cc8 100644
--- a/examples/novice/N04/src/ExN04TrackerParametrisation.cc
+++ b/examples/novice/N04/src/ExN04TrackerParametrisation.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04TrackerParametrisation.hh"
 
diff --git a/examples/novice/N04/src/ExN04TrackerSD.cc b/examples/novice/N04/src/ExN04TrackerSD.cc
index fd64264588..0389809c88 100644
--- a/examples/novice/N04/src/ExN04TrackerSD.cc
+++ b/examples/novice/N04/src/ExN04TrackerSD.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "ExN04TrackerSD.hh"
 #include "ExN04TrackerHit.hh"
diff --git a/examples/novice/N04/src/ExN04TrackingAction.cc b/examples/novice/N04/src/ExN04TrackingAction.cc
index 421fceb9da..400d3b5601 100644
--- a/examples/novice/N04/src/ExN04TrackingAction.cc
+++ b/examples/novice/N04/src/ExN04TrackingAction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 
 #include "ExN04TrackingAction.hh"
diff --git a/examples/novice/N05/History b/examples/novice/N05/History
index 6706dd7cf0..f963eab469 100644
--- a/examples/novice/N05/History
+++ b/examples/novice/N05/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.10 2000/11/24 10:11:42 stesting Exp $
+$Id: History,v 1.11 2001/04/27 12:50:51 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -15,6 +15,9 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+27th April 2001 Gabriele Cosmo (exampleN05-V03-01-00)
+- Migrated to STL vector. Removed RW wrappers.
+
 25th November 2000 Steve O'Neale (tagset210)
 - Update test outputs for min.delta energy cut
 - The changes in deposited energy in HAD cal towers upto 20 per cent
diff --git a/examples/novice/N05/exampleN05.cc b/examples/novice/N05/exampleN05.cc
index a4cd119d1c..8cc65a036c 100644
--- a/examples/novice/N05/exampleN05.cc
+++ b/examples/novice/N05/exampleN05.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: exampleN05.cc,v 1.6 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: exampleN05.cc,v 1.8.2.2 2001/06/28 20:18:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 - exampleN05
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 // Comments
 //
@@ -45,12 +59,6 @@
 //----------------------------------
 #include "ExN05PhysicsList.hh"
 
-#ifdef GNU_GCC
-  #include "ExN05CalorimeterHit.hh"
-  template class G4RWTValVector<ExN05CalorimeterHit>;
-  template class G4Allocator<ExN05CalorimeterHit>;
-#endif
-
 #include "G4UIterminal.hh"
 #include "G4UImanager.hh"
 #include "G4RunManager.hh"
@@ -135,7 +143,3 @@ int main(int argc, char** argv) {
   delete runManager;
   return EXIT_SUCCESS;
 }
-
-
-
-
diff --git a/examples/novice/N05/exampleN05.out b/examples/novice/N05/exampleN05.out
index 88b17e9da2..852e759f6f 100644
--- a/examples/novice/N05/exampleN05.out
+++ b/examples/novice/N05/exampleN05.out
@@ -1,7 +1,7 @@
 RunManager construction starting....
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 
@@ -29,17 +29,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 CsI         138.95
-                  He           0.99
-           Aluminium         125.02
-                Lead         228.53
-                 Fer         225.11
-                 Air           0.99
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -50,17 +39,6 @@ annihil:  Total cross section from Heilter formula (annihilation into 2 photons)
         gamma energies sampled according Heitler
         PhysicsTables from 10 keV to 10 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 CsI         138.95
-                  He           0.99
-           Aluminium         125.02
-                Lead         228.53
-                 Fer         225.11
-                 Air           0.99
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -97,111 +75,111 @@ Closing FastSimulation
 ### Run 0 start.
 >>> Event 0
      10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9899 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.989895 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999921 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999906 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99989 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999915 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     12 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98992 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.989909 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
 #
 ### Run 1 start.
 >>> Event 0
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9999 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999923 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
+     5 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     7 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999927 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999907 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9999 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999923 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
 #
 ### Run 2 start.
 >>> Event 0
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999894 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     11 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99991 (GeV)
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999907 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     7 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
+     6 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999913 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
+     10 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999926 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     11 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99993 (GeV)
+     8 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999931 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
 #
 ### Run 3 start.
 >>> Event 0
-     10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99988 (GeV)
+     9 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999921 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99988 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999905 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98991 (GeV)
+     11 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999905 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
      10 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9998 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.989858 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     9 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99992 (GeV)
+     12 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.999918 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 number of event = 5
@@ -211,114 +189,114 @@ number of event = 5
 #
 ### Run 4 start.
 >>> Event 0
-     8 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.21998 (GeV)
-     8 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.39997 (GeV)
+     12 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.299967 (GeV)
+     12 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.499946 (GeV)
 >>> Event 1
      17 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.47997 (GeV)
-     11 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.87994 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.519957 (GeV)
+     15 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.919926 (GeV)
 >>> Event 2
-     24 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.69996 (GeV)
-     14 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 1.4199 (GeV)
+     19 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.639947 (GeV)
+     17 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 1.2999 (GeV)
 >>> Event 3
-     7 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.26502 (GeV)
-     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.4873 (GeV)
+     21 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.799939 (GeV)
+     17 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 1.75987 (GeV)
 >>> Event 4
-     27 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.89995 (GeV)
-     16 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 1.9199 (GeV)
+     23 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.95993 (GeV)
+     17 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 2.07985 (GeV)
 number of event = 5
 #
 ### Run 5 start.
 >>> Event 0
-     29 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.93995 (GeV)
-     30 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 2.8199 (GeV)
+     24 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.979929 (GeV)
+     29 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 2.93981 (GeV)
 >>> Event 1
-     31 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99994 (GeV)
-     33 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 3.5998 (GeV)
+     24 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.979929 (GeV)
+     30 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 3.79977 (GeV)
 >>> Event 2
-     32 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0399 (GeV)
-     36 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 4.5197 (GeV)
+     26 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.01993 (GeV)
+     31 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 4.61973 (GeV)
 >>> Event 3
-     33 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.0799 (GeV)
-     37 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 5.3397 (GeV)
+     29 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.07992 (GeV)
+     32 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 5.47969 (GeV)
 >>> Event 4
-     33 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1199 (GeV)
-     38 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 6.1196 (GeV)
+     30 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.09992 (GeV)
+     35 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 6.25964 (GeV)
 number of event = 5
 #
 ### Run 6 start.
 >>> Event 0
-     34 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1399 (GeV)
-     50 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 6.9795 (GeV)
+     31 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.11992 (GeV)
+     48 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 7.1796 (GeV)
 >>> Event 1
-     35 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1599 (GeV)
-     51 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 7.7795 (GeV)
->>> Event 2
-     35 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.1599 (GeV)
+     34 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.17992 (GeV)
      53 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 8.5994 (GeV)
+     Total energy deposition in HAD calorimeter towers : 8.01956 (GeV)
+>>> Event 2
+     36 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.21992 (GeV)
+     53 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 8.91952 (GeV)
 >>> Event 3
-     38 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.2199 (GeV)
-     55 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 9.4794 (GeV)
->>> Event 4
-     41 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.2799 (GeV)
+     36 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.21992 (GeV)
      56 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 10.319 (GeV)
+     Total energy deposition in HAD calorimeter towers : 9.79948 (GeV)
+>>> Event 4
+     36 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.21992 (GeV)
+     57 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 10.7194 (GeV)
 number of event = 5
 #
 ### Run 7 start.
 >>> Event 0
-     53 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.5399 (GeV)
-     66 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 10.819 (GeV)
+     48 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.4799 (GeV)
+     64 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 11.1194 (GeV)
 >>> Event 1
-     56 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.6999 (GeV)
-     67 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 11.379 (GeV)
->>> Event 2
-     62 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 1.8799 (GeV)
+     52 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.59989 (GeV)
      69 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 11.759 (GeV)
+     Total energy deposition in HAD calorimeter towers : 11.6194 (GeV)
+>>> Event 2
+     55 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.79988 (GeV)
+     69 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 12.0393 (GeV)
 >>> Event 3
-     65 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 2.0598 (GeV)
-     70 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 12.139 (GeV)
+     56 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 1.91987 (GeV)
+     69 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 12.5993 (GeV)
 >>> Event 4
-     68 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 2.2398 (GeV)
-     70 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 12.679 (GeV)
+     60 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 2.05987 (GeV)
+     71 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 13.1393 (GeV)
 number of event = 5
 #
 #
@@ -331,58 +309,58 @@ number of event = 5
 ### Run 8 start.
 >>> Event 0
      32 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99043 (GeV)
-     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.002653 (GeV)
+     Total energy deposition in EM calorimeter crytals : 0.994625 (GeV)
+     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     28 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99125 (GeV)
-     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0060463 (GeV)
+     39 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.995765 (GeV)
+     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     41 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99558 (GeV)
-     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.00089997 (GeV)
+     36 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.990406 (GeV)
+     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.00520094 (GeV)
 >>> Event 3
-     38 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98576 (GeV)
-     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0040621 (GeV)
+     33 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.995879 (GeV)
+     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     28 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.97926 (GeV)
-     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0070271 (GeV)
+     49 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.991912 (GeV)
+     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.00576664 (GeV)
 number of event = 5
 #
 #   switch on UserLimits
 #
 ### Run 9 start.
 >>> Event 0
-     24 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.9875 (GeV)
-     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0043757 (GeV)
+     22 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99602 (GeV)
+     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 1
-     26 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99858 (GeV)
+     17 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.99114 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 2
-     21 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.98943 (GeV)
+     24 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.985522 (GeV)
      0 hits are stored in HAD ExN05CalorimeterHitsCollection.
      Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 3
-     18 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99623 (GeV)
-     3 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.003691 (GeV)
+     26 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.998598 (GeV)
+     0 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0 (GeV)
 >>> Event 4
-     28 hits are stored in EM ExN05CalorimeterHitsCollection.
-     Total energy deposition in EM calorimeter crytals : 0.99103 (GeV)
-     2 hits are stored in HAD ExN05CalorimeterHitsCollection.
-     Total energy deposition in HAD calorimeter towers : 0.0018768 (GeV)
+     19 hits are stored in EM ExN05CalorimeterHitsCollection.
+     Total energy deposition in EM calorimeter crytals : 0.997669 (GeV)
+     1 hits are stored in HAD ExN05CalorimeterHitsCollection.
+     Total energy deposition in HAD calorimeter towers : 0.00115066 (GeV)
 number of event = 5
 #
diff --git a/examples/novice/N05/include/ExN05CalorimeterHit.hh b/examples/novice/N05/include/ExN05CalorimeterHit.hh
index 89fff6c9d2..e7eaa7f224 100644
--- a/examples/novice/N05/include/ExN05CalorimeterHit.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05CalorimeterHit.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05CalorimeterHit.hh,v 1.3.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05CalorimeterHit_h
diff --git a/examples/novice/N05/include/ExN05CalorimeterSD.hh b/examples/novice/N05/include/ExN05CalorimeterSD.hh
index 4d20916ea3..2c89a7d111 100644
--- a/examples/novice/N05/include/ExN05CalorimeterSD.hh
+++ b/examples/novice/N05/include/ExN05CalorimeterSD.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05CalorimeterSD.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05CalorimeterSD.hh,v 1.2.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05CalorimeterSD_h
diff --git a/examples/novice/N05/include/ExN05DetectorConstruction.hh b/examples/novice/N05/include/ExN05DetectorConstruction.hh
index 106e75c613..281f15e335 100644
--- a/examples/novice/N05/include/ExN05DetectorConstruction.hh
+++ b/examples/novice/N05/include/ExN05DetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05DetectorConstruction.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05DetectorConstruction.hh,v 1.2.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef ExN05DetectorConstruction_h
 #define ExN05DetectorConstruction_h 1
diff --git a/examples/novice/N05/include/ExN05DetectorMessenger.hh b/examples/novice/N05/include/ExN05DetectorMessenger.hh
index d1fc74e1f5..efb878dd89 100644
--- a/examples/novice/N05/include/ExN05DetectorMessenger.hh
+++ b/examples/novice/N05/include/ExN05DetectorMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05DetectorMessenger.hh,v 1.2 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05DetectorMessenger.hh,v 1.2.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N05/include/ExN05EMShowerModel.hh b/examples/novice/N05/include/ExN05EMShowerModel.hh
index 07ef44e31f..19a865f535 100644
--- a/examples/novice/N05/include/ExN05EMShowerModel.hh
+++ b/examples/novice/N05/include/ExN05EMShowerModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EMShowerModel.hh,v 1.3 1999/12/15 14:49:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EMShowerModel.hh,v 1.4.2.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //----------------------------------------------
@@ -23,7 +39,7 @@
 #include "G4Step.hh"
 #include "G4VTouchable.hh"
 #include "G4TouchableHistory.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 class ExN05EMShowerModel : public G4VFastSimulationModel
 {
@@ -58,7 +74,7 @@ private:
   G4Navigator *fpNavigator;
   G4bool       fNaviSetup;
 
-  G4RWTValOrderedVector<ExN05EnergySpot> feSpotList;
+  G4std::vector<ExN05EnergySpot> feSpotList;
 
 };
 #endif
diff --git a/examples/novice/N05/include/ExN05EnergySpot.hh b/examples/novice/N05/include/ExN05EnergySpot.hh
index c3de384c24..b164d6802d 100644
--- a/examples/novice/N05/include/ExN05EnergySpot.hh
+++ b/examples/novice/N05/include/ExN05EnergySpot.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EnergySpot.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EnergySpot.hh,v 1.4.2.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef ExN05EnergySpot_h
 #define ExN05EnergySpot_h
@@ -27,12 +43,10 @@ public:
   inline void SetPosition(const G4ThreeVector& point) {Point = point;}
   inline G4ThreeVector GetPosition() const {return Point;}
 
-  // Required by Rogue Wave explicitely,
-  // when using G4RWTValOrderedVector<ExN05EnergySpot>
-  int operator==(const ExN05EnergySpot& eSpot) const
+  G4int operator==(const ExN05EnergySpot& eSpot) const
   {
     return (Energy==eSpot.Energy && Point==eSpot.Point) ? 1 : 0;
-  };
+  }
 
   // Draw:
   void Draw(G4Colour* color = NULL);
diff --git a/examples/novice/N05/include/ExN05EventAction.hh b/examples/novice/N05/include/ExN05EventAction.hh
index 3faf3f0721..03dc96a327 100644
--- a/examples/novice/N05/include/ExN05EventAction.hh
+++ b/examples/novice/N05/include/ExN05EventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EventAction.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EventAction.hh,v 1.3.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05EventAction_h
diff --git a/examples/novice/N05/include/ExN05EventActionMessenger.hh b/examples/novice/N05/include/ExN05EventActionMessenger.hh
index b8a9ce377b..95099fb448 100644
--- a/examples/novice/N05/include/ExN05EventActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05EventActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EventActionMessenger.hh,v 1.2 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EventActionMessenger.hh,v 1.2.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05EventActionMessenger_h
diff --git a/examples/novice/N05/include/ExN05MaxTimeCuts.hh b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
index 2e7e7ab841..2d62d79d5e 100644
--- a/examples/novice/N05/include/ExN05MaxTimeCuts.hh
+++ b/examples/novice/N05/include/ExN05MaxTimeCuts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MaxTimeCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MaxTimeCuts.hh,v 1.3.4.2 2001/06/28 20:18:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // ------------------------------------------------------------
 //                  14 Aug. 1998  H.Kurashige
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinEkineCuts.hh b/examples/novice/N05/include/ExN05MinEkineCuts.hh
index a3796bf910..f0b93f3ca4 100644
--- a/examples/novice/N05/include/ExN05MinEkineCuts.hh
+++ b/examples/novice/N05/include/ExN05MinEkineCuts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MinEkineCuts.hh,v 1.3 1999/12/15 14:49:28 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MinEkineCuts.hh,v 1.3.4.2 2001/06/28 20:18:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // ------------------------------------------------------------
 //                  14 Aug. 1998  H.Kurashige
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05MinRangeCuts.hh b/examples/novice/N05/include/ExN05MinRangeCuts.hh
index e67db4c5cb..5146893d58 100644
--- a/examples/novice/N05/include/ExN05MinRangeCuts.hh
+++ b/examples/novice/N05/include/ExN05MinRangeCuts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MinRangeCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MinRangeCuts.hh,v 1.3.4.2 2001/06/28 20:18:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // ------------------------------------------------------------
 //                  14 Aug. 1998  H.Kurashige
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05PhysicsList.hh b/examples/novice/N05/include/ExN05PhysicsList.hh
index 38132090e4..5726e46014 100644
--- a/examples/novice/N05/include/ExN05PhysicsList.hh
+++ b/examples/novice/N05/include/ExN05PhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PhysicsList.hh,v 1.5 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PhysicsList.hh,v 1.5.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 #ifndef ExN05PhysicsList_h
diff --git a/examples/novice/N05/include/ExN05PiModel.hh b/examples/novice/N05/include/ExN05PiModel.hh
index c4a5f95401..594ae49281 100644
--- a/examples/novice/N05/include/ExN05PiModel.hh
+++ b/examples/novice/N05/include/ExN05PiModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PiModel.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PiModel.hh,v 1.2.4.1 2001/06/28 19:07:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //----------------------------------------
diff --git a/examples/novice/N05/include/ExN05PionShowerModel.hh b/examples/novice/N05/include/ExN05PionShowerModel.hh
index 1ac7afcb96..943a076180 100644
--- a/examples/novice/N05/include/ExN05PionShowerModel.hh
+++ b/examples/novice/N05/include/ExN05PionShowerModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PionShowerModel.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PionShowerModel.hh,v 1.4.2.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //----------------------------------------------
@@ -21,7 +37,7 @@
 #include "G4Step.hh"
 #include "G4VTouchable.hh"
 #include "G4TouchableHistory.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 class ExN05PionShowerModel : public G4VFastSimulationModel
 {
@@ -56,7 +72,7 @@ private:
   G4Navigator *fpNavigator;
   G4bool       fNaviSetup;
 
-  G4RWTValOrderedVector<ExN05EnergySpot> feSpotList;
+  G4std::vector<ExN05EnergySpot> feSpotList;
 
 };
 #endif
diff --git a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
index dec71f4800..fb2f73dca1 100644
--- a/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
+++ b/examples/novice/N05/include/ExN05PrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PrimaryGeneratorAction.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PrimaryGeneratorAction.hh,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05PrimaryGeneratorAction_h
diff --git a/examples/novice/N05/include/ExN05RunAction.hh b/examples/novice/N05/include/ExN05RunAction.hh
index ee93ca343d..d572fa14b1 100644
--- a/examples/novice/N05/include/ExN05RunAction.hh
+++ b/examples/novice/N05/include/ExN05RunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05RunAction.hh,v 1.6 2000/01/06 15:06:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05RunAction.hh,v 1.6.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05RunAction_h
diff --git a/examples/novice/N05/include/ExN05SpecialCuts.hh b/examples/novice/N05/include/ExN05SpecialCuts.hh
index 55da2b2be0..7b2062a52a 100644
--- a/examples/novice/N05/include/ExN05SpecialCuts.hh
+++ b/examples/novice/N05/include/ExN05SpecialCuts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SpecialCuts.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SpecialCuts.hh,v 1.3.4.2 2001/06/28 20:18:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // ------------------------------------------------------------
 //                  15 April 1998  M.Maire
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/include/ExN05SteppingAction.hh b/examples/novice/N05/include/ExN05SteppingAction.hh
index a181a5043e..0de89a8f2f 100644
--- a/examples/novice/N05/include/ExN05SteppingAction.hh
+++ b/examples/novice/N05/include/ExN05SteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SteppingAction.hh,v 1.3 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SteppingAction.hh,v 1.3.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05SteppingAction_h
diff --git a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
index 7ad40eb5d1..2b52227218 100644
--- a/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
+++ b/examples/novice/N05/include/ExN05SteppingActionMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SteppingActionMessenger.hh,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SteppingActionMessenger.hh,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef ExN05SteppingActionMessenger_h
diff --git a/examples/novice/N05/include/ExN05VisManager.hh b/examples/novice/N05/include/ExN05VisManager.hh
index 121b7749d8..719b3eda23 100644
--- a/examples/novice/N05/include/ExN05VisManager.hh
+++ b/examples/novice/N05/include/ExN05VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05VisManager.hh,v 1.1 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05VisManager.hh,v 1.1.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N05/include/RandomGamma.hh b/examples/novice/N05/include/RandomGamma.hh
index 62fa1f070b..5825bc5cb8 100644
--- a/examples/novice/N05/include/RandomGamma.hh
+++ b/examples/novice/N05/include/RandomGamma.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // -----------------------------------
 // Header file for RandomGamma:
 // adaptation of RNGAMA function from
diff --git a/examples/novice/N05/src/ExN05CalorimeterHit.cc b/examples/novice/N05/src/ExN05CalorimeterHit.cc
index fc61cacbec..a448759c89 100644
--- a/examples/novice/N05/src/ExN05CalorimeterHit.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05CalorimeterHit.cc,v 1.2 1999/12/15 14:49:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05CalorimeterHit.cc,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05CalorimeterHit.hh"
diff --git a/examples/novice/N05/src/ExN05CalorimeterSD.cc b/examples/novice/N05/src/ExN05CalorimeterSD.cc
index 14b22816be..ae94a29c08 100644
--- a/examples/novice/N05/src/ExN05CalorimeterSD.cc
+++ b/examples/novice/N05/src/ExN05CalorimeterSD.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05CalorimeterSD.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05CalorimeterSD.cc,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05CalorimeterSD.hh"
diff --git a/examples/novice/N05/src/ExN05DetectorConstruction.cc b/examples/novice/N05/src/ExN05DetectorConstruction.cc
index 7722c2bddb..012a5f0ad5 100644
--- a/examples/novice/N05/src/ExN05DetectorConstruction.cc
+++ b/examples/novice/N05/src/ExN05DetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05DetectorConstruction.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05DetectorConstruction.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "ExN05DetectorConstruction.hh"
 #include "ExN05CalorimeterSD.hh"
diff --git a/examples/novice/N05/src/ExN05DetectorMessenger.cc b/examples/novice/N05/src/ExN05DetectorMessenger.cc
index f8b55930cb..f9f00839ce 100644
--- a/examples/novice/N05/src/ExN05DetectorMessenger.cc
+++ b/examples/novice/N05/src/ExN05DetectorMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05DetectorMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N05/src/ExN05EMShowerModel.cc b/examples/novice/N05/src/ExN05EMShowerModel.cc
index 190bbb527a..7861d25a79 100644
--- a/examples/novice/N05/src/ExN05EMShowerModel.cc
+++ b/examples/novice/N05/src/ExN05EMShowerModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EMShowerModel.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EMShowerModel.cc,v 1.3.2.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "ExN05EMShowerModel.hh"
 #include "ExN05EnergySpot.hh"
@@ -149,7 +165,7 @@ void ExN05EMShowerModel::Explode(const G4FastTrack& fastTrack)
       eSpot.SetPosition(ePoint);
 
       // Records the eSpot:
-      feSpotList.insert(eSpot);
+      feSpotList.push_back(eSpot);
     }
 }
 
@@ -157,7 +173,7 @@ void ExN05EMShowerModel::Explode(const G4FastTrack& fastTrack)
 void ExN05EMShowerModel::BuildDetectorResponse()
 {
   // Does the assignation of the energy spots to the sensitive volumes:
-  for (int i = 0; i < feSpotList.entries(); i++)
+  for (int i = 0; i < feSpotList.size(); i++)
     {
       // Draw the energy spot:
       feSpotList[i].Draw();
@@ -229,9 +245,3 @@ void ExN05EMShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
   // set total energy deposit:
   fFakeStep->SetTotalEnergyDeposit(eSpot.GetEnergy());
 }
-
-
-
-
-
-
diff --git a/examples/novice/N05/src/ExN05EnergySpot.cc b/examples/novice/N05/src/ExN05EnergySpot.cc
index a471f4afc2..ea4e6b35ef 100644
--- a/examples/novice/N05/src/ExN05EnergySpot.cc
+++ b/examples/novice/N05/src/ExN05EnergySpot.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EnergySpot.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EnergySpot.cc,v 1.3.2.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "ExN05EnergySpot.hh"
 
@@ -44,21 +60,21 @@ void ExN05EnergySpot::Draw(G4Colour *color)
       // Draw a "home made" marker:
       // Will be better by using a real Marker:
       pp.setZ(pp.z()+1*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp.setZ(pp.z()-2*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp = Point;
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp.setX(pp.x()+1*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp.setX(pp.x()-2*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp = Point;
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp.setY(pp.y()+1*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pp.setY(pp.y()-2*cm);
-      polyline.append(pp);
+      polyline.push_back(pp);
       pVVisManager -> Draw(polyline);
     }
 }
diff --git a/examples/novice/N05/src/ExN05EventAction.cc b/examples/novice/N05/src/ExN05EventAction.cc
index aefc8e291d..9eb19dfe36 100644
--- a/examples/novice/N05/src/ExN05EventAction.cc
+++ b/examples/novice/N05/src/ExN05EventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EventAction.cc,v 1.4 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EventAction.cc,v 1.5.2.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05EventAction.hh"
@@ -22,7 +38,6 @@
 #include "G4VVisManager.hh"
 #include "G4SDManager.hh"
 #include "G4UImanager.hh"
-#include "g4rw/tvordvec.h"
 #include "G4ios.hh"
 
 ExN05EventAction::ExN05EventAction()
diff --git a/examples/novice/N05/src/ExN05EventActionMessenger.cc b/examples/novice/N05/src/ExN05EventActionMessenger.cc
index f8601db7ee..603623a20e 100644
--- a/examples/novice/N05/src/ExN05EventActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05EventActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05EventActionMessenger.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05EventActionMessenger.hh"
diff --git a/examples/novice/N05/src/ExN05MaxTimeCuts.cc b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
index 8477e22745..628ec964fd 100644
--- a/examples/novice/N05/src/ExN05MaxTimeCuts.cc
+++ b/examples/novice/N05/src/ExN05MaxTimeCuts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MaxTimeCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MaxTimeCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05MinEkineCuts.cc b/examples/novice/N05/src/ExN05MinEkineCuts.cc
index e3bee56d81..8bdc968c81 100644
--- a/examples/novice/N05/src/ExN05MinEkineCuts.cc
+++ b/examples/novice/N05/src/ExN05MinEkineCuts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MinEkineCuts.cc,v 1.2 1999/12/15 14:49:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MinEkineCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05MinRangeCuts.cc b/examples/novice/N05/src/ExN05MinRangeCuts.cc
index 1efed7afe4..16907304a0 100644
--- a/examples/novice/N05/src/ExN05MinRangeCuts.cc
+++ b/examples/novice/N05/src/ExN05MinRangeCuts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05MinRangeCuts.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05MinRangeCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05PhysicsList.cc b/examples/novice/N05/src/ExN05PhysicsList.cc
index 9ca139673c..97abb53cc9 100644
--- a/examples/novice/N05/src/ExN05PhysicsList.cc
+++ b/examples/novice/N05/src/ExN05PhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PhysicsList.cc,v 1.5 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PhysicsList.cc,v 1.5.4.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/examples/novice/N05/src/ExN05PiModel.cc b/examples/novice/N05/src/ExN05PiModel.cc
index 540d63d4e5..8e29aa0ca6 100644
--- a/examples/novice/N05/src/ExN05PiModel.cc
+++ b/examples/novice/N05/src/ExN05PiModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PiModel.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PiModel.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "ExN05PiModel.hh"
 
diff --git a/examples/novice/N05/src/ExN05PionShowerModel.cc b/examples/novice/N05/src/ExN05PionShowerModel.cc
index 99145bf927..fabf3a3ccf 100644
--- a/examples/novice/N05/src/ExN05PionShowerModel.cc
+++ b/examples/novice/N05/src/ExN05PionShowerModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PionShowerModel.cc,v 1.3 2000/08/03 09:09:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PionShowerModel.cc,v 1.4.2.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "ExN05PionShowerModel.hh"
 #include "ExN05EnergySpot.hh"
@@ -122,7 +138,7 @@ void ExN05PionShowerModel::Explode(const G4FastTrack& fastTrack)
 	z*zShower +
 	r*cos(phi)*xShower + r*sin(phi)*yShower;
       eSpot.SetPosition(ePoint);
-      feSpotList.insert(eSpot);
+      feSpotList.push_back(eSpot);
     }
 }
 
@@ -130,7 +146,7 @@ void ExN05PionShowerModel::Explode(const G4FastTrack& fastTrack)
 void ExN05PionShowerModel::BuildDetectorResponse()
 {
   // Does the assignation of the energy spots to the sensitive volumes:
-  for (int i = 0; i < feSpotList.entries(); i++)
+  for (int i = 0; i < feSpotList.size(); i++)
     {
       // Draw the energy spot:
       G4Colour red(1.,0.,0.);
@@ -203,9 +219,3 @@ void ExN05PionShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
   // set total energy deposit:
   fFakeStep->SetTotalEnergyDeposit(eSpot.GetEnergy());
 }
-
-
-
-
-
-
diff --git a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
index fb0b9c14c6..988abc82e9 100644
--- a/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
+++ b/examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05PrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N05/src/ExN05RunAction.cc b/examples/novice/N05/src/ExN05RunAction.cc
index 80bdb26438..3287f1339d 100644
--- a/examples/novice/N05/src/ExN05RunAction.cc
+++ b/examples/novice/N05/src/ExN05RunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05RunAction.cc,v 1.5 2000/01/06 15:06:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05RunAction.cc,v 1.5.4.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Make this appear first!
diff --git a/examples/novice/N05/src/ExN05SpecialCuts.cc b/examples/novice/N05/src/ExN05SpecialCuts.cc
index 1df897c01d..c98421abac 100644
--- a/examples/novice/N05/src/ExN05SpecialCuts.cc
+++ b/examples/novice/N05/src/ExN05SpecialCuts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SpecialCuts.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SpecialCuts.cc,v 1.3.4.2 2001/06/28 20:18:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // ------------------------------------------------------------
 //                  15 April 1998  M.Maire
 // ------------------------------------------------------------
diff --git a/examples/novice/N05/src/ExN05SteppingAction.cc b/examples/novice/N05/src/ExN05SteppingAction.cc
index fd2288bdb5..669392ea07 100644
--- a/examples/novice/N05/src/ExN05SteppingAction.cc
+++ b/examples/novice/N05/src/ExN05SteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SteppingAction.cc,v 1.3 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SteppingAction.cc,v 1.4.2.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05SteppingAction.hh"
@@ -41,8 +57,8 @@ void ExN05SteppingAction::UserSteppingAction(const G4Step*)
       else                  colour = G4Colour(0., 1., 0.);
       G4VisAttributes attribs(colour);
       polyline.SetVisAttributes(attribs);
-      polyline.append(pSM->GetStep()->GetPreStepPoint()->GetPosition());
-      polyline.append(pSM->GetStep()->GetPostStepPoint()->GetPosition());
+      polyline.push_back(pSM->GetStep()->GetPreStepPoint()->GetPosition());
+      polyline.push_back(pSM->GetStep()->GetPostStepPoint()->GetPosition());
       pVVisManager -> Draw(polyline);
     }
   }
diff --git a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
index 922e13a522..fdb0543dce 100644
--- a/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
+++ b/examples/novice/N05/src/ExN05SteppingActionMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05SteppingActionMessenger.cc,v 1.2 1999/12/15 14:49:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05SteppingActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "ExN05SteppingActionMessenger.hh"
diff --git a/examples/novice/N05/src/ExN05VisManager.cc b/examples/novice/N05/src/ExN05VisManager.cc
index 92589b04cc..0cb7e74ca6 100644
--- a/examples/novice/N05/src/ExN05VisManager.cc
+++ b/examples/novice/N05/src/ExN05VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ExN05VisManager.cc,v 1.1 2000/06/29 07:42:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ExN05VisManager.cc,v 1.1.4.1 2001/06/28 19:07:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/examples/novice/N05/src/RandomGamma.cc b/examples/novice/N05/src/RandomGamma.cc
index 9758abd2f2..efa2daf054 100644
--- a/examples/novice/N05/src/RandomGamma.cc
+++ b/examples/novice/N05/src/RandomGamma.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // --------------------------------------------
 // Adapted from RNGAMA function of the KERNLIB
 // Shoot at random according to the gamma
diff --git a/examples/novice/N06/exampleN06.cc b/examples/novice/N06/exampleN06.cc
index 3efc96c6f5..831a29c764 100644
--- a/examples/novice/N06/exampleN06.cc
+++ b/examples/novice/N06/exampleN06.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // --------------------------------------------------------------
 //      GEANT 4 - exampleExN06
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 // --------------------------------------------------------------
 //
 // File:        exampleExN06.cc
diff --git a/examples/novice/N06/exampleN06.out b/examples/novice/N06/exampleN06.out
index 0d6e5b67ac..d42ef20156 100644
--- a/examples/novice/N06/exampleN06.out
+++ b/examples/novice/N06/exampleN06.out
@@ -1,6 +1,6 @@
 **********************************************
- Geant4 version $Name: geant4-03-01 $
-                                (15-Dec-2000)
+ Geant4 version $Name: geant4-03-01-ref-01 $
+                                (06-Apr-2001)
              Copyright : Geant4 Collaboration
 **********************************************
 /run/initialize
@@ -26,13 +26,6 @@ eIoni:  delta cross sections from Moller+Bhabha. Good description from 1 KeV to
         delta ray energy sampled from  differential Xsection.
         PhysicsTables from 1 keV to 100 TeV in 100 bins. 
 
- eIoni   Minimum Delta cut in range=0.1  mm.
-
-           material       min.delta energy(keV) 
-
-                 Air           0.99
-               Water         81.851
-
 eBrem:  Total cross sections from a NEW parametrisation based on the EEDL data library. 
  Good description from 1 KeV to 100 GeV.
         log scale extrapolation above 100 GeV 
@@ -48,13 +41,6 @@ msc:   Tables of transport mean free paths.
           displacement of the particle , too.
         PhysicsTables from 100 eV  to 100 TeV in 100 bins. 
 
- hIoni    Minimum Delta cut in range=0.1  mm.
-
-           material        min.delta energy(keV) 
-
-                 Air           0.99
-               Water         81.851
-
 hIoni:    Knock-on electron cross sections . 
          Good description above the mean excitation energy.
          delta ray energy sampled from  differential Xsection.
@@ -91,10 +77,10 @@ MuPairProd:  theoretical cross sections
 Track (trackID 1, parentID 0) is processed with stopping code 4
 ### pop requested out of 303 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73988,0.574,0.35084)
- Old Polarization:       (-0.67273,0.6313,0.38586)
- New Momentum Direction: (0.41391,0.77672,0.47475)
- New Polarization:       (-0.91032,0.35316,0.21586)
+ Old Momentum Direction: (0.739884,0.574004,0.350843)
+ Old Polarization:       (-0.672734,0.631299,0.385863)
+ New Momentum Direction: (0.413909,0.77672,0.474748)
+ New Polarization:       (-0.910318,0.353164,0.215861)
  *** FresnelRefraction *** 
 Track (trackID 303, parentID 1) is processed with stopping code 2
 ### pop requested out of 302 stacked tracks.
@@ -107,39 +93,39 @@ Track (trackID 302, parentID 1) is processed with stopping code 2
 Track (trackID 301, parentID 1) is processed with stopping code 2
 ### pop requested out of 300 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74386,0.63219,0.21681)
- Old Polarization:       (-0.66834,0.70363,0.24131)
- New Momentum Direction: (0.43684,0.85089,0.29182)
- New Polarization:       (-0.89954,0.41322,0.14172)
+ Old Momentum Direction: (0.743858,0.632192,0.216814)
+ Old Polarization:       (-0.668338,0.703628,0.241313)
+ New Momentum Direction: (0.436842,0.850889,0.291817)
+ New Polarization:       (-0.899538,0.413217,0.141715)
  *** FresnelRefraction *** 
 Track (trackID 300, parentID 1) is processed with stopping code 2
 ### pop requested out of 299 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74493,0.66385,-0.066164)
- Old Polarization:       (-0.66714,0.74126,-0.07388)
- New Momentum Direction: (0.44279,0.89221,-0.088924)
- New Polarization:       (-0.89663,0.4406,-0.043914)
+ Old Momentum Direction: (0.744934,0.663849,-0.0661642)
+ Old Polarization:       (-0.667138,0.741262,-0.0738797)
+ New Momentum Direction: (0.442788,0.892206,-0.088924)
+ New Polarization:       (-0.896626,0.440605,-0.043914)
  *** FresnelRefraction *** 
 Track (trackID 299, parentID 1) is processed with stopping code 2
 ### pop requested out of 298 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73743,-0.38845,-0.55254)
-Old Polarization: (-0.67542,-0.42411,-0.60327)
-New Polarization: (-0.17176,-0.95925,0.22434)
-Polarization Change: (-0.17176,-0.95925,0.22434)
-New Momentum Direction: (0.66047,0.056839,0.7487)
-Momentum Change: (0.66047,0.056839,0.7487)
+Old Momentum Direction: (0.737431,-0.38845,-0.552542)
+Old Polarization: (-0.675423,-0.424112,-0.603269)
+New Polarization: (-0.171758,-0.959255,0.224342)
+Polarization Change: (-0.171758,-0.959255,0.224342)
+New Momentum Direction: (0.66047,0.0568391,0.748698)
+Momentum Change: (0.66047,0.0568391,0.748698)
  Photon at Boundary! 
- Old Momentum Direction: (0.66047,0.056839,0.7487)
- Old Polarization:       (-0.17176,-0.95925,0.22434)
- New Momentum Direction: (-0.66047,0.056839,0.7487)
- New Polarization:       (-0.17176,0.95925,-0.22434)
+ Old Momentum Direction: (0.66047,0.0568391,0.748698)
+ Old Polarization:       (-0.171758,-0.959255,0.224342)
+ New Momentum Direction: (-0.66047,0.0568391,0.748698)
+ New Polarization:       (-0.171758,0.959255,-0.224342)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66047,0.056839,0.7487)
- Old Polarization:       (-0.17176,0.95925,-0.22434)
- New Momentum Direction: (-0.66047,0.056839,-0.7487)
- New Polarization:       (-0.0071378,-0.99756,-0.069435)
+ Old Momentum Direction: (-0.66047,0.0568391,0.748698)
+ Old Polarization:       (-0.171758,0.959255,-0.224342)
+ New Momentum Direction: (-0.66047,0.0568391,-0.748698)
+ New Polarization:       (-0.00713785,-0.997561,-0.0694354)
  *** FresnelReflection *** 
 
 ** Photon absorbed! **
@@ -154,22 +140,22 @@ Track (trackID 297, parentID 1) is processed with stopping code 2
 Track (trackID 296, parentID 1) is processed with stopping code 2
 ### pop requested out of 295 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74126,0.12212,0.66002)
- Old Polarization:       (-0.67122,0.13487,0.72888)
- New Momentum Direction: (-0.74126,0.12212,0.66002)
- New Polarization:       (-0.67122,-0.13487,-0.72888)
+ Old Momentum Direction: (0.741256,0.122124,0.660019)
+ Old Polarization:       (-0.671223,0.134867,0.728884)
+ New Momentum Direction: (-0.741256,0.122124,0.660019)
+ New Polarization:       (-0.671223,-0.134867,-0.728884)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74126,0.12212,0.66002)
- Old Polarization:       (-0.67122,-0.13487,-0.72888)
- New Momentum Direction: (-0.74126,0.12212,-0.66002)
- New Polarization:       (0.67122,0.13487,-0.72888)
+ Old Momentum Direction: (-0.741256,0.122124,0.660019)
+ Old Polarization:       (-0.671223,-0.134867,-0.728884)
+ New Momentum Direction: (-0.741256,0.122124,-0.660019)
+ New Polarization:       (0.671223,0.134867,-0.728884)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74126,0.12212,-0.66002)
- Old Polarization:       (0.67122,0.13487,-0.72888)
- New Momentum Direction: (-0.42201,0.16495,-0.89146)
- New Polarization:       (0.90659,0.076781,-0.41496)
+ Old Momentum Direction: (-0.741256,0.122124,-0.660019)
+ Old Polarization:       (0.671223,0.134867,-0.728884)
+ New Momentum Direction: (-0.422007,0.164949,-0.891461)
+ New Polarization:       (0.906593,0.0767813,-0.414963)
  *** FresnelRefraction *** 
 Track (trackID 295, parentID 1) is processed with stopping code 2
 ### pop requested out of 294 stacked tracks.
@@ -178,18 +164,18 @@ Track (trackID 295, parentID 1) is processed with stopping code 2
 Track (trackID 294, parentID 1) is processed with stopping code 2
 ### pop requested out of 293 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74161,0.54495,-0.39121)
- Old Polarization:       (-0.67083,0.60245,-0.43249)
- New Momentum Direction: (0.42406,0.73569,-0.52814)
- New Polarization:       (-0.90563,0.34448,-0.2473)
+ Old Momentum Direction: (0.741609,0.54495,-0.39121)
+ Old Polarization:       (-0.670832,0.602445,-0.432485)
+ New Momentum Direction: (0.42406,0.735691,-0.52814)
+ New Polarization:       (-0.905634,0.344485,-0.2473)
  *** FresnelRefraction *** 
 Track (trackID 293, parentID 1) is processed with stopping code 2
 ### pop requested out of 292 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73936,0.67147,-0.049807)
- Old Polarization:       (-0.67331,0.73733,-0.054693)
- New Momentum Direction: (0.41076,0.90925,-0.067444)
- New Polarization:       (-0.91174,0.40963,-0.030385)
+ Old Momentum Direction: (0.73936,0.671465,-0.0498066)
+ Old Polarization:       (-0.67331,0.737335,-0.0546925)
+ New Momentum Direction: (0.41076,0.909245,-0.0674442)
+ New Polarization:       (-0.911743,0.409635,-0.0303851)
  *** FresnelRefraction *** 
 Track (trackID 292, parentID 1) is processed with stopping code 2
 ### pop requested out of 291 stacked tracks.
@@ -206,34 +192,34 @@ Track (trackID 290, parentID 1) is processed with stopping code 2
 Track (trackID 289, parentID 1) is processed with stopping code 2
 ### pop requested out of 288 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73875,0.13058,0.66121)
- Old Polarization:       (-0.67398,0.14313,0.72476)
- New Momentum Direction: (0.40707,0.17696,0.89609)
- New Polarization:       (-0.9134,0.078867,0.39936)
+ Old Momentum Direction: (0.738753,0.130576,0.661206)
+ Old Polarization:       (-0.673976,0.143126,0.724756)
+ New Momentum Direction: (0.407074,0.176961,0.896089)
+ New Polarization:       (-0.913395,0.0788665,0.399361)
  *** FresnelRefraction *** 
 Track (trackID 288, parentID 1) is processed with stopping code 2
 ### pop requested out of 287 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74021,-0.66243,0.1152)
- Old Polarization:       (-0.67237,-0.72927,0.12682)
- New Momentum Direction: (0.41586,-0.89598,0.15581)
- New Polarization:       (-0.90943,-0.40971,0.071249)
+ Old Momentum Direction: (0.740212,-0.662432,0.115196)
+ Old Polarization:       (-0.672373,-0.729268,0.126819)
+ New Momentum Direction: (0.415863,-0.89598,0.15581)
+ New Polarization:       (-0.909427,-0.409714,0.071249)
  *** FresnelRefraction *** 
 Track (trackID 287, parentID 1) is processed with stopping code 2
 ### pop requested out of 286 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74152,-0.053634,-0.66878)
- Old Polarization:       (-0.67093,-0.059277,-0.73915)
- New Momentum Direction: (0.42355,-0.072415,-0.90297)
- New Polarization:       (-0.90587,-0.033859,-0.4222)
+ Old Momentum Direction: (0.741522,-0.0536341,-0.668782)
+ Old Polarization:       (-0.670929,-0.0592773,-0.739149)
+ New Momentum Direction: (0.423553,-0.0724154,-0.902972)
+ New Polarization:       (-0.905871,-0.0338589,-0.422198)
  *** FresnelRefraction *** 
 Track (trackID 286, parentID 1) is processed with stopping code 2
 ### pop requested out of 285 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7445,0.66741,0.016796)
- Old Polarization:       (-0.66762,0.74427,0.01873)
- New Momentum Direction: (0.44041,0.89751,0.022586)
- New Polarization:       (-0.8978,0.44027,0.01108)
+ Old Momentum Direction: (0.744501,0.66741,0.0167957)
+ Old Polarization:       (-0.667621,0.744265,0.0187298)
+ New Momentum Direction: (0.440407,0.897514,0.0225863)
+ New Polarization:       (-0.897798,0.440268,0.0110795)
  *** FresnelRefraction *** 
 Track (trackID 285, parentID 1) is processed with stopping code 2
 ### pop requested out of 284 stacked tracks.
@@ -242,10 +228,10 @@ Track (trackID 285, parentID 1) is processed with stopping code 2
 Track (trackID 284, parentID 1) is processed with stopping code 2
 ### pop requested out of 283 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73733,-0.40746,0.53882)
- Old Polarization:       (-0.67554,-0.44473,0.5881)
- New Momentum Direction: (0.39824,-0.55328,0.73164)
- New Polarization:       (-0.91728,-0.2402,0.31764)
+ Old Momentum Direction: (0.737326,-0.407462,0.538818)
+ Old Polarization:       (-0.675537,-0.444731,0.588102)
+ New Momentum Direction: (0.398236,-0.553276,0.731638)
+ New Polarization:       (-0.917283,-0.240203,0.317639)
  *** FresnelRefraction *** 
 Track (trackID 283, parentID 1) is processed with stopping code 2
 ### pop requested out of 282 stacked tracks.
@@ -254,10 +240,10 @@ Track (trackID 283, parentID 1) is processed with stopping code 2
 Track (trackID 282, parentID 1) is processed with stopping code 2
 ### pop requested out of 281 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73872,0.41996,-0.52718)
- Old Polarization:       (-0.67401,0.46028,-0.5778)
- New Momentum Direction: (0.4069,0.56917,-0.71448)
- New Polarization:       (-0.91347,0.25353,-0.31826)
+ Old Momentum Direction: (0.738724,0.41996,-0.527181)
+ Old Polarization:       (-0.674008,0.460283,-0.5778)
+ New Momentum Direction: (0.406896,0.569167,-0.714482)
+ New Polarization:       (-0.913475,0.253528,-0.318257)
  *** FresnelRefraction *** 
 Track (trackID 281, parentID 1) is processed with stopping code 2
 ### pop requested out of 280 stacked tracks.
@@ -270,34 +256,34 @@ Track (trackID 280, parentID 1) is processed with stopping code 2
 Track (trackID 279, parentID 1) is processed with stopping code 2
 ### pop requested out of 278 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73915,-0.046027,-0.67197)
- Old Polarization:       (-0.67354,-0.05051,-0.73742)
- New Momentum Direction: (0.40949,-0.062344,-0.91018)
- New Polarization:       (-0.91231,-0.027983,-0.40853)
+ Old Momentum Direction: (0.73915,-0.0460269,-0.671966)
+ Old Polarization:       (-0.67354,-0.0505104,-0.737423)
+ New Momentum Direction: (0.40949,-0.0623437,-0.910182)
+ New Polarization:       (-0.912315,-0.0279828,-0.408533)
  *** FresnelRefraction *** 
 Track (trackID 278, parentID 1) is processed with stopping code 2
 ### pop requested out of 277 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73652,0.62262,-0.26436)
- Old Polarization:       (-0.67641,0.67794,-0.28785)
- New Momentum Direction: (0.39314,0.84635,-0.35935)
- New Polarization:       (-0.91948,0.36187,-0.15365)
+ Old Momentum Direction: (0.736521,0.622616,-0.264358)
+ Old Polarization:       (-0.676414,0.677943,-0.28785)
+ New Momentum Direction: (0.393142,0.846348,-0.359353)
+ New Polarization:       (-0.919478,0.361874,-0.153649)
  *** FresnelRefraction *** 
 Track (trackID 277, parentID 1) is processed with stopping code 2
 ### pop requested out of 276 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74096,-0.53783,-0.40213)
- Old Polarization:       (-0.67154,-0.59343,-0.4437)
- New Momentum Direction: (0.4203,-0.72672,-0.54335)
- New Polarization:       (-0.90738,-0.33662,-0.25168)
+ Old Momentum Direction: (0.740964,-0.537835,-0.402126)
+ Old Polarization:       (-0.671544,-0.593433,-0.443696)
+ New Momentum Direction: (0.420303,-0.726717,-0.543349)
+ New Polarization:       (-0.907384,-0.336617,-0.251681)
  *** FresnelRefraction *** 
 Track (trackID 276, parentID 1) is processed with stopping code 2
 ### pop requested out of 275 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73867,-0.29,0.60849)
- Old Polarization:       (-0.67406,-0.3178,0.66682)
- New Momentum Direction: (0.40659,-0.39306,0.82473)
- New Polarization:       (-0.91361,-0.17493,0.36704)
+ Old Momentum Direction: (0.738675,-0.289999,0.60849)
+ Old Polarization:       (-0.674062,-0.317797,0.666817)
+ New Momentum Direction: (0.406594,-0.393058,0.824734)
+ New Polarization:       (-0.913609,-0.174927,0.367041)
  *** FresnelRefraction *** 
 Track (trackID 275, parentID 1) is processed with stopping code 2
 ### pop requested out of 274 stacked tracks.
@@ -306,70 +292,70 @@ Track (trackID 275, parentID 1) is processed with stopping code 2
 Track (trackID 274, parentID 1) is processed with stopping code 2
 ### pop requested out of 273 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73759,0.39385,0.54849)
- Old Polarization:       (-0.67525,0.43021,0.59913)
- New Momentum Direction: (0.39988,0.5346,0.74451)
- New Polarization:       (-0.91657,0.23324,0.32482)
+ Old Momentum Direction: (0.737589,0.393851,0.548492)
+ Old Polarization:       (-0.67525,0.430212,0.599129)
+ New Momentum Direction: (0.399885,0.534603,0.744508)
+ New Polarization:       (-0.916565,0.23324,0.324818)
  *** FresnelRefraction *** 
 Track (trackID 273, parentID 1) is processed with stopping code 2
 ### pop requested out of 272 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74118,-0.0098924,-0.67124)
- Old Polarization:       (-0.67131,-0.010922,-0.7411)
- New Momentum Direction: (0.42155,-0.013363,-0.90671)
- New Polarization:       (-0.9068,-0.006212,-0.42151)
+ Old Momentum Direction: (0.741178,-0.00989236,-0.671236)
+ Old Polarization:       (-0.671309,-0.010922,-0.741098)
+ New Momentum Direction: (0.421552,-0.0133626,-0.906706)
+ New Polarization:       (-0.906804,-0.00621197,-0.421507)
  *** FresnelRefraction *** 
 Track (trackID 272, parentID 1) is processed with stopping code 2
 ### pop requested out of 271 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73922,-0.48749,-0.46465)
- Old Polarization:       (-0.67346,-0.53509,-0.51002)
- New Momentum Direction: (0.40992,-0.66025,-0.62931)
- New Polarization:       (-0.91212,-0.29672,-0.28282)
+ Old Momentum Direction: (0.739221,-0.487495,-0.464652)
+ Old Polarization:       (-0.673463,-0.535094,-0.510021)
+ New Momentum Direction: (0.409916,-0.660252,-0.629314)
+ New Polarization:       (-0.912123,-0.296723,-0.282819)
  *** FresnelRefraction *** 
 Track (trackID 271, parentID 1) is processed with stopping code 2
 ### pop requested out of 270 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73955,-0.67307,-0.0070698)
- Old Polarization:       (-0.67311,-0.73951,-0.0077676)
- New Momentum Direction: (0.41188,-0.91119,-0.0095709)
- New Polarization:       (-0.91124,-0.41186,-0.0043261)
+ Old Momentum Direction: (0.739546,-0.673069,-0.00706978)
+ Old Polarization:       (-0.673106,-0.739506,-0.00776763)
+ New Momentum Direction: (0.411881,-0.911187,-0.00957094)
+ New Polarization:       (-0.911238,-0.411858,-0.00432608)
  *** FresnelRefraction *** 
 Track (trackID 270, parentID 1) is processed with stopping code 2
 ### pop requested out of 269 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7378,0.40606,0.53923)
- Old Polarization:       (-0.67502,0.44383,0.58938)
- New Momentum Direction: (0.40119,0.55102,0.73173)
- New Polarization:       (-0.916,0.24134,0.32048)
+ Old Momentum Direction: (0.737799,0.406061,0.539229)
+ Old Polarization:       (-0.675021,0.443825,0.589378)
+ New Momentum Direction: (0.401189,0.55102,0.731727)
+ New Polarization:       (-0.915995,0.241336,0.320483)
  *** FresnelRefraction *** 
 Track (trackID 269, parentID 1) is processed with stopping code 2
 ### pop requested out of 268 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74385,-0.64846,0.16179)
- Old Polarization:       (-0.66834,-0.72173,0.18007)
- New Momentum Direction: (0.43682,-0.87279,0.21776)
- New Polarization:       (-0.89955,-0.42383,0.10574)
+ Old Momentum Direction: (0.743854,-0.648464,0.16179)
+ Old Polarization:       (-0.668342,-0.72173,0.180069)
+ New Momentum Direction: (0.43682,-0.872794,0.217759)
+ New Polarization:       (-0.899549,-0.423828,0.105744)
  *** FresnelRefraction *** 
 Track (trackID 268, parentID 1) is processed with stopping code 2
 ### pop requested out of 267 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73745,0.078603,0.67081)
- Old Polarization:       (-0.6754,0.085824,0.73244)
- New Momentum Direction: (-0.73745,0.078603,0.67081)
- New Polarization:       (-0.6754,-0.085824,-0.73244)
+ Old Momentum Direction: (0.737449,0.0786034,0.670814)
+ Old Polarization:       (-0.675403,0.0858243,0.732438)
+ New Momentum Direction: (-0.737449,0.0786034,0.670814)
+ New Polarization:       (-0.675403,-0.0858243,-0.732438)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73745,0.078603,0.67081)
- Old Polarization:       (-0.6754,-0.085824,-0.73244)
- New Momentum Direction: (-0.73745,0.078603,-0.67081)
- New Polarization:       (0.6754,0.085824,-0.73244)
+ Old Momentum Direction: (-0.737449,0.0786034,0.670814)
+ Old Polarization:       (-0.675403,-0.0858243,-0.732438)
+ New Momentum Direction: (-0.737449,0.0786034,-0.670814)
+ New Polarization:       (0.675403,0.0858243,-0.732438)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73745,0.078603,-0.67081)
- Old Polarization:       (0.6754,0.085824,-0.73244)
- New Momentum Direction: (-0.399,0.10671,-0.91072)
- New Polarization:       (0.91695,0.046436,-0.39629)
+ Old Momentum Direction: (-0.737449,0.0786034,-0.670814)
+ Old Polarization:       (0.675403,0.0858243,-0.732438)
+ New Momentum Direction: (-0.399005,0.106715,-0.910718)
+ New Polarization:       (0.916949,0.0464362,-0.396293)
  *** FresnelRefraction *** 
 Track (trackID 267, parentID 1) is processed with stopping code 2
 ### pop requested out of 266 stacked tracks.
@@ -382,34 +368,34 @@ Track (trackID 266, parentID 1) is processed with stopping code 2
 Track (trackID 265, parentID 1) is processed with stopping code 2
 ### pop requested out of 264 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7378,-0.54358,-0.40021)
- Old Polarization:       (-0.67502,-0.59414,-0.43743)
- New Momentum Direction: (0.40118,-0.73764,-0.54309)
- New Polarization:       (-0.916,-0.32306,-0.23786)
+ Old Momentum Direction: (0.737797,-0.543584,-0.400215)
+ Old Polarization:       (-0.675022,-0.594135,-0.437433)
+ New Momentum Direction: (0.40118,-0.737638,-0.543088)
+ New Polarization:       (-0.915999,-0.323064,-0.237856)
  *** FresnelRefraction *** 
 Track (trackID 264, parentID 1) is processed with stopping code 2
 ### pop requested out of 263 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73641,0.59258,-0.32642)
- Old Polarization:       (-0.67653,0.64503,-0.35531)
- New Momentum Direction: (0.39246,0.80563,-0.44378)
- New Polarization:       (-0.91977,0.34375,-0.18936)
+ Old Momentum Direction: (0.736414,0.592575,-0.326418)
+ Old Polarization:       (-0.676531,0.645027,-0.355311)
+ New Momentum Direction: (0.392456,0.805629,-0.443778)
+ New Polarization:       (-0.919771,0.343753,-0.189356)
  *** FresnelRefraction *** 
 Track (trackID 263, parentID 1) is processed with stopping code 2
 ### pop requested out of 262 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73911,-0.28866,0.6086)
- Old Polarization:       (-0.67358,-0.31674,0.6678)
- New Momentum Direction: (0.40925,-0.39101,0.82439)
- New Polarization:       (-0.91242,-0.17538,0.36977)
+ Old Momentum Direction: (0.739111,-0.288659,0.608597)
+ Old Polarization:       (-0.673584,-0.316741,0.667803)
+ New Momentum Direction: (0.40925,-0.391012,0.824393)
+ New Polarization:       (-0.912422,-0.175381,0.369766)
  *** FresnelRefraction *** 
 Track (trackID 262, parentID 1) is processed with stopping code 2
 ### pop requested out of 261 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74398,-0.65963,-0.1067)
- Old Polarization:       (-0.66821,-0.73443,-0.1188)
- New Momentum Direction: (0.4375,-0.88768,-0.14358)
- New Polarization:       (-0.89922,-0.43188,-0.069858)
+ Old Momentum Direction: (0.743976,-0.659633,-0.106697)
+ Old Polarization:       (-0.668207,-0.73443,-0.118796)
+ New Momentum Direction: (0.437496,-0.887683,-0.143585)
+ New Polarization:       (-0.89922,-0.431883,-0.0698579)
  *** FresnelRefraction *** 
 Track (trackID 261, parentID 1) is processed with stopping code 2
 ### pop requested out of 260 stacked tracks.
@@ -422,18 +408,18 @@ Track (trackID 260, parentID 1) is processed with stopping code 2
 Track (trackID 259, parentID 1) is processed with stopping code 2
 ### pop requested out of 258 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73768,0.58733,0.33298)
- Old Polarization:       (-0.67515,0.64172,0.36382)
- New Momentum Direction: (0.40044,0.79712,0.45193)
- New Polarization:       (-0.91632,0.34835,0.1975)
+ Old Momentum Direction: (0.737679,0.587326,0.332984)
+ Old Polarization:       (-0.675152,0.641719,0.363822)
+ New Momentum Direction: (0.400444,0.797123,0.451928)
+ New Polarization:       (-0.916321,0.348353,0.197498)
  *** FresnelRefraction *** 
 Track (trackID 258, parentID 1) is processed with stopping code 2
 ### pop requested out of 257 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74271,0.66785,-0.0486)
- Old Polarization:       (-0.66961,0.74075,-0.053905)
- New Momentum Direction: (0.43039,0.90026,-0.065513)
- New Polarization:       (-0.90264,0.42925,-0.031237)
+ Old Momentum Direction: (0.742712,0.667845,-0.0485996)
+ Old Polarization:       (-0.669611,0.740753,-0.0539052)
+ New Momentum Direction: (0.430389,0.900263,-0.0655129)
+ New Polarization:       (-0.902644,0.429253,-0.0312371)
  *** FresnelRefraction *** 
 Track (trackID 257, parentID 1) is processed with stopping code 2
 ### pop requested out of 256 stacked tracks.
@@ -442,26 +428,26 @@ Track (trackID 257, parentID 1) is processed with stopping code 2
 Track (trackID 256, parentID 1) is processed with stopping code 2
 ### pop requested out of 255 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74108,0.57021,-0.35448)
- Old Polarization:       (-0.67141,0.62938,-0.39126)
- New Momentum Direction: (0.421,0.77034,-0.47889)
- New Polarization:       (-0.90706,0.35755,-0.22227)
+ Old Momentum Direction: (0.741084,0.570212,-0.354476)
+ Old Polarization:       (-0.671412,0.629382,-0.391259)
+ New Momentum Direction: (0.421003,0.77034,-0.478887)
+ New Polarization:       (-0.907059,0.357546,-0.222271)
  *** FresnelRefraction *** 
 Track (trackID 255, parentID 1) is processed with stopping code 2
 ### pop requested out of 254 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73942,0.62983,-0.23784)
- Old Polarization:       (-0.67325,0.69174,-0.26122)
- New Momentum Direction: (0.41111,0.85281,-0.32205)
- New Polarization:       (-0.91159,0.3846,-0.14524)
+ Old Momentum Direction: (0.739418,0.629835,-0.237845)
+ Old Polarization:       (-0.673247,0.691738,-0.261221)
+ New Momentum Direction: (0.411105,0.852807,-0.322046)
+ New Polarization:       (-0.911588,0.384596,-0.145235)
  *** FresnelRefraction *** 
 Track (trackID 254, parentID 1) is processed with stopping code 2
 ### pop requested out of 253 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74032,0.099384,0.66487)
- Old Polarization:       (-0.67226,0.10945,0.73218)
- New Momentum Direction: (0.41649,0.1344,0.89915)
- New Polarization:       (-0.90914,0.061572,0.41191)
+ Old Momentum Direction: (0.740317,0.0993838,0.664871)
+ Old Polarization:       (-0.672258,0.109445,0.732183)
+ New Momentum Direction: (0.416486,0.134404,0.899152)
+ New Polarization:       (-0.909142,0.0615716,0.41191)
  *** FresnelRefraction *** 
 Track (trackID 253, parentID 1) is processed with stopping code 2
 ### pop requested out of 252 stacked tracks.
@@ -474,10 +460,10 @@ Track (trackID 252, parentID 1) is processed with stopping code 2
 Track (trackID 251, parentID 1) is processed with stopping code 2
 ### pop requested out of 250 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74122,0.53412,-0.40657)
- Old Polarization:       (-0.67126,0.5898,-0.44895)
- New Momentum Direction: (0.42182,0.72145,-0.54916)
- New Polarization:       (-0.90668,0.33565,-0.25549)
+ Old Momentum Direction: (0.741224,0.534122,-0.406571)
+ Old Polarization:       (-0.671257,0.589795,-0.448949)
+ New Momentum Direction: (0.421823,0.721447,-0.549162)
+ New Polarization:       (-0.906678,0.335646,-0.255492)
  *** FresnelRefraction *** 
 Track (trackID 250, parentID 1) is processed with stopping code 2
 ### pop requested out of 249 stacked tracks.
@@ -490,77 +476,77 @@ Track (trackID 249, parentID 1) is processed with stopping code 2
 Track (trackID 248, parentID 1) is processed with stopping code 2
 ### pop requested out of 247 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73737,-0.36456,0.56867)
- Old Polarization:       (-0.67549,-0.39795,0.62076)
- New Momentum Direction: (-0.73737,-0.36456,0.56867)
- New Polarization:       (-0.67549,0.39795,-0.62076)
+ Old Momentum Direction: (0.737366,-0.364559,0.568672)
+ Old Polarization:       (-0.675493,-0.397952,0.62076)
+ New Momentum Direction: (-0.737366,-0.364559,0.568672)
+ New Polarization:       (-0.675493,0.397952,-0.62076)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73737,-0.36456,0.56867)
- Old Polarization:       (-0.67549,0.39795,-0.62076)
- New Momentum Direction: (-0.73737,-0.36456,-0.56867)
- New Polarization:       (0.67549,-0.39795,-0.62076)
+ Old Momentum Direction: (-0.737366,-0.364559,0.568672)
+ Old Polarization:       (-0.675493,0.397952,-0.62076)
+ New Momentum Direction: (-0.737366,-0.364559,-0.568672)
+ New Polarization:       (0.675493,-0.397952,-0.62076)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 247, parentID 1) is processed with stopping code 2
 ### pop requested out of 246 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73936,0.6192,0.26446)
- Old Polarization:       (-0.67331,0.67994,0.2904)
- New Momentum Direction: (0.41075,0.83848,0.35811)
- New Polarization:       (-0.91175,0.37774,0.16133)
+ Old Momentum Direction: (0.739359,0.619202,0.264457)
+ Old Polarization:       (-0.673312,0.679941,0.290399)
+ New Momentum Direction: (0.41075,0.838477,0.358108)
+ New Polarization:       (-0.911748,0.377741,0.161331)
  *** FresnelRefraction *** 
 Track (trackID 246, parentID 1) is processed with stopping code 2
 ### pop requested out of 245 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74401,0.52778,-0.40974)
- Old Polarization:       (-0.66816,0.58769,-0.45626)
- New Momentum Direction: (0.43771,0.71021,-0.55137)
- New Polarization:       (-0.89912,0.34575,-0.26842)
+ Old Momentum Direction: (0.744014,0.52778,-0.409745)
+ Old Polarization:       (-0.668164,0.587694,-0.45626)
+ New Momentum Direction: (0.437712,0.710208,-0.551374)
+ New Polarization:       (-0.899115,0.345747,-0.268423)
  *** FresnelRefraction *** 
 Track (trackID 245, parentID 1) is processed with stopping code 2
 ### pop requested out of 244 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73937,-0.58845,0.3272)
- Old Polarization:       (-0.6733,-0.64619,0.35931)
- New Momentum Direction: (0.41082,-0.79682,0.44306)
- New Polarization:       (-0.91172,-0.35905,0.19964)
+ Old Momentum Direction: (0.73937,-0.588451,0.327198)
+ Old Polarization:       (-0.6733,-0.646195,0.359305)
+ New Momentum Direction: (0.410817,-0.796824,0.44306)
+ New Polarization:       (-0.911718,-0.359046,0.199641)
  *** FresnelRefraction *** 
 Track (trackID 244, parentID 1) is processed with stopping code 2
 ### pop requested out of 243 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73597,0.47867,0.47877)
-Old Polarization: (-0.67701,0.52036,0.52046)
-New Polarization: (0.20634,-0.45505,-0.86623)
-Polarization Change: (0.20634,-0.45505,-0.86623)
-New Momentum Direction: (0.90133,-0.25615,0.34926)
-Momentum Change: (0.90133,-0.25615,0.34926)
+Old Momentum Direction: (0.735971,0.478672,0.478769)
+Old Polarization: (-0.677013,0.520358,0.520463)
+New Polarization: (0.206341,-0.455049,-0.86623)
+Polarization Change: (0.206341,-0.455049,-0.86623)
+New Momentum Direction: (0.901334,-0.256148,0.349263)
+Momentum Change: (0.901334,-0.256148,0.349263)
  Photon at Boundary! 
- Old Momentum Direction: (0.90133,-0.25615,0.34926)
- Old Polarization:       (0.20634,-0.45505,-0.86623)
- New Momentum Direction: (-0.90133,-0.25615,0.34926)
- New Polarization:       (0.10924,0.64587,0.75559)
+ Old Momentum Direction: (0.901334,-0.256148,0.349263)
+ Old Polarization:       (0.206341,-0.455049,-0.86623)
+ New Momentum Direction: (-0.901334,-0.256148,0.349263)
+ New Polarization:       (0.109239,0.645873,0.755589)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.90133,-0.25615,0.34926)
- Old Polarization:       (0.10924,0.64587,0.75559)
- New Momentum Direction: (-0.90133,-0.25615,-0.34926)
- New Polarization:       (-0.10924,-0.64587,0.75559)
+ Old Momentum Direction: (-0.901334,-0.256148,0.349263)
+ Old Polarization:       (0.109239,0.645873,0.755589)
+ New Momentum Direction: (-0.901334,-0.256148,-0.349263)
+ New Polarization:       (-0.109239,-0.645873,0.755589)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.90133,-0.25615,-0.34926)
- Old Polarization:       (-0.10924,-0.64587,0.75559)
- New Momentum Direction: (-0.80798,-0.34845,-0.47512)
- New Polarization:       (0.19983,-0.92065,0.33537)
+ Old Momentum Direction: (-0.901334,-0.256148,-0.349263)
+ Old Polarization:       (-0.109239,-0.645873,0.755589)
+ New Momentum Direction: (-0.807985,-0.348453,-0.475122)
+ New Polarization:       (0.19983,-0.920649,0.335372)
  *** FresnelRefraction *** 
 Track (trackID 243, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73574,-0.037718,-0.67621)
- Old Polarization:       (-0.67726,-0.040974,-0.7346)
- New Momentum Direction: (0.38812,-0.051326,-0.92018)
- New Polarization:       (-0.92161,-0.021615,-0.38752)
+ Old Momentum Direction: (0.735741,-0.0377178,-0.676212)
+ Old Polarization:       (-0.677263,-0.0409745,-0.734599)
+ New Momentum Direction: (0.388121,-0.0513257,-0.920178)
+ New Polarization:       (-0.921608,-0.021615,-0.387519)
  *** FresnelRefraction *** 
 Track (trackID 242, parentID 1) is processed with stopping code 2
 ### pop requested out of 241 stacked tracks.
@@ -569,34 +555,34 @@ Track (trackID 242, parentID 1) is processed with stopping code 2
 Track (trackID 241, parentID 1) is processed with stopping code 2
 ### pop requested out of 240 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74306,0.24609,-0.62234)
- Old Polarization:       (-0.66923,0.27324,-0.69099)
- New Momentum Direction: (0.43235,0.33158,-0.83852)
- New Polarization:       (-0.9017,0.15899,-0.40206)
+ Old Momentum Direction: (0.743058,0.246094,-0.622336)
+ Old Polarization:       (-0.669227,0.273244,-0.690994)
+ New Momentum Direction: (0.432353,0.331583,-0.838525)
+ New Polarization:       (-0.901704,0.158989,-0.402059)
  *** FresnelRefraction *** 
 Track (trackID 240, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73964,-0.52904,0.41599)
- Old Polarization:       (-0.673,-0.58143,0.45718)
- New Momentum Direction: (0.41246,-0.71611,0.56308)
- New Polarization:       (-0.91097,-0.32423,0.25495)
+ Old Momentum Direction: (0.739643,-0.529038,0.415989)
+ Old Polarization:       (-0.672999,-0.581426,0.457183)
+ New Momentum Direction: (0.412463,-0.716107,0.563085)
+ New Polarization:       (-0.910974,-0.324233,0.254949)
  *** FresnelRefraction *** 
 Track (trackID 239, parentID 1) is processed with stopping code 2
 ### pop requested out of 238 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73659,0.07483,0.67219)
- Old Polarization:       (-0.67634,0.081496,0.73207)
- New Momentum Direction: (0.39356,0.10171,0.91365)
- New Polarization:       (-0.9193,0.043544,0.39115)
+ Old Momentum Direction: (0.736588,0.0748301,0.67219)
+ Old Polarization:       (-0.676342,0.0814957,0.732065)
+ New Momentum Direction: (0.393564,0.101711,0.913653)
+ New Polarization:       (-0.919297,0.0435438,0.391148)
  *** FresnelRefraction *** 
 Track (trackID 238, parentID 1) is processed with stopping code 2
 ### pop requested out of 237 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73868,0.45381,-0.4984)
- Old Polarization:       (-0.67405,0.49732,-0.54619)
- New Momentum Direction: (0.40665,0.61508,-0.67551)
- New Polarization:       (-0.91358,0.27378,-0.30068)
+ Old Momentum Direction: (0.738684,0.453809,-0.4984)
+ Old Polarization:       (-0.674052,0.497323,-0.54619)
+ New Momentum Direction: (0.40665,0.615076,-0.675513)
+ New Polarization:       (-0.913584,0.27378,-0.300681)
  *** FresnelRefraction *** 
 Track (trackID 237, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
@@ -609,10 +595,10 @@ Track (trackID 236, parentID 1) is processed with stopping code 2
 Track (trackID 235, parentID 1) is processed with stopping code 2
 ### pop requested out of 234 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73913,-0.15801,0.65477)
- Old Polarization:       (-0.67356,-0.17339,0.71851)
- New Momentum Direction: (0.40938,-0.21403,0.88691)
- New Polarization:       (-0.91236,-0.096033,0.39796)
+ Old Momentum Direction: (0.739132,-0.158006,0.654766)
+ Old Polarization:       (-0.673561,-0.173388,0.718507)
+ New Momentum Direction: (0.409379,-0.214025,0.886906)
+ New Polarization:       (-0.912365,-0.0960333,0.397955)
  *** FresnelRefraction *** 
 Track (trackID 234, parentID 1) is processed with stopping code 2
 ### pop requested out of 233 stacked tracks.
@@ -621,10 +607,10 @@ Track (trackID 234, parentID 1) is processed with stopping code 2
 Track (trackID 233, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73644,-0.66476,0.12546)
- Old Polarization:       (-0.6765,-0.72367,0.13658)
- New Momentum Direction: (0.39265,-0.90374,0.17056)
- New Polarization:       (-0.91969,-0.38583,0.072818)
+ Old Momentum Direction: (0.736444,-0.664764,0.12546)
+ Old Polarization:       (-0.676499,-0.723668,0.136577)
+ New Momentum Direction: (0.392645,-0.903736,0.170561)
+ New Polarization:       (-0.91969,-0.385834,0.0728178)
  *** FresnelRefraction *** 
 Track (trackID 232, parentID 1) is processed with stopping code 2
 ### pop requested out of 231 stacked tracks.
@@ -641,115 +627,115 @@ Track (trackID 230, parentID 1) is processed with stopping code 2
 Track (trackID 229, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.74001,-0.27616,0.61329)
-Old Polarization: (-0.6726,-0.30384,0.67476)
-New Polarization: (-0.82262,-0.56812,-0.022946)
-Polarization Change: (-0.82262,-0.56812,-0.022946)
-New Momentum Direction: (-0.1253,0.14177,0.98194)
-Momentum Change: (-0.1253,0.14177,0.98194)
+Old Momentum Direction: (0.740009,-0.27616,0.613288)
+Old Polarization: (-0.672597,-0.303838,0.674756)
+New Polarization: (-0.822623,-0.568123,-0.0229458)
+Polarization Change: (-0.822623,-0.568123,-0.0229458)
+New Momentum Direction: (-0.125299,0.14177,0.981938)
+Momentum Change: (-0.125299,0.14177,0.981938)
  Photon at Boundary! 
- Old Momentum Direction: (-0.1253,0.14177,0.98194)
- Old Polarization:       (-0.82262,-0.56812,-0.022946)
- New Momentum Direction: (-0.16952,0.19181,0.96668)
- New Polarization:       (-0.84386,-0.53494,-0.041842)
+ Old Momentum Direction: (-0.125299,0.14177,0.981938)
+ Old Polarization:       (-0.822623,-0.568123,-0.0229458)
+ New Momentum Direction: (-0.169522,0.191805,0.966681)
+ New Polarization:       (-0.843855,-0.534937,-0.0418422)
  *** FresnelRefraction *** 
 Track (trackID 228, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74431,0.1819,-0.64259)
- Old Polarization:       (-0.66784,0.20272,-0.71617)
- New Momentum Direction: (0.43934,0.24467,-0.86436)
- New Polarization:       (-0.89832,0.11966,-0.42273)
+ Old Momentum Direction: (0.744308,0.181895,-0.642588)
+ Old Polarization:       (-0.667836,0.202724,-0.716169)
+ New Momentum Direction: (0.439343,0.244671,-0.864357)
+ New Polarization:       (-0.898319,0.119662,-0.422733)
  *** FresnelRefraction *** 
 Track (trackID 227, parentID 1) is processed with stopping code 2
 ### pop requested out of 226 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73796,-0.31504,0.5968)
- Old Polarization:       (-0.67485,-0.3445,0.65261)
- New Momentum Direction: (0.40217,-0.42742,0.80968)
- New Polarization:       (-0.91557,-0.18775,0.35565)
+ Old Momentum Direction: (0.737956,-0.315042,0.596799)
+ Old Polarization:       (-0.674849,-0.344503,0.652608)
+ New Momentum Direction: (0.402168,-0.427417,0.809676)
+ New Polarization:       (-0.915566,-0.187745,0.355655)
  *** FresnelRefraction *** 
 Track (trackID 226, parentID 1) is processed with stopping code 2
 ### pop requested out of 225 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74434,0.58384,0.32418)
- Old Polarization:       (-0.6678,0.65076,0.36133)
- New Momentum Direction: (0.43952,0.7853,0.43604)
- New Polarization:       (-0.89823,0.38426,0.21336)
+ Old Momentum Direction: (0.744341,0.583838,0.324175)
+ Old Polarization:       (-0.667799,0.650756,0.361332)
+ New Momentum Direction: (0.439525,0.785297,0.436035)
+ New Polarization:       (-0.89823,0.384264,0.213362)
  *** FresnelRefraction *** 
 Track (trackID 225, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74314,0.44538,-0.49938)
- Old Polarization:       (-0.66913,0.49464,-0.55461)
- New Momentum Direction: (0.43283,0.60003,-0.67278)
- New Polarization:       (-0.90148,0.28809,-0.32302)
+ Old Momentum Direction: (0.743143,0.445377,-0.499378)
+ Old Polarization:       (-0.669133,0.494638,-0.554612)
+ New Momentum Direction: (0.432829,0.600026,-0.672777)
+ New Polarization:       (-0.901476,0.288092,-0.323023)
  *** FresnelRefraction *** 
 Track (trackID 224, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7425,0.66474,0.082613)
- Old Polarization:       (-0.66985,0.73683,0.091573)
- New Momentum Direction: (0.42916,0.89633,0.1114)
- New Polarization:       (-0.90323,0.42588,0.052928)
+ Old Momentum Direction: (0.742495,0.664737,0.0826134)
+ Old Polarization:       (-0.669851,0.736827,0.0915726)
+ New Momentum Direction: (0.429157,0.896334,0.111396)
+ New Polarization:       (-0.90323,0.42588,0.0529283)
  *** FresnelRefraction *** 
 Track (trackID 223, parentID 1) is processed with stopping code 2
 ### pop requested out of 222 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73812,-0.30239,-0.60311)
- Old Polarization:       (-0.67467,-0.33083,-0.65983)
- New Momentum Direction: (0.40317,-0.41016,-0.81806)
- New Polarization:       (-0.91513,-0.1807,-0.36041)
+ Old Momentum Direction: (0.738118,-0.302389,-0.603111)
+ Old Polarization:       (-0.674672,-0.330825,-0.659828)
+ New Momentum Direction: (0.403169,-0.41016,-0.818061)
+ New Polarization:       (-0.915125,-0.180701,-0.360406)
  *** FresnelRefraction *** 
 Track (trackID 222, parentID 1) is processed with stopping code 2
 ### pop requested out of 221 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73861,-0.63748,0.21925)
- Old Polarization:       (-0.67413,-0.69846,0.24022)
- New Momentum Direction: (0.40621,-0.8641,0.29719)
- New Polarization:       (-0.91378,-0.38413,0.13211)
+ Old Momentum Direction: (0.738612,-0.637482,0.219245)
+ Old Polarization:       (-0.67413,-0.698458,0.240217)
+ New Momentum Direction: (0.406212,-0.864102,0.297186)
+ New Polarization:       (-0.913779,-0.384129,0.132111)
  *** FresnelRefraction *** 
 Track (trackID 221, parentID 1) is processed with stopping code 2
 ### pop requested out of 220 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73618,-0.53719,-0.41166)
-Old Polarization: (-0.67679,-0.58433,-0.44779)
-New Polarization: (-0.55258,-0.83346,0.0024185)
-Polarization Change: (-0.55258,-0.83346,0.0024185)
-New Momentum Direction: (0.39498,-0.25932,0.88133)
-Momentum Change: (0.39498,-0.25932,0.88133)
+Old Momentum Direction: (0.73618,-0.53719,-0.411662)
+Old Polarization: (-0.676786,-0.584334,-0.447789)
+New Polarization: (-0.552579,-0.833457,0.00241849)
+Polarization Change: (-0.552579,-0.833457,0.00241849)
+New Momentum Direction: (0.394984,-0.259316,0.88133)
+Momentum Change: (0.394984,-0.259316,0.88133)
  Photon at Boundary! 
- Old Momentum Direction: (0.39498,-0.25932,0.88133)
- Old Polarization:       (-0.55258,-0.83346,0.0024185)
- New Momentum Direction: (-0.39498,-0.25932,0.88133)
- New Polarization:       (-0.55258,0.83346,-0.0024185)
+ Old Momentum Direction: (0.394984,-0.259316,0.88133)
+ Old Polarization:       (-0.552579,-0.833457,0.00241849)
+ New Momentum Direction: (-0.394984,-0.259316,0.88133)
+ New Polarization:       (-0.552579,0.833457,-0.00241849)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.39498,-0.25932,0.88133)
- Old Polarization:       (-0.55258,0.83346,-0.0024185)
- New Momentum Direction: (-0.39498,0.25932,0.88133)
- New Polarization:       (0.55258,0.83346,0.0024185)
+ Old Momentum Direction: (-0.394984,-0.259316,0.88133)
+ Old Polarization:       (-0.552579,0.833457,-0.00241849)
+ New Momentum Direction: (-0.394984,0.259316,0.88133)
+ New Polarization:       (0.552579,0.833457,0.00241849)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.39498,0.25932,0.88133)
-Old Polarization: (0.55258,0.83346,0.0024185)
-New Polarization: (0.97455,0.03293,-0.22175)
-Polarization Change: (0.97455,0.03293,-0.22175)
-New Momentum Direction: (-0.0018745,-0.98792,-0.15495)
-Momentum Change: (-0.0018745,-0.98792,-0.15495)
+Old Momentum Direction: (-0.394984,0.259316,0.88133)
+Old Polarization: (0.552579,0.833457,0.00241849)
+New Polarization: (0.974548,0.0329304,-0.221749)
+Polarization Change: (0.974548,0.0329304,-0.221749)
+New Momentum Direction: (-0.00187451,-0.987921,-0.154947)
+Momentum Change: (-0.00187451,-0.987921,-0.154947)
  Photon at Boundary! 
- Old Momentum Direction: (-0.0018745,-0.98792,-0.15495)
- Old Polarization:       (0.97455,0.03293,-0.22175)
- New Momentum Direction: (-0.0025493,-0.97754,-0.21072)
- New Polarization:       (0.95538,0.059858,-0.28924)
+ Old Momentum Direction: (-0.00187451,-0.987921,-0.154947)
+ Old Polarization:       (0.974548,0.0329304,-0.221749)
+ New Momentum Direction: (-0.00254929,-0.977542,-0.210724)
+ New Polarization:       (0.955384,0.0598583,-0.289239)
  *** FresnelRefraction *** 
 Track (trackID 220, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73623,-0.0013534,-0.67673)
- Old Polarization:       (-0.67673,-0.0014724,-0.73623)
- New Momentum Direction: (0.39129,-0.0018404,-0.92027)
- New Polarization:       (-0.92027,-0.00078252,-0.39129)
+ Old Momentum Direction: (0.736231,-0.00135337,-0.676728)
+ Old Polarization:       (-0.67673,-0.00147236,-0.73623)
+ New Momentum Direction: (0.391287,-0.00184041,-0.920267)
+ New Polarization:       (-0.920269,-0.000782521,-0.391286)
  *** FresnelRefraction *** 
 Track (trackID 219, parentID 1) is processed with stopping code 2
 ### pop requested out of 218 stacked tracks.
@@ -758,80 +744,80 @@ Track (trackID 219, parentID 1) is processed with stopping code 2
 Track (trackID 218, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73579,-0.63928,-0.22346)
-Old Polarization: (-0.67721,-0.69458,-0.24279)
-New Polarization: (0.57603,0.49861,0.64775)
-Polarization Change: (0.57603,0.49861,0.64775)
-New Momentum Direction: (0.36198,0.5549,-0.74904)
-Momentum Change: (0.36198,0.5549,-0.74904)
+Old Momentum Direction: (0.735789,-0.639282,-0.223457)
+Old Polarization: (-0.677211,-0.694579,-0.242786)
+New Polarization: (0.576033,0.498608,0.647747)
+Polarization Change: (0.576033,0.498608,0.647747)
+New Momentum Direction: (0.361979,0.554898,-0.749039)
+Momentum Change: (0.361979,0.554898,-0.749039)
 
 ** Photon absorbed! **
 Track (trackID 217, parentID 1) is processed with stopping code 2
 ### pop requested out of 216 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74257,0.6549,0.14032)
- Old Polarization:       (-0.66976,0.7261,0.15557)
- New Momentum Direction: (0.42961,0.88298,0.18919)
- New Polarization:       (-0.90302,0.42007,0.090005)
+ Old Momentum Direction: (0.742575,0.6549,0.140318)
+ Old Polarization:       (-0.669763,0.726095,0.155573)
+ New Momentum Direction: (0.429609,0.882975,0.189186)
+ New Polarization:       (-0.903015,0.420075,0.0900049)
  *** FresnelRefraction *** 
 Track (trackID 216, parentID 1) is processed with stopping code 2
 ### pop requested out of 215 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.7366,0.024063,-0.6759)
-Old Polarization: (-0.67633,0.026207,-0.73613)
-New Polarization: (-0.67986,-0.14008,-0.71984)
-Polarization Change: (-0.67986,-0.14008,-0.71984)
-New Momentum Direction: (0.035831,-0.98676,0.15818)
-Momentum Change: (0.035831,-0.98676,0.15818)
+Old Momentum Direction: (0.736599,0.0240631,-0.675902)
+Old Polarization: (-0.67633,0.0262074,-0.736132)
+New Polarization: (-0.679857,-0.140083,-0.719841)
+Polarization Change: (-0.679857,-0.140083,-0.719841)
+New Momentum Direction: (0.0358311,-0.986759,0.158184)
+Momentum Change: (0.0358311,-0.986759,0.158184)
 
 ** Photon absorbed! **
 Track (trackID 215, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74306,0.58443,-0.32604)
- Old Polarization:       (-0.66922,0.64891,-0.36201)
- New Momentum Direction: (0.43237,0.78745,-0.4393)
- New Polarization:       (-0.9017,0.37759,-0.21065)
+ Old Momentum Direction: (0.743061,0.58443,-0.326039)
+ Old Polarization:       (-0.669223,0.648912,-0.362012)
+ New Momentum Direction: (0.43237,0.787448,-0.439298)
+ New Polarization:       (-0.901696,0.377587,-0.210646)
  *** FresnelRefraction *** 
 Track (trackID 214, parentID 1) is processed with stopping code 2
 ### pop requested out of 213 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73633,0.67654,0.010306)
- Old Polarization:       (-0.67662,0.73624,0.011216)
- New Momentum Direction: (0.39192,0.91989,0.014013)
- New Polarization:       (-0.92,0.39187,0.0059696)
+ Old Momentum Direction: (0.73633,0.676544,0.0103061)
+ Old Polarization:       (-0.676622,0.736245,0.0112156)
+ New Momentum Direction: (0.39192,0.919892,0.0140132)
+ New Polarization:       (-0.919999,0.391875,0.00596963)
  *** FresnelRefraction *** 
 Track (trackID 213, parentID 1) is processed with stopping code 2
 ### pop requested out of 212 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73879,0.078842,0.66931)
- Old Polarization:       (-0.67394,0.086428,0.73371)
- New Momentum Direction: (0.40727,0.10684,0.90704)
- New Polarization:       (-0.91331,0.047645,0.40448)
+ Old Momentum Direction: (0.738786,0.078842,0.669313)
+ Old Polarization:       (-0.67394,0.0864281,0.733713)
+ New Momentum Direction: (0.407272,0.106845,0.907036)
+ New Polarization:       (-0.913307,0.0476454,0.404475)
  *** FresnelRefraction *** 
 Track (trackID 212, parentID 1) is processed with stopping code 2
 ### pop requested out of 211 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73985,-0.0038688,0.67276)
- Old Polarization:       (-0.67277,-0.0042545,0.73984)
- New Momentum Direction: (0.41373,-0.0052353,0.91039)
- New Polarization:       (-0.9104,-0.0023791,0.41372)
+ Old Momentum Direction: (0.739854,-0.00386876,0.672756)
+ Old Polarization:       (-0.672767,-0.00425455,0.739842)
+ New Momentum Direction: (0.413727,-0.00523528,0.910386)
+ New Polarization:       (-0.910401,-0.00237915,0.41372)
  *** FresnelRefraction *** 
 Track (trackID 211, parentID 1) is processed with stopping code 2
 ### pop requested out of 210 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74392,-0.59928,0.2957)
- Old Polarization:       (-0.66826,-0.66713,0.32918)
- New Momentum Direction: (0.43721,-0.80652,0.39796)
- New Polarization:       (-0.89936,-0.39207,0.19346)
+ Old Momentum Direction: (0.743923,-0.599283,0.295699)
+ Old Polarization:       (-0.668265,-0.667132,0.329177)
+ New Momentum Direction: (0.437205,-0.806525,0.397956)
+ New Polarization:       (-0.899362,-0.392075,0.193458)
  *** FresnelRefraction *** 
 Track (trackID 210, parentID 1) is processed with stopping code 2
 ### pop requested out of 209 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73669,-0.47233,-0.48393)
- Old Polarization:       (-0.67623,-0.51456,-0.5272)
- New Momentum Direction: (0.39423,-0.6419,-0.65768)
- New Polarization:       (-0.91901,-0.27536,-0.28213)
+ Old Momentum Direction: (0.736692,-0.472326,-0.483935)
+ Old Polarization:       (-0.676228,-0.514558,-0.527205)
+ New Momentum Direction: (0.394231,-0.641903,-0.65768)
+ New Polarization:       (-0.919012,-0.275359,-0.282126)
  *** FresnelRefraction *** 
 Track (trackID 209, parentID 1) is processed with stopping code 2
 ### pop requested out of 208 stacked tracks.
@@ -844,34 +830,34 @@ Track (trackID 208, parentID 1) is processed with stopping code 2
 Track (trackID 207, parentID 1) is processed with stopping code 2
 ### pop requested out of 206 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74015,-0.1908,0.64481)
- Old Polarization:       (-0.67244,-0.21001,0.70973)
- New Momentum Direction: (0.41548,-0.25809,0.87222)
- New Polarization:       (-0.9096,-0.11789,0.3984)
+ Old Momentum Direction: (0.740148,-0.190799,0.644808)
+ Old Polarization:       (-0.672444,-0.21001,0.709729)
+ New Momentum Direction: (0.415479,-0.258091,0.872219)
+ New Polarization:       (-0.909603,-0.117888,0.398404)
  *** FresnelRefraction *** 
 Track (trackID 206, parentID 1) is processed with stopping code 2
 ### pop requested out of 205 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73775,0.28736,0.61086)
- Old Polarization:       (-0.67507,0.31404,0.66758)
- New Momentum Direction: (0.40089,0.38997,0.82898)
- New Polarization:       (-0.91613,0.17065,0.36276)
+ Old Momentum Direction: (0.737751,0.287358,0.61086)
+ Old Polarization:       (-0.675073,0.314038,0.667575)
+ New Momentum Direction: (0.400891,0.389966,0.828983)
+ New Polarization:       (-0.916126,0.170647,0.362758)
  *** FresnelRefraction *** 
 Track (trackID 205, parentID 1) is processed with stopping code 2
 ### pop requested out of 204 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73884,-0.047976,0.67217)
- Old Polarization:       (-0.67388,-0.052601,0.73697)
- New Momentum Direction: (0.40762,-0.065011,0.91084)
- New Polarization:       (-0.91315,-0.02902,0.40658)
+ Old Momentum Direction: (0.738843,-0.0479759,0.672168)
+ Old Polarization:       (-0.673878,-0.052601,0.736968)
+ New Momentum Direction: (0.407618,-0.0650108,0.910835)
+ New Polarization:       (-0.913152,-0.0290199,0.406584)
  *** FresnelRefraction *** 
 Track (trackID 204, parentID 1) is processed with stopping code 2
 ### pop requested out of 203 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74031,-0.50543,0.44326)
- Old Polarization:       (-0.67226,-0.55659,0.48813)
- New Momentum Direction: (0.41646,-0.68353,0.59946)
- New Polarization:       (-0.90915,-0.31311,0.2746)
+ Old Momentum Direction: (0.740313,-0.505426,0.443262)
+ Old Polarization:       (-0.672262,-0.556589,0.488131)
+ New Momentum Direction: (0.416461,-0.683528,0.599458)
+ New Polarization:       (-0.909154,-0.313107,0.274597)
  *** FresnelRefraction *** 
 Track (trackID 203, parentID 1) is processed with stopping code 2
 ### pop requested out of 202 stacked tracks.
@@ -880,34 +866,34 @@ Track (trackID 203, parentID 1) is processed with stopping code 2
 Track (trackID 202, parentID 1) is processed with stopping code 2
 ### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73703,-0.56084,-0.37714)
- Old Polarization:       (-0.67586,-0.61161,-0.41128)
- New Momentum Direction: (0.3964,-0.76185,-0.51231)
- New Polarization:       (-0.91808,-0.32894,-0.2212)
+ Old Momentum Direction: (0.737034,-0.560843,-0.377142)
+ Old Polarization:       (-0.675856,-0.61161,-0.411281)
+ New Momentum Direction: (0.396396,-0.761847,-0.512308)
+ New Polarization:       (-0.91808,-0.32894,-0.221198)
  *** FresnelRefraction *** 
 Track (trackID 201, parentID 1) is processed with stopping code 2
 ### pop requested out of 200 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74462,0.467,0.47692)
- Old Polarization:       (-0.66749,0.52097,0.53203)
- New Momentum Direction: (0.44107,0.62791,0.64124)
- New Polarization:       (-0.89747,0.30859,0.31514)
+ Old Momentum Direction: (0.744621,0.467001,0.476916)
+ Old Polarization:       (-0.667487,0.520967,0.532028)
+ New Momentum Direction: (0.441068,0.627909,0.64124)
+ New Polarization:       (-0.897474,0.308589,0.315141)
  *** FresnelRefraction *** 
 Track (trackID 200, parentID 1) is processed with stopping code 2
 ### pop requested out of 199 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73655,0.3692,0.56673)
- Old Polarization:       (-0.67638,0.40205,0.61715)
- New Momentum Direction: (0.39335,0.50185,0.77034)
- New Polarization:       (-0.91939,0.21471,0.32958)
+ Old Momentum Direction: (0.736555,0.369201,0.566726)
+ Old Polarization:       (-0.676378,0.402049,0.617146)
+ New Momentum Direction: (0.393354,0.501848,0.770339)
+ New Polarization:       (-0.919387,0.214712,0.329584)
  *** FresnelRefraction *** 
 Track (trackID 199, parentID 1) is processed with stopping code 2
 ### pop requested out of 198 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73829,-0.47137,-0.48243)
- Old Polarization:       (-0.67449,-0.51596,-0.52807)
- New Momentum Direction: (0.40422,-0.63922,-0.65422)
- New Polarization:       (-0.91466,-0.28249,-0.28912)
+ Old Momentum Direction: (0.738288,-0.47137,-0.482432)
+ Old Polarization:       (-0.674485,-0.51596,-0.528068)
+ New Momentum Direction: (0.404222,-0.639219,-0.65422)
+ New Polarization:       (-0.914661,-0.282494,-0.289123)
  *** FresnelRefraction *** 
 Track (trackID 198, parentID 1) is processed with stopping code 2
 ### pop requested out of 197 stacked tracks.
@@ -916,29 +902,29 @@ Track (trackID 198, parentID 1) is processed with stopping code 2
 Track (trackID 197, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73982,-0.42084,0.52494)
- Old Polarization:       (-0.6728,-0.46276,0.57723)
- New Momentum Direction: (0.41353,-0.56951,0.71039)
- New Polarization:       (-0.91049,-0.25866,0.32264)
+ Old Momentum Direction: (0.73982,-0.420838,0.524939)
+ Old Polarization:       (-0.672804,-0.462757,0.577226)
+ New Momentum Direction: (0.413525,-0.569512,0.710389)
+ New Polarization:       (-0.910493,-0.25866,0.322643)
  *** FresnelRefraction *** 
 Track (trackID 196, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73592,0.5043,0.45177)
-Old Polarization: (-0.67706,0.54814,0.49104)
-New Polarization: (0.55186,-0.46961,-0.68914)
-Polarization Change: (0.55186,-0.46961,-0.68914)
-New Momentum Direction: (0.5792,-0.3787,0.72188)
-Momentum Change: (0.5792,-0.3787,0.72188)
+Old Momentum Direction: (0.735925,0.504302,0.451768)
+Old Polarization: (-0.677063,0.548144,0.491043)
+New Polarization: (0.551861,-0.469607,-0.689144)
+Polarization Change: (0.551861,-0.469607,-0.689144)
+New Momentum Direction: (0.579205,-0.378697,0.72188)
+Momentum Change: (0.579205,-0.378697,0.72188)
 
 ** Photon absorbed! **
 Track (trackID 195, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74175,-0.12544,0.65884)
- Old Polarization:       (-0.67067,-0.13873,0.72867)
- New Momentum Direction: (0.4249,-0.16931,0.88927)
- New Polarization:       (-0.90524,-0.079469,0.4174)
+ Old Momentum Direction: (0.741754,-0.125435,0.658837)
+ Old Polarization:       (-0.670672,-0.13873,0.728666)
+ New Momentum Direction: (0.424901,-0.169306,0.889266)
+ New Polarization:       (-0.90524,-0.0794691,0.417404)
  *** FresnelRefraction *** 
 Track (trackID 194, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
@@ -947,26 +933,26 @@ Track (trackID 194, parentID 1) is processed with stopping code 2
 Track (trackID 193, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74105,0.59539,0.31041)
- Old Polarization:       (-0.67145,0.65711,0.34258)
- New Momentum Direction: (0.42079,0.8044,0.41937)
- New Polarization:       (-0.90716,0.37313,0.19453)
+ Old Momentum Direction: (0.741048,0.595394,0.310409)
+ Old Polarization:       (-0.671452,0.657107,0.342583)
+ New Momentum Direction: (0.420794,0.804399,0.419374)
+ New Polarization:       (-0.907156,0.373129,0.194531)
  *** FresnelRefraction *** 
 Track (trackID 192, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73667,0.67625,0.0016799)
- Old Polarization:       (-0.67626,0.73666,0.00183)
- New Momentum Direction: (0.39406,0.91908,0.0022831)
- New Polarization:       (-0.91908,0.39406,0.00097889)
+ Old Momentum Direction: (0.736666,0.676255,0.00167989)
+ Old Polarization:       (-0.676257,0.736664,0.00182995)
+ New Momentum Direction: (0.394062,0.919081,0.0022831)
+ New Polarization:       (-0.919084,0.394061,0.000978891)
  *** FresnelRefraction *** 
 Track (trackID 191, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73818,-0.58146,0.34203)
- Old Polarization:       (-0.6746,-0.63627,0.37427)
- New Momentum Direction: (0.40357,-0.78863,0.46389)
- New Polarization:       (-0.91495,-0.34785,0.20462)
+ Old Momentum Direction: (0.738183,-0.581462,0.342035)
+ Old Polarization:       (-0.6746,-0.636266,0.374272)
+ New Momentum Direction: (0.403573,-0.788626,0.463895)
+ New Polarization:       (-0.914947,-0.347854,0.204619)
  *** FresnelRefraction *** 
 Track (trackID 190, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
@@ -975,42 +961,42 @@ Track (trackID 190, parentID 1) is processed with stopping code 2
 Track (trackID 189, parentID 1) is processed with stopping code 2
 ### pop requested out of 188 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73666,0.24141,0.63171)
- Old Polarization:       (-0.67626,0.26297,0.68812)
- New Momentum Direction: (0.39402,0.3281,0.85854)
- New Polarization:       (-0.9191,0.14066,0.36806)
+ Old Momentum Direction: (0.73666,0.24141,0.631707)
+ Old Polarization:       (-0.676264,0.26297,0.688124)
+ New Momentum Direction: (0.394023,0.328097,0.858544)
+ New Polarization:       (-0.9191,0.140657,0.368063)
  *** FresnelRefraction *** 
 Track (trackID 188, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74164,-0.2271,-0.63119)
- Old Polarization:       (-0.6708,-0.25108,-0.69784)
- New Momentum Direction: (0.42421,-0.30658,-0.85209)
- New Polarization:       (-0.90556,-0.14362,-0.39916)
+ Old Momentum Direction: (0.741636,-0.227104,-0.63119)
+ Old Polarization:       (-0.670803,-0.251085,-0.69784)
+ New Momentum Direction: (0.424215,-0.306583,-0.852085)
+ New Polarization:       (-0.905562,-0.14362,-0.399163)
  *** FresnelRefraction *** 
 Track (trackID 187, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73637,-0.66002,0.14874)
- Old Polarization:       (-0.67658,-0.71836,0.16189)
- New Momentum Direction: (0.39219,-0.89738,0.20223)
- New Polarization:       (-0.91989,-0.38259,0.086222)
+ Old Momentum Direction: (0.736372,-0.660024,0.148744)
+ Old Polarization:       (-0.676577,-0.718356,0.16189)
+ New Momentum Direction: (0.392188,-0.897379,0.202235)
+ New Polarization:       (-0.919885,-0.382593,0.0862216)
  *** FresnelRefraction *** 
 Track (trackID 186, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73742,-0.29739,0.60644)
- Old Polarization:       (-0.67543,-0.32468,0.6621)
- New Momentum Direction: (0.39884,-0.40375,0.82335)
- New Polarization:       (-0.91702,-0.17561,0.3581)
+ Old Momentum Direction: (0.737423,-0.297385,0.60644)
+ Old Polarization:       (-0.675431,-0.32468,0.6621)
+ New Momentum Direction: (0.398844,-0.403754,0.823351)
+ New Polarization:       (-0.917019,-0.175607,0.358105)
  *** FresnelRefraction *** 
 Track (trackID 185, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7385,-0.091499,0.66801)
- Old Polarization:       (-0.67425,-0.10022,0.73167)
- New Momentum Direction: (0.40555,-0.12404,0.90562)
- New Polarization:       (-0.91407,-0.055036,0.4018)
+ Old Momentum Direction: (0.738505,-0.0914989,0.668011)
+ Old Polarization:       (-0.674248,-0.100219,0.731673)
+ New Momentum Direction: (0.405553,-0.124044,0.905616)
+ New Polarization:       (-0.914071,-0.0550357,0.401802)
  *** FresnelRefraction *** 
 Track (trackID 184, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
@@ -1023,18 +1009,18 @@ Track (trackID 183, parentID 1) is processed with stopping code 2
 Track (trackID 182, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7382,0.42417,0.52453)
- Old Polarization:       (-0.67458,0.46418,0.57401)
- New Momentum Direction: (0.4037,0.57528,0.7114)
- New Polarization:       (-0.91489,0.25384,0.31391)
+ Old Momentum Direction: (0.738204,0.424169,0.524534)
+ Old Polarization:       (-0.674578,0.464176,0.574008)
+ New Momentum Direction: (0.403699,0.575276,0.711396)
+ New Polarization:       (-0.914892,0.253842,0.313906)
  *** FresnelRefraction *** 
 Track (trackID 181, parentID 1) is processed with stopping code 2
 ### pop requested out of 180 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74394,0.55656,-0.36985)
- Old Polarization:       (-0.66824,0.61961,-0.41175)
- New Momentum Direction: (0.43731,0.74901,-0.49774)
- New Polarization:       (-0.89931,0.36422,-0.24204)
+ Old Momentum Direction: (0.743942,0.556562,-0.369852)
+ Old Polarization:       (-0.668245,0.619607,-0.411747)
+ New Momentum Direction: (0.437307,0.749011,-0.49774)
+ New Polarization:       (-0.899312,0.36422,-0.242035)
  *** FresnelRefraction *** 
 Track (trackID 180, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
@@ -1043,18 +1029,18 @@ Track (trackID 180, parentID 1) is processed with stopping code 2
 Track (trackID 179, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73654,0.30908,0.60165)
- Old Polarization:       (-0.6764,0.33656,0.65514)
- New Momentum Direction: (0.39324,0.42014,0.81783)
- New Polarization:       (-0.91944,0.17969,0.34978)
+ Old Momentum Direction: (0.736536,0.309081,0.601651)
+ Old Polarization:       (-0.676398,0.336561,0.655143)
+ New Momentum Direction: (0.393235,0.420138,0.817833)
+ New Polarization:       (-0.919438,0.179689,0.349779)
  *** FresnelRefraction *** 
 Track (trackID 178, parentID 1) is processed with stopping code 2
 ### pop requested out of 177 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74198,-0.48288,0.46507)
- Old Polarization:       (-0.67042,-0.53442,0.51471)
- New Momentum Direction: (0.4262,-0.65157,0.62754)
- New Polarization:       (-0.90463,-0.30697,0.29565)
+ Old Momentum Direction: (0.741979,-0.482883,0.465071)
+ Old Polarization:       (-0.670423,-0.534422,0.51471)
+ New Momentum Direction: (0.426197,-0.651574,0.627541)
+ New Polarization:       (-0.904631,-0.306975,0.295652)
  *** FresnelRefraction *** 
 Track (trackID 177, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
@@ -1063,104 +1049,104 @@ Track (trackID 177, parentID 1) is processed with stopping code 2
 Track (trackID 176, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74218,0.16729,-0.64899)
- Old Polarization:       (-0.6702,0.18526,-0.71868)
- New Momentum Direction: (0.42734,0.22567,-0.87547)
- New Polarization:       (-0.90409,0.10667,-0.41381)
+ Old Momentum Direction: (0.742178,0.167292,-0.648988)
+ Old Polarization:       (-0.670203,0.185258,-0.718685)
+ New Momentum Direction: (0.427339,0.225673,-0.875473)
+ New Polarization:       (-0.904091,0.10667,-0.413812)
  *** FresnelRefraction *** 
 Track (trackID 175, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73597,0.67624,0.032244)
- Old Polarization:       (-0.67701,0.73514,0.035052)
- New Momentum Direction: (0.38963,0.91993,0.043863)
- New Polarization:       (-0.92097,0.38919,0.018557)
+ Old Momentum Direction: (0.735974,0.676241,0.0322435)
+ Old Polarization:       (-0.67701,0.735139,0.0350518)
+ New Momentum Direction: (0.389631,0.919926,0.0438625)
+ New Polarization:       (-0.920971,0.389189,0.0185567)
  *** FresnelRefraction *** 
 Track (trackID 174, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.739,0.49493,-0.45707)
- Old Polarization:       (-0.6737,0.54291,-0.50138)
- New Momentum Direction: (0.4086,0.67052,-0.61923)
- New Polarization:       (-0.91271,0.30018,-0.27721)
+ Old Momentum Direction: (0.739004,0.494932,-0.457073)
+ Old Polarization:       (-0.673701,0.542906,-0.501377)
+ New Momentum Direction: (0.408599,0.670522,-0.619231)
+ New Polarization:       (-0.912714,0.300176,-0.277214)
  *** FresnelRefraction *** 
 Track (trackID 173, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73656,-0.5356,-0.41305)
- Old Polarization:       (-0.67637,-0.58326,-0.4498)
- New Momentum Direction: (0.39338,-0.72803,-0.56145)
- New Polarization:       (-0.91938,-0.31151,-0.24023)
+ Old Momentum Direction: (0.736558,-0.535604,-0.41305)
+ Old Polarization:       (-0.676374,-0.583263,-0.449803)
+ New Momentum Direction: (0.393379,-0.728032,-0.561447)
+ New Polarization:       (-0.919377,-0.311507,-0.240229)
  *** FresnelRefraction *** 
 Track (trackID 172, parentID 1) is processed with stopping code 2
 ### pop requested out of 171 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73684,-0.2113,-0.6422)
- Old Polarization:       (-0.67607,-0.23029,-0.69993)
- New Momentum Direction: (0.39516,-0.2871,-0.87259)
- New Polarization:       (-0.91861,-0.1235,-0.37537)
+ Old Momentum Direction: (0.736839,-0.211299,-0.6422)
+ Old Polarization:       (-0.676068,-0.230292,-0.699927)
+ New Momentum Direction: (0.395165,-0.287103,-0.872592)
+ New Polarization:       (-0.91861,-0.123505,-0.375369)
  *** FresnelRefraction *** 
 Track (trackID 171, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73931,0.18208,0.64828)
- Old Polarization:       (-0.67337,0.19991,0.71177)
- New Momentum Direction: (0.41044,0.24657,0.87792)
- New Polarization:       (-0.91189,0.11098,0.39515)
+ Old Momentum Direction: (0.739307,0.182079,0.648284)
+ Old Polarization:       (-0.673369,0.199909,0.711766)
+ New Momentum Direction: (0.410437,0.246575,0.87792)
+ New Polarization:       (-0.911889,0.110982,0.395147)
  *** FresnelRefraction *** 
 Track (trackID 170, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73697,-0.20137,0.64523)
- Old Polarization:       (-0.67592,-0.21955,0.70351)
- New Momentum Direction: (0.396,-0.27356,0.87656)
- New Polarization:       (-0.91825,-0.11797,0.37802)
+ Old Momentum Direction: (0.736971,-0.201368,0.645233)
+ Old Polarization:       (-0.675925,-0.219554,0.703507)
+ New Momentum Direction: (0.395997,-0.27356,0.876557)
+ New Polarization:       (-0.918252,-0.117973,0.378015)
  *** FresnelRefraction *** 
 Track (trackID 169, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.7388,-0.41344,-0.53221)
-Old Polarization: (-0.67393,-0.45324,-0.58343)
-New Polarization: (-0.79334,-0.36247,0.48911)
-Polarization Change: (-0.79334,-0.36247,0.48911)
-New Momentum Direction: (-0.37983,-0.33316,-0.86298)
-Momentum Change: (-0.37983,-0.33316,-0.86298)
+Old Momentum Direction: (0.738796,-0.413444,-0.532206)
+Old Polarization: (-0.673929,-0.45324,-0.583433)
+New Polarization: (-0.793339,-0.362469,0.489111)
+Polarization Change: (-0.793339,-0.362469,0.489111)
+New Momentum Direction: (-0.379829,-0.333159,-0.86298)
+Momentum Change: (-0.379829,-0.333159,-0.86298)
  Photon at Boundary! 
- Old Momentum Direction: (-0.37983,-0.33316,-0.86298)
- Old Polarization:       (-0.79334,-0.36247,0.48911)
- New Momentum Direction: (-0.51473,-0.45148,-0.72885)
- New Polarization:       (-0.65941,-0.33483,0.6731)
+ Old Momentum Direction: (-0.379829,-0.333159,-0.86298)
+ Old Polarization:       (-0.793339,-0.362469,0.489111)
+ New Momentum Direction: (-0.514728,-0.451482,-0.728848)
+ New Polarization:       (-0.659413,-0.334828,0.6731)
  *** FresnelRefraction *** 
 Track (trackID 168, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7364,-0.29083,-0.61084)
- Old Polarization:       (-0.67654,-0.31657,-0.66489)
- New Momentum Direction: (0.3924,-0.3954,-0.83047)
- New Polarization:       (-0.9198,-0.16868,-0.35429)
+ Old Momentum Direction: (0.736405,-0.290831,-0.61084)
+ Old Polarization:       (-0.676541,-0.316566,-0.66489)
+ New Momentum Direction: (0.392396,-0.395402,-0.830471)
+ New Polarization:       (-0.919796,-0.168683,-0.354289)
  *** FresnelRefraction *** 
 Track (trackID 167, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73594,0.39917,0.54685)
-Old Polarization: (-0.67704,0.4339,0.59443)
-New Polarization: (-0.47855,-0.32186,0.81694)
-Polarization Change: (-0.47855,-0.32186,0.81694)
-New Momentum Direction: (0.48011,-0.87491,-0.063456)
-Momentum Change: (0.48011,-0.87491,-0.063456)
+Old Momentum Direction: (0.735943,0.399172,0.546854)
+Old Polarization: (-0.677043,0.433898,0.594428)
+New Polarization: (-0.478555,-0.321858,0.816941)
+Polarization Change: (-0.478555,-0.321858,0.816941)
+New Momentum Direction: (0.480108,-0.874911,-0.0634556)
+Momentum Change: (0.480108,-0.874911,-0.0634556)
  Photon at Boundary! 
- Old Momentum Direction: (0.48011,-0.87491,-0.063456)
- Old Polarization:       (-0.47855,-0.32186,0.81694)
- New Momentum Direction: (-0.48011,-0.87491,-0.063456)
- New Polarization:       (-0.47855,0.32186,-0.81694)
+ Old Momentum Direction: (0.480108,-0.874911,-0.0634556)
+ Old Polarization:       (-0.478555,-0.321858,0.816941)
+ New Momentum Direction: (-0.480108,-0.874911,-0.0634556)
+ New Polarization:       (-0.478555,0.321858,-0.816941)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.48011,-0.87491,-0.063456)
-Old Polarization: (-0.47855,0.32186,-0.81694)
-New Polarization: (-0.21353,-0.16874,-0.96225)
-Polarization Change: (-0.21353,-0.16874,-0.96225)
-New Momentum Direction: (-0.54454,0.83833,-0.026166)
-Momentum Change: (-0.54454,0.83833,-0.026166)
+Old Momentum Direction: (-0.480108,-0.874911,-0.0634556)
+Old Polarization: (-0.478555,0.321858,-0.816941)
+New Polarization: (-0.213533,-0.168736,-0.962254)
+Polarization Change: (-0.213533,-0.168736,-0.962254)
+New Momentum Direction: (-0.54454,0.838326,-0.0261662)
+Momentum Change: (-0.54454,0.838326,-0.0261662)
 
 ** Photon absorbed! **
 Track (trackID 166, parentID 1) is processed with stopping code 2
@@ -1174,154 +1160,154 @@ Track (trackID 165, parentID 1) is processed with stopping code 2
 Track (trackID 164, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74292,0.19631,-0.63995)
- Old Polarization:       (-0.66939,0.21788,-0.71025)
- New Momentum Direction: (0.43155,0.26456,-0.86243)
- New Polarization:       (-0.90209,0.12656,-0.41257)
+ Old Momentum Direction: (0.742916,0.196312,-0.639951)
+ Old Polarization:       (-0.669385,0.217877,-0.710249)
+ New Momentum Direction: (0.431546,0.264559,-0.862425)
+ New Polarization:       (-0.902091,0.126561,-0.41257)
  *** FresnelRefraction *** 
 Track (trackID 163, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74138,-0.41896,-0.52424)
- Old Polarization:       (-0.67108,-0.46285,-0.57915)
- New Momentum Direction: (0.42274,-0.56578,-0.70795)
- New Polarization:       (-0.90625,-0.26391,-0.33023)
+ Old Momentum Direction: (0.741381,-0.418959,-0.52424)
+ Old Polarization:       (-0.671084,-0.462845,-0.579154)
+ New Momentum Direction: (0.422736,-0.565775,-0.70795)
+ New Polarization:       (-0.906253,-0.263915,-0.330234)
  *** FresnelRefraction *** 
 Track (trackID 162, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74156,0.62106,0.2537)
- Old Polarization:       (-0.67088,0.6865,0.28043)
- New Momentum Direction: (0.4238,0.8385,0.34252)
- New Polarization:       (-0.90576,0.39233,0.16026)
+ Old Momentum Direction: (0.741564,0.621063,0.253697)
+ Old Polarization:       (-0.670882,0.686498,0.280427)
+ New Momentum Direction: (0.423802,0.838496,0.342516)
+ New Polarization:       (-0.905755,0.392331,0.160263)
  *** FresnelRefraction *** 
 Track (trackID 161, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73884,-0.5197,-0.42899)
- Old Polarization:       (-0.67388,-0.56979,-0.47034)
- New Momentum Direction: (0.4076,-0.70423,-0.58131)
- New Polarization:       (-0.91316,-0.31434,-0.25947)
+ Old Momentum Direction: (0.738839,-0.519697,-0.42899)
+ Old Polarization:       (-0.673882,-0.569791,-0.470341)
+ New Momentum Direction: (0.407597,-0.704229,-0.581314)
+ New Polarization:       (-0.913162,-0.314338,-0.259474)
  *** FresnelRefraction *** 
 Track (trackID 160, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74205,0.0087739,0.67028)
- Old Polarization:       (-0.67034,0.0097125,0.74199)
- New Momentum Direction: (0.42662,0.011838,0.90435)
- New Polarization:       (-0.90443,0.0055839,0.42658)
+ Old Momentum Direction: (0.742052,0.00877387,0.670285)
+ Old Polarization:       (-0.670342,0.00971246,0.741989)
+ New Momentum Direction: (0.426618,0.0118378,0.904354)
+ New Polarization:       (-0.904432,0.00558386,0.426582)
  *** FresnelRefraction *** 
 Track (trackID 159, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74123,0.27252,0.61344)
- Old Polarization:       (-0.67125,0.30093,0.6774)
- New Momentum Direction: (0.42188,0.36809,0.82857)
- New Polarization:       (-0.90665,0.17128,0.38555)
+ Old Momentum Direction: (0.741234,0.272516,0.613438)
+ Old Polarization:       (-0.671246,0.30093,0.677399)
+ New Momentum Direction: (0.421882,0.368086,0.82857)
+ New Polarization:       (-0.906651,0.171278,0.385549)
  *** FresnelRefraction *** 
 Track (trackID 158, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73622,0.060396,-0.67404)
- Old Polarization:       (-0.67674,0.065705,-0.73329)
- New Momentum Direction: (0.39124,0.082132,-0.91662)
- New Polarization:       (-0.92029,0.034917,-0.38968)
+ Old Momentum Direction: (0.736225,0.0603963,-0.674037)
+ Old Polarization:       (-0.676737,0.0657054,-0.733287)
+ New Momentum Direction: (0.391242,0.0821323,-0.916615)
+ New Polarization:       (-0.920288,0.034917,-0.389681)
  *** FresnelRefraction *** 
 Track (trackID 157, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73947,0.25218,-0.62417)
- Old Polarization:       (-0.67318,0.27701,-0.68563)
- New Momentum Direction: (0.41145,0.34142,-0.84507)
- New Polarization:       (-0.91143,0.15413,-0.38149)
+ Old Momentum Direction: (0.739474,0.252176,-0.624167)
+ Old Polarization:       (-0.673185,0.277008,-0.68563)
+ New Momentum Direction: (0.411448,0.341424,-0.845068)
+ New Polarization:       (-0.911433,0.154129,-0.381489)
  *** FresnelRefraction *** 
 Track (trackID 156, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7365,0.29571,0.60838)
- Old Polarization:       (-0.67644,0.32196,0.6624)
- New Momentum Direction: (0.39302,0.40198,0.82701)
- New Polarization:       (-0.91953,0.17181,0.35347)
+ Old Momentum Direction: (0.736502,0.295706,0.608377)
+ Old Polarization:       (-0.676436,0.321964,0.6624)
+ New Momentum Direction: (0.393016,0.401977,0.827015)
+ New Polarization:       (-0.919532,0.171808,0.353473)
  *** FresnelRefraction *** 
 Track (trackID 155, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74237,0.57768,0.33938)
- Old Polarization:       (-0.67,0.64008,0.37604)
- New Momentum Direction: (0.42841,0.77908,0.4577)
- New Polarization:       (-0.90358,0.36939,0.21701)
+ Old Momentum Direction: (0.742366,0.577681,0.33938)
+ Old Polarization:       (-0.669995,0.64008,0.376038)
+ New Momentum Direction: (0.428415,0.779083,0.457701)
+ New Polarization:       (-0.903582,0.369386,0.217009)
  *** FresnelRefraction *** 
 Track (trackID 154, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74216,-0.31719,0.59042)
- Old Polarization:       (-0.67022,-0.35123,0.65379)
- New Momentum Direction: (0.42723,-0.42789,0.79648)
- New Polarization:       (-0.90414,-0.20219,0.37636)
+ Old Momentum Direction: (0.742158,-0.317186,0.590418)
+ Old Polarization:       (-0.670224,-0.351229,0.653787)
+ New Momentum Direction: (0.427229,-0.427889,0.796484)
+ New Polarization:       (-0.904144,-0.202187,0.376357)
  *** FresnelRefraction *** 
 Track (trackID 153, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74221,0.15966,0.65087)
- Old Polarization:       (-0.67016,0.17683,0.72084)
- New Momentum Direction: (0.42754,0.21537,0.87797)
- New Polarization:       (-0.90399,0.10186,0.41523)
+ Old Momentum Direction: (0.742213,0.159661,0.650867)
+ Old Polarization:       (-0.670164,0.176826,0.720842)
+ New Momentum Direction: (0.427544,0.215369,0.877965)
+ New Polarization:       (-0.903995,0.101858,0.415233)
  *** FresnelRefraction *** 
 Track (trackID 152, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73917,-0.41438,0.53096)
- Old Polarization:       (-0.67352,-0.45476,0.58272)
- New Momentum Direction: (0.4096,-0.56126,0.71918)
- New Polarization:       (-0.91227,-0.252,0.3229)
+ Old Momentum Direction: (0.739168,-0.414376,0.530964)
+ Old Polarization:       (-0.673521,-0.454765,0.582717)
+ New Momentum Direction: (0.409598,-0.561261,0.719177)
+ New Polarization:       (-0.912266,-0.252,0.322903)
  *** FresnelRefraction *** 
 Track (trackID 151, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73882,0.15246,0.65643)
- Old Polarization:       (-0.67391,0.16714,0.71966)
- New Momentum Direction: (0.40746,0.2066,0.88955)
- New Polarization:       (-0.91322,0.092179,0.3969)
+ Old Momentum Direction: (0.738817,0.152456,0.656435)
+ Old Polarization:       (-0.673906,0.16714,0.719663)
+ New Momentum Direction: (0.407462,0.206596,0.889547)
+ New Polarization:       (-0.913222,0.0921788,0.396898)
  *** FresnelRefraction *** 
 Track (trackID 150, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7385,-0.56145,0.37336)
- Old Polarization:       (-0.67426,-0.61494,0.40893)
- New Momentum Direction: (0.4055,-0.76116,0.50617)
- New Polarization:       (-0.9141,-0.33765,0.22454)
+ Old Momentum Direction: (0.738495,-0.561449,0.373362)
+ Old Polarization:       (-0.674258,-0.614939,0.408932)
+ New Momentum Direction: (0.405495,-0.761161,0.506169)
+ New Polarization:       (-0.914097,-0.337652,0.224538)
  *** FresnelRefraction *** 
 Track (trackID 149, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73845,-0.21618,-0.63872)
- Old Polarization:       (-0.67431,-0.23674,-0.69947)
- New Momentum Direction: (0.40522,-0.29309,-0.86597)
- New Polarization:       (-0.91422,-0.12991,-0.38383)
+ Old Momentum Direction: (0.73845,-0.216179,-0.638716)
+ Old Polarization:       (-0.674308,-0.236743,-0.699472)
+ New Momentum Direction: (0.405216,-0.293094,-0.865966)
+ New Polarization:       (-0.914221,-0.12991,-0.383827)
  *** FresnelRefraction *** 
 Track (trackID 148, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73918,0.66101,0.12916)
- Old Polarization:       (-0.67351,0.72546,0.14176)
- New Momentum Direction: (0.40966,0.8953,0.17494)
- New Polarization:       (-0.91224,0.40206,0.078563)
+ Old Momentum Direction: (0.739179,0.661008,0.129161)
+ Old Polarization:       (-0.673509,0.725459,0.141755)
+ New Momentum Direction: (0.409663,0.895305,0.174943)
+ New Polarization:       (-0.912237,0.40206,0.0785627)
  *** FresnelRefraction *** 
 Track (trackID 147, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73903,-0.65981,0.13598)
- Old Polarization:       (-0.67368,-0.72382,0.14917)
- New Momentum Direction: (0.40874,-0.89387,0.18421)
- New Polarization:       (-0.91265,-0.40033,0.082501)
+ Old Momentum Direction: (0.739027,-0.659811,0.135977)
+ Old Polarization:       (-0.673676,-0.723816,0.149168)
+ New Momentum Direction: (0.408738,-0.893867,0.184213)
+ New Polarization:       (-0.912652,-0.400325,0.0825011)
  *** FresnelRefraction *** 
 Track (trackID 146, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73954,0.2675,0.61768)
- Old Polarization:       (-0.67312,0.2939,0.67863)
- New Momentum Direction: (0.41182,0.36214,0.83621)
- New Polarization:       (-0.91126,0.16366,0.37791)
+ Old Momentum Direction: (0.739537,0.267501,0.61768)
+ Old Polarization:       (-0.673116,0.293897,0.67863)
+ New Momentum Direction: (0.411824,0.362143,0.836214)
+ New Polarization:       (-0.911263,0.163662,0.377907)
  *** FresnelRefraction *** 
 Track (trackID 145, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
@@ -1330,34 +1316,34 @@ Track (trackID 145, parentID 1) is processed with stopping code 2
 Track (trackID 144, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74155,0.41201,-0.52948)
- Old Polarization:       (-0.6709,0.4554,-0.58524)
- New Momentum Direction: (0.42371,0.55627,-0.71487)
- New Polarization:       (-0.9058,0.26021,-0.3344)
+ Old Momentum Direction: (0.741549,0.41201,-0.529483)
+ Old Polarization:       (-0.670899,0.455398,-0.585242)
+ New Momentum Direction: (0.423711,0.556266,-0.714869)
+ New Polarization:       (-0.905797,0.260208,-0.334399)
  *** FresnelRefraction *** 
 Track (trackID 143, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7366,0.47437,-0.48207)
- Old Polarization:       (-0.67633,0.51664,-0.52503)
- New Momentum Direction: (0.39363,0.64477,-0.65524)
- New Polarization:       (-0.91927,0.27609,-0.28057)
+ Old Momentum Direction: (0.736597,0.474371,-0.482075)
+ Old Polarization:       (-0.676331,0.516641,-0.525031)
+ New Momentum Direction: (0.393627,0.644766,-0.655237)
+ New Polarization:       (-0.91927,0.276086,-0.280569)
  *** FresnelRefraction *** 
 Track (trackID 142, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73744,0.031057,-0.6747)
- Old Polarization:       (-0.67541,0.03391,-0.73666)
- New Momentum Direction: (0.39896,0.042165,-0.916)
- New Polarization:       (-0.91697,0.018345,-0.39854)
+ Old Momentum Direction: (0.737441,0.0310574,-0.674697)
+ Old Polarization:       (-0.675411,0.0339097,-0.736661)
+ New Momentum Direction: (0.398958,0.042165,-0.915999)
+ New Polarization:       (-0.916969,0.0183453,-0.398536)
  *** FresnelRefraction *** 
 Track (trackID 141, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73741,0.6173,0.27416)
- Old Polarization:       (-0.67545,0.67393,0.29931)
- New Momentum Direction: (0.39875,0.83812,0.37224)
- New Polarization:       (-0.91706,0.36442,0.16185)
+ Old Momentum Direction: (0.737408,0.617303,0.274165)
+ Old Polarization:       (-0.675448,0.67393,0.299314)
+ New Momentum Direction: (0.398749,0.838117,0.372235)
+ New Polarization:       (-0.91706,0.364423,0.161852)
  *** FresnelRefraction *** 
 Track (trackID 140, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
@@ -1366,50 +1352,50 @@ Track (trackID 140, parentID 1) is processed with stopping code 2
 Track (trackID 139, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73859,0.27457,0.6157)
- Old Polarization:       (-0.67415,0.30082,0.67456)
- New Momentum Direction: (0.4061,0.37219,0.8346)
- New Polarization:       (-0.91383,0.1654,0.37089)
+ Old Momentum Direction: (0.738593,0.274571,0.615703)
+ Old Polarization:       (-0.674151,0.300817,0.674558)
+ New Momentum Direction: (0.406095,0.372189,0.834603)
+ New Polarization:       (-0.913831,0.165396,0.370887)
  *** FresnelRefraction *** 
 Track (trackID 138, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73615,0.63077,0.24539)
- Old Polarization:       (-0.67682,0.68606,0.2669)
- New Momentum Direction: (0.39077,0.85786,0.33373)
- New Polarization:       (-0.92049,0.36418,0.14168)
+ Old Momentum Direction: (0.73615,0.630768,0.245387)
+ Old Polarization:       (-0.676818,0.686063,0.266898)
+ New Momentum Direction: (0.390766,0.85786,0.333732)
+ New Polarization:       (-0.92049,0.364179,0.141676)
  *** FresnelRefraction *** 
 Track (trackID 137, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73603,0.51332,0.44132)
- Old Polarization:       (-0.67695,0.55812,0.47984)
- New Momentum Direction: (0.39001,0.69824,0.6003)
- New Polarization:       (-0.92081,0.29574,0.25425)
+ Old Momentum Direction: (0.736032,0.513319,0.441316)
+ Old Polarization:       (-0.676946,0.558123,0.479836)
+ New Momentum Direction: (0.390006,0.698239,0.600298)
+ New Polarization:       (-0.920812,0.295736,0.254254)
  *** FresnelRefraction *** 
 Track (trackID 136, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73589,0.6413,0.21726)
- Old Polarization:       (-0.6771,0.69698,0.23612)
- New Momentum Direction: (0.38907,0.8725,0.29558)
- New Polarization:       (-0.92121,0.3685,0.12484)
+ Old Momentum Direction: (0.735888,0.641302,0.217257)
+ Old Polarization:       (-0.677103,0.696978,0.236119)
+ New Momentum Direction: (0.389074,0.872498,0.295581)
+ New Polarization:       (-0.921207,0.368502,0.124839)
  *** FresnelRefraction *** 
 Track (trackID 135, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73868,-0.62694,0.24758)
- Old Polarization:       (-0.67405,-0.68705,0.27132)
- New Momentum Direction: (0.40665,-0.84973,0.33556)
- New Polarization:       (-0.91358,-0.37823,0.14936)
+ Old Momentum Direction: (0.738684,-0.626937,0.247581)
+ Old Polarization:       (-0.674052,-0.687051,0.27132)
+ New Momentum Direction: (0.406649,-0.849726,0.335562)
+ New Polarization:       (-0.913584,-0.378225,0.149363)
  *** FresnelRefraction *** 
 Track (trackID 134, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73858,0.23167,0.63311)
- Old Polarization:       (-0.67417,0.25381,0.6936)
- New Momentum Direction: (0.406,0.31405,0.85822)
- New Polarization:       (-0.91388,0.13952,0.38127)
+ Old Momentum Direction: (0.738577,0.231672,0.633113)
+ Old Polarization:       (-0.674169,0.253806,0.693598)
+ New Momentum Direction: (0.405995,0.314045,0.858221)
+ New Polarization:       (-0.913875,0.139517,0.38127)
  *** FresnelRefraction *** 
 Track (trackID 133, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
@@ -1422,10 +1408,10 @@ Track (trackID 132, parentID 1) is processed with stopping code 2
 Track (trackID 131, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73784,-0.64035,-0.21341)
- Old Polarization:       (-0.67498,-0.69999,-0.23328)
- New Momentum Direction: (0.40144,-0.8689,-0.28958)
- New Polarization:       (-0.91588,-0.38085,-0.12692)
+ Old Momentum Direction: (0.737839,-0.640351,-0.213409)
+ Old Polarization:       (-0.674976,-0.699989,-0.233284)
+ New Momentum Direction: (0.401442,-0.868901,-0.289577)
+ New Polarization:       (-0.915884,-0.380849,-0.126925)
  *** FresnelRefraction *** 
 Track (trackID 130, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
@@ -1434,10 +1420,10 @@ Track (trackID 130, parentID 1) is processed with stopping code 2
 Track (trackID 129, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73877,-0.24803,0.62666)
- Old Polarization:       (-0.67396,-0.27188,0.68692)
- New Momentum Direction: (0.40716,-0.33613,0.84926)
- New Polarization:       (-0.91336,-0.14984,0.37859)
+ Old Momentum Direction: (0.738768,-0.248028,0.626661)
+ Old Polarization:       (-0.67396,-0.271878,0.686921)
+ New Momentum Direction: (0.407164,-0.336129,0.849255)
+ New Polarization:       (-0.913355,-0.149843,0.378589)
  *** FresnelRefraction *** 
 Track (trackID 128, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
@@ -1446,34 +1432,34 @@ Track (trackID 128, parentID 1) is processed with stopping code 2
 Track (trackID 127, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73918,-0.38433,-0.55308)
- Old Polarization:       (-0.67351,-0.42181,-0.60702)
- New Momentum Direction: (0.40968,-0.52056,-0.74912)
- New Polarization:       (-0.91223,-0.23378,-0.33643)
+ Old Momentum Direction: (0.739182,-0.384331,-0.553082)
+ Old Polarization:       (-0.673505,-0.421809,-0.607015)
+ New Momentum Direction: (0.409683,-0.520556,-0.74912)
+ New Polarization:       (-0.912228,-0.233782,-0.336431)
  *** FresnelRefraction *** 
 Track (trackID 126, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74183,-0.59458,0.31011)
- Old Polarization:       (-0.67059,-0.65774,0.34305)
- New Momentum Direction: (0.42531,-0.80246,0.41854)
- New Polarization:       (-0.90505,-0.3771,0.19668)
+ Old Momentum Direction: (0.741825,-0.59458,0.310113)
+ Old Polarization:       (-0.670593,-0.657738,0.343054)
+ New Momentum Direction: (0.42531,-0.802459,0.418535)
+ New Polarization:       (-0.905048,-0.3771,0.196683)
  *** FresnelRefraction *** 
 Track (trackID 125, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74124,-0.38596,0.54918)
- Old Polarization:       (-0.67124,-0.42621,0.60645)
- New Momentum Direction: (0.42191,-0.52131,0.74177)
- New Polarization:       (-0.90664,-0.2426,0.34519)
+ Old Momentum Direction: (0.74124,-0.385957,0.549182)
+ Old Polarization:       (-0.67124,-0.426206,0.606453)
+ New Momentum Direction: (0.421913,-0.521307,0.741774)
+ New Polarization:       (-0.906636,-0.242596,0.345192)
  *** FresnelRefraction *** 
 Track (trackID 124, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74143,-0.30895,0.59568)
- Old Polarization:       (-0.67103,-0.34136,0.65817)
- New Momentum Direction: (0.42302,-0.41718,0.80437)
- New Polarization:       (-0.90612,-0.19476,0.37552)
+ Old Momentum Direction: (0.74143,-0.308948,0.595678)
+ Old Polarization:       (-0.67103,-0.341361,0.658173)
+ New Momentum Direction: (0.423023,-0.417185,0.804368)
+ New Polarization:       (-0.906119,-0.194763,0.37552)
  *** FresnelRefraction *** 
 Track (trackID 123, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
@@ -1482,18 +1468,18 @@ Track (trackID 123, parentID 1) is processed with stopping code 2
 Track (trackID 122, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74309,-0.0037197,0.66918)
- Old Polarization:       (-0.66919,-0.0041304,0.74308)
- New Momentum Direction: (0.43251,-0.0050116,0.90161)
- New Polarization:       (-0.90163,-0.0024041,0.43251)
+ Old Momentum Direction: (0.743087,-0.00371966,0.669185)
+ Old Polarization:       (-0.669195,-0.00413038,0.743075)
+ New Momentum Direction: (0.432515,-0.00501161,0.901613)
+ New Polarization:       (-0.901627,-0.00240409,0.432508)
  *** FresnelRefraction *** 
 Track (trackID 121, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74034,-0.4975,-0.4521)
- Old Polarization:       (-0.67223,-0.5479,-0.4979)
- New Momentum Direction: (0.41662,-0.67278,-0.61138)
- New Polarization:       (-0.90908,-0.30833,-0.28019)
+ Old Momentum Direction: (0.74034,-0.4975,-0.452096)
+ Old Polarization:       (-0.672233,-0.547904,-0.4979)
+ New Momentum Direction: (0.416621,-0.672784,-0.611383)
+ New Polarization:       (-0.90908,-0.308329,-0.28019)
  *** FresnelRefraction *** 
 Track (trackID 120, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
@@ -1502,10 +1488,10 @@ Track (trackID 120, parentID 1) is processed with stopping code 2
 Track (trackID 119, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74034,0.65745,0.14021)
- Old Polarization:       (-0.67224,0.72405,0.15441)
- New Momentum Direction: (0.4166,0.8891,0.18961)
- New Polarization:       (-0.90909,0.40744,0.08689)
+ Old Momentum Direction: (0.740337,0.657452,0.140208)
+ Old Polarization:       (-0.672236,0.724055,0.154412)
+ New Momentum Direction: (0.416601,0.889097,0.189608)
+ New Polarization:       (-0.90909,0.407439,0.0868901)
  *** FresnelRefraction *** 
 Track (trackID 118, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
@@ -1514,26 +1500,26 @@ Track (trackID 118, parentID 1) is processed with stopping code 2
 Track (trackID 117, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73887,-0.67367,0.015334)
- Old Polarization:       (-0.67384,-0.73868,0.016814)
- New Momentum Direction: (0.40781,-0.91283,0.020778)
- New Polarization:       (-0.91307,-0.4077,0.0092799)
+ Old Momentum Direction: (0.738874,-0.67367,0.0153338)
+ Old Polarization:       (-0.673844,-0.738682,0.0168136)
+ New Momentum Direction: (0.407807,-0.912832,0.0207775)
+ New Polarization:       (-0.913068,-0.407701,0.00927994)
  *** FresnelRefraction *** 
 Track (trackID 116, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73636,0.31476,-0.59892)
- Old Polarization:       (-0.6766,0.34256,-0.65182)
- New Momentum Direction: (0.39208,0.42797,-0.81432)
- New Polarization:       (-0.91993,0.1824,-0.34707)
+ Old Momentum Direction: (0.736355,0.314762,-0.598921)
+ Old Polarization:       (-0.676595,0.342564,-0.65182)
+ New Momentum Direction: (0.392079,0.427966,-0.814321)
+ New Polarization:       (-0.919932,0.182401,-0.347067)
  *** FresnelRefraction *** 
 Track (trackID 115, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73992,-0.60884,-0.28605)
- Old Polarization:       (-0.67269,-0.66969,-0.31464)
- New Momentum Direction: (0.41415,-0.82382,-0.38705)
- New Polarization:       (-0.91021,-0.37484,-0.17611)
+ Old Momentum Direction: (0.739925,-0.608842,-0.286048)
+ Old Polarization:       (-0.67269,-0.669695,-0.314638)
+ New Momentum Direction: (0.414148,-0.823817,-0.387048)
+ New Polarization:       (-0.910209,-0.37484,-0.176108)
  *** FresnelRefraction *** 
 Track (trackID 114, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
@@ -1542,10 +1528,10 @@ Track (trackID 114, parentID 1) is processed with stopping code 2
 Track (trackID 113, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74246,-0.62245,-0.24761)
- Old Polarization:       (-0.66989,-0.68988,-0.27443)
- New Momentum Direction: (0.42895,-0.83936,-0.33389)
- New Polarization:       (-0.90333,-0.39857,-0.15855)
+ Old Momentum Direction: (0.742458,-0.622451,-0.247609)
+ Old Polarization:       (-0.669892,-0.689878,-0.274431)
+ New Momentum Direction: (0.428946,-0.839357,-0.333893)
+ New Polarization:       (-0.90333,-0.398569,-0.158549)
  *** FresnelRefraction *** 
 Track (trackID 112, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
@@ -1558,160 +1544,160 @@ Track (trackID 111, parentID 1) is processed with stopping code 2
 Track (trackID 110, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73832,-0.083902,0.66921)
- Old Polarization:       (-0.67445,-0.091847,0.73258)
- New Momentum Direction: (0.40441,-0.11377,0.90748)
- New Polarization:       (-0.91458,-0.050308,0.40126)
+ Old Momentum Direction: (0.738318,-0.0839017,0.669214)
+ Old Polarization:       (-0.674453,-0.0918466,0.732583)
+ New Momentum Direction: (0.404405,-0.113773,0.907476)
+ New Polarization:       (-0.91458,-0.0503079,0.401264)
  *** FresnelRefraction *** 
 Track (trackID 109, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73859,-0.14368,0.65867)
- Old Polarization:       (-0.67416,-0.15741,0.72162)
- New Momentum Direction: (0.40607,-0.19476,0.89285)
- New Polarization:       (-0.91384,-0.086544,0.39674)
+ Old Momentum Direction: (0.738589,-0.143681,0.658667)
+ Old Polarization:       (-0.674156,-0.157413,0.721619)
+ New Momentum Direction: (0.406066,-0.194765,0.892848)
+ New Polarization:       (-0.913844,-0.0865436,0.396737)
  *** FresnelRefraction *** 
 Track (trackID 108, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73927,0.67306,-0.02189)
- Old Polarization:       (-0.67341,0.73888,-0.024031)
- New Momentum Direction: (0.41019,0.91152,-0.029646)
- New Polarization:       (-0.912,0.40997,-0.013334)
+ Old Momentum Direction: (0.739266,0.673058,-0.0218902)
+ Old Polarization:       (-0.673414,0.738875,-0.0240308)
+ New Momentum Direction: (0.410188,0.911519,-0.0296458)
+ New Polarization:       (-0.912001,0.409971,-0.0133337)
  *** FresnelRefraction *** 
 Track (trackID 107, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.7358,-0.58526,-0.34068)
-Old Polarization: (-0.67719,-0.63591,-0.37016)
-New Polarization: (-0.49597,-0.86556,-0.069395)
-Polarization Change: (-0.49597,-0.86556,-0.069395)
-New Momentum Direction: (0.54817,-0.37408,0.74805)
-Momentum Change: (0.54817,-0.37408,0.74805)
+Old Momentum Direction: (0.735804,-0.585261,-0.34068)
+Old Polarization: (-0.677195,-0.635913,-0.370164)
+New Polarization: (-0.495973,-0.865561,-0.0693948)
+Polarization Change: (-0.495973,-0.865561,-0.0693948)
+New Momentum Direction: (0.548167,-0.374077,0.74805)
+Momentum Change: (0.548167,-0.374077,0.74805)
  Photon at Boundary! 
- Old Momentum Direction: (0.54817,-0.37408,0.74805)
- Old Polarization:       (-0.49597,-0.86556,-0.069395)
- New Momentum Direction: (-0.54817,-0.37408,0.74805)
- New Polarization:       (-0.49597,0.86556,0.069395)
+ Old Momentum Direction: (0.548167,-0.374077,0.74805)
+ Old Polarization:       (-0.495973,-0.865561,-0.0693948)
+ New Momentum Direction: (-0.548167,-0.374077,0.74805)
+ New Polarization:       (-0.495973,0.865561,0.0693948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54817,-0.37408,0.74805)
- Old Polarization:       (-0.49597,0.86556,0.069395)
- New Momentum Direction: (-0.54817,0.37408,0.74805)
- New Polarization:       (0.49597,0.86556,-0.069395)
+ Old Momentum Direction: (-0.548167,-0.374077,0.74805)
+ Old Polarization:       (-0.495973,0.865561,0.0693948)
+ New Momentum Direction: (-0.548167,0.374077,0.74805)
+ New Polarization:       (0.495973,0.865561,-0.0693948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54817,0.37408,0.74805)
- Old Polarization:       (0.49597,0.86556,-0.069395)
- New Momentum Direction: (-0.74587,0.50899,0.42965)
- New Polarization:       (0.5025,0.85339,-0.13865)
+ Old Momentum Direction: (-0.548167,0.374077,0.74805)
+ Old Polarization:       (0.495973,0.865561,-0.0693948)
+ New Momentum Direction: (-0.745873,0.508995,0.429649)
+ New Polarization:       (0.502495,0.853389,-0.138655)
  *** FresnelRefraction *** 
 Track (trackID 106, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74456,0.37366,-0.55318)
- Old Polarization:       (-0.66755,0.41677,-0.61699)
- New Momentum Direction: (0.44075,0.50245,-0.74383)
- New Polarization:       (-0.89763,0.24671,-0.36523)
+ Old Momentum Direction: (0.744563,0.373661,-0.553176)
+ Old Polarization:       (-0.667552,0.416767,-0.616992)
+ New Momentum Direction: (0.440749,0.502447,-0.743833)
+ New Polarization:       (-0.897631,0.246708,-0.365232)
  *** FresnelRefraction *** 
 Track (trackID 105, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74296,-0.42927,0.51355)
- Old Polarization:       (-0.66933,-0.47649,0.57005)
- New Momentum Direction: (0.43181,-0.57846,0.69204)
- New Polarization:       (-0.90197,-0.27693,0.33131)
+ Old Momentum Direction: (0.742962,-0.429265,0.513555)
+ Old Polarization:       (-0.669333,-0.476486,0.570047)
+ New Momentum Direction: (0.431809,-0.578459,0.692045)
+ New Polarization:       (-0.901965,-0.276933,0.331311)
  *** FresnelRefraction *** 
 Track (trackID 104, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74009,0.43523,-0.51269)
- Old Polarization:       (-0.67251,0.47896,-0.5642)
- New Momentum Direction: (0.41511,0.58877,-0.69356)
- New Polarization:       (-0.90977,0.26864,-0.31646)
+ Old Momentum Direction: (0.740086,0.435227,-0.51269)
+ Old Polarization:       (-0.672513,0.478958,-0.564204)
+ New Momentum Direction: (0.41511,0.588773,-0.693564)
+ New Polarization:       (-0.909771,0.268645,-0.316459)
  *** FresnelRefraction *** 
 Track (trackID 103, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7419,0.12193,-0.65933)
- Old Polarization:       (-0.67051,0.13491,-0.72953)
- New Momentum Direction: (0.42575,0.16454,-0.88975)
- New Polarization:       (-0.90484,0.077421,-0.41866)
+ Old Momentum Direction: (0.741902,0.121929,-0.659329)
+ Old Polarization:       (-0.670508,0.134911,-0.729532)
+ New Momentum Direction: (0.425754,0.164541,-0.889753)
+ New Polarization:       (-0.904839,0.0774213,-0.418655)
  *** FresnelRefraction *** 
 Track (trackID 102, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73827,-0.38815,0.55163)
- Old Polarization:       (-0.6745,-0.42485,0.60378)
- New Momentum Direction: (0.40412,-0.52638,0.74807)
- New Polarization:       (-0.91471,-0.23256,0.3305)
+ Old Momentum Direction: (0.738272,-0.388155,0.551625)
+ Old Polarization:       (-0.674503,-0.424851,0.603777)
+ New Momentum Direction: (0.40412,-0.526383,0.748069)
+ New Polarization:       (-0.914706,-0.232558,0.3305)
  *** FresnelRefraction *** 
 Track (trackID 101, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73699,0.39858,-0.54587)
- Old Polarization:       (-0.6759,0.43461,-0.59521)
- New Momentum Direction: (0.39613,0.54147,-0.74155)
- New Polarization:       (-0.91819,0.2336,-0.31992)
+ Old Momentum Direction: (0.736992,0.398584,-0.54587)
+ Old Polarization:       (-0.675902,0.434609,-0.595207)
+ New Momentum Direction: (0.39613,0.541466,-0.741549)
+ New Polarization:       (-0.918194,0.233601,-0.319921)
  *** FresnelRefraction *** 
 Track (trackID 100, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73625,-0.11937,0.66609)
-Old Polarization: (-0.6767,-0.12987,0.72471)
-New Polarization: (0.073341,0.83954,-0.53833)
-Polarization Change: (0.073341,0.83954,-0.53833)
-New Momentum Direction: (-0.76135,0.39579,0.51352)
-Momentum Change: (-0.76135,0.39579,0.51352)
+Old Momentum Direction: (0.736255,-0.119369,0.666093)
+Old Polarization: (-0.676704,-0.129874,0.724709)
+New Polarization: (0.0733413,0.839539,-0.538326)
+Polarization Change: (0.0733413,0.839539,-0.538326)
+New Momentum Direction: (-0.761349,0.395787,0.513518)
+Momentum Change: (-0.761349,0.395787,0.513518)
 
 ** Photon absorbed! **
 Track (trackID 99, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73718,0.65515,0.16534)
- Old Polarization:       (-0.67569,0.71477,0.18038)
- New Momentum Direction: (0.39733,0.88978,0.22455)
- New Polarization:       (-0.91768,0.38525,0.097224)
+ Old Momentum Direction: (0.737182,0.655153,0.165337)
+ Old Polarization:       (-0.675694,0.714773,0.180383)
+ New Momentum Direction: (0.397332,0.889778,0.224548)
+ New Polarization:       (-0.917675,0.385253,0.097224)
  *** FresnelRefraction *** 
 Track (trackID 98, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73784,-0.48948,0.46475)
- Old Polarization:       (-0.67497,-0.53508,0.50804)
- New Momentum Direction: (0.40145,-0.66419,0.63063)
- New Polarization:       (-0.91588,-0.29113,0.27642)
+ Old Momentum Direction: (0.737841,-0.489485,0.464753)
+ Old Polarization:       (-0.674974,-0.535075,0.50804)
+ New Momentum Direction: (0.401454,-0.664187,0.630627)
+ New Polarization:       (-0.915879,-0.291131,0.276421)
  *** FresnelRefraction *** 
 Track (trackID 97, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7399,0.4506,-0.4995)
- Old Polarization:       (-0.67272,0.49561,-0.54939)
- New Momentum Direction: (0.41401,0.60973,-0.67589)
- New Polarization:       (-0.91027,0.27731,-0.30741)
+ Old Momentum Direction: (0.739901,0.450605,-0.499502)
+ Old Polarization:       (-0.672716,0.495607,-0.549388)
+ New Momentum Direction: (0.414007,0.609728,-0.675892)
+ New Polarization:       (-0.910274,0.277314,-0.307406)
  *** FresnelRefraction *** 
 Track (trackID 96, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74257,-0.4535,-0.49288)
- Old Polarization:       (-0.66977,-0.50279,-0.54645)
- New Momentum Direction: (0.42957,-0.61144,-0.66454)
- New Polarization:       (-0.90303,-0.29086,-0.31612)
+ Old Momentum Direction: (0.742568,-0.453498,-0.492882)
+ Old Polarization:       (-0.669771,-0.502789,-0.546453)
+ New Momentum Direction: (0.429569,-0.611439,-0.664539)
+ New Polarization:       (-0.903034,-0.290859,-0.316118)
  *** FresnelRefraction *** 
 Track (trackID 95, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73636,-0.32212,0.59499)
- Old Polarization:       (-0.67659,-0.35058,0.64755)
- New Momentum Direction: (0.39211,-0.43797,0.80897)
- New Polarization:       (-0.91992,-0.18668,0.34482)
+ Old Momentum Direction: (0.736359,-0.322122,0.594989)
+ Old Polarization:       (-0.676591,-0.350578,0.647549)
+ New Momentum Direction: (0.392107,-0.437971,0.808971)
+ New Polarization:       (-0.91992,-0.186681,0.344816)
  *** FresnelRefraction *** 
 Track (trackID 94, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7359,0.61915,0.27406)
- Old Polarization:       (-0.67709,0.67292,0.29786)
- New Momentum Direction: (0.38913,0.84235,0.37285)
- New Polarization:       (-0.92118,0.35583,0.1575)
+ Old Momentum Direction: (0.735897,0.619151,0.274057)
+ Old Polarization:       (-0.677094,0.672923,0.297858)
+ New Momentum Direction: (0.389131,0.842352,0.372853)
+ New Polarization:       (-0.921182,0.355831,0.157503)
  *** FresnelRefraction *** 
 Track (trackID 93, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
@@ -1720,37 +1706,37 @@ Track (trackID 93, parentID 1) is processed with stopping code 2
 Track (trackID 92, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74179,0.48423,0.46398)
- Old Polarization:       (-0.67064,0.5356,0.5132)
- New Momentum Direction: (0.42508,0.65356,0.62622)
- New Polarization:       (-0.90515,0.30693,0.29409)
+ Old Momentum Direction: (0.741786,0.484232,0.463975)
+ Old Polarization:       (-0.670637,0.535605,0.513199)
+ New Momentum Direction: (0.425083,0.653565,0.626225)
+ New Polarization:       (-0.905154,0.30693,0.294091)
  *** FresnelRefraction *** 
 Track (trackID 91, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73931,-0.6211,0.2601)
-Old Polarization: (-0.67336,-0.68193,0.28557)
-New Polarization: (-0.14163,0.827,-0.54407)
-Polarization Change: (-0.14163,0.827,-0.54407)
-New Momentum Direction: (0.97476,0.21232,0.068981)
-Momentum Change: (0.97476,0.21232,0.068981)
+Old Momentum Direction: (0.739312,-0.621101,0.260098)
+Old Polarization: (-0.673363,-0.681932,0.285572)
+New Polarization: (-0.141634,0.826997,-0.544073)
+Polarization Change: (-0.141634,0.826997,-0.544073)
+New Momentum Direction: (0.974762,0.212323,0.0689805)
+Momentum Change: (0.974762,0.212323,0.0689805)
 
 ** Photon absorbed! **
 Track (trackID 90, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73847,-0.52619,0.42164)
- Old Polarization:       (-0.67428,-0.57628,0.46178)
- New Momentum Direction: (0.40537,-0.71338,0.57164)
- New Polarization:       (-0.91415,-0.31633,0.25348)
+ Old Momentum Direction: (0.738474,-0.526187,0.421643)
+ Old Polarization:       (-0.674282,-0.576281,0.461784)
+ New Momentum Direction: (0.405366,-0.713376,0.57164)
+ New Polarization:       (-0.914155,-0.316334,0.253484)
  *** FresnelRefraction *** 
 Track (trackID 89, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73929,-0.10052,0.66584)
- Old Polarization:       (-0.67339,-0.11036,0.73101)
- New Momentum Direction: (0.41033,-0.13613,0.90172)
- New Polarization:       (-0.91194,-0.061252,0.40573)
+ Old Momentum Direction: (0.739289,-0.10052,0.665843)
+ Old Polarization:       (-0.673388,-0.110357,0.731006)
+ New Momentum Direction: (0.41033,-0.136129,0.90172)
+ New Polarization:       (-0.911937,-0.0612519,0.405732)
  *** FresnelRefraction *** 
 Track (trackID 88, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
@@ -1759,10 +1745,10 @@ Track (trackID 88, parentID 1) is processed with stopping code 2
 Track (trackID 87, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73839,-0.49998,0.45254)
- Old Polarization:       (-0.67437,-0.54745,0.49551)
- New Momentum Direction: (0.40487,-0.67792,0.6136)
- New Polarization:       (-0.91437,-0.30017,0.27169)
+ Old Momentum Direction: (0.738394,-0.499978,0.452544)
+ Old Polarization:       (-0.67437,-0.547446,0.495508)
+ New Momentum Direction: (0.404871,-0.677918,0.613602)
+ New Polarization:       (-0.914374,-0.300172,0.271694)
  *** FresnelRefraction *** 
 Track (trackID 86, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
@@ -1771,34 +1757,34 @@ Track (trackID 86, parentID 1) is processed with stopping code 2
 Track (trackID 85, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73706,-0.15034,0.65889)
- Old Polarization:       (-0.67582,-0.16396,0.7186)
- New Momentum Direction: (0.39659,-0.20421,0.895)
- New Polarization:       (-0.918,-0.088221,0.38665)
+ Old Momentum Direction: (0.737064,-0.150337,0.658889)
+ Old Polarization:       (-0.675823,-0.16396,0.718596)
+ New Momentum Direction: (0.396587,-0.204208,0.894996)
+ New Polarization:       (-0.917997,-0.0882208,0.38665)
  *** FresnelRefraction *** 
 Track (trackID 84, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73852,-0.66181,-0.12881)
- Old Polarization:       (-0.67423,-0.72492,-0.14109)
- New Momentum Direction: (0.40565,-0.8972,-0.17462)
- New Polarization:       (-0.91403,-0.39817,-0.077497)
+ Old Momentum Direction: (0.73852,-0.661813,-0.128809)
+ Old Polarization:       (-0.674232,-0.724917,-0.141091)
+ New Momentum Direction: (0.405645,-0.897195,-0.174622)
+ New Polarization:       (-0.914031,-0.398174,-0.0774968)
  *** FresnelRefraction *** 
 Track (trackID 83, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73589,0.57686,-0.35455)
- Old Polarization:       (-0.6771,0.62694,-0.38533)
- New Momentum Direction: (0.38907,0.78482,-0.48237)
- New Polarization:       (-0.92121,0.33147,-0.20373)
+ Old Momentum Direction: (0.735888,0.576855,-0.354552)
+ Old Polarization:       (-0.677104,0.626936,-0.385333)
+ New Momentum Direction: (0.389072,0.784819,-0.482372)
+ New Polarization:       (-0.921208,0.331468,-0.20373)
  *** FresnelRefraction *** 
 Track (trackID 82, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73894,-0.59897,-0.30854)
- Old Polarization:       (-0.67377,-0.65691,-0.33838)
- New Momentum Direction: (0.40823,-0.81154,-0.41803)
- New Polarization:       (-0.91288,-0.36291,-0.18694)
+ Old Momentum Direction: (0.738943,-0.598974,-0.308535)
+ Old Polarization:       (-0.673768,-0.656913,-0.33838)
+ New Momentum Direction: (0.408228,-0.811542,-0.41803)
+ New Polarization:       (-0.91288,-0.362911,-0.186938)
  *** FresnelRefraction *** 
 Track (trackID 81, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
@@ -1807,26 +1793,26 @@ Track (trackID 81, parentID 1) is processed with stopping code 2
 Track (trackID 80, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73613,0.67609,0.031976)
- Old Polarization:       (-0.67684,0.73531,0.034776)
- New Momentum Direction: (0.39062,0.91952,0.043489)
- New Polarization:       (-0.92055,0.39018,0.018454)
+ Old Momentum Direction: (0.736128,0.676087,0.0319755)
+ Old Polarization:       (-0.676842,0.735306,0.0347763)
+ New Momentum Direction: (0.390621,0.919524,0.0434889)
+ New Polarization:       (-0.920552,0.390185,0.0184538)
  *** FresnelRefraction *** 
 Track (trackID 79, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7385,-0.22865,-0.6343)
- Old Polarization:       (-0.67425,-0.25044,-0.69474)
- New Momentum Direction: (0.40553,-0.30999,-0.85991)
- New Polarization:       (-0.91408,-0.13752,-0.3815)
+ Old Momentum Direction: (0.738501,-0.228654,-0.634297)
+ Old Polarization:       (-0.674252,-0.250443,-0.694739)
+ New Momentum Direction: (0.405531,-0.309986,-0.859915)
+ New Polarization:       (-0.914081,-0.137525,-0.3815)
  *** FresnelRefraction *** 
 Track (trackID 78, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74142,-0.43832,-0.50811)
- Old Polarization:       (-0.67105,-0.48428,-0.5614)
- New Momentum Direction: (0.42293,-0.59189,-0.68614)
- New Polarization:       (-0.90616,-0.27626,-0.32024)
+ Old Momentum Direction: (0.741415,-0.43832,-0.508113)
+ Old Polarization:       (-0.671047,-0.484284,-0.561396)
+ New Momentum Direction: (0.422934,-0.591894,-0.68614)
+ New Polarization:       (-0.90616,-0.276256,-0.320244)
  *** FresnelRefraction *** 
 Track (trackID 77, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
@@ -1835,18 +1821,18 @@ Track (trackID 77, parentID 1) is processed with stopping code 2
 Track (trackID 76, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7394,-0.66549,0.10206)
- Old Polarization:       (-0.67327,-0.73085,0.11208)
- New Momentum Direction: (0.41098,-0.90111,0.13819)
- New Polarization:       (-0.91164,-0.40623,0.062297)
+ Old Momentum Direction: (0.739397,-0.66549,0.102055)
+ Old Polarization:       (-0.67327,-0.730853,0.112079)
+ New Momentum Direction: (0.410981,-0.90111,0.138188)
+ New Polarization:       (-0.911644,-0.406232,0.0622972)
  *** FresnelRefraction *** 
 Track (trackID 75, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74337,-0.30117,0.59724)
- Old Polarization:       (-0.66888,-0.33471,0.66375)
- New Momentum Direction: (0.43412,-0.40562,0.80437)
- New Polarization:       (-0.90086,-0.19547,0.38762)
+ Old Momentum Direction: (0.743371,-0.301172,0.59724)
+ Old Polarization:       (-0.668879,-0.334713,0.663753)
+ New Momentum Direction: (0.434115,-0.405623,0.804372)
+ New Polarization:       (-0.900857,-0.195466,0.38762)
  *** FresnelRefraction *** 
 Track (trackID 74, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
@@ -1855,17 +1841,17 @@ Track (trackID 74, parentID 1) is processed with stopping code 2
 Track (trackID 73, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73593,0.026506,-0.67654)
-Old Polarization: (-0.67706,0.028811,-0.73536)
-New Polarization: (-0.70101,0.53902,-0.46696)
-Polarization Change: (-0.70101,0.53902,-0.46696)
-New Momentum Direction: (0.16788,0.7611,0.62653)
-Momentum Change: (0.16788,0.7611,0.62653)
+Old Momentum Direction: (0.735925,0.0265065,-0.676544)
+Old Polarization: (-0.677063,0.0288109,-0.735361)
+New Polarization: (-0.701009,0.539017,-0.466956)
+Polarization Change: (-0.701009,0.539017,-0.466956)
+New Momentum Direction: (0.167877,0.761101,0.626533)
+Momentum Change: (0.167877,0.761101,0.626533)
  Photon at Boundary! 
- Old Momentum Direction: (0.16788,0.7611,0.62653)
- Old Polarization:       (-0.70101,0.53902,-0.46696)
- New Momentum Direction: (0.22839,0.47045,0.85236)
- New Polarization:       (-0.29137,-0.80234,0.52091)
+ Old Momentum Direction: (0.167877,0.761101,0.626533)
+ Old Polarization:       (-0.701009,0.539017,-0.466956)
+ New Momentum Direction: (0.228387,0.470446,0.852362)
+ New Polarization:       (-0.291368,-0.802344,0.520911)
  *** FresnelRefraction *** 
 Track (trackID 72, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
@@ -1874,10 +1860,10 @@ Track (trackID 72, parentID 1) is processed with stopping code 2
 Track (trackID 71, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74212,0.63641,0.21035)
- Old Polarization:       (-0.67027,0.70462,0.2329)
- New Momentum Direction: (0.42699,0.85857,0.28378)
- New Polarization:       (-0.90425,0.40542,0.134)
+ Old Momentum Direction: (0.742118,0.636407,0.210353)
+ Old Polarization:       (-0.67027,0.704624,0.232901)
+ New Momentum Direction: (0.426994,0.85857,0.283785)
+ New Polarization:       (-0.904255,0.405421,0.134005)
  *** FresnelRefraction *** 
 Track (trackID 70, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
@@ -1886,26 +1872,26 @@ Track (trackID 70, parentID 1) is processed with stopping code 2
 Track (trackID 69, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74324,-0.66561,0.067528)
- Old Polarization:       (-0.66903,-0.73944,0.075018)
- New Momentum Direction: (0.43336,-0.89662,0.090964)
- New Polarization:       (-0.90122,-0.43114,0.04374)
+ Old Momentum Direction: (0.743236,-0.665613,0.0675277)
+ Old Polarization:       (-0.669029,-0.73944,0.0750177)
+ New Momentum Direction: (0.433355,-0.896621,0.0909639)
+ New Polarization:       (-0.901223,-0.431142,0.0437402)
  *** FresnelRefraction *** 
 Track (trackID 68, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74073,-0.67151,0.02005)
- Old Polarization:       (-0.67181,-0.7404,0.022107)
- New Momentum Direction: (0.4189,-0.90763,0.0271)
- New Polarization:       (-0.90803,-0.41872,0.012502)
+ Old Momentum Direction: (0.740726,-0.671508,0.0200498)
+ Old Polarization:       (-0.671807,-0.740396,0.0221066)
+ New Momentum Direction: (0.418904,-0.907626,0.0270997)
+ New Polarization:       (-0.908031,-0.418717,0.012502)
  *** FresnelRefraction *** 
 Track (trackID 67, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73812,0.58006,0.34454)
- Old Polarization:       (-0.67467,0.63462,0.37694)
- New Momentum Direction: (0.40318,0.7868,0.46733)
- New Polarization:       (-0.91512,0.34664,0.20589)
+ Old Momentum Direction: (0.738119,0.580063,0.344538)
+ Old Polarization:       (-0.67467,0.634615,0.37694)
+ New Momentum Direction: (0.403178,0.786797,0.467331)
+ New Polarization:       (-0.915121,0.346642,0.205894)
  *** FresnelRefraction *** 
 Track (trackID 66, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
@@ -1914,34 +1900,34 @@ Track (trackID 66, parentID 1) is processed with stopping code 2
 Track (trackID 65, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73764,0.48673,-0.46796)
- Old Polarization:       (-0.6752,0.53174,-0.51124)
- New Momentum Direction: (0.40019,0.66062,-0.63516)
- New Polarization:       (-0.91643,0.28849,-0.27736)
+ Old Momentum Direction: (0.737639,0.486725,-0.467961)
+ Old Polarization:       (-0.675196,0.531738,-0.511239)
+ New Momentum Direction: (0.400193,0.660623,-0.635155)
+ New Polarization:       (-0.916431,0.288486,-0.277364)
  *** FresnelRefraction *** 
 Track (trackID 64, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73583,0.56197,-0.37782)
- Old Polarization:       (-0.67717,0.61065,-0.41055)
- New Momentum Direction: (0.3887,0.76462,-0.51407)
- New Polarization:       (-0.92137,0.32257,-0.21687)
+ Old Momentum Direction: (0.73583,0.561965,-0.377822)
+ Old Polarization:       (-0.677167,0.610648,-0.410553)
+ New Momentum Direction: (0.388697,0.76462,-0.514072)
+ New Polarization:       (-0.921366,0.322571,-0.216872)
  *** FresnelRefraction *** 
 Track (trackID 63, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73907,-0.64062,-0.20829)
- Old Polarization:       (-0.67363,-0.70285,-0.22853)
- New Momentum Direction: (0.40898,-0.86782,-0.28217)
- New Polarization:       (-0.91254,-0.38894,-0.12646)
+ Old Momentum Direction: (0.739066,-0.640621,-0.208294)
+ Old Polarization:       (-0.673633,-0.702847,-0.228527)
+ New Momentum Direction: (0.408978,-0.867824,-0.282168)
+ New Polarization:       (-0.912544,-0.388936,-0.12646)
  *** FresnelRefraction *** 
 Track (trackID 62, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73651,0.11782,0.66609)
- Old Polarization:       (-0.67643,0.12829,0.72525)
- New Momentum Direction: (0.39307,0.16016,0.90545)
- New Polarization:       (-0.91951,0.068466,0.38706)
+ Old Momentum Direction: (0.736509,0.117822,0.666087)
+ Old Polarization:       (-0.676427,0.128288,0.725251)
+ New Momentum Direction: (0.393066,0.160163,0.905454)
+ New Polarization:       (-0.91951,0.0684656,0.387057)
  *** FresnelRefraction *** 
 Track (trackID 61, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
@@ -1950,33 +1936,33 @@ Track (trackID 61, parentID 1) is processed with stopping code 2
 Track (trackID 60, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73633,-0.13996,-0.66198)
-Old Polarization: (-0.67662,-0.15231,-0.72041)
-New Polarization: (-0.68949,-0.48171,-0.54088)
-Polarization Change: (-0.68949,-0.48171,-0.54088)
-New Momentum Direction: (-0.096837,0.80138,-0.59027)
-Momentum Change: (-0.096837,0.80138,-0.59027)
+Old Momentum Direction: (0.736334,-0.139962,-0.661984)
+Old Polarization: (-0.676618,-0.152314,-0.720409)
+New Polarization: (-0.689489,-0.481715,-0.540884)
+Polarization Change: (-0.689489,-0.481715,-0.540884)
+New Momentum Direction: (-0.0968368,0.801377,-0.590269)
+Momentum Change: (-0.0968368,0.801377,-0.590269)
  Photon at Boundary! 
- Old Momentum Direction: (-0.096837,0.80138,-0.59027)
- Old Polarization:       (-0.68949,-0.48171,-0.54088)
- New Momentum Direction: (-0.13167,0.58183,-0.80258)
- New Polarization:       (-0.53609,-0.72281,-0.43606)
+ Old Momentum Direction: (-0.0968368,0.801377,-0.590269)
+ Old Polarization:       (-0.689489,-0.481715,-0.540884)
+ New Momentum Direction: (-0.131668,0.581831,-0.802581)
+ New Polarization:       (-0.536092,-0.722814,-0.436056)
  *** FresnelRefraction *** 
 Track (trackID 59, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73779,-0.042706,0.67368)
- Old Polarization:       (-0.67503,-0.046677,0.73631)
- New Momentum Direction: (0.40113,-0.057953,0.91419)
- New Polarization:       (-0.91602,-0.025378,0.40032)
+ Old Momentum Direction: (0.737789,-0.0427065,0.67368)
+ Old Polarization:       (-0.675032,-0.0466769,0.736311)
+ New Momentum Direction: (0.401127,-0.057953,0.914187)
+ New Polarization:       (-0.916022,-0.0253777,0.400323)
  *** FresnelRefraction *** 
 Track (trackID 58, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74286,0.13385,0.65592)
- Old Polarization:       (-0.66944,0.14853,0.72786)
- New Momentum Direction: (0.43126,0.1804,0.88401)
- New Polarization:       (-0.90223,0.086228,0.42255)
+ Old Momentum Direction: (0.742865,0.133851,0.655924)
+ Old Polarization:       (-0.669442,0.148532,0.727864)
+ New Momentum Direction: (0.431257,0.180396,0.88401)
+ New Polarization:       (-0.902229,0.0862277,0.422549)
  *** FresnelRefraction *** 
 Track (trackID 57, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
@@ -1989,65 +1975,65 @@ Track (trackID 56, parentID 1) is processed with stopping code 2
 Track (trackID 55, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73956,0.25405,-0.6233)
- Old Polarization:       (-0.67309,0.27914,-0.68486)
- New Momentum Direction: (0.41198,0.34392,-0.8438)
- New Polarization:       (-0.91119,0.1555,-0.38151)
+ Old Momentum Direction: (0.739563,0.254049,-0.623303)
+ Old Polarization:       (-0.673088,0.279139,-0.684861)
+ New Momentum Direction: (0.411979,0.343919,-0.843797)
+ New Polarization:       (-0.911193,0.155496,-0.381507)
  *** FresnelRefraction *** 
 Track (trackID 54, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73931,-0.66388,0.11263)
- Old Polarization:       (-0.67337,-0.72889,0.12366)
- New Momentum Direction: (0.41043,-0.89904,0.15253)
- New Polarization:       (-0.91189,-0.40465,0.068653)
+ Old Momentum Direction: (0.739306,-0.663882,0.112634)
+ Old Polarization:       (-0.673369,-0.72889,0.123664)
+ New Momentum Direction: (0.410433,-0.899043,0.152532)
+ New Polarization:       (-0.911891,-0.404651,0.068653)
  *** FresnelRefraction *** 
 Track (trackID 53, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73618,0.22771,0.63733)
-Old Polarization: (-0.67679,0.24769,0.69326)
-New Polarization: (0.73781,-0.49158,-0.46259)
-Polarization Change: (0.73781,-0.49158,-0.46259)
-New Momentum Direction: (-0.053765,0.64033,-0.76622)
-Momentum Change: (-0.053765,0.64033,-0.76622)
+Old Momentum Direction: (0.73618,0.227707,0.637329)
+Old Polarization: (-0.676786,0.247691,0.693261)
+New Polarization: (0.737808,-0.491582,-0.462587)
+Polarization Change: (0.737808,-0.491582,-0.462587)
+New Momentum Direction: (-0.0537646,0.640329,-0.766217)
+Momentum Change: (-0.0537646,0.640329,-0.766217)
  Photon at Boundary! 
- Old Momentum Direction: (-0.053765,0.64033,-0.76622)
- Old Polarization:       (0.73781,-0.49158,-0.46259)
- New Momentum Direction: (-0.073118,0.87083,-0.48612)
- New Polarization:       (0.51626,0.45008,0.72863)
+ Old Momentum Direction: (-0.0537646,0.640329,-0.766217)
+ Old Polarization:       (0.737808,-0.491582,-0.462587)
+ New Momentum Direction: (-0.0731183,0.870829,-0.486118)
+ New Polarization:       (0.516261,0.450085,0.728628)
  *** FresnelRefraction *** 
 Track (trackID 52, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73606,0.48265,-0.47462)
- Old Polarization:       (-0.67692,0.52482,-0.51609)
- New Momentum Direction: (0.39018,0.6565,-0.64558)
- New Polarization:       (-0.92074,0.2782,-0.27357)
+ Old Momentum Direction: (0.736059,0.482651,-0.474621)
+ Old Polarization:       (-0.676918,0.52482,-0.516088)
+ New Momentum Direction: (0.390177,0.6565,-0.645577)
+ New Polarization:       (-0.92074,0.278201,-0.273572)
  *** FresnelRefraction *** 
 Track (trackID 51, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73878,0.10911,0.66505)
- Old Polarization:       (-0.67395,0.11961,0.72903)
- New Momentum Direction: (0.40724,0.14787,0.90127)
- New Polarization:       (-0.91332,0.065934,0.40187)
+ Old Momentum Direction: (0.738781,0.109114,0.665054)
+ Old Polarization:       (-0.673946,0.119611,0.729034)
+ New Momentum Direction: (0.407243,0.147869,0.90127)
+ New Polarization:       (-0.91332,0.0659339,0.40187)
  *** FresnelRefraction *** 
 Track (trackID 50, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74271,-0.23481,0.62709)
- Old Polarization:       (-0.66961,-0.26045,0.69555)
- New Momentum Direction: (0.43038,-0.31653,0.84533)
- New Polarization:       (-0.90265,-0.15092,0.40305)
+ Old Momentum Direction: (0.74271,-0.234814,0.627091)
+ Old Polarization:       (-0.669613,-0.260447,0.695547)
+ New Momentum Direction: (0.43038,-0.316533,0.845328)
+ New Polarization:       (-0.902648,-0.150922,0.403051)
  *** FresnelRefraction *** 
 Track (trackID 49, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73871,-0.50621,0.44503)
- Old Polarization:       (-0.67402,-0.5548,0.48774)
- New Momentum Direction: (0.40683,-0.68608,0.60315)
- New Polarization:       (-0.91351,-0.30554,0.26861)
+ Old Momentum Direction: (0.738713,-0.506215,0.445028)
+ Old Polarization:       (-0.67402,-0.554801,0.487742)
+ New Momentum Direction: (0.406827,-0.686077,0.60315)
+ New Polarization:       (-0.913505,-0.305542,0.268611)
  *** FresnelRefraction *** 
 Track (trackID 48, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
@@ -2056,50 +2042,50 @@ Track (trackID 48, parentID 1) is processed with stopping code 2
 Track (trackID 47, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73763,0.36684,0.56686)
- Old Polarization:       (-0.6752,0.40076,0.61927)
- New Momentum Direction: (0.40015,0.49791,0.76939)
- New Polarization:       (-0.91645,0.21741,0.33594)
+ Old Momentum Direction: (0.737632,0.366842,0.566856)
+ Old Polarization:       (-0.675203,0.40076,0.619268)
+ New Momentum Direction: (0.400153,0.497912,0.76939)
+ New Polarization:       (-0.916448,0.217406,0.335942)
  *** FresnelRefraction *** 
 Track (trackID 46, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74219,-0.46169,0.48578)
- Old Polarization:       (-0.67018,-0.5113,0.53798)
- New Momentum Direction: (0.42744,-0.6228,0.6553)
- New Polarization:       (-0.90405,-0.29446,0.30983)
+ Old Momentum Direction: (0.742195,-0.461695,0.485783)
+ Old Polarization:       (-0.670184,-0.511303,0.537979)
+ New Momentum Direction: (0.427436,-0.622804,0.655297)
+ New Polarization:       (-0.904046,-0.294463,0.309826)
  *** FresnelRefraction *** 
 Track (trackID 45, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74258,0.61966,0.25417)
- Old Polarization:       (-0.66976,0.68703,0.2818)
- New Momentum Direction: (0.42961,0.83547,0.34268)
- New Polarization:       (-0.90301,0.39748,0.16303)
+ Old Momentum Direction: (0.742575,0.619663,0.254165)
+ Old Polarization:       (-0.669763,0.687029,0.281797)
+ New Momentum Direction: (0.429612,0.835466,0.342681)
+ New Polarization:       (-0.903013,0.397476,0.163032)
  *** FresnelRefraction *** 
 Track (trackID 44, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73789,0.49082,-0.46326)
- Old Polarization:       (-0.67492,0.53662,-0.50648)
- New Momentum Direction: (0.40177,0.66596,-0.62856)
- New Polarization:       (-0.91574,0.29218,-0.27577)
+ Old Momentum Direction: (0.737891,0.490823,-0.463259)
+ Old Polarization:       (-0.674919,0.536618,-0.506482)
+ New Momentum Direction: (0.401766,0.665957,-0.628558)
+ New Polarization:       (-0.915742,0.292177,-0.275769)
  *** FresnelRefraction *** 
 Track (trackID 43, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7389,-0.60872,0.28895)
- Old Polarization:       (-0.67382,-0.66751,0.31685)
- New Momentum Direction: (0.40794,-0.8248,0.39152)
- New Polarization:       (-0.91301,-0.36853,0.17493)
+ Old Momentum Direction: (0.738895,-0.608723,0.288948)
+ Old Polarization:       (-0.67382,-0.667511,0.316853)
+ New Momentum Direction: (0.407939,-0.824803,0.391516)
+ New Polarization:       (-0.913009,-0.368528,0.174932)
  *** FresnelRefraction *** 
 Track (trackID 42, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73743,0.4531,0.5009)
- Old Polarization:       (-0.67542,0.49469,0.54688)
- New Momentum Direction: (0.39888,0.61516,0.68006)
- New Polarization:       (-0.917,0.26758,0.29581)
+ Old Momentum Direction: (0.737429,0.453098,0.500899)
+ Old Polarization:       (-0.675425,0.494693,0.546882)
+ New Momentum Direction: (0.398881,0.615157,0.680055)
+ New Polarization:       (-0.917003,0.267584,0.295813)
  *** FresnelRefraction *** 
 Track (trackID 41, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
@@ -2108,25 +2094,25 @@ Track (trackID 41, parentID 1) is processed with stopping code 2
 Track (trackID 40, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73954,-0.37021,0.56216)
-Old Polarization: (-0.67311,-0.40674,0.61764)
-New Polarization: (-0.51342,0.20433,-0.83346)
-Polarization Change: (-0.51342,0.20433,-0.83346)
-New Momentum Direction: (0.82948,0.36706,-0.42098)
-Momentum Change: (0.82948,0.36706,-0.42098)
+Old Momentum Direction: (0.739539,-0.370207,0.562164)
+Old Polarization: (-0.673113,-0.406741,0.617641)
+New Polarization: (-0.513418,0.204325,-0.833458)
+Polarization Change: (-0.513418,0.204325,-0.833458)
+New Momentum Direction: (0.829481,0.367065,-0.420981)
+Momentum Change: (0.829481,0.367065,-0.420981)
  Photon at Boundary! 
- Old Momentum Direction: (0.82948,0.36706,-0.42098)
- Old Polarization:       (-0.51342,0.20433,-0.83346)
- New Momentum Direction: (0.65441,0.49693,-0.56992)
- New Polarization:       (-0.72317,0.19119,-0.66368)
+ Old Momentum Direction: (0.829481,0.367065,-0.420981)
+ Old Polarization:       (-0.513418,0.204325,-0.833458)
+ New Momentum Direction: (0.654408,0.49693,-0.569922)
+ New Polarization:       (-0.723174,0.19119,-0.663675)
  *** FresnelRefraction *** 
 Track (trackID 39, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74209,-0.25681,-0.61916)
- Old Polarization:       (-0.6703,-0.28431,-0.68547)
- New Momentum Direction: (0.42683,-0.34647,-0.83533)
- New Polarization:       (-0.90433,-0.16353,-0.39426)
+ Old Momentum Direction: (0.742089,-0.256805,-0.619156)
+ Old Polarization:       (-0.670301,-0.284309,-0.685467)
+ New Momentum Direction: (0.426832,-0.346467,-0.83533)
+ New Polarization:       (-0.904331,-0.163528,-0.394264)
  *** FresnelRefraction *** 
 Track (trackID 38, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
@@ -2135,18 +2121,18 @@ Track (trackID 38, parentID 1) is processed with stopping code 2
 Track (trackID 37, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73914,0.57171,0.35612)
- Old Polarization:       (-0.67355,0.62738,0.3908)
- New Momentum Direction: (0.40942,0.7744,0.48238)
- New Polarization:       (-0.91235,0.34751,0.21647)
+ Old Momentum Direction: (0.739139,0.571709,0.356122)
+ Old Polarization:       (-0.673553,0.627377,0.390799)
+ New Momentum Direction: (0.409418,0.774396,0.482378)
+ New Polarization:       (-0.912347,0.347512,0.216468)
  *** FresnelRefraction *** 
 Track (trackID 36, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73619,0.55544,-0.38667)
- Old Polarization:       (-0.67677,0.6042,-0.42062)
- New Momentum Direction: (0.39103,0.75537,-0.52585)
- New Polarization:       (-0.92038,0.32092,-0.22341)
+ Old Momentum Direction: (0.736191,0.555437,-0.386669)
+ Old Polarization:       (-0.676774,0.604201,-0.420616)
+ New Momentum Direction: (0.391025,0.755368,-0.525851)
+ New Polarization:       (-0.92038,0.32092,-0.223409)
  *** FresnelRefraction *** 
 Track (trackID 35, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
@@ -2155,90 +2141,90 @@ Track (trackID 35, parentID 1) is processed with stopping code 2
 Track (trackID 34, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74213,-0.39746,-0.53969)
- Old Polarization:       (-0.67026,-0.44008,-0.59756)
- New Momentum Direction: (0.42707,-0.5362,-0.72808)
- New Polarization:       (-0.90422,-0.25325,-0.34388)
+ Old Momentum Direction: (0.742131,-0.397463,-0.53969)
+ Old Polarization:       (-0.670255,-0.440085,-0.597564)
+ New Momentum Direction: (0.427069,-0.536204,-0.728078)
+ New Polarization:       (-0.904219,-0.253253,-0.343876)
  *** FresnelRefraction *** 
 Track (trackID 33, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73881,0.64939,0.18012)
- Old Polarization:       (-0.67391,0.71194,0.19747)
- New Momentum Direction: (0.40744,0.88001,0.24408)
- New Polarization:       (-0.91323,0.39262,0.1089)
+ Old Momentum Direction: (0.738814,0.649393,0.180119)
+ Old Polarization:       (-0.67391,0.711936,0.197467)
+ New Momentum Direction: (0.407443,0.880007,0.244084)
+ New Polarization:       (-0.913231,0.39262,0.108899)
  *** FresnelRefraction *** 
 Track (trackID 32, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74224,-0.63961,0.19995)
- Old Polarization:       (-0.67014,-0.70843,0.22146)
- New Momentum Direction: (0.42767,-0.86276,0.26971)
- New Polarization:       (-0.90394,-0.40819,0.1276)
+ Old Momentum Direction: (0.742235,-0.639615,0.19995)
+ Old Polarization:       (-0.67014,-0.708426,0.221461)
+ New Momentum Direction: (0.427668,-0.862762,0.269708)
+ New Polarization:       (-0.903936,-0.408187,0.127604)
  *** FresnelRefraction *** 
 Track (trackID 31, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74048,-0.1999,-0.64166)
- Old Polarization:       (-0.67208,-0.22024,-0.70697)
- New Momentum Direction: (0.41746,-0.27028,-0.86757)
- New Polarization:       (-0.90869,-0.12417,-0.39857)
+ Old Momentum Direction: (0.740482,-0.199898,-0.64166)
+ Old Polarization:       (-0.672076,-0.220244,-0.70697)
+ New Momentum Direction: (0.417463,-0.270276,-0.867569)
+ New Polarization:       (-0.908694,-0.124168,-0.39857)
  *** FresnelRefraction *** 
 Track (trackID 30, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73872,0.12096,0.66307)
- Old Polarization:       (-0.67401,0.13257,0.72673)
- New Momentum Direction: (0.40687,0.16394,0.89865)
- New Polarization:       (-0.91349,0.073019,0.40027)
+ Old Momentum Direction: (0.73872,0.120961,0.663069)
+ Old Polarization:       (-0.674012,0.132574,0.726727)
+ New Momentum Direction: (0.406872,0.163938,0.898654)
+ New Polarization:       (-0.913485,0.073019,0.400266)
  *** FresnelRefraction *** 
 Track (trackID 29, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74243,0.49077,0.45601)
- Old Polarization:       (-0.66993,0.54388,0.50536)
- New Momentum Direction: (0.42877,0.66182,0.61495)
- New Polarization:       (-0.90342,0.3141,0.29186)
+ Old Momentum Direction: (0.742427,0.490769,0.456014)
+ Old Polarization:       (-0.669927,0.54388,0.505363)
+ New Momentum Direction: (0.428765,0.661816,0.614947)
+ New Polarization:       (-0.903416,0.314101,0.291857)
  *** FresnelRefraction *** 
 Track (trackID 28, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74258,0.072262,0.66584)
- Old Polarization:       (-0.66975,0.080119,0.73825)
- New Momentum Direction: (0.42966,0.097426,0.89772)
- New Polarization:       (-0.90299,0.046357,0.42715)
+ Old Momentum Direction: (0.742583,0.0722617,0.665844)
+ Old Polarization:       (-0.669754,0.0801194,0.738248)
+ New Momentum Direction: (0.429657,0.0974264,0.897721)
+ New Polarization:       (-0.902992,0.0463569,0.427149)
  *** FresnelRefraction *** 
 Track (trackID 27, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73758,-0.65687,0.15648)
- Old Polarization:       (-0.67525,-0.71751,0.17093)
- New Momentum Direction: (0.39986,-0.89163,0.21241)
- New Polarization:       (-0.91658,-0.38897,0.092662)
+ Old Momentum Direction: (0.737585,-0.656873,0.156482)
+ Old Polarization:       (-0.675255,-0.717507,0.170926)
+ New Momentum Direction: (0.399856,-0.891627,0.212406)
+ New Polarization:       (-0.916578,-0.388972,0.0926617)
  *** FresnelRefraction *** 
 Track (trackID 26, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73991,-0.57267,0.35294)
- Old Polarization:       (-0.6727,-0.62989,0.38821)
- New Momentum Direction: (0.41409,-0.77489,0.47757)
- New Polarization:       (-0.91024,-0.35252,0.21726)
+ Old Momentum Direction: (0.739915,-0.572675,0.352945)
+ Old Polarization:       (-0.672701,-0.629894,0.38821)
+ New Momentum Direction: (0.414089,-0.77489,0.477572)
+ New Polarization:       (-0.910237,-0.352516,0.217259)
  *** FresnelRefraction *** 
 Track (trackID 25, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74346,0.1954,0.6396)
- Old Polarization:       (-0.66878,0.21722,0.71102)
- New Momentum Direction: (0.43463,0.26313,0.86131)
- New Polarization:       (-0.90061,0.12699,0.41567)
+ Old Momentum Direction: (0.743463,0.195396,0.639596)
+ Old Polarization:       (-0.668777,0.217218,0.711023)
+ New Momentum Direction: (0.434633,0.26313,0.861311)
+ New Polarization:       (-0.900608,0.126987,0.415669)
  *** FresnelRefraction *** 
 Track (trackID 24, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7362,0.28154,-0.61542)
- Old Polarization:       (-0.67676,0.30627,-0.66948)
- New Momentum Direction: (0.39111,0.38287,-0.83692)
- New Polarization:       (-0.92034,0.16271,-0.35566)
+ Old Momentum Direction: (0.736204,0.281538,-0.615419)
+ Old Polarization:       (-0.67676,0.306267,-0.669475)
+ New Momentum Direction: (0.391111,0.382871,-0.836924)
+ New Polarization:       (-0.920344,0.162705,-0.355661)
  *** FresnelRefraction *** 
 Track (trackID 23, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
@@ -2251,34 +2237,34 @@ Track (trackID 22, parentID 1) is processed with stopping code 2
 Track (trackID 21, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74096,0.64492,-0.1872)
- Old Polarization:       (-0.67154,0.71159,-0.20655)
- New Momentum Direction: (0.4203,0.87142,-0.25295)
- New Polarization:       (-0.90739,0.40364,-0.11716)
+ Old Momentum Direction: (0.740964,0.644925,-0.187203)
+ Old Polarization:       (-0.671545,0.711592,-0.206555)
+ New Momentum Direction: (0.420299,0.871416,-0.252947)
+ New Polarization:       (-0.907386,0.403638,-0.117164)
  *** FresnelRefraction *** 
 Track (trackID 20, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73788,0.56715,0.36588)
- Old Polarization:       (-0.67493,0.62005,0.40001)
- New Momentum Direction: (0.40172,0.76953,0.49644)
- New Polarization:       (-0.91576,0.33757,0.21777)
+ Old Momentum Direction: (0.737884,0.56715,0.365881)
+ Old Polarization:       (-0.674928,0.620052,0.400009)
+ New Momentum Direction: (0.401718,0.769527,0.496438)
+ New Polarization:       (-0.915764,0.337568,0.217772)
  *** FresnelRefraction *** 
 Track (trackID 19, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7385,-0.5424,0.40052)
- Old Polarization:       (-0.67425,-0.59408,0.43869)
- New Momentum Direction: (0.40553,-0.73533,0.54299)
- New Polarization:       (-0.91408,-0.32623,0.2409)
+ Old Momentum Direction: (0.738501,-0.5424,0.400523)
+ Old Polarization:       (-0.674252,-0.594085,0.438688)
+ New Momentum Direction: (0.405532,-0.735329,0.542987)
+ New Polarization:       (-0.914081,-0.326229,0.240896)
  *** FresnelRefraction *** 
 Track (trackID 18, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73861,0.28384,0.61146)
- Old Polarization:       (-0.67413,0.31099,0.66995)
- New Momentum Direction: (0.40621,0.38475,0.82883)
- New Polarization:       (-0.91378,0.17104,0.36845)
+ Old Momentum Direction: (0.738612,0.283844,0.611461)
+ Old Polarization:       (-0.67413,0.310994,0.669949)
+ New Momentum Direction: (0.406212,0.384748,0.828831)
+ New Polarization:       (-0.913779,0.171036,0.368449)
  *** FresnelRefraction *** 
 Track (trackID 17, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
@@ -2287,61 +2273,61 @@ Track (trackID 17, parentID 1) is processed with stopping code 2
 Track (trackID 16, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73769,-0.67508,-0.0086417)
- Old Polarization:       (-0.67514,-0.73763,-0.0094424)
- New Momentum Direction: (0.40054,-0.91621,-0.011728)
- New Polarization:       (-0.91628,-0.4005,-0.0051268)
+ Old Momentum Direction: (0.737694,-0.67508,-0.00864168)
+ Old Polarization:       (-0.675136,-0.737633,-0.00944243)
+ New Momentum Direction: (0.400536,-0.916206,-0.0117283)
+ New Polarization:       (-0.916281,-0.400503,-0.00512683)
  *** FresnelRefraction *** 
 Track (trackID 15, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73672,-0.41983,-0.53008)
-Old Polarization: (-0.6762,-0.4574,-0.57753)
-New Polarization: (-0.68397,-0.66932,-0.29016)
-Polarization Change: (-0.68397,-0.66932,-0.29016)
-New Momentum Direction: (0.10201,-0.48159,0.87044)
-Momentum Change: (0.10201,-0.48159,0.87044)
+Old Momentum Direction: (0.736718,-0.41983,-0.530085)
+Old Polarization: (-0.6762,-0.457403,-0.577525)
+New Polarization: (-0.683974,-0.669319,-0.29016)
+Polarization Change: (-0.683974,-0.669319,-0.29016)
+New Momentum Direction: (0.102011,-0.481593,0.870438)
+Momentum Change: (0.102011,-0.481593,0.870438)
 
 ** Photon absorbed! **
 Track (trackID 14, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74326,0.66876,0.018151)
- Old Polarization:       (-0.66901,0.74298,0.020165)
- New Momentum Direction: (0.43347,0.90084,0.024449)
- New Polarization:       (-0.90117,0.43331,0.01176)
+ Old Momentum Direction: (0.743256,0.668761,0.0181507)
+ Old Polarization:       (-0.669007,0.742983,0.0201652)
+ New Momentum Direction: (0.43347,0.900836,0.0244494)
+ New Polarization:       (-0.901168,0.43331,0.0117604)
  *** FresnelRefraction *** 
 Track (trackID 13, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74113,-0.48758,-0.46151)
- Old Polarization:       (-0.67136,-0.53825,-0.50947)
- New Momentum Direction: (0.42127,-0.65866,-0.62345)
- New Polarization:       (-0.90694,-0.30595,-0.28959)
+ Old Momentum Direction: (0.74113,-0.487578,-0.461513)
+ Old Polarization:       (-0.671362,-0.538248,-0.509473)
+ New Momentum Direction: (0.42127,-0.658664,-0.623452)
+ New Polarization:       (-0.906935,-0.305949,-0.289593)
  *** FresnelRefraction *** 
 Track (trackID 12, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74316,0.66368,0.085049)
- Old Polarization:       (-0.66911,0.73713,0.094461)
- New Momentum Direction: (0.43294,0.89411,0.11458)
- New Polarization:       (-0.90142,0.42943,0.05503)
+ Old Momentum Direction: (0.743162,0.663684,0.0850488)
+ Old Polarization:       (-0.669112,0.737134,0.0944611)
+ New Momentum Direction: (0.432938,0.894112,0.114577)
+ New Polarization:       (-0.901424,0.429427,0.0550295)
  *** FresnelRefraction *** 
 Track (trackID 11, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73631,-0.67149,-0.083398)
- Old Polarization:       (-0.67665,-0.73069,-0.090751)
- New Momentum Direction: (0.39177,-0.91305,-0.1134)
- New Polarization:       (-0.92006,-0.38878,-0.048286)
+ Old Momentum Direction: (0.736307,-0.671489,-0.0833978)
+ Old Polarization:       (-0.676648,-0.730693,-0.0907509)
+ New Momentum Direction: (0.39177,-0.913048,-0.113399)
+ New Polarization:       (-0.920063,-0.388783,-0.0482862)
  *** FresnelRefraction *** 
 Track (trackID 10, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73791,-0.67446,-0.024238)
- Old Polarization:       (-0.6749,-0.73744,-0.026501)
- New Momentum Direction: (0.4019,-0.91509,-0.032886)
- New Polarization:       (-0.91568,-0.40164,-0.014434)
+ Old Momentum Direction: (0.737914,-0.67446,-0.0242381)
+ Old Polarization:       (-0.674895,-0.737437,-0.0265013)
+ New Momentum Direction: (0.401903,-0.915091,-0.0328857)
+ New Polarization:       (-0.915682,-0.401644,-0.0144339)
  *** FresnelRefraction *** 
 Track (trackID 9, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
@@ -2354,26 +2340,26 @@ Track (trackID 8, parentID 1) is processed with stopping code 2
 Track (trackID 7, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73721,-0.11141,-0.66641)
- Old Polarization:       (-0.67566,-0.12156,-0.72712)
- New Momentum Direction: (0.39753,-0.1513,-0.90503)
- New Polarization:       (-0.91759,-0.065549,-0.39209)
+ Old Momentum Direction: (0.737214,-0.111409,-0.666411)
+ Old Polarization:       (-0.675659,-0.121559,-0.727123)
+ New Momentum Direction: (0.397532,-0.1513,-0.905028)
+ New Polarization:       (-0.917588,-0.0655487,-0.392091)
  *** FresnelRefraction *** 
 Track (trackID 6, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73599,-0.52676,-0.42526)
- Old Polarization:       (-0.677,-0.57266,-0.46232)
- New Momentum Direction: (0.38972,-0.71656,-0.57849)
- New Polarization:       (-0.92093,-0.30323,-0.2448)
+ Old Momentum Direction: (0.735988,-0.526759,-0.425262)
+ Old Polarization:       (-0.676995,-0.57266,-0.462318)
+ New Momentum Direction: (0.389717,-0.716564,-0.578495)
+ New Polarization:       (-0.920935,-0.303232,-0.244805)
  *** FresnelRefraction *** 
 Track (trackID 5, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73721,-0.35641,-0.57401)
- Old Polarization:       (-0.67566,-0.38888,-0.62631)
- New Momentum Direction: (0.39754,-0.48402,-0.77954)
- New Polarization:       (-0.91759,-0.2097,-0.33773)
+ Old Momentum Direction: (0.737215,-0.356406,-0.574012)
+ Old Polarization:       (-0.675659,-0.388876,-0.626307)
+ New Momentum Direction: (0.397535,-0.484021,-0.779544)
+ New Polarization:       (-0.917587,-0.209697,-0.33773)
  *** FresnelRefraction *** 
 Track (trackID 4, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
@@ -2382,22 +2368,22 @@ Track (trackID 4, parentID 1) is processed with stopping code 2
 Track (trackID 3, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73775,-0.67472,-0.021988)
- Old Polarization:       (-0.67508,-0.73736,-0.024029)
- New Momentum Direction: (-0.73775,-0.67472,-0.021988)
- New Polarization:       (-0.67508,0.73736,0.024029)
+ Old Momentum Direction: (0.737748,-0.674718,-0.0219877)
+ Old Polarization:       (-0.675076,-0.737357,-0.024029)
+ New Momentum Direction: (-0.737748,-0.674718,-0.0219877)
+ New Polarization:       (-0.675076,0.737357,0.024029)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73775,-0.67472,-0.021988)
- Old Polarization:       (-0.67508,0.73736,0.024029)
- New Momentum Direction: (-0.73775,0.67472,-0.021988)
- New Polarization:       (0.67508,0.73736,-0.024029)
+ Old Momentum Direction: (-0.737748,-0.674718,-0.0219877)
+ Old Polarization:       (-0.675076,0.737357,0.024029)
+ New Momentum Direction: (-0.737748,0.674718,-0.0219877)
+ New Polarization:       (0.675076,0.737357,-0.024029)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.73775,0.67472,-0.021988)
- Old Polarization:       (0.67508,0.73736,-0.024029)
- New Momentum Direction: (-0.40087,0.91565,-0.029839)
- New Polarization:       (0.91613,0.40066,-0.013057)
+ Old Momentum Direction: (-0.737748,0.674718,-0.0219877)
+ Old Polarization:       (0.675076,0.737357,-0.024029)
+ New Momentum Direction: (-0.400875,0.915647,-0.0298391)
+ New Polarization:       (0.916133,0.400662,-0.0130568)
  *** FresnelRefraction *** 
 Track (trackID 2, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
@@ -2406,42 +2392,42 @@ Track (trackID 2, parentID 1) is processed with stopping code 2
 Track (trackID 1, parentID 0) is processed with stopping code 4
 ### pop requested out of 284 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77864,0.59172,-0.20878)
- Old Polarization:       (-0.61826,0.66669,-0.41626)
- New Momentum Direction: (0.52829,0.80069,-0.28252)
- New Polarization:       (-0.84293,0.45465,-0.28768)
+ Old Momentum Direction: (0.778644,0.591717,-0.208771)
+ Old Polarization:       (-0.618254,0.666695,-0.41627)
+ New Momentum Direction: (0.528297,0.800685,-0.282499)
+ New Polarization:       (-0.842922,0.454663,-0.287688)
  *** FresnelRefraction *** 
 Track (trackID 586, parentID 1) is processed with stopping code 2
 ### pop requested out of 283 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64984,0.080704,0.75577)
- Old Polarization:       (-0.75961,0.10358,0.64208)
- New Momentum Direction: (0.88133,0.10945,0.45965)
- New Polarization:       (0.43516,0.19102,-0.87986)
+ Old Momentum Direction: (0.649831,0.0807029,0.755782)
+ Old Polarization:       (-0.759617,0.103583,0.642069)
+ New Momentum Direction: (0.881316,0.109451,0.459677)
+ New Polarization:       (0.435186,0.191023,-0.879843)
  *** FresnelRefraction *** 
 Track (trackID 585, parentID 1) is processed with stopping code 2
 ### pop requested out of 282 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69278,0.52724,0.492)
- Old Polarization:       (-0.71327,0.60157,0.35968)
- New Momentum Direction: (0.23708,0.71027,0.6628)
- New Polarization:       (-0.96707,0.23754,0.091357)
+ Old Momentum Direction: (0.692775,0.527242,0.492015)
+ Old Polarization:       (-0.713269,0.601568,0.359669)
+ New Momentum Direction: (0.237043,0.710272,0.662815)
+ New Polarization:       (-0.967079,0.237522,0.091329)
  *** FresnelRefraction *** 
 Track (trackID 584, parentID 1) is processed with stopping code 2
 ### pop requested out of 281 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71688,-0.67771,0.16368)
- Old Polarization:       (-0.68617,-0.72741,-0.0065496)
- New Momentum Direction: (0.32569,-0.91905,0.22197)
- New Polarization:       (-0.93891,-0.34201,-0.038435)
+ Old Momentum Direction: (0.716876,-0.677712,0.163694)
+ Old Polarization:       (-0.686172,-0.72741,-0.00655997)
+ New Momentum Direction: (0.32568,-0.919051,0.221987)
+ New Polarization:       (-0.938912,-0.342004,-0.0384458)
  *** FresnelRefraction *** 
 Track (trackID 583, parentID 1) is processed with stopping code 2
 ### pop requested out of 280 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75689,0.65306,-0.025025)
- Old Polarization:       (-0.64215,0.73603,-0.21426)
- New Momentum Direction: (0.46869,0.88272,-0.033825)
- New Polarization:       (-0.87594,0.45945,-0.14708)
+ Old Momentum Direction: (0.756891,0.653063,-0.0250131)
+ Old Polarization:       (-0.642144,0.736029,-0.214272)
+ New Momentum Direction: (0.468692,0.882715,-0.033809)
+ New Polarization:       (-0.875935,0.459458,-0.147093)
  *** FresnelRefraction *** 
 Track (trackID 582, parentID 1) is processed with stopping code 2
 ### pop requested out of 279 stacked tracks.
@@ -2450,32 +2436,32 @@ Track (trackID 582, parentID 1) is processed with stopping code 2
 Track (trackID 581, parentID 1) is processed with stopping code 2
 ### pop requested out of 278 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65466,-0.34247,0.6739)
- Old Polarization:       (-0.75404,-0.35875,0.5502)
- New Momentum Direction: (0.65466,-0.34247,-0.6739)
- New Polarization:       (0.75404,0.35875,0.5502)
+ Old Momentum Direction: (0.654647,-0.342472,0.673907)
+ Old Polarization:       (-0.754051,-0.358753,0.550185)
+ New Momentum Direction: (0.654647,-0.342472,-0.673907)
+ New Polarization:       (0.754051,0.358753,0.550185)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65466,-0.34247,-0.6739)
- Old Polarization:       (0.75404,0.35875,0.5502)
- New Momentum Direction: (-0.65466,-0.34247,-0.6739)
- New Polarization:       (0.75404,-0.35875,-0.5502)
+ Old Momentum Direction: (0.654647,-0.342472,-0.673907)
+ Old Polarization:       (0.754051,0.358753,0.550185)
+ New Momentum Direction: (-0.654647,-0.342472,-0.673907)
+ New Polarization:       (0.754051,-0.358753,-0.550185)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65466,-0.34247,-0.6739)
- Old Polarization:       (0.75404,-0.35875,-0.5502)
- New Momentum Direction: (-0.65466,0.34247,-0.6739)
- New Polarization:       (-0.75404,-0.35875,0.5502)
+ Old Momentum Direction: (-0.654647,-0.342472,-0.673907)
+ Old Polarization:       (0.754051,-0.358753,-0.550185)
+ New Momentum Direction: (-0.654647,0.342472,-0.673907)
+ New Polarization:       (-0.754051,-0.358753,0.550185)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 580, parentID 1) is processed with stopping code 2
 ### pop requested out of 277 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79179,-0.48025,-0.3774)
- Old Polarization:       (-0.60324,-0.51805,-0.6064)
- New Momentum Direction: (0.56762,-0.64733,-0.5087)
- New Polarization:       (-0.81816,-0.3747,-0.43613)
+ Old Momentum Direction: (0.791798,-0.480246,-0.377384)
+ Old Polarization:       (-0.603236,-0.518053,-0.606405)
+ New Momentum Direction: (0.567637,-0.647328,-0.508679)
+ New Polarization:       (-0.818154,-0.374709,-0.43614)
  *** FresnelRefraction *** 
 Track (trackID 579, parentID 1) is processed with stopping code 2
 ### pop requested out of 276 stacked tracks.
@@ -2484,10 +2470,10 @@ Track (trackID 579, parentID 1) is processed with stopping code 2
 Track (trackID 578, parentID 1) is processed with stopping code 2
 ### pop requested out of 275 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81648,0.0052182,-0.57735)
- Old Polarization:       (-0.57732,0.020846,-0.81625)
- New Momentum Direction: (0.62066,0.0070864,-0.78405)
- New Polarization:       (-0.78405,0.015125,-0.62052)
+ Old Momentum Direction: (0.81649,0.00521705,-0.577337)
+ Old Polarization:       (-0.577308,0.0208465,-0.81626)
+ New Momentum Direction: (0.62068,0.00708483,-0.784032)
+ New Polarization:       (-0.784028,0.0151251,-0.620541)
  *** FresnelRefraction *** 
 Track (trackID 577, parentID 1) is processed with stopping code 2
 ### pop requested out of 274 stacked tracks.
@@ -2496,10 +2482,10 @@ Track (trackID 577, parentID 1) is processed with stopping code 2
 Track (trackID 576, parentID 1) is processed with stopping code 2
 ### pop requested out of 273 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68838,-0.59479,0.41516)
- Old Polarization:       (-0.71776,-0.64117,0.27154)
- New Momentum Direction: (0.19665,-0.80399,0.56118)
- New Polarization:       (-0.97641,-0.21265,0.037499)
+ Old Momentum Direction: (0.688374,-0.594789,0.415172)
+ Old Polarization:       (-0.717761,-0.641166,0.271524)
+ New Momentum Direction: (0.196605,-0.803992,0.561199)
+ New Polarization:       (-0.976417,-0.212615,0.0374696)
  *** FresnelRefraction *** 
 Track (trackID 575, parentID 1) is processed with stopping code 2
 ### pop requested out of 272 stacked tracks.
@@ -2508,34 +2494,34 @@ Track (trackID 575, parentID 1) is processed with stopping code 2
 Track (trackID 574, parentID 1) is processed with stopping code 2
 ### pop requested out of 271 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66307,0.22549,0.71379)
- Old Polarization:       (-0.74666,0.26713,0.60921)
- New Momentum Direction: (0.89157,0.3032,0.33641)
- New Polarization:       (0.18356,0.43715,-0.88046)
+ Old Momentum Direction: (0.663059,0.225494,0.713796)
+ Old Polarization:       (-0.746667,0.267134,0.609203)
+ New Momentum Direction: (0.891554,0.303201,0.336452)
+ New Polarization:       (0.183585,0.43717,-0.880443)
  *** FresnelRefraction *** 
 Track (trackID 573, parentID 1) is processed with stopping code 2
 ### pop requested out of 270 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77714,0.58994,-0.21914)
- Old Polarization:       (-0.62031,0.65934,-0.42484)
- New Momentum Direction: (0.51901,0.80127,-0.29764)
- New Polarization:       (-0.84882,0.44214,-0.28986)
+ Old Momentum Direction: (0.777147,0.589938,-0.219124)
+ Old Polarization:       (-0.620301,0.659339,-0.424852)
+ New Momentum Direction: (0.519024,0.801271,-0.297621)
+ New Polarization:       (-0.84881,0.442149,-0.289871)
  *** FresnelRefraction *** 
 Track (trackID 572, parentID 1) is processed with stopping code 2
 ### pop requested out of 269 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81014,0.32564,-0.48747)
- Old Polarization:       (-0.58381,0.37271,-0.72128)
- New Momentum Direction: (0.60755,0.44121,-0.66047)
- New Polarization:       (-0.79264,0.28333,-0.53986)
+ Old Momentum Direction: (0.810151,0.325641,-0.487456)
+ Old Polarization:       (-0.583802,0.372706,-0.721294)
+ New Momentum Direction: (0.607568,0.441209,-0.660451)
+ New Polarization:       (-0.792624,0.283338,-0.539876)
  *** FresnelRefraction *** 
 Track (trackID 571, parentID 1) is processed with stopping code 2
 ### pop requested out of 268 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76244,0.63987,-0.096215)
- Old Polarization:       (-0.63634,0.7145,-0.2908)
- New Momentum Direction: (0.47775,0.86873,-0.13063)
- New Polarization:       (-0.87153,0.45001,-0.19474)
+ Old Momentum Direction: (0.76244,0.639868,-0.0962036)
+ Old Polarization:       (-0.63633,0.714501,-0.290814)
+ New Momentum Direction: (0.477758,0.868728,-0.130613)
+ New Polarization:       (-0.871526,0.450016,-0.194754)
  *** FresnelRefraction *** 
 Track (trackID 570, parentID 1) is processed with stopping code 2
 ### pop requested out of 267 stacked tracks.
@@ -2544,171 +2530,171 @@ Track (trackID 570, parentID 1) is processed with stopping code 2
 Track (trackID 569, parentID 1) is processed with stopping code 2
 ### pop requested out of 266 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65265,-0.33425,0.67994)
- Old Polarization:       (-0.7559,-0.34839,0.5543)
- New Momentum Direction: (0.65265,-0.33425,-0.67994)
- New Polarization:       (-0.11337,0.84424,-0.52383)
+ Old Momentum Direction: (0.652643,-0.334247,0.679953)
+ Old Polarization:       (-0.755905,-0.348385,0.554288)
+ New Momentum Direction: (0.652643,-0.334247,-0.679953)
+ New Polarization:       (-0.11323,0.844325,-0.523731)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65265,-0.33425,-0.67994)
- Old Polarization:       (-0.11337,0.84424,-0.52383)
- New Momentum Direction: (-0.65265,-0.33425,-0.67994)
- New Polarization:       (-0.11337,-0.84424,0.52383)
+ Old Momentum Direction: (0.652643,-0.334247,-0.679953)
+ Old Polarization:       (-0.11323,0.844325,-0.523731)
+ New Momentum Direction: (-0.652643,-0.334247,-0.679953)
+ New Polarization:       (-0.11323,-0.844325,0.523731)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 568, parentID 1) is processed with stopping code 2
 ### pop requested out of 265 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (-0.66088,-0.38737,0.64279)
- New Polarization:       (-0.74789,0.41116,-0.52116)
+ Old Momentum Direction: (0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,0.642803)
+ New Polarization:       (-0.7479,0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,0.41116,-0.52116)
- New Momentum Direction: (-0.66088,-0.38737,-0.64279)
- New Polarization:       (0.74789,-0.41116,-0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ New Polarization:       (0.7479,-0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
- Old Polarization:       (0.74789,-0.41116,-0.52116)
- New Momentum Direction: (-0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ Old Polarization:       (0.7479,-0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,0.38737,-0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,0.41116,-0.52116)
+ Old Momentum Direction: (-0.66087,0.387368,-0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,0.38737,-0.64279)
- Old Polarization:       (-0.74789,0.41116,-0.52116)
- New Momentum Direction: (0.66088,0.38737,0.64279)
- New Polarization:       (0.74789,-0.41116,-0.52116)
+ Old Momentum Direction: (0.66087,0.387368,-0.642803)
+ Old Polarization:       (-0.7479,0.411162,-0.521145)
+ New Momentum Direction: (0.66087,0.387368,0.642803)
+ New Polarization:       (0.7479,-0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,0.38737,0.64279)
- Old Polarization:       (0.74789,-0.41116,-0.52116)
- New Momentum Direction: (0.66088,-0.38737,0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (0.66087,0.387368,0.642803)
+ Old Polarization:       (0.7479,-0.411162,-0.521145)
+ New Momentum Direction: (0.66087,-0.387368,0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (-0.66088,-0.38737,0.64279)
- New Polarization:       (-0.74789,0.41116,-0.52116)
+ Old Momentum Direction: (0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,0.642803)
+ New Polarization:       (-0.7479,0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,0.41116,-0.52116)
- New Momentum Direction: (-0.66088,-0.38737,-0.64279)
- New Polarization:       (0.74789,-0.41116,-0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ New Polarization:       (0.7479,-0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
- Old Polarization:       (0.74789,-0.41116,-0.52116)
- New Momentum Direction: (-0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ Old Polarization:       (0.7479,-0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,0.38737,-0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,0.41116,-0.52116)
+ Old Momentum Direction: (-0.66087,0.387368,-0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,0.38737,-0.64279)
- Old Polarization:       (-0.74789,0.41116,-0.52116)
- New Momentum Direction: (0.66088,0.38737,0.64279)
- New Polarization:       (0.74789,-0.41116,-0.52116)
+ Old Momentum Direction: (0.66087,0.387368,-0.642803)
+ Old Polarization:       (-0.7479,0.411162,-0.521145)
+ New Momentum Direction: (0.66087,0.387368,0.642803)
+ New Polarization:       (0.7479,-0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,0.38737,0.64279)
- Old Polarization:       (0.74789,-0.41116,-0.52116)
- New Momentum Direction: (-0.66088,0.38737,0.64279)
- New Polarization:       (0.74789,0.41116,0.52116)
+ Old Momentum Direction: (0.66087,0.387368,0.642803)
+ Old Polarization:       (0.7479,-0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,0.387368,0.642803)
+ New Polarization:       (0.7479,0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,0.38737,0.64279)
- Old Polarization:       (0.74789,0.41116,0.52116)
- New Momentum Direction: (-0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,0.387368,0.642803)
+ Old Polarization:       (0.7479,0.411162,0.521145)
+ New Momentum Direction: (-0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,0.38737,-0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (-0.66088,-0.38737,-0.64279)
- New Polarization:       (0.74789,-0.41116,-0.52116)
+ Old Momentum Direction: (-0.66087,0.387368,-0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ New Polarization:       (0.7479,-0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,-0.64279)
- Old Polarization:       (0.74789,-0.41116,-0.52116)
- New Momentum Direction: (0.66088,-0.38737,-0.64279)
- New Polarization:       (0.74789,0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,-0.642803)
+ Old Polarization:       (0.7479,-0.411162,-0.521145)
+ New Momentum Direction: (0.66087,-0.387368,-0.642803)
+ New Polarization:       (0.7479,0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,-0.38737,-0.64279)
- Old Polarization:       (0.74789,0.41116,0.52116)
- New Momentum Direction: (0.66088,-0.38737,0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (0.66087,-0.387368,-0.642803)
+ Old Polarization:       (0.7479,0.411162,0.521145)
+ New Momentum Direction: (0.66087,-0.387368,0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,-0.41116,0.52116)
- New Momentum Direction: (-0.66088,-0.38737,0.64279)
- New Polarization:       (-0.74789,0.41116,-0.52116)
+ Old Momentum Direction: (0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,-0.411162,0.521145)
+ New Momentum Direction: (-0.66087,-0.387368,0.642803)
+ New Polarization:       (-0.7479,0.411162,-0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,-0.38737,0.64279)
- Old Polarization:       (-0.74789,0.41116,-0.52116)
- New Momentum Direction: (-0.66088,0.38737,0.64279)
- New Polarization:       (0.74789,0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,-0.387368,0.642803)
+ Old Polarization:       (-0.7479,0.411162,-0.521145)
+ New Momentum Direction: (-0.66087,0.387368,0.642803)
+ New Polarization:       (0.7479,0.411162,0.521145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66088,0.38737,0.64279)
- Old Polarization:       (0.74789,0.41116,0.52116)
- New Momentum Direction: (-0.66088,0.38737,-0.64279)
- New Polarization:       (-0.74789,-0.41116,0.52116)
+ Old Momentum Direction: (-0.66087,0.387368,0.642803)
+ Old Polarization:       (0.7479,0.411162,0.521145)
+ New Momentum Direction: (-0.66087,0.387368,-0.642803)
+ New Polarization:       (-0.7479,-0.411162,0.521145)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.66088,0.38737,-0.64279)
-Old Polarization: (-0.74789,-0.41116,0.52116)
-New Polarization: (0.2295,-0.64309,0.73059)
-Polarization Change: (0.2295,-0.64309,0.73059)
-New Momentum Direction: (-0.97251,-0.12108,0.19892)
-Momentum Change: (-0.97251,-0.12108,0.19892)
+Old Momentum Direction: (-0.66087,0.387368,-0.642803)
+Old Polarization: (-0.7479,-0.411162,0.521145)
+New Polarization: (0.229488,-0.643096,0.730591)
+Polarization Change: (0.229488,-0.643096,0.730591)
+New Momentum Direction: (-0.972511,-0.121074,0.198904)
+Momentum Change: (-0.972511,-0.121074,0.198904)
  Photon at Boundary! 
- Old Momentum Direction: (-0.97251,-0.12108,0.19892)
- Old Polarization:       (0.2295,-0.64309,0.73059)
- New Momentum Direction: (-0.94904,-0.16386,0.2692)
- New Polarization:       (0.31265,-0.59682,0.73896)
+ Old Momentum Direction: (-0.972511,-0.121074,0.198904)
+ Old Polarization:       (0.229488,-0.643096,0.730591)
+ New Momentum Direction: (-0.949048,-0.163853,0.269183)
+ New Polarization:       (0.312636,-0.596828,0.738956)
  *** FresnelRefraction *** 
 Track (trackID 567, parentID 1) is processed with stopping code 2
 ### pop requested out of 264 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70185,0.60728,0.3723)
- Old Polarization:       (-0.70245,0.67678,0.22031)
- New Momentum Direction: (0.24909,0.82567,0.50618)
- New Polarization:       (-0.96298,0.26676,0.03875)
+ Old Momentum Direction: (0.70185,0.607282,0.372311)
+ Old Polarization:       (-0.702451,0.676781,0.220295)
+ New Momentum Direction: (0.249068,0.825668,0.506199)
+ New Polarization:       (-0.962988,0.266746,0.0387315)
  *** FresnelRefraction *** 
 Track (trackID 566, parentID 1) is processed with stopping code 2
 ### pop requested out of 263 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80571,0.35945,-0.47077)
- Old Polarization:       (-0.58931,0.40666,-0.6981)
- New Momentum Direction: (0.59274,0.48876,-0.64013)
- New Polarization:       (-0.80338,0.30263,-0.51284)
+ Old Momentum Direction: (0.805723,0.359446,-0.470754)
+ Old Polarization:       (-0.589297,0.406661,-0.698109)
+ New Momentum Direction: (0.592764,0.48876,-0.640113)
+ New Polarization:       (-0.803361,0.302638,-0.512856)
  *** FresnelRefraction *** 
 Track (trackID 565, parentID 1) is processed with stopping code 2
 ### pop requested out of 262 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71452,-0.66794,0.20813)
- Old Polarization:       (-0.68896,-0.7235,0.043344)
- New Momentum Direction: (0.3278,-0.90197,0.28106)
- New Polarization:       (-0.93834,-0.34541,-0.01412)
+ Old Momentum Direction: (0.714517,-0.667938,0.208144)
+ Old Polarization:       (-0.688961,-0.723502,0.0433334)
+ New Momentum Direction: (0.327781,-0.901974,0.281075)
+ New Polarization:       (-0.938348,-0.345403,-0.0141324)
  *** FresnelRefraction *** 
 Track (trackID 564, parentID 1) is processed with stopping code 2
 ### pop requested out of 261 stacked tracks.
@@ -2717,180 +2703,180 @@ Track (trackID 564, parentID 1) is processed with stopping code 2
 Track (trackID 563, parentID 1) is processed with stopping code 2
 ### pop requested out of 260 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78668,0.55241,-0.27563)
- Old Polarization:       (-0.60941,0.62342,-0.48987)
- New Momentum Direction: (0.54968,0.74749,-0.37297)
- New Polarization:       (-0.83004,0.43833,-0.34482)
+ Old Momentum Direction: (0.786688,0.552408,-0.275621)
+ Old Polarization:       (-0.609397,0.623423,-0.489877)
+ New Momentum Direction: (0.549691,0.747491,-0.372957)
+ New Polarization:       (-0.830031,0.438337,-0.344832)
  *** FresnelRefraction *** 
 Track (trackID 562, parentID 1) is processed with stopping code 2
 ### pop requested out of 259 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66906,-0.42993,0.60623)
- Old Polarization:       (-0.73977,-0.46358,0.48768)
- New Momentum Direction: (-0.66906,-0.42993,0.60623)
- New Polarization:       (-0.73977,0.46358,-0.48768)
+ Old Momentum Direction: (0.669053,-0.429931,0.60624)
+ Old Polarization:       (-0.739779,-0.463581,0.487668)
+ New Momentum Direction: (-0.669053,-0.429931,0.60624)
+ New Polarization:       (-0.739779,0.463581,-0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66906,-0.42993,0.60623)
- Old Polarization:       (-0.73977,0.46358,-0.48768)
- New Momentum Direction: (-0.66906,-0.42993,-0.60623)
- New Polarization:       (0.73977,-0.46358,-0.48768)
+ Old Momentum Direction: (-0.669053,-0.429931,0.60624)
+ Old Polarization:       (-0.739779,0.463581,-0.487668)
+ New Momentum Direction: (-0.669053,-0.429931,-0.60624)
+ New Polarization:       (0.739779,-0.463581,-0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66906,-0.42993,-0.60623)
- Old Polarization:       (0.73977,-0.46358,-0.48768)
- New Momentum Direction: (-0.66906,0.42993,-0.60623)
- New Polarization:       (-0.73977,-0.46358,0.48768)
+ Old Momentum Direction: (-0.669053,-0.429931,-0.60624)
+ Old Polarization:       (0.739779,-0.463581,-0.487668)
+ New Momentum Direction: (-0.669053,0.429931,-0.60624)
+ New Polarization:       (-0.739779,-0.463581,0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66906,0.42993,-0.60623)
- Old Polarization:       (-0.73977,-0.46358,0.48768)
- New Momentum Direction: (0.66906,0.42993,-0.60623)
- New Polarization:       (-0.73977,0.46358,-0.48768)
+ Old Momentum Direction: (-0.669053,0.429931,-0.60624)
+ Old Polarization:       (-0.739779,-0.463581,0.487668)
+ New Momentum Direction: (0.669053,0.429931,-0.60624)
+ New Polarization:       (-0.739779,0.463581,-0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66906,0.42993,-0.60623)
- Old Polarization:       (-0.73977,0.46358,-0.48768)
- New Momentum Direction: (0.66906,0.42993,0.60623)
- New Polarization:       (0.73977,-0.46358,-0.48768)
+ Old Momentum Direction: (0.669053,0.429931,-0.60624)
+ Old Polarization:       (-0.739779,0.463581,-0.487668)
+ New Momentum Direction: (0.669053,0.429931,0.60624)
+ New Polarization:       (0.739779,-0.463581,-0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66906,0.42993,0.60623)
- Old Polarization:       (0.73977,-0.46358,-0.48768)
- New Momentum Direction: (0.66906,-0.42993,0.60623)
- New Polarization:       (-0.73977,-0.46358,0.48768)
+ Old Momentum Direction: (0.669053,0.429931,0.60624)
+ Old Polarization:       (0.739779,-0.463581,-0.487668)
+ New Momentum Direction: (0.669053,-0.429931,0.60624)
+ New Polarization:       (-0.739779,-0.463581,0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66906,-0.42993,0.60623)
- Old Polarization:       (-0.73977,-0.46358,0.48768)
- New Momentum Direction: (-0.66906,-0.42993,0.60623)
- New Polarization:       (-0.73977,0.46358,-0.48768)
+ Old Momentum Direction: (0.669053,-0.429931,0.60624)
+ Old Polarization:       (-0.739779,-0.463581,0.487668)
+ New Momentum Direction: (-0.669053,-0.429931,0.60624)
+ New Polarization:       (-0.739779,0.463581,-0.487668)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66906,-0.42993,0.60623)
- Old Polarization:       (-0.73977,0.46358,-0.48768)
- New Momentum Direction: (-0.66906,-0.42993,-0.60623)
- New Polarization:       (0.73977,-0.46358,-0.48768)
+ Old Momentum Direction: (-0.669053,-0.429931,0.60624)
+ Old Polarization:       (-0.739779,0.463581,-0.487668)
+ New Momentum Direction: (-0.669053,-0.429931,-0.60624)
+ New Polarization:       (0.739779,-0.463581,-0.487668)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 561, parentID 1) is processed with stopping code 2
 ### pop requested out of 258 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65473,-0.33005,0.67999)
- Old Polarization:       (-0.75414,-0.34594,0.55821)
- New Momentum Direction: (0.65473,-0.33005,-0.67999)
- New Polarization:       (-0.10131,0.85319,-0.51167)
+ Old Momentum Direction: (0.654723,-0.33005,0.680003)
+ Old Polarization:       (-0.754146,-0.345939,0.558203)
+ New Momentum Direction: (0.654723,-0.33005,-0.680003)
+ New Polarization:       (-0.101217,0.853247,-0.511591)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65473,-0.33005,-0.67999)
- Old Polarization:       (-0.10131,0.85319,-0.51167)
- New Momentum Direction: (-0.65473,-0.33005,-0.67999)
- New Polarization:       (-0.10131,-0.85319,0.51167)
+ Old Momentum Direction: (0.654723,-0.33005,-0.680003)
+ Old Polarization:       (-0.101217,0.853247,-0.511591)
+ New Momentum Direction: (-0.654723,-0.33005,-0.680003)
+ New Polarization:       (-0.101217,-0.853247,0.511591)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65473,-0.33005,-0.67999)
- Old Polarization:       (-0.10131,-0.85319,0.51167)
- New Momentum Direction: (-0.65473,0.33005,-0.67999)
- New Polarization:       (0.10131,-0.85319,-0.51167)
+ Old Momentum Direction: (-0.654723,-0.33005,-0.680003)
+ Old Polarization:       (-0.101217,-0.853247,0.511591)
+ New Momentum Direction: (-0.654723,0.33005,-0.680003)
+ New Polarization:       (0.101217,-0.853247,-0.511591)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65473,0.33005,-0.67999)
- Old Polarization:       (0.10131,-0.85319,-0.51167)
- New Momentum Direction: (-0.65473,0.33005,0.67999)
- New Polarization:       (0.73179,0.502,0.46095)
+ Old Momentum Direction: (-0.654723,0.33005,-0.680003)
+ Old Polarization:       (0.101217,-0.853247,-0.511591)
+ New Momentum Direction: (-0.654723,0.33005,0.680003)
+ New Polarization:       (0.731755,0.502187,0.460807)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65473,0.33005,0.67999)
- Old Polarization:       (0.73179,0.502,0.46095)
- New Momentum Direction: (0.65473,0.33005,0.67999)
- New Polarization:       (0.73179,-0.502,-0.46095)
+ Old Momentum Direction: (-0.654723,0.33005,0.680003)
+ Old Polarization:       (0.731755,0.502187,0.460807)
+ New Momentum Direction: (0.654723,0.33005,0.680003)
+ New Polarization:       (0.731755,-0.502187,-0.460807)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65473,0.33005,0.67999)
- Old Polarization:       (0.73179,-0.502,-0.46095)
- New Momentum Direction: (0.8885,0.44789,0.099833)
- New Polarization:       (0.33678,-0.48869,-0.80483)
+ Old Momentum Direction: (0.654723,0.33005,0.680003)
+ Old Polarization:       (0.731755,-0.502187,-0.460807)
+ New Momentum Direction: (0.888483,0.44789,0.0999573)
+ New Polarization:       (0.336961,-0.488853,-0.804661)
  *** FresnelRefraction *** 
 Track (trackID 560, parentID 1) is processed with stopping code 2
 ### pop requested out of 257 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73032,-0.67535,0.10266)
- Old Polarization:       (-0.67155,-0.73733,-0.073235)
- New Momentum Direction: (0.39349,-0.90889,0.13816)
- New Polarization:       (-0.91203,-0.40483,-0.065661)
+ Old Momentum Direction: (0.730313,-0.675353,0.102668)
+ Old Polarization:       (-0.671548,-0.737332,-0.0732451)
+ New Momentum Direction: (0.39348,-0.908891,0.138171)
+ New Polarization:       (-0.912033,-0.404824,-0.0656703)
  *** FresnelRefraction *** 
 Track (trackID 559, parentID 1) is processed with stopping code 2
 ### pop requested out of 256 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79601,-0.44385,-0.41155)
- Old Polarization:       (-0.59866,-0.47694,-0.64353)
- New Momentum Direction: (0.57749,-0.59865,-0.55509)
- New Polarization:       (-0.81189,-0.34976,-0.46745)
+ Old Momentum Direction: (0.796011,-0.44385,-0.411538)
+ Old Polarization:       (-0.59865,-0.476944,-0.643539)
+ New Momentum Direction: (0.577508,-0.59865,-0.55507)
+ New Polarization:       (-0.811875,-0.349772,-0.467461)
  *** FresnelRefraction *** 
 Track (trackID 558, parentID 1) is processed with stopping code 2
 ### pop requested out of 255 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72521,0.65915,0.19896)
- Old Polarization:       (-0.67702,0.73528,0.031762)
- New Momentum Direction: (0.35477,0.89507,0.27017)
- New Polarization:       (-0.92798,0.37233,-0.01499)
+ Old Momentum Direction: (0.725213,0.659149,0.198969)
+ Old Polarization:       (-0.677015,0.735284,0.0317512)
+ New Momentum Direction: (0.35476,0.895068,0.270183)
+ New Polarization:       (-0.927979,0.372332,-0.015)
  *** FresnelRefraction *** 
 Track (trackID 557, parentID 1) is processed with stopping code 2
 ### pop requested out of 254 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74778,0.6625,0.043786)
- Old Polarization:       (-0.65222,0.74532,-0.13823)
- New Momentum Direction: (0.43993,0.89608,0.059225)
- New Polarization:       (-0.89051,0.44381,-0.10013)
+ Old Momentum Direction: (0.747784,0.662496,0.043798)
+ Old Polarization:       (-0.652217,0.745321,-0.138242)
+ New Momentum Direction: (0.439927,0.896078,0.0592402)
+ New Polarization:       (-0.890507,0.443812,-0.100138)
  *** FresnelRefraction *** 
 Track (trackID 556, parentID 1) is processed with stopping code 2
 ### pop requested out of 253 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74932,-0.65585,-0.091533)
- Old Polarization:       (-0.65062,-0.70341,-0.28618)
- New Momentum Direction: (0.43991,-0.88942,-0.12413)
- New Polarization:       (-0.89064,-0.41439,-0.18719)
+ Old Momentum Direction: (0.749325,-0.655847,-0.0915215)
+ Old Polarization:       (-0.650618,-0.703413,-0.286194)
+ New Momentum Direction: (0.439913,-0.889422,-0.124116)
+ New Polarization:       (-0.890639,-0.414392,-0.187195)
  *** FresnelRefraction *** 
 Track (trackID 555, parentID 1) is processed with stopping code 2
 ### pop requested out of 252 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80495,-0.28856,-0.51845)
- Old Polarization:       (-0.59016,-0.2991,-0.74983)
- New Momentum Direction: (0.59067,-0.39242,-0.70506)
- New Polarization:       (-0.80478,-0.22298,-0.5501)
+ Old Momentum Direction: (0.80496,-0.288556,-0.518434)
+ Old Polarization:       (-0.590153,-0.299098,-0.74984)
+ New Momentum Direction: (0.59069,-0.392423,-0.705046)
+ New Polarization:       (-0.804763,-0.222989,-0.55012)
  *** FresnelRefraction *** 
 Track (trackID 554, parentID 1) is processed with stopping code 2
 ### pop requested out of 251 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76996,-0.59731,-0.22447)
- Old Polarization:       (-0.62764,-0.64551,-0.43519)
- New Momentum Direction: (0.50758,-0.80653,-0.3031)
- New Polarization:       (-0.85466,-0.42676,-0.29568)
+ Old Momentum Direction: (0.76996,-0.59731,-0.22446)
+ Old Polarization:       (-0.627633,-0.645506,-0.435201)
+ New Momentum Direction: (0.507591,-0.806531,-0.303082)
+ New Polarization:       (-0.854658,-0.426762,-0.295694)
  *** FresnelRefraction *** 
 Track (trackID 553, parentID 1) is processed with stopping code 2
 ### pop requested out of 250 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6579,0.21863,0.72067)
- Old Polarization:       (-0.75132,0.25631,0.60813)
- New Momentum Direction: (0.88963,0.29564,0.34808)
- New Polarization:       (0.20229,0.42823,-0.88074)
+ Old Momentum Direction: (0.657892,0.218632,0.720679)
+ Old Polarization:       (-0.751331,0.25631,0.608117)
+ New Momentum Direction: (0.889614,0.295639,0.348115)
+ New Polarization:       (0.202318,0.428249,-0.880721)
  *** FresnelRefraction *** 
 Track (trackID 552, parentID 1) is processed with stopping code 2
 ### pop requested out of 249 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80373,-0.30609,-0.51022)
- Old Polarization:       (-0.5915,-0.3182,-0.74087)
- New Momentum Direction: (0.58758,-0.41627,-0.69388)
- New Polarization:       (-0.80681,-0.23609,-0.54158)
+ Old Momentum Direction: (0.803738,-0.306094,-0.510207)
+ Old Polarization:       (-0.591484,-0.318195,-0.740877)
+ New Momentum Direction: (0.587601,-0.416275,-0.693859)
+ New Polarization:       (-0.8068,-0.2361,-0.5416)
  *** FresnelRefraction *** 
 Track (trackID 551, parentID 1) is processed with stopping code 2
 ### pop requested out of 248 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74066,-0.67186,-0.0060028)
- Old Polarization:       (-0.66007,-0.72593,-0.19321)
- New Momentum Direction: (0.41818,-0.90833,-0.0081155)
- New Polarization:       (-0.90086,-0.41357,-0.13197)
+ Old Momentum Direction: (0.740656,-0.671857,-0.00599118)
+ Old Polarization:       (-0.660065,-0.725933,-0.193222)
+ New Momentum Direction: (0.418183,-0.908327,-0.00809986)
+ New Polarization:       (-0.900857,-0.413567,-0.131981)
  *** FresnelRefraction *** 
 Track (trackID 550, parentID 1) is processed with stopping code 2
 ### pop requested out of 247 stacked tracks.
@@ -2899,43 +2885,43 @@ Track (trackID 550, parentID 1) is processed with stopping code 2
 Track (trackID 549, parentID 1) is processed with stopping code 2
 ### pop requested out of 246 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70707,0.60195,0.37109)
- Old Polarization:       (-0.6972,0.68111,0.22361)
- New Momentum Direction: (0.29708,0.81281,0.50108)
- New Polarization:       (-0.94901,0.30928,0.060951)
+ Old Momentum Direction: (0.707068,0.601948,0.371097)
+ Old Polarization:       (-0.697203,0.681109,0.223604)
+ New Momentum Direction: (0.297057,0.812812,0.501093)
+ New Polarization:       (-0.94902,0.309271,0.0609346)
  *** FresnelRefraction *** 
 Track (trackID 548, parentID 1) is processed with stopping code 2
 ### pop requested out of 245 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66567,-0.45263,0.5933)
- Old Polarization:       (-0.74244,-0.48185,0.4654)
- New Momentum Direction: (-0.66567,-0.45263,0.5933)
- New Polarization:       (-0.74244,0.48185,-0.4654)
+ Old Momentum Direction: (0.665662,-0.452627,0.593315)
+ Old Polarization:       (-0.74245,-0.481851,0.46539)
+ New Momentum Direction: (-0.665662,-0.452627,0.593315)
+ New Polarization:       (-0.74245,0.481851,-0.46539)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 547, parentID 1) is processed with stopping code 2
 ### pop requested out of 244 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77762,-0.54297,-0.31701)
- Old Polarization:       (-0.61982,-0.5774,-0.53145)
- New Momentum Direction: (0.51993,-0.73768,-0.43069)
- New Polarization:       (-0.84832,-0.38685,-0.36151)
+ Old Momentum Direction: (0.777623,-0.542967,-0.317)
+ Old Polarization:       (-0.619811,-0.577399,-0.531455)
+ New Momentum Direction: (0.519947,-0.73768,-0.430678)
+ New Polarization:       (-0.848316,-0.38686,-0.361525)
  *** FresnelRefraction *** 
 Track (trackID 546, parentID 1) is processed with stopping code 2
 ### pop requested out of 243 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.6488,-0.070394,0.75769)
-Old Polarization: (-0.76096,-0.062102,0.64582)
-New Polarization: (-0.41453,-0.56799,0.71102)
-Polarization Change: (-0.41453,-0.56799,0.71102)
-New Momentum Direction: (0.72495,-0.6784,-0.11928)
-Momentum Change: (0.72495,-0.6784,-0.11928)
+Old Momentum Direction: (0.64879,-0.0703944,0.757705)
+Old Polarization: (-0.760966,-0.0621014,0.645813)
+New Polarization: (-0.414544,-0.567991,0.711013)
+Polarization Change: (-0.414544,-0.567991,0.711013)
+New Momentum Direction: (0.724948,-0.678399,-0.119268)
+Momentum Change: (0.724948,-0.678399,-0.119268)
  Photon at Boundary! 
- Old Momentum Direction: (0.72495,-0.6784,-0.11928)
- Old Polarization:       (-0.41453,-0.56799,0.71102)
- New Momentum Direction: (0.35931,-0.91912,-0.1616)
- New Polarization:       (-0.69893,-0.37978,0.60602)
+ Old Momentum Direction: (0.724948,-0.678399,-0.119268)
+ Old Polarization:       (-0.414544,-0.567991,0.711013)
+ New Momentum Direction: (0.359309,-0.919123,-0.161589)
+ New Polarization:       (-0.698944,-0.379777,0.606009)
  *** FresnelRefraction *** 
 Track (trackID 545, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
@@ -2944,72 +2930,72 @@ Track (trackID 545, parentID 1) is processed with stopping code 2
 Track (trackID 544, parentID 1) is processed with stopping code 2
 ### pop requested out of 241 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65465,-0.31417,0.68755)
- Old Polarization:       (-0.75441,-0.32927,0.56785)
- New Momentum Direction: (0.88754,-0.42593,0.17566)
- New Polarization:       (-0.048609,-0.46571,-0.8836)
+ Old Momentum Direction: (0.654642,-0.314166,0.687564)
+ Old Polarization:       (-0.754414,-0.329264,0.567841)
+ New Momentum Direction: (0.887526,-0.425929,0.175735)
+ New Polarization:       (-0.048565,-0.465755,-0.88358)
  *** FresnelRefraction *** 
 Track (trackID 543, parentID 1) is processed with stopping code 2
 ### pop requested out of 240 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7365,0.66779,0.10777)
- Old Polarization:       (-0.66469,0.74403,-0.067885)
- New Momentum Direction: (0.39441,0.9072,0.1464)
- New Polarization:       (-0.91164,0.40632,-0.06183)
+ Old Momentum Direction: (0.736503,0.667793,0.107776)
+ Old Polarization:       (-0.664685,0.744032,-0.0678948)
+ New Momentum Direction: (0.394408,0.907196,0.146414)
+ New Polarization:       (-0.911636,0.406319,-0.0618391)
  *** FresnelRefraction *** 
 Track (trackID 542, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75777,-0.63483,-0.15089)
- Old Polarization:       (-0.64131,-0.68188,-0.35179)
- New Momentum Direction: (0.46741,-0.86008,-0.20442)
- New Polarization:       (-0.87677,-0.4214,-0.23173)
+ Old Momentum Direction: (0.757774,-0.634835,-0.150875)
+ Old Polarization:       (-0.641303,-0.681883,-0.351805)
+ New Momentum Direction: (0.467418,-0.86008,-0.204407)
+ New Polarization:       (-0.876762,-0.421409,-0.231739)
  *** FresnelRefraction *** 
 Track (trackID 541, parentID 1) is processed with stopping code 2
 ### pop requested out of 238 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79155,0.51253,-0.33282)
- Old Polarization:       (-0.60442,0.57622,-0.55014)
- New Momentum Direction: (0.55913,0.69534,-0.45153)
- New Polarization:       (-0.8246,0.40985,-0.38995)
+ Old Momentum Direction: (0.791555,0.512525,-0.332805)
+ Old Polarization:       (-0.604406,0.576223,-0.550147)
+ New Momentum Direction: (0.559146,0.695336,-0.451512)
+ New Polarization:       (-0.824587,0.409862,-0.38996)
  *** FresnelRefraction *** 
 Track (trackID 540, parentID 1) is processed with stopping code 2
 ### pop requested out of 237 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82121,0.15627,-0.5488)
- Old Polarization:       (-0.57024,0.18948,-0.79933)
- New Momentum Direction: (0.64057,0.21029,-0.73855)
- New Polarization:       (-0.76764,0.15009,-0.62306)
+ Old Momentum Direction: (0.821224,0.156266,-0.548792)
+ Old Polarization:       (-0.570223,0.189485,-0.799338)
+ New Momentum Direction: (0.640586,0.210293,-0.73853)
+ New Polarization:       (-0.767621,0.150095,-0.62308)
  *** FresnelRefraction *** 
 Track (trackID 539, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67533,-0.48797,0.553)
- Old Polarization:       (-0.73282,-0.52846,0.42861)
- New Momentum Direction: (-0.67533,-0.48797,0.553)
- New Polarization:       (-0.73019,0.54781,-0.40832)
+ Old Momentum Direction: (0.675319,-0.487975,0.553014)
+ Old Polarization:       (-0.732829,-0.528459,0.428595)
+ New Momentum Direction: (-0.675319,-0.487975,0.553014)
+ New Polarization:       (-0.7302,0.547798,-0.40832)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67533,-0.48797,0.553)
- Old Polarization:       (-0.73019,0.54781,-0.40832)
- New Momentum Direction: (-0.67533,-0.48797,-0.553)
- New Polarization:       (0.73019,-0.54781,-0.40832)
+ Old Momentum Direction: (-0.675319,-0.487975,0.553014)
+ Old Polarization:       (-0.7302,0.547798,-0.40832)
+ New Momentum Direction: (-0.675319,-0.487975,-0.553014)
+ New Polarization:       (0.7302,-0.547798,-0.40832)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67533,-0.48797,-0.553)
- Old Polarization:       (0.73019,-0.54781,-0.40832)
- New Momentum Direction: (-0.67533,0.48797,-0.553)
- New Polarization:       (-0.73019,-0.54781,0.40832)
+ Old Momentum Direction: (-0.675319,-0.487975,-0.553014)
+ Old Polarization:       (0.7302,-0.547798,-0.40832)
+ New Momentum Direction: (-0.675319,0.487975,-0.553014)
+ New Polarization:       (-0.7302,-0.547798,0.40832)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 538, parentID 1) is processed with stopping code 2
 ### pop requested out of 235 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81726,-0.031115,-0.57543)
- Old Polarization:       (-0.57609,-0.018948,-0.81717)
- New Momentum Direction: (0.62438,-0.042175,-0.77998)
- New Polarization:       (-0.78099,-0.015874,-0.62434)
+ Old Momentum Direction: (0.817268,-0.0311159,-0.575417)
+ Old Polarization:       (-0.576074,-0.0189478,-0.817178)
+ New Momentum Direction: (0.624406,-0.0421766,-0.779961)
+ New Polarization:       (-0.780976,-0.0158748,-0.62436)
  *** FresnelRefraction *** 
 Track (trackID 537, parentID 1) is processed with stopping code 2
 ### pop requested out of 234 stacked tracks.
@@ -3018,25 +3004,25 @@ Track (trackID 537, parentID 1) is processed with stopping code 2
 Track (trackID 536, parentID 1) is processed with stopping code 2
 ### pop requested out of 233 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81089,-0.1915,-0.55297)
- Old Polarization:       (-0.58355,-0.19376,-0.78863)
- New Momentum Direction: (0.60632,-0.26023,-0.75143)
- New Polarization:       (-0.7941,-0.14817,-0.58945)
+ Old Momentum Direction: (0.810901,-0.191503,-0.552961)
+ Old Polarization:       (-0.583535,-0.193755,-0.788636)
+ New Momentum Direction: (0.606346,-0.260232,-0.751415)
+ New Polarization:       (-0.794088,-0.14817,-0.589466)
  *** FresnelRefraction *** 
 Track (trackID 535, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.65354,0.13374,0.74498)
-Old Polarization: (-0.75603,0.16251,0.63405)
-New Polarization: (-0.73994,0.37216,-0.56034)
-Polarization Change: (-0.73994,0.37216,-0.56034)
-New Momentum Direction: (-0.58094,0.0664,0.81124)
-Momentum Change: (-0.58094,0.0664,0.81124)
+Old Momentum Direction: (0.653526,0.133744,0.744994)
+Old Polarization: (-0.756034,0.162511,0.634036)
+New Polarization: (-0.739934,0.372156,-0.560354)
+Polarization Change: (-0.739934,0.372156,-0.560354)
+New Momentum Direction: (-0.580948,0.0664014,0.811228)
+Momentum Change: (-0.580948,0.0664014,0.811228)
  Photon at Boundary! 
- Old Momentum Direction: (-0.58094,0.0664,0.81124)
- Old Polarization:       (-0.73994,0.37216,-0.56034)
- New Momentum Direction: (-0.78599,0.089837,0.61167)
- New Polarization:       (-0.57111,0.27335,-0.77402)
+ Old Momentum Direction: (-0.580948,0.0664014,0.811228)
+ Old Polarization:       (-0.739934,0.372156,-0.560354)
+ New Momentum Direction: (-0.78601,0.0898396,0.611651)
+ New Polarization:       (-0.571094,0.273342,-0.774039)
  *** FresnelRefraction *** 
 Track (trackID 534, parentID 1) is processed with stopping code 2
 ### pop requested out of 231 stacked tracks.
@@ -3045,101 +3031,101 @@ Track (trackID 534, parentID 1) is processed with stopping code 2
 Track (trackID 533, parentID 1) is processed with stopping code 2
 ### pop requested out of 230 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72274,-0.67358,0.15472)
- Old Polarization:       (-0.67994,-0.73311,-0.015417)
- New Momentum Direction: (-0.72274,-0.67358,0.15472)
- New Polarization:       (-0.634,0.7353,0.23953)
+ Old Momentum Direction: (0.722739,-0.673577,0.154735)
+ Old Polarization:       (-0.679938,-0.733108,-0.015427)
+ New Momentum Direction: (-0.722739,-0.673577,0.154735)
+ New Polarization:       (-0.633998,0.735299,0.239545)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72274,-0.67358,0.15472)
- Old Polarization:       (-0.634,0.7353,0.23953)
- New Momentum Direction: (-0.97398,-0.088778,0.20851)
- New Polarization:       (-0.074061,0.99425,0.077374)
+ Old Momentum Direction: (-0.722739,-0.673577,0.154735)
+ Old Polarization:       (-0.633998,0.735299,0.239545)
+ New Momentum Direction: (-0.973979,-0.0887857,0.208524)
+ New Polarization:       (-0.0740664,0.994247,0.0773811)
  *** FresnelRefraction *** 
 Track (trackID 532, parentID 1) is processed with stopping code 2
 ### pop requested out of 229 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8162,-0.030165,-0.57698)
- Old Polarization:       (-0.57759,-0.017814,-0.81613)
- New Momentum Direction: (0.62015,-0.040957,-0.78342)
- New Polarization:       (-0.78437,-0.014856,-0.62012)
+ Old Momentum Direction: (0.816208,-0.030166,-0.576971)
+ Old Polarization:       (-0.577581,-0.0178133,-0.816139)
+ New Momentum Direction: (0.620168,-0.0409587,-0.783399)
+ New Polarization:       (-0.784348,-0.0148561,-0.620143)
  *** FresnelRefraction *** 
 Track (trackID 531, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67519,-0.4866,0.55438)
- Old Polarization:       (-0.73298,-0.52696,0.43018)
- New Momentum Direction: (0.12038,-0.65487,0.74609)
- New Polarization:       (-0.99042,-0.13044,0.045314)
+ Old Momentum Direction: (0.675184,-0.4866,0.55439)
+ Old Polarization:       (-0.732985,-0.526964,0.430165)
+ New Momentum Direction: (0.120294,-0.654872,0.746105)
+ New Polarization:       (-0.990431,-0.130385,0.0452451)
  *** FresnelRefraction *** 
 Track (trackID 530, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79617,0.49896,-0.34227)
- Old Polarization:       (-0.59863,0.56727,-0.56555)
- New Momentum Direction: (0.57668,0.6737,-0.46213)
- New Polarization:       (-0.8126,0.41458,-0.40964)
+ Old Momentum Direction: (0.796179,0.49896,-0.342254)
+ Old Polarization:       (-0.598622,0.567272,-0.565557)
+ New Momentum Direction: (0.576696,0.6737,-0.462114)
+ New Polarization:       (-0.812588,0.414593,-0.409649)
  *** FresnelRefraction *** 
 Track (trackID 529, parentID 1) is processed with stopping code 2
 ### pop requested out of 226 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.65899,0.30187,0.68892)
-Old Polarization: (-0.74922,0.34429,0.56581)
-New Polarization: (0.99969,-0.019514,0.01575)
-Polarization Change: (0.99969,-0.019514,0.01575)
-New Momentum Direction: (-0.0040048,0.49577,0.86844)
-Momentum Change: (-0.0040048,0.49577,0.86844)
+Old Momentum Direction: (0.65898,0.301864,0.688929)
+Old Polarization: (-0.749223,0.344296,0.565796)
+New Polarization: (0.999685,-0.0195113,0.0157627)
+Polarization Change: (0.999685,-0.0195113,0.0157627)
+New Momentum Direction: (-0.00401695,0.49578,0.868439)
+Momentum Change: (-0.00401695,0.49578,0.868439)
 
 ** Photon absorbed! **
 Track (trackID 528, parentID 1) is processed with stopping code 2
 ### pop requested out of 225 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65758,0.262,0.70636)
- Old Polarization:       (-0.75104,0.30187,0.58721)
- New Momentum Direction: (0.65758,0.262,-0.70636)
- New Polarization:       (-0.12948,-0.88433,-0.44855)
+ Old Momentum Direction: (0.657571,0.262002,0.706367)
+ Old Polarization:       (-0.751048,0.301875,0.587196)
+ New Momentum Direction: (0.657571,0.262002,-0.706367)
+ New Polarization:       (-0.129427,-0.884358,-0.448507)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65758,0.262,-0.70636)
- Old Polarization:       (-0.12948,-0.88433,-0.44855)
- New Momentum Direction: (-0.65758,0.262,-0.70636)
- New Polarization:       (-0.12948,0.88433,0.44855)
+ Old Momentum Direction: (0.657571,0.262002,-0.706367)
+ Old Polarization:       (-0.129427,-0.884358,-0.448507)
+ New Momentum Direction: (-0.657571,0.262002,-0.706367)
+ New Polarization:       (-0.129427,0.884358,0.448507)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65758,0.262,-0.70636)
- Old Polarization:       (-0.12948,0.88433,0.44855)
- New Momentum Direction: (-0.65758,-0.262,-0.70636)
- New Polarization:       (0.12948,0.88433,-0.44855)
+ Old Momentum Direction: (-0.657571,0.262002,-0.706367)
+ Old Polarization:       (-0.129427,0.884358,0.448507)
+ New Momentum Direction: (-0.657571,-0.262002,-0.706367)
+ New Polarization:       (0.129427,0.884358,-0.448507)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65758,-0.262,-0.70636)
- Old Polarization:       (0.12948,0.88433,-0.44855)
- New Momentum Direction: (-0.89227,-0.35551,-0.27832)
- New Polarization:       (-0.43221,0.49434,0.7542)
+ Old Momentum Direction: (-0.657571,-0.262002,-0.706367)
+ Old Polarization:       (0.129427,0.884358,-0.448507)
+ New Momentum Direction: (-0.892259,-0.35551,-0.278365)
+ New Polarization:       (-0.432259,0.494386,0.754145)
  *** FresnelRefraction *** 
 Track (trackID 527, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81402,-0.15239,-0.56049)
- Old Polarization:       (-0.57967,-0.15192,-0.80057)
- New Momentum Direction: (0.61642,-0.20658,-0.75983)
- New Polarization:       (-0.78662,-0.11821,-0.60602)
+ Old Momentum Direction: (0.814028,-0.152388,-0.560478)
+ Old Polarization:       (-0.579655,-0.151918,-0.800575)
+ New Momentum Direction: (0.616443,-0.206586,-0.759816)
+ New Polarization:       (-0.786604,-0.118209,-0.606037)
  *** FresnelRefraction *** 
 Track (trackID 526, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75485,-0.64702,-0.10755)
- Old Polarization:       (-0.64434,-0.70087,-0.30596)
- New Momentum Direction: (0.46476,-0.87345,-0.14519)
- New Polarization:       (-0.8779,-0.43323,-0.20397)
+ Old Momentum Direction: (0.75485,-0.647022,-0.107536)
+ Old Polarization:       (-0.644337,-0.700865,-0.305972)
+ New Momentum Direction: (0.464766,-0.873452,-0.145169)
+ New Polarization:       (-0.877898,-0.43323,-0.203978)
  *** FresnelRefraction *** 
 Track (trackID 525, parentID 1) is processed with stopping code 2
 ### pop requested out of 222 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8164,0.20892,-0.53838)
- Old Polarization:       (-0.57667,0.24529,-0.77928)
- New Momentum Direction: (0.62407,0.28268,-0.72844)
- New Polarization:       (-0.78081,0.19034,-0.59507)
+ Old Momentum Direction: (0.816404,0.208924,-0.538363)
+ Old Polarization:       (-0.576661,0.245287,-0.779292)
+ New Momentum Direction: (0.624093,0.28268,-0.728423)
+ New Polarization:       (-0.78079,0.190342,-0.595094)
  *** FresnelRefraction *** 
 Track (trackID 524, parentID 1) is processed with stopping code 2
 ### pop requested out of 221 stacked tracks.
@@ -3148,65 +3134,65 @@ Track (trackID 524, parentID 1) is processed with stopping code 2
 Track (trackID 523, parentID 1) is processed with stopping code 2
 ### pop requested out of 220 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81943,0.055831,-0.57045)
- Old Polarization:       (-0.57317,0.076812,-0.81583)
- New Momentum Direction: (0.63204,0.075483,-0.77125)
- New Polarization:       (-0.77494,0.059425,-0.62924)
+ Old Momentum Direction: (0.819442,0.0558294,-0.570436)
+ Old Polarization:       (-0.573159,0.0768126,-0.815836)
+ New Momentum Direction: (0.632058,0.0754819,-0.771236)
+ New Polarization:       (-0.774919,0.0594273,-0.629261)
  *** FresnelRefraction *** 
 Track (trackID 522, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77227,-0.5847,-0.24846)
- Old Polarization:       (-0.62519,-0.62995,-0.46077)
- New Momentum Direction: (0.5123,-0.79041,-0.33587)
- New Polarization:       (-0.8521,-0.41903,-0.31361)
+ Old Momentum Direction: (0.772269,-0.584702,-0.248445)
+ Old Polarization:       (-0.625181,-0.629945,-0.460779)
+ New Momentum Direction: (0.51231,-0.790407,-0.33585)
+ New Polarization:       (-0.852089,-0.419033,-0.313616)
  *** FresnelRefraction *** 
 Track (trackID 521, parentID 1) is processed with stopping code 2
 ### pop requested out of 218 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6712,-0.52427,0.52406)
- Old Polarization:       (-0.73588,-0.55638,0.3859)
- New Momentum Direction: (-0.6712,-0.52427,0.52406)
- New Polarization:       (-0.73588,0.55638,-0.3859)
+ Old Momentum Direction: (0.671189,-0.524266,0.524071)
+ Old Polarization:       (-0.735891,-0.556375,0.38589)
+ New Momentum Direction: (-0.671189,-0.524266,0.524071)
+ New Polarization:       (-0.735891,0.556375,-0.38589)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6712,-0.52427,0.52406)
- Old Polarization:       (-0.73588,0.55638,-0.3859)
- New Momentum Direction: (-0.6712,0.52427,0.52406)
- New Polarization:       (0.73588,0.55638,0.3859)
+ Old Momentum Direction: (-0.671189,-0.524266,0.524071)
+ Old Polarization:       (-0.735891,0.556375,-0.38589)
+ New Momentum Direction: (-0.671189,0.524266,0.524071)
+ New Polarization:       (0.735891,0.556375,0.38589)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6712,0.52427,0.52406)
- Old Polarization:       (0.73588,0.55638,0.3859)
- New Momentum Direction: (-0.6712,0.52427,-0.52406)
- New Polarization:       (-0.73588,-0.55638,0.3859)
+ Old Momentum Direction: (-0.671189,0.524266,0.524071)
+ Old Polarization:       (0.735891,0.556375,0.38589)
+ New Momentum Direction: (-0.671189,0.524266,-0.524071)
+ New Polarization:       (-0.735891,-0.556375,0.38589)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.6712,0.52427,-0.52406)
-Old Polarization: (-0.73588,-0.55638,0.3859)
-New Polarization: (0.86584,0.37456,-0.33172)
-Polarization Change: (0.86584,0.37456,-0.33172)
-New Momentum Direction: (-0.46866,0.83929,-0.27559)
-Momentum Change: (-0.46866,0.83929,-0.27559)
+Old Momentum Direction: (-0.671189,0.524266,-0.524071)
+Old Polarization: (-0.735891,-0.556375,0.38589)
+New Polarization: (0.86584,0.374554,-0.331708)
+Polarization Change: (0.86584,0.374554,-0.331708)
+New Momentum Direction: (-0.46865,0.839297,-0.275585)
+Momentum Change: (-0.46865,0.839297,-0.275585)
  Photon at Boundary! 
- Old Momentum Direction: (-0.46866,0.83929,-0.27559)
- Old Polarization:       (0.86584,0.37456,-0.33172)
- New Momentum Direction: (0.46866,0.83929,-0.27559)
- New Polarization:       (0.86584,-0.37456,0.33172)
+ Old Momentum Direction: (-0.46865,0.839297,-0.275585)
+ Old Polarization:       (0.86584,0.374554,-0.331708)
+ New Momentum Direction: (0.46865,0.839297,-0.275585)
+ New Polarization:       (0.86584,-0.374554,0.331708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.46866,0.83929,-0.27559)
- Old Polarization:       (0.86584,-0.37456,0.33172)
- New Momentum Direction: (0.63704,0.67369,-0.3746)
- New Polarization:       (0.76867,-0.5916,0.24324)
+ Old Momentum Direction: (0.46865,0.839297,-0.275585)
+ Old Polarization:       (0.86584,-0.374554,0.331708)
+ New Momentum Direction: (0.637029,0.673698,-0.374598)
+ New Polarization:       (0.768673,-0.591595,0.243223)
  *** FresnelRefraction *** 
 Track (trackID 520, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64692,-0.1853,0.7397)
- Old Polarization:       (-0.76221,-0.18656,0.61987)
- New Momentum Direction: (0.87998,-0.25205,0.40262)
- New Polarization:       (0.29716,-0.36917,-0.88058)
+ Old Momentum Direction: (0.646908,-0.185296,0.739713)
+ Old Polarization:       (-0.762216,-0.186558,0.619856)
+ New Momentum Direction: (0.879964,-0.252051,0.402657)
+ New Polarization:       (0.297183,-0.369183,-0.88056)
  *** FresnelRefraction *** 
 Track (trackID 519, parentID 1) is processed with stopping code 2
 ### pop requested out of 216 stacked tracks.
@@ -3215,34 +3201,34 @@ Track (trackID 519, parentID 1) is processed with stopping code 2
 Track (trackID 518, parentID 1) is processed with stopping code 2
 ### pop requested out of 215 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81194,0.30357,-0.49859)
- Old Polarization:       (-0.58168,0.3491,-0.73469)
- New Momentum Direction: (0.61279,0.41097,-0.67498)
- New Polarization:       (-0.78885,0.26727,-0.55343)
+ Old Momentum Direction: (0.811949,0.303572,-0.49858)
+ Old Polarization:       (-0.581669,0.349105,-0.734702)
+ New Momentum Direction: (0.612809,0.410965,-0.674961)
+ New Polarization:       (-0.788829,0.267281,-0.553452)
  *** FresnelRefraction *** 
 Track (trackID 517, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80561,-0.35765,-0.47231)
- Old Polarization:       (-0.58778,-0.38256,-0.71286)
- New Momentum Direction: (0.6027,-0.48172,-0.63616)
- New Polarization:       (-0.79476,-0.291,-0.53261)
+ Old Momentum Direction: (0.805615,-0.357653,-0.472302)
+ Old Polarization:       (-0.587765,-0.382558,-0.712869)
+ New Momentum Direction: (0.602715,-0.481722,-0.636143)
+ New Polarization:       (-0.794751,-0.291003,-0.532624)
  *** FresnelRefraction *** 
 Track (trackID 516, parentID 1) is processed with stopping code 2
 ### pop requested out of 213 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79693,-0.42857,-0.42571)
- Old Polarization:       (-0.59784,-0.45858,-0.65749)
- New Momentum Direction: (0.57823,-0.57883,-0.57497)
- New Polarization:       (-0.81164,-0.33644,-0.47754)
+ Old Momentum Direction: (0.796935,-0.428572,-0.425701)
+ Old Polarization:       (-0.597831,-0.458583,-0.657495)
+ New Momentum Direction: (0.57825,-0.578836,-0.574957)
+ New Polarization:       (-0.811628,-0.336451,-0.477557)
  *** FresnelRefraction *** 
 Track (trackID 515, parentID 1) is processed with stopping code 2
 ### pop requested out of 212 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79753,-0.40282,-0.44909)
- Old Polarization:       (-0.59772,-0.42674,-0.6787)
- New Momentum Direction: (0.5757,-0.54597,-0.60868)
- New Polarization:       (-0.81391,-0.31142,-0.49047)
+ Old Momentum Direction: (0.797536,-0.402822,-0.449078)
+ Old Polarization:       (-0.597705,-0.426735,-0.678709)
+ New Momentum Direction: (0.575717,-0.545969,-0.608661)
+ New Polarization:       (-0.813898,-0.311431,-0.490491)
  *** FresnelRefraction *** 
 Track (trackID 514, parentID 1) is processed with stopping code 2
 ### pop requested out of 211 stacked tracks.
@@ -3251,10 +3237,10 @@ Track (trackID 514, parentID 1) is processed with stopping code 2
 Track (trackID 513, parentID 1) is processed with stopping code 2
 ### pop requested out of 210 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74087,0.66794,0.070439)
- Old Polarization:       (-0.65993,0.74344,-0.1086)
- New Momentum Direction: (0.40829,0.90782,0.095736)
- New Polarization:       (-0.90552,0.41604,-0.08331)
+ Old Momentum Direction: (0.740873,0.66794,0.0704504)
+ Old Polarization:       (-0.659925,0.74344,-0.108611)
+ New Momentum Direction: (0.408287,0.907818,0.0957514)
+ New Polarization:       (-0.90552,0.416042,-0.0833184)
  *** FresnelRefraction *** 
 Track (trackID 512, parentID 1) is processed with stopping code 2
 ### pop requested out of 209 stacked tracks.
@@ -3263,42 +3249,42 @@ Track (trackID 512, parentID 1) is processed with stopping code 2
 Track (trackID 511, parentID 1) is processed with stopping code 2
 ### pop requested out of 208 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79122,0.51876,-0.32383)
- Old Polarization:       (-0.60464,0.5843,-0.54129)
- New Momentum Direction: (0.55948,0.7031,-0.4389)
- New Polarization:       (-0.82422,0.41607,-0.38413)
+ Old Momentum Direction: (0.791221,0.51876,-0.323816)
+ Old Polarization:       (-0.604631,0.584306,-0.541302)
+ New Momentum Direction: (0.559495,0.703098,-0.438883)
+ New Polarization:       (-0.824204,0.416081,-0.38414)
  *** FresnelRefraction *** 
 Track (trackID 510, parentID 1) is processed with stopping code 2
 ### pop requested out of 207 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76825,0.62822,-0.12302)
- Old Polarization:       (-0.62969,0.70702,-0.32189)
- New Momentum Direction: (0.4998,0.84999,-0.16646)
- New Polarization:       (-0.85925,0.46238,-0.21886)
+ Old Momentum Direction: (0.768255,0.628214,-0.123013)
+ Old Polarization:       (-0.629684,0.707021,-0.321899)
+ New Momentum Direction: (0.49981,0.849993,-0.16644)
+ New Polarization:       (-0.85924,0.46239,-0.218866)
  *** FresnelRefraction *** 
 Track (trackID 509, parentID 1) is processed with stopping code 2
 ### pop requested out of 206 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70949,-0.66181,0.24214)
- Old Polarization:       (-0.69445,-0.71501,0.080568)
- New Momentum Direction: (-0.70949,-0.66181,0.24214)
- New Polarization:       (-0.66802,0.74103,0.06797)
+ Old Momentum Direction: (0.70949,-0.661806,0.242152)
+ Old Polarization:       (-0.694453,-0.715014,0.0805572)
+ New Momentum Direction: (-0.70949,-0.661806,0.242152)
+ New Polarization:       (-0.668023,0.741029,0.0679787)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70949,-0.66181,0.24214)
- Old Polarization:       (-0.66802,0.74103,0.06797)
- New Momentum Direction: (-0.70949,0.66181,0.24214)
- New Polarization:       (0.66802,0.74103,-0.06797)
+ Old Momentum Direction: (-0.70949,-0.661806,0.242152)
+ Old Polarization:       (-0.668023,0.741029,0.0679787)
+ New Momentum Direction: (-0.70949,0.661806,0.242152)
+ New Polarization:       (0.668023,0.741029,-0.0679787)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 508, parentID 1) is processed with stopping code 2
 ### pop requested out of 205 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74482,0.66594,0.042049)
- Old Polarization:       (-0.65561,0.74208,-0.13962)
- New Momentum Direction: (0.42235,0.90463,0.05712)
- New Polarization:       (-0.89907,0.42611,-0.10051)
+ Old Momentum Direction: (0.744823,0.665935,0.0420603)
+ Old Polarization:       (-0.655602,0.742084,-0.139629)
+ New Momentum Direction: (0.422356,0.904627,0.057136)
+ New Polarization:       (-0.89907,0.42611,-0.100514)
  *** FresnelRefraction *** 
 Track (trackID 507, parentID 1) is processed with stopping code 2
 ### pop requested out of 204 stacked tracks.
@@ -3307,42 +3293,42 @@ Track (trackID 507, parentID 1) is processed with stopping code 2
 Track (trackID 506, parentID 1) is processed with stopping code 2
 ### pop requested out of 203 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80175,0.44465,-0.39936)
- Old Polarization:       (-0.5927,0.50558,-0.62697)
- New Momentum Direction: (0.58899,0.60124,-0.54)
- New Polarization:       (-0.80477,0.3754,-0.4598)
+ Old Momentum Direction: (0.801752,0.44465,-0.399349)
+ Old Polarization:       (-0.592691,0.505584,-0.626979)
+ New Momentum Direction: (0.589006,0.601239,-0.539985)
+ New Polarization:       (-0.804757,0.375411,-0.459819)
  *** FresnelRefraction *** 
 Track (trackID 505, parentID 1) is processed with stopping code 2
 ### pop requested out of 202 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69296,-0.6149,0.37644)
- Old Polarization:       (-0.71269,-0.66315,0.2287)
- New Momentum Direction: (0.22348,-0.8313,0.50891)
- New Polarization:       (-0.97015,-0.24013,0.033774)
+ Old Momentum Direction: (0.69295,-0.614905,0.376446)
+ Old Polarization:       (-0.712695,-0.66315,0.228687)
+ New Momentum Direction: (0.223445,-0.831304,0.508926)
+ New Polarization:       (-0.97016,-0.240106,0.03375)
  *** FresnelRefraction *** 
 Track (trackID 504, parentID 1) is processed with stopping code 2
 ### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67707,-0.50523,0.53509)
- Old Polarization:       (-0.73081,-0.54711,0.40814)
- New Momentum Direction: (0.1346,-0.68027,0.72049)
- New Polarization:       (-0.98833,-0.1445,0.048207)
+ Old Momentum Direction: (0.677059,-0.505227,0.535105)
+ Old Polarization:       (-0.73082,-0.547111,0.408131)
+ New Momentum Direction: (0.134523,-0.680275,0.720506)
+ New Polarization:       (-0.98834,-0.144447,0.0481484)
  *** FresnelRefraction *** 
 Track (trackID 503, parentID 1) is processed with stopping code 2
 ### pop requested out of 200 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81757,-0.098602,-0.56733)
- Old Polarization:       (-0.5752,-0.093574,-0.81264)
- New Momentum Direction: (0.62776,-0.13329,-0.76691)
- New Polarization:       (-0.77797,-0.074508,-0.62386)
+ Old Momentum Direction: (0.817576,-0.0986032,-0.567316)
+ Old Polarization:       (-0.575186,-0.0935732,-0.812653)
+ New Momentum Direction: (0.62778,-0.133291,-0.766893)
+ New Polarization:       (-0.777956,-0.0745104,-0.623886)
  *** FresnelRefraction *** 
 Track (trackID 502, parentID 1) is processed with stopping code 2
 ### pop requested out of 199 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64697,0.014951,0.76237)
- Old Polarization:       (-0.76238,0.03145,0.64636)
- New Momentum Direction: (0.87904,0.020315,0.47631)
- New Polarization:       (0.47514,0.044666,-0.87878)
+ Old Momentum Direction: (0.646958,0.0149507,0.762379)
+ Old Polarization:       (-0.762392,0.0314515,0.646351)
+ New Momentum Direction: (0.879027,0.0203136,0.476339)
+ New Polarization:       (0.475164,0.0446667,-0.878763)
  *** FresnelRefraction *** 
 Track (trackID 501, parentID 1) is processed with stopping code 2
 ### pop requested out of 198 stacked tracks.
@@ -3351,10 +3337,10 @@ Track (trackID 501, parentID 1) is processed with stopping code 2
 Track (trackID 500, parentID 1) is processed with stopping code 2
 ### pop requested out of 197 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64646,-0.015056,0.7628)
- Old Polarization:       (-0.7629,-0.0012883,0.64652)
- New Momentum Direction: (0.87852,-0.020461,0.47726)
- New Polarization:       (0.47679,-0.024179,-0.87869)
+ Old Momentum Direction: (0.64645,-0.0150572,0.762808)
+ Old Polarization:       (-0.762906,-0.00128719,0.646508)
+ New Momentum Direction: (0.878508,-0.0204623,0.47729)
+ New Polarization:       (0.476815,-0.0241809,-0.878671)
  *** FresnelRefraction *** 
 Track (trackID 499, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
@@ -3363,10 +3349,10 @@ Track (trackID 499, parentID 1) is processed with stopping code 2
 Track (trackID 498, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78456,-0.52925,-0.32304)
- Old Polarization:       (-0.61125,-0.57272,-0.54623)
- New Momentum Direction: (0.54932,-0.71324,-0.43535)
- New Polarization:       (-0.82967,-0.40352,-0.38579)
+ Old Momentum Direction: (0.784568,-0.52925,-0.323029)
+ Old Polarization:       (-0.611243,-0.57272,-0.546237)
+ New Momentum Direction: (0.549336,-0.713244,-0.43533)
+ New Polarization:       (-0.829656,-0.403523,-0.385797)
  *** FresnelRefraction *** 
 Track (trackID 497, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
@@ -3379,26 +3365,26 @@ Track (trackID 496, parentID 1) is processed with stopping code 2
 Track (trackID 495, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65454,0.11829,0.74671)
- Old Polarization:       (-0.75528,0.14606,0.63892)
- New Momentum Direction: (0.88394,0.15974,0.43946)
- New Polarization:       (0.38958,0.26816,-0.88109)
+ Old Momentum Direction: (0.654533,0.118284,0.746723)
+ Old Polarization:       (-0.755291,0.146056,0.638908)
+ New Momentum Direction: (0.883929,0.15974,0.439492)
+ New Polarization:       (0.38961,0.268168,-0.881073)
  *** FresnelRefraction *** 
 Track (trackID 494, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73832,-0.67438,-0.0095867)
- Old Polarization:       (-0.66269,-0.72273,-0.19625)
- New Momentum Direction: (0.40296,-0.91512,-0.013009)
- New Polarization:       (-0.90786,-0.39788,-0.13222)
+ Old Momentum Direction: (0.73832,-0.674382,-0.00957516)
+ Old Polarization:       (-0.662684,-0.722726,-0.196256)
+ New Momentum Direction: (0.402959,-0.915126,-0.0129933)
+ New Polarization:       (-0.907857,-0.397881,-0.132234)
  *** FresnelRefraction *** 
 Track (trackID 493, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80417,0.40351,-0.43645)
- Old Polarization:       (-0.59045,0.45775,-0.66471)
- New Momentum Direction: (0.59232,0.54696,-0.59161)
- New Polarization:       (-0.80303,0.34099,-0.48874)
+ Old Momentum Direction: (0.804178,0.403509,-0.436439)
+ Old Polarization:       (-0.590436,0.457755,-0.664715)
+ New Momentum Direction: (0.592335,0.546955,-0.591591)
+ New Polarization:       (-0.803017,0.341003,-0.488754)
  *** FresnelRefraction *** 
 Track (trackID 492, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
@@ -3407,42 +3393,42 @@ Track (trackID 492, parentID 1) is processed with stopping code 2
 Track (trackID 491, parentID 1) is processed with stopping code 2
 ### pop requested out of 188 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71114,0.61873,0.33383)
- Old Polarization:       (-0.69263,0.69801,0.18177)
- New Momentum Direction: (0.31117,0.83638,0.45127)
- New Polarization:       (-0.94418,0.3261,0.046664)
+ Old Momentum Direction: (0.711139,0.618731,0.333845)
+ Old Polarization:       (-0.692636,0.698012,0.181757)
+ New Momentum Direction: (0.311155,0.836379,0.45128)
+ New Polarization:       (-0.944186,0.326092,0.0466492)
  *** FresnelRefraction *** 
 Track (trackID 490, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76773,0.62244,-0.15218)
- Old Polarization:       (-0.63074,0.69222,-0.35072)
- New Momentum Direction: (0.48982,0.84688,-0.20706)
- New Polarization:       (-0.8653,0.44324,-0.23408)
+ Old Momentum Direction: (0.767735,0.622436,-0.152173)
+ Old Polarization:       (-0.63073,0.692219,-0.350732)
+ New Momentum Direction: (0.489827,0.846878,-0.207044)
+ New Polarization:       (-0.865294,0.44325,-0.234087)
  *** FresnelRefraction *** 
 Track (trackID 489, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75311,-0.64849,-0.11083)
- Old Polarization:       (-0.64639,-0.69801,-0.30817)
- New Momentum Direction: (0.45466,-0.87793,-0.15005)
- New Polarization:       (-0.88324,-0.42272,-0.20297)
+ Old Momentum Direction: (0.753116,-0.648487,-0.110822)
+ Old Polarization:       (-0.646383,-0.698005,-0.308185)
+ New Momentum Direction: (0.454664,-0.877935,-0.150034)
+ New Polarization:       (-0.883236,-0.422721,-0.202983)
  *** FresnelRefraction *** 
 Track (trackID 488, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78462,0.56047,-0.26504)
- Old Polarization:       (-0.61181,0.6308,-0.47726)
- New Momentum Direction: (0.54284,0.75922,-0.35903)
- New Polarization:       (-0.83438,0.43889,-0.33345)
+ Old Momentum Direction: (0.784623,0.560469,-0.26503)
+ Old Polarization:       (-0.611803,0.6308,-0.477272)
+ New Momentum Direction: (0.542855,0.759222,-0.359015)
+ New Polarization:       (-0.834367,0.4389,-0.333464)
  *** FresnelRefraction *** 
 Track (trackID 487, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69826,-0.62495,0.3491)
- Old Polarization:       (-0.70709,-0.6782,0.20019)
- New Momentum Direction: (0.26134,-0.84268,0.47073)
- New Polarization:       (-0.96024,-0.27659,0.037953)
+ Old Momentum Direction: (0.698252,-0.624951,0.349115)
+ Old Polarization:       (-0.707089,-0.678198,0.200179)
+ New Momentum Direction: (0.26131,-0.842683,0.470746)
+ New Polarization:       (-0.960244,-0.276574,0.0379333)
  *** FresnelRefraction *** 
 Track (trackID 486, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
@@ -3451,10 +3437,10 @@ Track (trackID 486, parentID 1) is processed with stopping code 2
 Track (trackID 485, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68427,0.4897,0.54034)
- Old Polarization:       (-0.72238,0.55651,0.41045)
- New Momentum Direction: (0.1724,0.66148,0.72988)
- New Polarization:       (-0.98145,0.17844,0.070101)
+ Old Momentum Direction: (0.684263,0.489699,0.540351)
+ Old Polarization:       (-0.722385,0.556509,0.410437)
+ New Momentum Direction: (0.172342,0.661476,0.729896)
+ New Polarization:       (-0.98146,0.178406,0.0700589)
  *** FresnelRefraction *** 
 Track (trackID 484, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
@@ -3467,10 +3453,10 @@ Track (trackID 483, parentID 1) is processed with stopping code 2
 Track (trackID 482, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81793,0.20732,-0.53667)
- Old Polarization:       (-0.5745,0.24476,-0.78105)
- New Momentum Direction: (0.63001,0.27984,-0.72441)
- New Polarization:       (-0.77603,0.19151,-0.60092)
+ Old Momentum Direction: (0.817939,0.207315,-0.536653)
+ Old Polarization:       (-0.574492,0.244761,-0.781058)
+ New Momentum Direction: (0.630034,0.279841,-0.724393)
+ New Polarization:       (-0.776009,0.191517,-0.600942)
  *** FresnelRefraction *** 
 Track (trackID 481, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
@@ -3479,26 +3465,26 @@ Track (trackID 481, parentID 1) is processed with stopping code 2
 Track (trackID 480, parentID 1) is processed with stopping code 2
 ### pop requested out of 177 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81156,0.32449,-0.48587)
- Old Polarization:       (-0.58184,0.37321,-0.72261)
- New Momentum Direction: (0.61326,0.43869,-0.65686)
- New Polarization:       (-0.78823,0.2861,-0.54483)
+ Old Momentum Direction: (0.811572,0.324492,-0.485856)
+ Old Polarization:       (-0.581829,0.373215,-0.722624)
+ New Momentum Direction: (0.613278,0.438689,-0.656842)
+ New Polarization:       (-0.788213,0.286108,-0.544852)
  *** FresnelRefraction *** 
 Track (trackID 479, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75508,0.65476,-0.033824)
- Old Polarization:       (-0.64435,0.73156,-0.22276)
- New Momentum Direction: (0.45655,0.88851,-0.0459)
- New Polarization:       (-0.88244,0.44564,-0.15069)
+ Old Momentum Direction: (0.755077,0.654763,-0.0338127)
+ Old Polarization:       (-0.64435,0.731564,-0.222773)
+ New Momentum Direction: (0.456551,0.888513,-0.0458838)
+ New Polarization:       (-0.882435,0.445646,-0.150696)
  *** FresnelRefraction *** 
 Track (trackID 478, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6518,-0.082932,0.75384)
- Old Polarization:       (-0.75838,-0.076521,0.64731)
- New Momentum Direction: (0.87997,-0.11196,0.46165)
- New Polarization:       (0.43964,-0.17616,-0.88073)
+ Old Momentum Direction: (0.65179,-0.0829329,0.753852)
+ Old Polarization:       (-0.758389,-0.0765197,0.647295)
+ New Momentum Direction: (0.879951,-0.111964,0.461682)
+ New Polarization:       (0.439666,-0.176171,-0.880714)
  *** FresnelRefraction *** 
 Track (trackID 477, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
@@ -3507,82 +3493,82 @@ Track (trackID 477, parentID 1) is processed with stopping code 2
 Track (trackID 476, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6821,-0.55549,0.47558)
- Old Polarization:       (-0.72485,-0.5995,0.3394)
- New Momentum Direction: (0.15939,-0.74992,0.64204)
- New Polarization:       (-0.98391,-0.17381,0.041252)
+ Old Momentum Direction: (0.682091,-0.555489,0.475588)
+ Old Polarization:       (-0.72486,-0.599495,0.339386)
+ New Momentum Direction: (0.159332,-0.74992,0.642053)
+ New Polarization:       (-0.983924,-0.173768,0.0412095)
  *** FresnelRefraction *** 
 Track (trackID 475, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68018,-0.56509,0.46693)
- Old Polarization:       (-0.72646,-0.60482,0.32627)
- New Momentum Direction: (0.11397,-0.76586,0.63283)
- New Polarization:       (-0.9903,-0.13852,0.010708)
+ Old Momentum Direction: (0.680176,-0.56509,0.466942)
+ Old Polarization:       (-0.726462,-0.60482,0.32626)
+ New Momentum Direction: (0.113884,-0.765861,0.632841)
+ New Polarization:       (-0.990311,-0.138457,0.0106525)
  *** FresnelRefraction *** 
 Track (trackID 474, parentID 1) is processed with stopping code 2
 ### pop requested out of 171 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65144,-0.017325,0.7585)
- Old Polarization:       (-0.75866,-0.0039044,0.65148)
- New Momentum Direction: (0.88001,-0.023404,0.47438)
- New Polarization:       (0.47371,-0.029242,-0.8802)
+ Old Momentum Direction: (0.651428,-0.0173261,0.758513)
+ Old Polarization:       (-0.758665,-0.00390333,0.651469)
+ New Momentum Direction: (0.879991,-0.0234053,0.474413)
+ New Polarization:       (0.473737,-0.029244,-0.880181)
  *** FresnelRefraction *** 
 Track (trackID 473, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.81288,-0.14218,-0.56481)
-Old Polarization: (-0.58138,-0.13995,-0.80151)
-New Polarization: (0.25382,0.84293,0.47439)
-Polarization Change: (0.25382,0.84293,0.47439)
-New Momentum Direction: (0.54676,-0.52961,0.64851)
-Momentum Change: (0.54676,-0.52961,0.64851)
+Old Momentum Direction: (0.812892,-0.142185,-0.564792)
+Old Polarization: (-0.581367,-0.139953,-0.801515)
+New Polarization: (0.253814,0.842929,0.474393)
+Polarization Change: (0.253814,0.842929,0.474393)
+New Momentum Direction: (0.546748,-0.529612,0.64852)
+Momentum Change: (0.546748,-0.529612,0.64852)
  Photon at Boundary! 
- Old Momentum Direction: (0.54676,-0.52961,0.64851)
- Old Polarization:       (0.25382,0.84293,0.47439)
- New Momentum Direction: (-0.54676,-0.52961,0.64851)
- New Polarization:       (0.25382,-0.84293,-0.47439)
+ Old Momentum Direction: (0.546748,-0.529612,0.64852)
+ Old Polarization:       (0.253814,0.842929,0.474393)
+ New Momentum Direction: (-0.546748,-0.529612,0.64852)
+ New Polarization:       (0.253814,-0.842929,-0.474393)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54676,-0.52961,0.64851)
- Old Polarization:       (0.25382,-0.84293,-0.47439)
- New Momentum Direction: (-0.54676,0.52961,0.64851)
- New Polarization:       (-0.25382,-0.84293,0.47439)
+ Old Momentum Direction: (-0.546748,-0.529612,0.64852)
+ Old Polarization:       (0.253814,-0.842929,-0.474393)
+ New Momentum Direction: (-0.546748,0.529612,0.64852)
+ New Polarization:       (-0.253814,-0.842929,0.474393)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54676,0.52961,0.64851)
- Old Polarization:       (-0.25382,-0.84293,0.47439)
- New Momentum Direction: (-0.54676,0.52961,-0.64851)
- New Polarization:       (0.25382,0.84293,0.47439)
+ Old Momentum Direction: (-0.546748,0.529612,0.64852)
+ Old Polarization:       (-0.253814,-0.842929,0.474393)
+ New Momentum Direction: (-0.546748,0.529612,-0.64852)
+ New Polarization:       (0.253814,0.842929,0.474393)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54676,0.52961,-0.64851)
- Old Polarization:       (0.25382,0.84293,0.47439)
- New Momentum Direction: (0.54676,0.52961,-0.64851)
- New Polarization:       (0.25382,-0.84293,-0.47439)
+ Old Momentum Direction: (-0.546748,0.529612,-0.64852)
+ Old Polarization:       (0.253814,0.842929,0.474393)
+ New Momentum Direction: (0.546748,0.529612,-0.64852)
+ New Polarization:       (0.253814,-0.842929,-0.474393)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.54676,0.52961,-0.64851)
-Old Polarization: (0.25382,-0.84293,-0.47439)
-New Polarization: (-0.30336,-0.94634,0.11142)
-Polarization Change: (-0.30336,-0.94634,0.11142)
-New Momentum Direction: (-0.61322,0.28338,0.73733)
-Momentum Change: (-0.61322,0.28338,0.73733)
+Old Momentum Direction: (0.546748,0.529612,-0.64852)
+Old Polarization: (0.253814,-0.842929,-0.474393)
+New Polarization: (-0.30337,-0.946337,0.111411)
+Polarization Change: (-0.30337,-0.946337,0.111411)
+New Momentum Direction: (-0.613216,0.283385,0.737332)
+Momentum Change: (-0.613216,0.283385,0.737332)
  Photon at Boundary! 
- Old Momentum Direction: (-0.61322,0.28338,0.73733)
- Old Polarization:       (-0.30336,-0.94634,0.11142)
- New Momentum Direction: (0.61322,0.28338,0.73733)
- New Polarization:       (-0.30336,0.94634,-0.11142)
+ Old Momentum Direction: (-0.613216,0.283385,0.737332)
+ Old Polarization:       (-0.30337,-0.946337,0.111411)
+ New Momentum Direction: (0.613216,0.283385,0.737332)
+ New Polarization:       (-0.30337,0.946337,-0.111411)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 472, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80429,0.38054,-0.4564)
- Old Polarization:       (-0.59081,0.42986,-0.68276)
- New Momentum Direction: (0.58943,0.51732,-0.62044)
- New Polarization:       (-0.80552,0.3185,-0.49969)
+ Old Momentum Direction: (0.804302,0.380542,-0.456384)
+ Old Polarization:       (-0.590804,0.42986,-0.682767)
+ New Momentum Direction: (0.589449,0.517323,-0.620425)
+ New Polarization:       (-0.805507,0.318512,-0.499708)
  *** FresnelRefraction *** 
 Track (trackID 471, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
@@ -3591,10 +3577,10 @@ Track (trackID 471, parentID 1) is processed with stopping code 2
 Track (trackID 470, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71151,0.61068,0.3476)
- Old Polarization:       (-0.6924,0.69358,0.19879)
- New Momentum Direction: (0.32103,0.82308,0.46849)
- New Polarization:       (-0.94091,0.33353,0.058787)
+ Old Momentum Direction: (0.711509,0.610675,0.347606)
+ Old Polarization:       (-0.692406,0.693585,0.198781)
+ New Momentum Direction: (0.321015,0.823074,0.468507)
+ New Polarization:       (-0.940909,0.33352,0.0587716)
  *** FresnelRefraction *** 
 Track (trackID 469, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
@@ -3603,36 +3589,36 @@ Track (trackID 469, parentID 1) is processed with stopping code 2
 Track (trackID 468, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70104,0.59997,0.38546)
- Old Polarization:       (-0.70342,0.67062,0.23552)
- New Momentum Direction: (0.24956,0.8147,0.52343)
- New Polarization:       (-0.96294,0.26587,0.0453)
+ Old Momentum Direction: (0.701038,0.599964,0.385472)
+ Old Polarization:       (-0.703426,0.670618,0.235507)
+ New Momentum Direction: (0.249538,0.814703,0.52344)
+ New Polarization:       (-0.96295,0.265853,0.0452806)
  *** FresnelRefraction *** 
 Track (trackID 467, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67684,0.46241,0.57277)
- Old Polarization:       (-0.73002,0.52167,0.44151)
- New Momentum Direction: (-0.67684,0.46241,0.57277)
- New Polarization:       (-0.72863,-0.53158,-0.43187)
+ Old Momentum Direction: (0.676837,0.462407,0.572775)
+ Old Polarization:       (-0.730023,0.521671,0.441503)
+ New Momentum Direction: (-0.676837,0.462407,0.572775)
+ New Polarization:       (-0.728642,-0.531554,-0.431893)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67684,0.46241,0.57277)
- Old Polarization:       (-0.72863,-0.53158,-0.43187)
- New Momentum Direction: (-0.67684,0.46241,-0.57277)
- New Polarization:       (0.72863,0.53158,-0.43187)
+ Old Momentum Direction: (-0.676837,0.462407,0.572775)
+ Old Polarization:       (-0.728642,-0.531554,-0.431893)
+ New Momentum Direction: (-0.676837,0.462407,-0.572775)
+ New Polarization:       (0.728642,0.531554,-0.431893)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67684,0.46241,-0.57277)
- Old Polarization:       (0.72863,0.53158,-0.43187)
- New Momentum Direction: (-0.67684,-0.46241,-0.57277)
- New Polarization:       (-0.72863,0.53158,0.43187)
+ Old Momentum Direction: (-0.676837,0.462407,-0.572775)
+ Old Polarization:       (0.728642,0.531554,-0.431893)
+ New Momentum Direction: (-0.676837,-0.462407,-0.572775)
+ New Polarization:       (-0.728642,0.531554,0.431893)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67684,-0.46241,-0.57277)
- Old Polarization:       (-0.72863,0.53158,0.43187)
- New Momentum Direction: (-0.056232,-0.62717,-0.77685)
- New Polarization:       (0.99508,0.028349,-0.094915)
+ Old Momentum Direction: (-0.676837,-0.462407,-0.572775)
+ Old Polarization:       (-0.728642,0.531554,0.431893)
+ New Momentum Direction: (-0.0560562,-0.627169,-0.776863)
+ New Polarization:       (0.995094,0.0284372,-0.0947607)
  *** FresnelRefraction *** 
 Track (trackID 466, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
@@ -3641,10 +3627,10 @@ Track (trackID 466, parentID 1) is processed with stopping code 2
 Track (trackID 465, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65419,-0.12081,0.74662)
- Old Polarization:       (-0.75625,-0.11914,0.64334)
- New Momentum Direction: (0.88099,-0.1627,0.44428)
- New Polarization:       (0.39749,-0.2548,-0.88152)
+ Old Momentum Direction: (0.654175,-0.120813,0.746632)
+ Old Polarization:       (-0.75626,-0.119136,0.643333)
+ New Momentum Direction: (0.880976,-0.162698,0.444309)
+ New Polarization:       (0.397518,-0.254809,-0.881506)
  *** FresnelRefraction *** 
 Track (trackID 464, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
@@ -3653,42 +3639,42 @@ Track (trackID 464, parentID 1) is processed with stopping code 2
 Track (trackID 463, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79681,-0.44846,-0.40493)
- Old Polarization:       (-0.59743,-0.48453,-0.63899)
- New Momentum Direction: (0.58209,-0.60351,-0.54493)
- New Polarization:       (-0.80848,-0.35804,-0.46709)
+ Old Momentum Direction: (0.796819,-0.448462,-0.404921)
+ Old Polarization:       (-0.597422,-0.484532,-0.638996)
+ New Momentum Direction: (0.582107,-0.603507,-0.544914)
+ New Polarization:       (-0.808466,-0.358046,-0.467103)
  *** FresnelRefraction *** 
 Track (trackID 462, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66001,-0.41581,0.62569)
- Old Polarization:       (-0.7482,-0.43885,0.49761)
- New Momentum Direction: (-0.66001,-0.41581,0.62569)
- New Polarization:       (-0.7482,0.43885,-0.49761)
+ Old Momentum Direction: (0.660004,-0.415807,0.625699)
+ Old Polarization:       (-0.748207,-0.438846,0.497594)
+ New Momentum Direction: (-0.660004,-0.415807,0.625699)
+ New Polarization:       (-0.748207,0.438846,-0.497594)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66001,-0.41581,0.62569)
- Old Polarization:       (-0.7482,0.43885,-0.49761)
- New Momentum Direction: (-0.66001,-0.41581,-0.62569)
- New Polarization:       (0.7482,-0.43885,-0.49761)
+ Old Momentum Direction: (-0.660004,-0.415807,0.625699)
+ Old Polarization:       (-0.748207,0.438846,-0.497594)
+ New Momentum Direction: (-0.660004,-0.415807,-0.625699)
+ New Polarization:       (0.748207,-0.438846,-0.497594)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 461, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75445,0.65596,0.022709)
- Old Polarization:       (-0.64463,0.74704,-0.16241)
- New Momentum Direction: (0.46946,0.88243,0.030549)
- New Polarization:       (-0.87525,0.46964,-0.11563)
+ Old Momentum Direction: (0.754453,0.655961,0.0227202)
+ Old Polarization:       (-0.644629,0.747044,-0.162417)
+ New Momentum Direction: (0.469461,0.882424,0.0305641)
+ New Polarization:       (-0.875247,0.469649,-0.11564)
  *** FresnelRefraction *** 
 Track (trackID 460, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81489,-0.20995,-0.54026)
- Old Polarization:       (-0.57766,-0.2177,-0.78671)
- New Momentum Direction: (0.62385,-0.28309,-0.72847)
- New Polarization:       (-0.7802,-0.17097,-0.60172)
+ Old Momentum Direction: (0.814899,-0.209949,-0.540242)
+ Old Polarization:       (-0.577649,-0.217699,-0.786721)
+ New Momentum Direction: (0.623874,-0.28309,-0.728451)
+ New Polarization:       (-0.780181,-0.170974,-0.601735)
  *** FresnelRefraction *** 
 Track (trackID 459, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
@@ -3697,223 +3683,223 @@ Track (trackID 459, parentID 1) is processed with stopping code 2
 Track (trackID 458, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81609,0.12441,-0.56437)
- Old Polarization:       (-0.57774,0.15105,-0.80212)
- New Momentum Direction: (0.61975,0.16895,-0.7664)
- New Polarization:       (-0.78467,0.11603,-0.60895)
+ Old Momentum Direction: (0.816103,0.124409,-0.564357)
+ Old Polarization:       (-0.577724,0.151056,-0.802133)
+ New Momentum Direction: (0.619773,0.168944,-0.76638)
+ New Polarization:       (-0.784657,0.116037,-0.608974)
  *** FresnelRefraction *** 
 Track (trackID 457, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66374,0.35193,0.66)
- Old Polarization:       (-0.74417,0.39955,0.53533)
- New Momentum Direction: (-0.66374,0.35193,0.66)
- New Polarization:       (-0.74417,-0.39955,-0.53533)
+ Old Momentum Direction: (0.663727,0.351928,0.66001)
+ Old Polarization:       (-0.744174,0.399554,0.535315)
+ New Momentum Direction: (-0.663727,0.351928,0.66001)
+ New Polarization:       (-0.744174,-0.399554,-0.535315)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66374,0.35193,0.66)
- Old Polarization:       (-0.74417,-0.39955,-0.53533)
- New Momentum Direction: (-0.66374,0.35193,-0.66)
- New Polarization:       (0.74417,0.39955,-0.53533)
+ Old Momentum Direction: (-0.663727,0.351928,0.66001)
+ Old Polarization:       (-0.744174,-0.399554,-0.535315)
+ New Momentum Direction: (-0.663727,0.351928,-0.66001)
+ New Polarization:       (0.744174,0.399554,-0.535315)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66374,0.35193,-0.66)
- Old Polarization:       (0.74417,0.39955,-0.53533)
- New Momentum Direction: (-0.66374,-0.35193,-0.66)
- New Polarization:       (-0.74417,0.39955,0.53533)
+ Old Momentum Direction: (-0.663727,0.351928,-0.66001)
+ Old Polarization:       (0.744174,0.399554,-0.535315)
+ New Momentum Direction: (-0.663727,-0.351928,-0.66001)
+ New Polarization:       (-0.744174,0.399554,0.535315)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66374,-0.35193,-0.66)
- Old Polarization:       (-0.74417,0.39955,0.53533)
- New Momentum Direction: (0.66374,-0.35193,-0.66)
- New Polarization:       (-0.74417,-0.39955,-0.53533)
+ Old Momentum Direction: (-0.663727,-0.351928,-0.66001)
+ Old Polarization:       (-0.744174,0.399554,0.535315)
+ New Momentum Direction: (0.663727,-0.351928,-0.66001)
+ New Polarization:       (-0.744174,-0.399554,-0.535315)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66374,-0.35193,-0.66)
- Old Polarization:       (-0.74417,-0.39955,-0.53533)
- New Momentum Direction: (0.66374,-0.35193,0.66)
- New Polarization:       (0.74417,0.39955,-0.53533)
+ Old Momentum Direction: (0.663727,-0.351928,-0.66001)
+ Old Polarization:       (-0.744174,-0.399554,-0.535315)
+ New Momentum Direction: (0.663727,-0.351928,0.66001)
+ New Polarization:       (0.744174,0.399554,-0.535315)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.66374,-0.35193,0.66)
-Old Polarization: (0.74417,0.39955,-0.53533)
-New Polarization: (0.84906,0.50638,-0.15057)
-Polarization Change: (0.84906,0.50638,-0.15057)
-New Momentum Direction: (-0.080535,-0.15762,-0.98421)
-Momentum Change: (-0.080535,-0.15762,-0.98421)
+Old Momentum Direction: (0.663727,-0.351928,0.66001)
+Old Polarization: (0.744174,0.399554,-0.535315)
+New Polarization: (0.849065,0.50638,-0.150559)
+Polarization Change: (0.849065,0.50638,-0.150559)
+New Momentum Direction: (-0.0805244,-0.157612,-0.984212)
+Momentum Change: (-0.0805244,-0.157612,-0.984212)
  Photon at Boundary! 
- Old Momentum Direction: (-0.080535,-0.15762,-0.98421)
- Old Polarization:       (0.84906,0.50638,-0.15057)
- New Momentum Direction: (-0.10937,-0.21405,-0.97068)
- New Polarization:       (-0.033971,-0.97516,0.21887)
+ Old Momentum Direction: (-0.0805244,-0.157612,-0.984212)
+ Old Polarization:       (0.849065,0.50638,-0.150559)
+ New Momentum Direction: (-0.109356,-0.214045,-0.970683)
+ New Polarization:       (-0.0338984,-0.975169,0.218853)
  *** FresnelRefraction *** 
 Track (trackID 456, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80046,0.44198,-0.40487)
- Old Polarization:       (-0.59454,0.49977,-0.62988)
- New Momentum Direction: (0.58283,0.5992,-0.54889)
- New Polarization:       (-0.80933,0.36751,-0.45818)
+ Old Momentum Direction: (0.800466,0.441978,-0.404857)
+ Old Polarization:       (-0.594532,0.499776,-0.629885)
+ New Momentum Direction: (0.582846,0.599194,-0.548869)
+ New Polarization:       (-0.809313,0.367522,-0.458193)
  *** FresnelRefraction *** 
 Track (trackID 455, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65148,0.11322,0.75017)
- Old Polarization:       (-0.75797,0.13944,0.63721)
- New Momentum Direction: (0.88285,0.15344,0.44389)
- New Polarization:       (0.39784,0.25798,-0.88044)
+ Old Momentum Direction: (0.651466,0.113224,0.750182)
+ Old Polarization:       (-0.757983,0.139443,0.637195)
+ New Momentum Direction: (0.882831,0.153435,0.443923)
+ New Polarization:       (0.397872,0.257989,-0.88042)
  *** FresnelRefraction *** 
 Track (trackID 454, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81768,0.20698,-0.53718)
- Old Polarization:       (-0.57487,0.24417,-0.78097)
- New Momentum Direction: (0.62902,0.27951,-0.7254)
- New Polarization:       (-0.77683,0.19078,-0.60011)
+ Old Momentum Direction: (0.817688,0.206984,-0.537163)
+ Old Polarization:       (-0.574853,0.244174,-0.780976)
+ New Momentum Direction: (0.629042,0.27951,-0.725383)
+ New Polarization:       (-0.776818,0.190791,-0.600128)
  *** FresnelRefraction *** 
 Track (trackID 453, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65731,-0.3502,0.66731)
- Old Polarization:       (-0.75161,-0.3693,0.54654)
- New Momentum Direction: (0.65731,-0.3502,-0.66731)
- New Polarization:       (0.75161,0.3693,0.54654)
+ Old Momentum Direction: (0.657298,-0.350203,0.667321)
+ Old Polarization:       (-0.751618,-0.369298,0.546525)
+ New Momentum Direction: (0.657298,-0.350203,-0.667321)
+ New Polarization:       (0.751618,0.369298,0.546525)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65731,-0.3502,-0.66731)
- Old Polarization:       (0.75161,0.3693,0.54654)
- New Momentum Direction: (-0.65731,-0.3502,-0.66731)
- New Polarization:       (0.75161,-0.3693,-0.54654)
+ Old Momentum Direction: (0.657298,-0.350203,-0.667321)
+ Old Polarization:       (0.751618,0.369298,0.546525)
+ New Momentum Direction: (-0.657298,-0.350203,-0.667321)
+ New Polarization:       (0.751618,-0.369298,-0.546525)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65731,-0.3502,-0.66731)
- Old Polarization:       (0.75161,-0.3693,-0.54654)
- New Momentum Direction: (-0.65731,0.3502,-0.66731)
- New Polarization:       (-0.75161,-0.3693,0.54654)
+ Old Momentum Direction: (-0.657298,-0.350203,-0.667321)
+ Old Polarization:       (0.751618,-0.369298,-0.546525)
+ New Momentum Direction: (-0.657298,0.350203,-0.667321)
+ New Polarization:       (-0.751618,-0.369298,0.546525)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65731,0.3502,-0.66731)
- Old Polarization:       (-0.75161,-0.3693,0.54654)
- New Momentum Direction: (-0.65731,0.3502,0.66731)
- New Polarization:       (0.75161,0.3693,0.54654)
+ Old Momentum Direction: (-0.657298,0.350203,-0.667321)
+ Old Polarization:       (-0.751618,-0.369298,0.546525)
+ New Momentum Direction: (-0.657298,0.350203,0.667321)
+ New Polarization:       (0.751618,0.369298,0.546525)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65731,0.3502,0.66731)
- Old Polarization:       (0.75161,0.3693,0.54654)
- New Momentum Direction: (0.65731,0.3502,0.66731)
- New Polarization:       (0.75161,-0.3693,-0.54654)
+ Old Momentum Direction: (-0.657298,0.350203,0.667321)
+ Old Polarization:       (0.751618,0.369298,0.546525)
+ New Momentum Direction: (0.657298,0.350203,0.667321)
+ New Polarization:       (0.751618,-0.369298,-0.546525)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 452, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71672,-0.68186,0.14621)
- Old Polarization:       (-0.68624,-0.72691,-0.026095)
- New Momentum Direction: (0.31628,-0.92758,0.1989)
- New Polarization:       (-0.94212,-0.3317,-0.048783)
+ Old Momentum Direction: (0.716714,-0.681865,0.146224)
+ Old Polarization:       (-0.686238,-0.726908,-0.0261052)
+ New Momentum Direction: (0.316266,-0.927582,0.198917)
+ New Polarization:       (-0.942126,-0.331689,-0.0487936)
  *** FresnelRefraction *** 
 Track (trackID 451, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73223,0.66076,0.16505)
- Old Polarization:       (-0.66936,0.74292,-0.0046412)
- New Momentum Direction: (0.38847,0.89399,0.22332)
- New Polarization:       (-0.91417,0.40434,-0.02843)
+ Old Momentum Direction: (0.732225,0.660758,0.165066)
+ Old Polarization:       (-0.669362,0.742922,-0.00465153)
+ New Momentum Direction: (0.388463,0.893991,0.223331)
+ New Polarization:       (-0.914169,0.404335,-0.0284398)
  *** FresnelRefraction *** 
 Track (trackID 450, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72416,0.6591,0.20294)
- Old Polarization:       (-0.67816,0.73404,0.035916)
- New Momentum Direction: (0.3489,0.89566,0.27578)
- New Polarization:       (-0.93024,0.36669,-0.014033)
+ Old Momentum Direction: (0.724156,0.659097,0.202952)
+ Old Polarization:       (-0.678156,0.73404,0.0359059)
+ New Momentum Direction: (0.34889,0.895663,0.275797)
+ New Polarization:       (-0.93024,0.366683,-0.0140433)
  *** FresnelRefraction *** 
 Track (trackID 449, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,-0.43158,0.60855)
- Old Polarization:       (-0.74264,-0.46141,0.48538)
- New Momentum Direction: (-0.66589,-0.43158,0.60855)
- New Polarization:       (-0.74264,0.46141,-0.48538)
+ Old Momentum Direction: (0.665879,-0.431584,0.608556)
+ Old Polarization:       (-0.742643,-0.461409,0.485368)
+ New Momentum Direction: (-0.665879,-0.431584,0.608556)
+ New Polarization:       (-0.742643,0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,-0.43158,0.60855)
- Old Polarization:       (-0.74264,0.46141,-0.48538)
- New Momentum Direction: (-0.66589,-0.43158,-0.60855)
- New Polarization:       (0.74264,-0.46141,-0.48538)
+ Old Momentum Direction: (-0.665879,-0.431584,0.608556)
+ Old Polarization:       (-0.742643,0.461409,-0.485368)
+ New Momentum Direction: (-0.665879,-0.431584,-0.608556)
+ New Polarization:       (0.742643,-0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,-0.43158,-0.60855)
- Old Polarization:       (0.74264,-0.46141,-0.48538)
- New Momentum Direction: (-0.66589,0.43158,-0.60855)
- New Polarization:       (-0.74264,-0.46141,0.48538)
+ Old Momentum Direction: (-0.665879,-0.431584,-0.608556)
+ Old Polarization:       (0.742643,-0.461409,-0.485368)
+ New Momentum Direction: (-0.665879,0.431584,-0.608556)
+ New Polarization:       (-0.742643,-0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,0.43158,-0.60855)
- Old Polarization:       (-0.74264,-0.46141,0.48538)
- New Momentum Direction: (0.66589,0.43158,-0.60855)
- New Polarization:       (-0.74264,0.46141,-0.48538)
+ Old Momentum Direction: (-0.665879,0.431584,-0.608556)
+ Old Polarization:       (-0.742643,-0.461409,0.485368)
+ New Momentum Direction: (0.665879,0.431584,-0.608556)
+ New Polarization:       (-0.742643,0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,0.43158,-0.60855)
- Old Polarization:       (-0.74264,0.46141,-0.48538)
- New Momentum Direction: (0.66589,0.43158,0.60855)
- New Polarization:       (0.74264,-0.46141,-0.48538)
+ Old Momentum Direction: (0.665879,0.431584,-0.608556)
+ Old Polarization:       (-0.742643,0.461409,-0.485368)
+ New Momentum Direction: (0.665879,0.431584,0.608556)
+ New Polarization:       (0.742643,-0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,0.43158,0.60855)
- Old Polarization:       (0.74264,-0.46141,-0.48538)
- New Momentum Direction: (0.66589,-0.43158,0.60855)
- New Polarization:       (-0.74264,-0.46141,0.48538)
+ Old Momentum Direction: (0.665879,0.431584,0.608556)
+ Old Polarization:       (0.742643,-0.461409,-0.485368)
+ New Momentum Direction: (0.665879,-0.431584,0.608556)
+ New Polarization:       (-0.742643,-0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,-0.43158,0.60855)
- Old Polarization:       (-0.74264,-0.46141,0.48538)
- New Momentum Direction: (-0.66589,-0.43158,0.60855)
- New Polarization:       (-0.74264,0.46141,-0.48538)
+ Old Momentum Direction: (0.665879,-0.431584,0.608556)
+ Old Polarization:       (-0.742643,-0.461409,0.485368)
+ New Momentum Direction: (-0.665879,-0.431584,0.608556)
+ New Polarization:       (-0.742643,0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,-0.43158,0.60855)
- Old Polarization:       (-0.74264,0.46141,-0.48538)
- New Momentum Direction: (-0.66589,-0.43158,-0.60855)
- New Polarization:       (0.74264,-0.46141,-0.48538)
+ Old Momentum Direction: (-0.665879,-0.431584,0.608556)
+ Old Polarization:       (-0.742643,0.461409,-0.485368)
+ New Momentum Direction: (-0.665879,-0.431584,-0.608556)
+ New Polarization:       (0.742643,-0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,-0.43158,-0.60855)
- Old Polarization:       (0.74264,-0.46141,-0.48538)
- New Momentum Direction: (0.66589,-0.43158,-0.60855)
- New Polarization:       (0.74264,0.46141,0.48538)
+ Old Momentum Direction: (-0.665879,-0.431584,-0.608556)
+ Old Polarization:       (0.742643,-0.461409,-0.485368)
+ New Momentum Direction: (0.665879,-0.431584,-0.608556)
+ New Polarization:       (0.742643,0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,-0.43158,-0.60855)
- Old Polarization:       (0.74264,0.46141,0.48538)
- New Momentum Direction: (0.66589,-0.43158,0.60855)
- New Polarization:       (-0.74264,-0.46141,0.48538)
+ Old Momentum Direction: (0.665879,-0.431584,-0.608556)
+ Old Polarization:       (0.742643,0.461409,0.485368)
+ New Momentum Direction: (0.665879,-0.431584,0.608556)
+ New Polarization:       (-0.742643,-0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,-0.43158,0.60855)
- Old Polarization:       (-0.74264,-0.46141,0.48538)
- New Momentum Direction: (0.66589,0.43158,0.60855)
- New Polarization:       (0.74264,-0.46141,-0.48538)
+ Old Momentum Direction: (0.665879,-0.431584,0.608556)
+ Old Polarization:       (-0.742643,-0.461409,0.485368)
+ New Momentum Direction: (0.665879,0.431584,0.608556)
+ New Polarization:       (0.742643,-0.461409,-0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66589,0.43158,0.60855)
- Old Polarization:       (0.74264,-0.46141,-0.48538)
- New Momentum Direction: (-0.66589,0.43158,0.60855)
- New Polarization:       (0.74264,0.46141,0.48538)
+ Old Momentum Direction: (0.665879,0.431584,0.608556)
+ Old Polarization:       (0.742643,-0.461409,-0.485368)
+ New Momentum Direction: (-0.665879,0.431584,0.608556)
+ New Polarization:       (0.742643,0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,0.43158,0.60855)
- Old Polarization:       (0.74264,0.46141,0.48538)
- New Momentum Direction: (-0.66589,0.43158,-0.60855)
- New Polarization:       (-0.74264,-0.46141,0.48538)
+ Old Momentum Direction: (-0.665879,0.431584,0.608556)
+ Old Polarization:       (0.742643,0.461409,0.485368)
+ New Momentum Direction: (-0.665879,0.431584,-0.608556)
+ New Polarization:       (-0.742643,-0.461409,0.485368)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66589,0.43158,-0.60855)
- Old Polarization:       (-0.74264,-0.46141,0.48538)
- New Momentum Direction: (-0.66589,-0.43158,-0.60855)
- New Polarization:       (0.74264,-0.46141,-0.48538)
+ Old Momentum Direction: (-0.665879,0.431584,-0.608556)
+ Old Polarization:       (-0.742643,-0.461409,0.485368)
+ New Momentum Direction: (-0.665879,-0.431584,-0.608556)
+ New Polarization:       (0.742643,-0.461409,-0.485368)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -3928,18 +3914,18 @@ Track (trackID 447, parentID 1) is processed with stopping code 2
 Track (trackID 446, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81026,-0.19207,-0.5537)
- Old Polarization:       (-0.58441,-0.19396,-0.78793)
- New Momentum Direction: (0.60376,-0.26126,-0.75314)
- New Polarization:       (-0.79605,-0.14771,-0.58692)
+ Old Momentum Direction: (0.810273,-0.192075,-0.553683)
+ Old Polarization:       (-0.584402,-0.193956,-0.787944)
+ New Momentum Direction: (0.603783,-0.26126,-0.75312)
+ New Polarization:       (-0.796037,-0.147716,-0.586946)
  *** FresnelRefraction *** 
 Track (trackID 445, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74074,-0.67082,-0.036076)
- Old Polarization:       (-0.66006,-0.71678,-0.22483)
- New Momentum Direction: (0.40844,-0.91147,-0.049018)
- New Polarization:       (-0.90544,-0.39778,-0.14814)
+ Old Momentum Direction: (0.740743,-0.67082,-0.0360644)
+ Old Polarization:       (-0.660061,-0.716774,-0.224842)
+ New Momentum Direction: (0.408442,-0.911468,-0.049002)
+ New Polarization:       (-0.905442,-0.397776,-0.148153)
  *** FresnelRefraction *** 
 Track (trackID 444, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
@@ -3948,42 +3934,42 @@ Track (trackID 444, parentID 1) is processed with stopping code 2
 Track (trackID 443, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76226,-0.62161,-0.18043)
- Old Polarization:       (-0.63632,-0.66861,-0.38479)
- New Momentum Direction: (0.48196,-0.84146,-0.24425)
- New Polarization:       (-0.86904,-0.42351,-0.25576)
+ Old Momentum Direction: (0.762264,-0.621613,-0.18042)
+ Old Polarization:       (-0.636314,-0.668606,-0.384798)
+ New Momentum Direction: (0.481964,-0.841464,-0.244231)
+ New Polarization:       (-0.869031,-0.423517,-0.255772)
  *** FresnelRefraction *** 
 Track (trackID 442, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77475,0.60362,-0.18816)
- Old Polarization:       (-0.62273,0.677,-0.39227)
- New Momentum Direction: (0.51503,0.81834,-0.25509)
- New Polarization:       (-0.85087,0.45206,-0.26769)
+ Old Momentum Direction: (0.774754,0.60362,-0.188145)
+ Old Polarization:       (-0.622724,0.677004,-0.392275)
+ New Momentum Direction: (0.515042,0.818335,-0.25507)
+ New Polarization:       (-0.850862,0.452072,-0.267704)
  *** FresnelRefraction *** 
 Track (trackID 441, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81482,-0.14416,-0.5615)
- Old Polarization:       (-0.57863,-0.14316,-0.80293)
- New Momentum Direction: (0.61916,-0.19527,-0.7606)
- New Polarization:       (-0.78453,-0.11192,-0.60991)
+ Old Momentum Direction: (0.814832,-0.14416,-0.561486)
+ Old Polarization:       (-0.578617,-0.143158,-0.802937)
+ New Momentum Direction: (0.619183,-0.195276,-0.760578)
+ New Polarization:       (-0.784511,-0.111924,-0.609931)
  *** FresnelRefraction *** 
 Track (trackID 440, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65125,-0.080478,0.75458)
- Old Polarization:       (-0.75885,-0.07369,0.64708)
- New Momentum Direction: (0.87979,-0.10872,0.46276)
- New Polarization:       (0.44205,-0.17087,-0.88056)
+ Old Momentum Direction: (0.651243,-0.0804783,0.75459)
+ Old Polarization:       (-0.758861,-0.0736886,0.64707)
+ New Momentum Direction: (0.879776,-0.10872,0.462789)
+ New Polarization:       (0.442079,-0.170877,-0.880549)
  *** FresnelRefraction *** 
 Track (trackID 439, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6496,0.12479,0.74996)
- Old Polarization:       (-0.75949,0.15127,0.63268)
- New Momentum Direction: (0.8827,0.16957,0.43828)
- New Polarization:       (0.38315,0.28032,-0.88012)
+ Old Momentum Direction: (0.649592,0.124794,0.749971)
+ Old Polarization:       (-0.7595,0.151276,0.632673)
+ New Momentum Direction: (0.882684,0.169573,0.438307)
+ New Polarization:       (0.383174,0.28033,-0.880109)
  *** FresnelRefraction *** 
 Track (trackID 438, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
@@ -3992,82 +3978,82 @@ Track (trackID 438, parentID 1) is processed with stopping code 2
 Track (trackID 437, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82019,0.043844,-0.5704)
- Old Polarization:       (-0.57208,0.063741,-0.81771)
- New Momentum Direction: (0.63496,0.059207,-0.77027)
- New Polarization:       (-0.77254,0.049292,-0.63305)
+ Old Momentum Direction: (0.820203,0.0438431,-0.57039)
+ Old Polarization:       (-0.572072,0.0637412,-0.817723)
+ New Momentum Direction: (0.634984,0.0592057,-0.770254)
+ New Polarization:       (-0.772525,0.0492931,-0.633068)
  *** FresnelRefraction *** 
 Track (trackID 436, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69555,-0.62356,0.35691)
- Old Polarization:       (-0.70986,-0.67314,0.20734)
- New Momentum Direction: (0.23891,-0.84276,0.48237)
- New Polarization:       (-0.96623,-0.25571,0.031813)
+ Old Momentum Direction: (0.695546,-0.62356,0.356916)
+ Old Polarization:       (-0.70986,-0.673137,0.207329)
+ New Momentum Direction: (0.23888,-0.842759,0.482383)
+ New Polarization:       (-0.966238,-0.255683,0.0317915)
  *** FresnelRefraction *** 
 Track (trackID 435, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78043,0.58595,-0.21814)
- Old Polarization:       (-0.61618,0.66165,-0.42725)
- New Momentum Direction: (0.53432,0.79217,-0.29491)
- New Polarization:       (-0.83923,0.45548,-0.29704)
+ Old Momentum Direction: (0.780439,0.585948,-0.21813)
+ Old Polarization:       (-0.616177,0.661647,-0.427258)
+ New Momentum Direction: (0.534331,0.792165,-0.294898)
+ New Polarization:       (-0.83922,0.455487,-0.297053)
  *** FresnelRefraction *** 
 Track (trackID 434, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72141,-0.68209,0.11969)
- Old Polarization:       (-0.68117,-0.73007,-0.054836)
- New Momentum Direction: (-0.72141,-0.68209,0.11969)
- New Polarization:       (-0.64191,0.72349,0.25399)
+ Old Momentum Direction: (0.721407,-0.682087,0.119704)
+ Old Polarization:       (-0.681172,-0.730066,-0.0548468)
+ New Momentum Direction: (-0.721407,-0.682087,0.119704)
+ New Polarization:       (-0.641907,0.723489,0.254006)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.72141,-0.68209,0.11969)
- Old Polarization:       (-0.64191,0.72349,0.25399)
- New Momentum Direction: (-0.9796,-0.11818,0.16253)
- New Polarization:       (-0.1019,0.98922,0.10514)
+ Old Momentum Direction: (-0.721407,-0.682087,0.119704)
+ Old Polarization:       (-0.641907,0.723489,0.254006)
+ New Momentum Direction: (-0.979597,-0.118188,0.162546)
+ New Polarization:       (-0.101903,0.989222,0.105144)
  *** FresnelRefraction *** 
 Track (trackID 433, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6823,-0.558,0.47234)
- Old Polarization:       (-0.7246,-0.60195,0.33558)
- New Momentum Direction: (-0.6823,-0.558,0.47234)
- New Polarization:       (-0.71932,0.6278,-0.29741)
+ Old Momentum Direction: (0.682293,-0.557999,0.472348)
+ Old Polarization:       (-0.724605,-0.601946,0.335574)
+ New Momentum Direction: (-0.682293,-0.557999,0.472348)
+ New Polarization:       (-0.719323,0.627787,-0.297417)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6823,-0.558,0.47234)
- Old Polarization:       (-0.71932,0.6278,-0.29741)
- New Momentum Direction: (-0.6823,0.558,0.47234)
- New Polarization:       (0.71932,0.6278,0.29741)
+ Old Momentum Direction: (-0.682293,-0.557999,0.472348)
+ Old Polarization:       (-0.719323,0.627787,-0.297417)
+ New Momentum Direction: (-0.682293,0.557999,0.472348)
+ New Polarization:       (0.719323,0.627787,0.297417)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6823,0.558,0.47234)
- Old Polarization:       (0.71932,0.6278,0.29741)
- New Momentum Direction: (-0.6823,0.558,-0.47234)
- New Polarization:       (-0.71932,-0.6278,0.29741)
+ Old Momentum Direction: (-0.682293,0.557999,0.472348)
+ Old Polarization:       (0.719323,0.627787,0.297417)
+ New Momentum Direction: (-0.682293,0.557999,-0.472348)
+ New Polarization:       (-0.719323,-0.627787,0.297417)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6823,0.558,-0.47234)
- Old Polarization:       (-0.71932,-0.6278,0.29741)
- New Momentum Direction: (-0.15949,0.75349,-0.63782)
- New Polarization:       (0.9811,0.049292,-0.1871)
+ Old Momentum Direction: (-0.682293,0.557999,-0.472348)
+ Old Polarization:       (-0.719323,-0.627787,0.297417)
+ New Momentum Direction: (-0.15943,0.753493,-0.637833)
+ New Polarization:       (0.981114,0.0492476,-0.187058)
  *** FresnelRefraction *** 
 Track (trackID 432, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65002,0.052977,0.75807)
- Old Polarization:       (-0.75961,0.073355,0.64622)
- New Momentum Direction: (0.88068,0.071775,0.46824)
- New Polarization:       (0.4571,0.13067,-0.87976)
+ Old Momentum Direction: (0.650012,0.0529759,0.758075)
+ Old Polarization:       (-0.759623,0.0733563,0.646213)
+ New Momentum Direction: (0.880666,0.0717743,0.468269)
+ New Polarization:       (0.45713,0.130677,-0.879747)
  *** FresnelRefraction *** 
 Track (trackID 431, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74679,0.664,0.037638)
- Old Polarization:       (-0.65339,0.74306,-0.14469)
- New Momentum Direction: (0.43234,0.90026,0.05103)
- New Polarization:       (-0.89428,0.43534,-0.10364)
+ Old Momentum Direction: (0.746788,0.663996,0.0376494)
+ Old Polarization:       (-0.65339,0.743064,-0.144697)
+ New Momentum Direction: (0.432344,0.900263,0.051046)
+ New Polarization:       (-0.894277,0.435346,-0.103647)
  *** FresnelRefraction *** 
 Track (trackID 430, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
@@ -4076,83 +4062,83 @@ Track (trackID 430, parentID 1) is processed with stopping code 2
 Track (trackID 429, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65946,-0.398,0.63774)
- Old Polarization:       (-0.74899,-0.42039,0.51214)
- New Momentum Direction: (-0.65946,-0.398,0.63774)
- New Polarization:       (-0.74899,0.42039,-0.51214)
+ Old Momentum Direction: (0.65945,-0.398,0.637747)
+ Old Polarization:       (-0.748995,-0.420393,0.512129)
+ New Momentum Direction: (-0.65945,-0.398,0.637747)
+ New Polarization:       (-0.748995,0.420393,-0.512129)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65946,-0.398,0.63774)
- Old Polarization:       (-0.74899,0.42039,-0.51214)
- New Momentum Direction: (-0.65946,-0.398,-0.63774)
- New Polarization:       (0.74899,-0.42039,-0.51214)
+ Old Momentum Direction: (-0.65945,-0.398,0.637747)
+ Old Polarization:       (-0.748995,0.420393,-0.512129)
+ New Momentum Direction: (-0.65945,-0.398,-0.637747)
+ New Polarization:       (0.748995,-0.420393,-0.512129)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 428, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81412,-0.091174,-0.57349)
- Old Polarization:       (-0.58013,-0.084211,-0.81016)
- New Momentum Direction: (0.61371,-0.12396,-0.77974)
- New Polarization:       (-0.78915,-0.065651,-0.61068)
+ Old Momentum Direction: (0.814129,-0.0911754,-0.573481)
+ Old Polarization:       (-0.58012,-0.0842106,-0.810166)
+ New Momentum Direction: (0.613736,-0.123964,-0.779718)
+ New Polarization:       (-0.78913,-0.0656531,-0.610707)
  *** FresnelRefraction *** 
 Track (trackID 427, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64919,-0.034677,0.75984)
- Old Polarization:       (-0.76061,-0.022911,0.6488)
- New Momentum Direction: (0.8792,-0.046963,0.47412)
- New Polarization:       (0.47066,-0.068944,-0.87962)
+ Old Momentum Direction: (0.649174,-0.0346772,0.759849)
+ Old Polarization:       (-0.760623,-0.0229099,0.64879)
+ New Momentum Direction: (0.879189,-0.046964,0.474153)
+ New Polarization:       (0.470692,-0.068947,-0.8796)
  *** FresnelRefraction *** 
 Track (trackID 426, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68425,0.49485,0.53565)
- Old Polarization:       (-0.72229,0.56111,0.4043)
- New Momentum Direction: (-0.68425,0.49485,0.53565)
- New Polarization:       (-0.71619,-0.59436,-0.3658)
+ Old Momentum Direction: (0.684247,0.494848,0.535659)
+ Old Polarization:       (-0.722292,0.56111,0.40429)
+ New Momentum Direction: (-0.684247,0.494848,0.535659)
+ New Polarization:       (-0.716198,-0.594352,-0.365796)
  *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 425, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79448,0.49923,-0.34578)
- Old Polarization:       (-0.60092,0.56403,-0.56636)
- New Momentum Direction: (0.56904,0.676,-0.46821)
- New Polarization:       (-0.81802,0.40725,-0.40619)
+ Old Momentum Direction: (0.79449,0.499232,-0.345764)
+ Old Polarization:       (-0.600907,0.564031,-0.566374)
+ New Momentum Direction: (0.569053,0.675999,-0.468192)
+ New Polarization:       (-0.818007,0.407261,-0.406205)
  *** FresnelRefraction *** 
 Track (trackID 424, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.79589,-0.44745,-0.40786)
-Old Polarization: (-0.59871,-0.4815,-0.64007)
-New Polarization: (-0.95707,-0.14201,0.25268)
-Polarization Change: (-0.95707,-0.14201,0.25268)
-New Momentum Direction: (-0.15916,-0.47112,-0.86759)
-Momentum Change: (-0.15916,-0.47112,-0.86759)
+Old Momentum Direction: (0.795894,-0.447454,-0.407845)
+Old Polarization: (-0.598705,-0.481503,-0.640084)
+New Polarization: (-0.957072,-0.142018,0.252673)
+Polarization Change: (-0.957072,-0.142018,0.252673)
+New Momentum Direction: (-0.159143,-0.471115,-0.867597)
+Momentum Change: (-0.159143,-0.471115,-0.867597)
  Photon at Boundary! 
- Old Momentum Direction: (-0.15916,-0.47112,-0.86759)
- Old Polarization:       (-0.95707,-0.14201,0.25268)
- New Momentum Direction: (-0.21455,-0.6351,-0.74203)
- New Polarization:       (-0.88469,-0.19556,0.42318)
+ Old Momentum Direction: (-0.159143,-0.471115,-0.867597)
+ Old Polarization:       (-0.957072,-0.142018,0.252673)
+ New Momentum Direction: (-0.214537,-0.635097,-0.742042)
+ New Polarization:       (-0.884696,-0.195568,0.423163)
  *** FresnelRefraction *** 
 Track (trackID 423, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70412,0.61093,0.36192)
- Old Polarization:       (-0.70006,0.68257,0.20979)
- New Momentum Direction: (0.26498,0.82961,0.49147)
- New Polarization:       (-0.95858,0.28184,0.04108)
+ Old Momentum Direction: (0.704112,0.610928,0.36193)
+ Old Polarization:       (-0.700066,0.68257,0.209776)
+ New Momentum Direction: (0.264957,0.829605,0.491481)
+ New Polarization:       (-0.958587,0.281824,0.0410627)
  *** FresnelRefraction *** 
 Track (trackID 422, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65463,-0.14902,0.74111)
- Old Polarization:       (-0.75576,-0.15055,0.6373)
- New Momentum Direction: (0.88154,-0.20068,0.42733)
- New Polarization:       (0.35711,-0.3086,-0.88161)
+ Old Momentum Direction: (0.654623,-0.149023,0.741121)
+ Old Polarization:       (-0.755773,-0.150549,0.637293)
+ New Momentum Direction: (0.881529,-0.200678,0.427358)
+ New Polarization:       (0.357134,-0.308618,-0.881595)
  *** FresnelRefraction *** 
 Track (trackID 421, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
@@ -4161,18 +4147,18 @@ Track (trackID 421, parentID 1) is processed with stopping code 2
 Track (trackID 420, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65183,-0.17981,0.73674)
- Old Polarization:       (-0.75804,-0.18309,0.62599)
- New Momentum Direction: (0.88134,-0.24312,0.40513)
- New Polarization:       (0.30543,-0.36105,-0.88111)
+ Old Momentum Direction: (0.651818,-0.17981,0.736751)
+ Old Polarization:       (-0.758046,-0.183085,0.625976)
+ New Momentum Direction: (0.881325,-0.243121,0.405165)
+ New Polarization:       (0.305456,-0.361066,-0.881095)
  *** FresnelRefraction *** 
 Track (trackID 419, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81031,0.28718,-0.5108)
- Old Polarization:       (-0.58423,0.32822,-0.74226)
- New Momentum Direction: (0.60463,0.39035,-0.6943)
- New Polarization:       (-0.79531,0.24815,-0.55309)
+ Old Momentum Direction: (0.810323,0.287183,-0.510786)
+ Old Polarization:       (-0.584213,0.328219,-0.742272)
+ New Momentum Direction: (0.604653,0.390349,-0.694278)
+ New Polarization:       (-0.795294,0.248158,-0.553105)
  *** FresnelRefraction *** 
 Track (trackID 418, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
@@ -4181,233 +4167,233 @@ Track (trackID 418, parentID 1) is processed with stopping code 2
 Track (trackID 417, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66482,0.34921,0.66035)
- Old Polarization:       (-0.74324,0.39792,0.53783)
- New Momentum Direction: (-0.66482,0.34921,0.66035)
- New Polarization:       (-0.74324,-0.39792,-0.53783)
+ Old Momentum Direction: (0.66481,0.34921,0.660364)
+ Old Polarization:       (-0.743243,0.397917,0.537822)
+ New Momentum Direction: (-0.66481,0.34921,0.660364)
+ New Polarization:       (-0.743243,-0.397917,-0.537822)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66482,0.34921,0.66035)
- Old Polarization:       (-0.74324,-0.39792,-0.53783)
- New Momentum Direction: (-0.66482,0.34921,-0.66035)
- New Polarization:       (0.74324,0.39792,-0.53783)
+ Old Momentum Direction: (-0.66481,0.34921,0.660364)
+ Old Polarization:       (-0.743243,-0.397917,-0.537822)
+ New Momentum Direction: (-0.66481,0.34921,-0.660364)
+ New Polarization:       (0.743243,0.397917,-0.537822)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66482,0.34921,-0.66035)
- Old Polarization:       (0.74324,0.39792,-0.53783)
- New Momentum Direction: (-0.66482,-0.34921,-0.66035)
- New Polarization:       (-0.74324,0.39792,0.53783)
+ Old Momentum Direction: (-0.66481,0.34921,-0.660364)
+ Old Polarization:       (0.743243,0.397917,-0.537822)
+ New Momentum Direction: (-0.66481,-0.34921,-0.660364)
+ New Polarization:       (-0.743243,0.397917,0.537822)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66482,-0.34921,-0.66035)
- Old Polarization:       (-0.74324,0.39792,0.53783)
- New Momentum Direction: (0.66482,-0.34921,-0.66035)
- New Polarization:       (-0.74324,-0.39792,-0.53783)
+ Old Momentum Direction: (-0.66481,-0.34921,-0.660364)
+ Old Polarization:       (-0.743243,0.397917,0.537822)
+ New Momentum Direction: (0.66481,-0.34921,-0.660364)
+ New Polarization:       (-0.743243,-0.397917,-0.537822)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66482,-0.34921,-0.66035)
- Old Polarization:       (-0.74324,-0.39792,-0.53783)
- New Momentum Direction: (0.66482,-0.34921,0.66035)
- New Polarization:       (0.74324,0.39792,-0.53783)
+ Old Momentum Direction: (0.66481,-0.34921,-0.660364)
+ Old Polarization:       (-0.743243,-0.397917,-0.537822)
+ New Momentum Direction: (0.66481,-0.34921,0.660364)
+ New Polarization:       (0.743243,0.397917,-0.537822)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 416, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80656,-0.29276,-0.51357)
- Old Polarization:       (-0.58786,-0.30576,-0.74895)
- New Momentum Direction: (0.59801,-0.39692,-0.6963)
- New Polarization:       (-0.79926,-0.23066,-0.55496)
+ Old Momentum Direction: (0.80657,-0.292758,-0.513555)
+ Old Polarization:       (-0.587853,-0.305759,-0.748959)
+ New Momentum Direction: (0.598034,-0.396923,-0.696282)
+ New Polarization:       (-0.799246,-0.230664,-0.554977)
  *** FresnelRefraction *** 
 Track (trackID 415, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66067,-0.39209,0.64014)
- Old Polarization:       (-0.748,-0.41575,0.51735)
- New Momentum Direction: (-0.66067,-0.39209,0.64014)
- New Polarization:       (-0.748,0.41575,-0.51735)
+ Old Momentum Direction: (0.660663,-0.392095,0.640145)
+ Old Polarization:       (-0.74801,-0.415745,0.517336)
+ New Momentum Direction: (-0.660663,-0.392095,0.640145)
+ New Polarization:       (-0.74801,0.415745,-0.517336)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66067,-0.39209,0.64014)
- Old Polarization:       (-0.748,0.41575,-0.51735)
- New Momentum Direction: (-0.66067,-0.39209,-0.64014)
- New Polarization:       (0.748,-0.41575,-0.51735)
+ Old Momentum Direction: (-0.660663,-0.392095,0.640145)
+ Old Polarization:       (-0.74801,0.415745,-0.517336)
+ New Momentum Direction: (-0.660663,-0.392095,-0.640145)
+ New Polarization:       (0.74801,-0.415745,-0.517336)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66067,-0.39209,-0.64014)
- Old Polarization:       (0.748,-0.41575,-0.51735)
- New Momentum Direction: (-0.66067,0.39209,-0.64014)
- New Polarization:       (-0.748,-0.41575,0.51735)
+ Old Momentum Direction: (-0.660663,-0.392095,-0.640145)
+ Old Polarization:       (0.74801,-0.415745,-0.517336)
+ New Momentum Direction: (-0.660663,0.392095,-0.640145)
+ New Polarization:       (-0.74801,-0.415745,0.517336)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66067,0.39209,-0.64014)
- Old Polarization:       (-0.748,-0.41575,0.51735)
- New Momentum Direction: (0.66067,0.39209,-0.64014)
- New Polarization:       (-0.748,0.41575,-0.51735)
+ Old Momentum Direction: (-0.660663,0.392095,-0.640145)
+ Old Polarization:       (-0.74801,-0.415745,0.517336)
+ New Momentum Direction: (0.660663,0.392095,-0.640145)
+ New Polarization:       (-0.74801,0.415745,-0.517336)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66067,0.39209,-0.64014)
- Old Polarization:       (-0.748,0.41575,-0.51735)
- New Momentum Direction: (0.66067,0.39209,0.64014)
- New Polarization:       (0.748,-0.41575,-0.51735)
+ Old Momentum Direction: (0.660663,0.392095,-0.640145)
+ Old Polarization:       (-0.74801,0.415745,-0.517336)
+ New Momentum Direction: (0.660663,0.392095,0.640145)
+ New Polarization:       (0.74801,-0.415745,-0.517336)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66067,0.39209,0.64014)
- Old Polarization:       (0.748,-0.41575,-0.51735)
- New Momentum Direction: (0.66067,-0.39209,0.64014)
- New Polarization:       (-0.748,-0.41575,0.51735)
+ Old Momentum Direction: (0.660663,0.392095,0.640145)
+ Old Polarization:       (0.74801,-0.415745,-0.517336)
+ New Momentum Direction: (0.660663,-0.392095,0.640145)
+ New Polarization:       (-0.74801,-0.415745,0.517336)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 414, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.77826,-0.54654,-0.30919)
-Old Polarization: (-0.61887,-0.58421,-0.52508)
-New Polarization: (-0.61279,-0.77121,0.17239)
-Polarization Change: (-0.61279,-0.77121,0.17239)
-New Momentum Direction: (0.24629,0.020896,0.96897)
-Momentum Change: (0.24629,0.020896,0.96897)
+Old Momentum Direction: (0.778267,-0.546542,-0.30918)
+Old Polarization: (-0.618861,-0.584205,-0.525087)
+New Polarization: (-0.612787,-0.771219,0.172376)
+Polarization Change: (-0.612787,-0.771219,0.172376)
+New Momentum Direction: (0.24628,0.0208904,0.968974)
+Momentum Change: (0.24628,0.0208904,0.968974)
 
 ** Photon absorbed! **
 Track (trackID 413, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,0.40815,0.62174)
- Old Polarization:       (-0.73886,0.46006,0.49238)
- New Momentum Direction: (-0.66847,0.40815,0.62174)
- New Polarization:       (-0.73886,-0.46006,-0.49238)
+ Old Momentum Direction: (0.668463,0.408153,0.621746)
+ Old Polarization:       (-0.738863,0.460063,0.492366)
+ New Momentum Direction: (-0.668463,0.408153,0.621746)
+ New Polarization:       (-0.738863,-0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,0.40815,0.62174)
- Old Polarization:       (-0.73886,-0.46006,-0.49238)
- New Momentum Direction: (-0.66847,0.40815,-0.62174)
- New Polarization:       (0.73886,0.46006,-0.49238)
+ Old Momentum Direction: (-0.668463,0.408153,0.621746)
+ Old Polarization:       (-0.738863,-0.460063,-0.492366)
+ New Momentum Direction: (-0.668463,0.408153,-0.621746)
+ New Polarization:       (0.738863,0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,0.40815,-0.62174)
- Old Polarization:       (0.73886,0.46006,-0.49238)
- New Momentum Direction: (-0.66847,-0.40815,-0.62174)
- New Polarization:       (-0.73886,0.46006,0.49238)
+ Old Momentum Direction: (-0.668463,0.408153,-0.621746)
+ Old Polarization:       (0.738863,0.460063,-0.492366)
+ New Momentum Direction: (-0.668463,-0.408153,-0.621746)
+ New Polarization:       (-0.738863,0.460063,0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,-0.40815,-0.62174)
- Old Polarization:       (-0.73886,0.46006,0.49238)
- New Momentum Direction: (0.66847,-0.40815,-0.62174)
- New Polarization:       (-0.73886,-0.46006,-0.49238)
+ Old Momentum Direction: (-0.668463,-0.408153,-0.621746)
+ Old Polarization:       (-0.738863,0.460063,0.492366)
+ New Momentum Direction: (0.668463,-0.408153,-0.621746)
+ New Polarization:       (-0.738863,-0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,-0.40815,-0.62174)
- Old Polarization:       (-0.73886,-0.46006,-0.49238)
- New Momentum Direction: (0.66847,-0.40815,0.62174)
- New Polarization:       (0.73886,0.46006,-0.49238)
+ Old Momentum Direction: (0.668463,-0.408153,-0.621746)
+ Old Polarization:       (-0.738863,-0.460063,-0.492366)
+ New Momentum Direction: (0.668463,-0.408153,0.621746)
+ New Polarization:       (0.738863,0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,-0.40815,0.62174)
- Old Polarization:       (0.73886,0.46006,-0.49238)
- New Momentum Direction: (0.66847,0.40815,0.62174)
- New Polarization:       (-0.73886,0.46006,0.49238)
+ Old Momentum Direction: (0.668463,-0.408153,0.621746)
+ Old Polarization:       (0.738863,0.460063,-0.492366)
+ New Momentum Direction: (0.668463,0.408153,0.621746)
+ New Polarization:       (-0.738863,0.460063,0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,0.40815,0.62174)
- Old Polarization:       (-0.73886,0.46006,0.49238)
- New Momentum Direction: (-0.66847,0.40815,0.62174)
- New Polarization:       (-0.73886,-0.46006,-0.49238)
+ Old Momentum Direction: (0.668463,0.408153,0.621746)
+ Old Polarization:       (-0.738863,0.460063,0.492366)
+ New Momentum Direction: (-0.668463,0.408153,0.621746)
+ New Polarization:       (-0.738863,-0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,0.40815,0.62174)
- Old Polarization:       (-0.73886,-0.46006,-0.49238)
- New Momentum Direction: (-0.66847,0.40815,-0.62174)
- New Polarization:       (0.73886,0.46006,-0.49238)
+ Old Momentum Direction: (-0.668463,0.408153,0.621746)
+ Old Polarization:       (-0.738863,-0.460063,-0.492366)
+ New Momentum Direction: (-0.668463,0.408153,-0.621746)
+ New Polarization:       (0.738863,0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,0.40815,-0.62174)
- Old Polarization:       (0.73886,0.46006,-0.49238)
- New Momentum Direction: (0.66847,0.40815,-0.62174)
- New Polarization:       (0.73886,-0.46006,0.49238)
+ Old Momentum Direction: (-0.668463,0.408153,-0.621746)
+ Old Polarization:       (0.738863,0.460063,-0.492366)
+ New Momentum Direction: (0.668463,0.408153,-0.621746)
+ New Polarization:       (0.738863,-0.460063,0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,0.40815,-0.62174)
- Old Polarization:       (0.73886,-0.46006,0.49238)
- New Momentum Direction: (0.66847,0.40815,0.62174)
- New Polarization:       (-0.73886,0.46006,0.49238)
+ Old Momentum Direction: (0.668463,0.408153,-0.621746)
+ Old Polarization:       (0.738863,-0.460063,0.492366)
+ New Momentum Direction: (0.668463,0.408153,0.621746)
+ New Polarization:       (-0.738863,0.460063,0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,0.40815,0.62174)
- Old Polarization:       (-0.73886,0.46006,0.49238)
- New Momentum Direction: (0.66847,-0.40815,0.62174)
- New Polarization:       (0.73886,0.46006,-0.49238)
+ Old Momentum Direction: (0.668463,0.408153,0.621746)
+ Old Polarization:       (-0.738863,0.460063,0.492366)
+ New Momentum Direction: (0.668463,-0.408153,0.621746)
+ New Polarization:       (0.738863,0.460063,-0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66847,-0.40815,0.62174)
- Old Polarization:       (0.73886,0.46006,-0.49238)
- New Momentum Direction: (-0.66847,-0.40815,0.62174)
- New Polarization:       (0.73886,-0.46006,0.49238)
+ Old Momentum Direction: (0.668463,-0.408153,0.621746)
+ Old Polarization:       (0.738863,0.460063,-0.492366)
+ New Momentum Direction: (-0.668463,-0.408153,0.621746)
+ New Polarization:       (0.738863,-0.460063,0.492366)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66847,-0.40815,0.62174)
- Old Polarization:       (0.73886,-0.46006,0.49238)
- New Momentum Direction: (-0.66847,-0.40815,-0.62174)
- New Polarization:       (-0.73886,0.46006,0.49238)
+ Old Momentum Direction: (-0.668463,-0.408153,0.621746)
+ Old Polarization:       (0.738863,-0.460063,0.492366)
+ New Momentum Direction: (-0.668463,-0.408153,-0.621746)
+ New Polarization:       (-0.738863,0.460063,0.492366)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.66847,-0.40815,-0.62174)
-Old Polarization: (-0.73886,0.46006,0.49238)
-New Polarization: (0.58498,0.29989,-0.75357)
-Polarization Change: (0.58498,0.29989,-0.75357)
-New Momentum Direction: (-0.46837,0.88345,-0.012009)
-Momentum Change: (-0.46837,0.88345,-0.012009)
+Old Momentum Direction: (-0.668463,-0.408153,-0.621746)
+Old Polarization: (-0.738863,0.460063,0.492366)
+New Polarization: (0.584986,0.299882,-0.753567)
+Polarization Change: (0.584986,0.299882,-0.753567)
+New Momentum Direction: (-0.468369,0.883451,-0.0120206)
+Momentum Change: (-0.468369,0.883451,-0.0120206)
  Photon at Boundary! 
- Old Momentum Direction: (-0.46837,0.88345,-0.012009)
- Old Polarization:       (0.58498,0.29989,-0.75357)
- New Momentum Direction: (-0.63664,0.77098,-0.016324)
- New Polarization:       (-0.56615,-0.48166,-0.66894)
+ Old Momentum Direction: (-0.468369,0.883451,-0.0120206)
+ Old Polarization:       (0.584986,0.299882,-0.753567)
+ New Momentum Direction: (-0.636647,0.770982,-0.0163394)
+ New Polarization:       (-0.566122,-0.481659,-0.668962)
  *** FresnelRefraction *** 
 Track (trackID 412, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66503,-0.47523,0.5761)
- Old Polarization:       (-0.74259,-0.50278,0.44247)
- New Momentum Direction: (-0.66503,-0.47523,0.5761)
- New Polarization:       (-0.74259,0.50278,-0.44247)
+ Old Momentum Direction: (0.665021,-0.475234,0.576107)
+ Old Polarization:       (-0.742594,-0.502776,0.44246)
+ New Momentum Direction: (-0.665021,-0.475234,0.576107)
+ New Polarization:       (-0.742594,0.502776,-0.44246)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66503,-0.47523,0.5761)
- Old Polarization:       (-0.74259,0.50278,-0.44247)
- New Momentum Direction: (-0.66503,-0.47523,-0.5761)
- New Polarization:       (0.74259,-0.50278,-0.44247)
+ Old Momentum Direction: (-0.665021,-0.475234,0.576107)
+ Old Polarization:       (-0.742594,0.502776,-0.44246)
+ New Momentum Direction: (-0.665021,-0.475234,-0.576107)
+ New Polarization:       (0.742594,-0.502776,-0.44246)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66503,-0.47523,-0.5761)
- Old Polarization:       (0.74259,-0.50278,-0.44247)
- New Momentum Direction: (-0.66503,0.47523,-0.5761)
- New Polarization:       (-0.74259,-0.50278,0.44247)
+ Old Momentum Direction: (-0.665021,-0.475234,-0.576107)
+ Old Polarization:       (0.742594,-0.502776,-0.44246)
+ New Momentum Direction: (-0.665021,0.475234,-0.576107)
+ New Polarization:       (-0.742594,-0.502776,0.44246)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.66503,0.47523,-0.5761)
-Old Polarization: (-0.74259,-0.50278,0.44247)
-New Polarization: (-0.96857,0.051047,-0.24345)
-Polarization Change: (-0.96857,0.051047,-0.24345)
-New Momentum Direction: (-0.21611,-0.6573,0.72198)
-Momentum Change: (-0.21611,-0.6573,0.72198)
+Old Momentum Direction: (-0.665021,0.475234,-0.576107)
+Old Polarization: (-0.742594,-0.502776,0.44246)
+New Polarization: (-0.968567,0.0510538,-0.243458)
+Polarization Change: (-0.968567,0.0510538,-0.243458)
+New Momentum Direction: (-0.216121,-0.657304,0.721971)
+Momentum Change: (-0.216121,-0.657304,0.721971)
 
 ** Photon absorbed! **
 Track (trackID 411, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73668,0.66291,0.13358)
- Old Polarization:       (-0.66445,0.7463,-0.03924)
- New Momentum Direction: (0.40488,0.89635,0.18062)
- New Polarization:       (-0.90694,0.41881,-0.04537)
+ Old Momentum Direction: (0.736683,0.66291,0.133594)
+ Old Polarization:       (-0.664448,0.746303,-0.0392505)
+ New Momentum Direction: (0.404877,0.89635,0.180639)
+ New Polarization:       (-0.906941,0.418806,-0.0453785)
  *** FresnelRefraction *** 
 Track (trackID 410, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78711,-0.48152,-0.38549)
- Old Polarization:       (-0.60943,-0.51066,-0.60649)
- New Momentum Direction: (0.54601,-0.65402,-0.52358)
- New Polarization:       (-0.83286,-0.35612,-0.4237)
+ Old Momentum Direction: (0.787113,-0.481521,-0.385475)
+ Old Polarization:       (-0.609419,-0.510656,-0.606498)
+ New Momentum Direction: (0.546022,-0.654018,-0.523565)
+ New Polarization:       (-0.83285,-0.356126,-0.423716)
  *** FresnelRefraction *** 
 Track (trackID 409, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
@@ -4416,18 +4402,18 @@ Track (trackID 409, parentID 1) is processed with stopping code 2
 Track (trackID 408, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69831,0.57802,0.4222)
- Old Polarization:       (-0.70665,0.65069,0.27793)
- New Momentum Direction: (0.24621,0.78267,0.57168)
- New Polarization:       (-0.9641,0.25832,0.061553)
+ Old Momentum Direction: (0.698302,0.578023,0.422213)
+ Old Polarization:       (-0.706654,0.650691,0.277923)
+ New Momentum Direction: (0.246177,0.782665,0.571692)
+ New Polarization:       (-0.964103,0.258301,0.0615309)
  *** FresnelRefraction *** 
 Track (trackID 407, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80221,-0.38662,-0.45495)
- Old Polarization:       (-0.59175,-0.41365,-0.6919)
- New Momentum Direction: (0.5931,-0.52137,-0.61352)
- New Polarization:       (-0.80152,-0.31023,-0.5112)
+ Old Momentum Direction: (0.802216,-0.386625,-0.454941)
+ Old Polarization:       (-0.591741,-0.413648,-0.691909)
+ New Momentum Direction: (0.593113,-0.521375,-0.613502)
+ New Polarization:       (-0.801505,-0.310235,-0.511219)
  *** FresnelRefraction *** 
 Track (trackID 406, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
@@ -4436,18 +4422,18 @@ Track (trackID 406, parentID 1) is processed with stopping code 2
 Track (trackID 405, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65441,-0.13682,0.74366)
- Old Polarization:       (-0.75601,-0.13695,0.64008)
- New Momentum Direction: (0.88127,-0.18425,0.43521)
- New Polarization:       (0.37559,-0.2859,-0.88159)
+ Old Momentum Direction: (0.654397,-0.136817,0.743671)
+ Old Polarization:       (-0.756017,-0.13695,0.640065)
+ New Momentum Direction: (0.88126,-0.184248,0.43524)
+ New Polarization:       (0.375618,-0.285909,-0.881571)
  *** FresnelRefraction *** 
 Track (trackID 404, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64981,-0.22132,0.72716)
- Old Polarization:       (-0.7595,-0.22692,0.60964)
- New Momentum Direction: (0.88192,-0.30038,0.36331)
- New Polarization:       (0.22008,-0.41919,-0.88082)
+ Old Momentum Direction: (0.649798,-0.221323,0.727171)
+ Old Polarization:       (-0.759511,-0.226922,0.609631)
+ New Momentum Direction: (0.881903,-0.300378,0.363346)
+ New Polarization:       (0.220107,-0.419214,-0.880802)
  *** FresnelRefraction *** 
 Track (trackID 403, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
@@ -4456,97 +4442,97 @@ Track (trackID 403, parentID 1) is processed with stopping code 2
 Track (trackID 402, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73521,-0.67764,0.016386)
- Old Polarization:       (-0.66609,-0.72673,-0.16788)
- New Momentum Direction: (0.39293,-0.9193,0.022229)
- New Polarization:       (-0.91226,-0.39273,-0.11639)
+ Old Momentum Direction: (0.735208,-0.677644,0.016397)
+ Old Polarization:       (-0.666088,-0.726733,-0.167888)
+ New Momentum Direction: (0.392925,-0.919301,0.0222445)
+ New Polarization:       (-0.912257,-0.392731,-0.116403)
  *** FresnelRefraction *** 
 Track (trackID 401, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80216,0.425,-0.41942)
- Old Polarization:       (-0.59267,0.48121,-0.64589)
- New Momentum Direction: (0.58716,0.57615,-0.56859)
- New Polarization:       (-0.80647,0.35596,-0.47212)
+ Old Momentum Direction: (0.802166,0.424998,-0.419412)
+ Old Polarization:       (-0.592661,0.481209,-0.645903)
+ New Momentum Direction: (0.587179,0.576147,-0.568573)
+ New Polarization:       (-0.806457,0.355969,-0.472136)
  *** FresnelRefraction *** 
 Track (trackID 400, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67002,-0.48651,0.5607)
- Old Polarization:       (-0.73779,-0.51996,0.43047)
- New Momentum Direction: (-0.67002,-0.48651,0.5607)
- New Polarization:       (-0.73779,0.51996,-0.43047)
+ Old Momentum Direction: (0.670008,-0.486512,0.56071)
+ Old Polarization:       (-0.737798,-0.519958,0.430462)
+ New Momentum Direction: (-0.670008,-0.486512,0.56071)
+ New Polarization:       (-0.737798,0.519958,-0.430462)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67002,-0.48651,0.5607)
- Old Polarization:       (-0.73779,0.51996,-0.43047)
- New Momentum Direction: (-0.67002,-0.48651,-0.5607)
- New Polarization:       (0.73779,-0.51996,-0.43047)
+ Old Momentum Direction: (-0.670008,-0.486512,0.56071)
+ Old Polarization:       (-0.737798,0.519958,-0.430462)
+ New Momentum Direction: (-0.670008,-0.486512,-0.56071)
+ New Polarization:       (0.737798,-0.519958,-0.430462)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 399, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66028,-0.34755,0.66576)
- Old Polarization:       (-0.74902,-0.36944,0.54998)
- New Momentum Direction: (0.66028,-0.34755,-0.66576)
- New Polarization:       (0.74902,0.36944,0.54998)
+ Old Momentum Direction: (0.660267,-0.347553,0.665773)
+ Old Polarization:       (-0.749027,-0.369443,0.549973)
+ New Momentum Direction: (0.660267,-0.347553,-0.665773)
+ New Polarization:       (0.749027,0.369443,0.549973)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66028,-0.34755,-0.66576)
- Old Polarization:       (0.74902,0.36944,0.54998)
- New Momentum Direction: (-0.66028,-0.34755,-0.66576)
- New Polarization:       (0.74902,-0.36944,-0.54998)
+ Old Momentum Direction: (0.660267,-0.347553,-0.665773)
+ Old Polarization:       (0.749027,0.369443,0.549973)
+ New Momentum Direction: (-0.660267,-0.347553,-0.665773)
+ New Polarization:       (0.749027,-0.369443,-0.549973)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66028,-0.34755,-0.66576)
- Old Polarization:       (0.74902,-0.36944,-0.54998)
- New Momentum Direction: (-0.66028,0.34755,-0.66576)
- New Polarization:       (-0.74902,-0.36944,0.54998)
+ Old Momentum Direction: (-0.660267,-0.347553,-0.665773)
+ Old Polarization:       (0.749027,-0.369443,-0.549973)
+ New Momentum Direction: (-0.660267,0.347553,-0.665773)
+ New Polarization:       (-0.749027,-0.369443,0.549973)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.66028,0.34755,-0.66576)
-Old Polarization: (-0.74902,-0.36944,0.54998)
-New Polarization: (-0.63167,-0.59585,0.49594)
-Polarization Change: (-0.63167,-0.59585,0.49594)
-New Momentum Direction: (-0.53708,0.79769,0.27431)
-Momentum Change: (-0.53708,0.79769,0.27431)
+Old Momentum Direction: (-0.660267,0.347553,-0.665773)
+Old Polarization: (-0.749027,-0.369443,0.549973)
+New Polarization: (-0.631682,-0.595847,0.495927)
+Polarization Change: (-0.631682,-0.595847,0.495927)
+New Momentum Direction: (-0.537076,0.797686,0.27431)
+Momentum Change: (-0.537076,0.797686,0.27431)
  Photon at Boundary! 
- Old Momentum Direction: (-0.53708,0.79769,0.27431)
- Old Polarization:       (-0.63167,-0.59585,0.49594)
- New Momentum Direction: (0.53708,0.79769,0.27431)
- New Polarization:       (-0.63167,0.59585,-0.49594)
+ Old Momentum Direction: (-0.537076,0.797686,0.27431)
+ Old Polarization:       (-0.631682,-0.595847,0.495927)
+ New Momentum Direction: (0.537076,0.797686,0.27431)
+ New Polarization:       (-0.631682,0.595847,-0.495927)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53708,0.79769,0.27431)
- Old Polarization:       (-0.63167,0.59585,-0.49594)
- New Momentum Direction: (0.72501,0.58073,0.3703)
- New Polarization:       (0.56398,-0.80918,0.16481)
+ Old Momentum Direction: (0.537076,0.797686,0.27431)
+ Old Polarization:       (-0.631682,0.595847,-0.495927)
+ New Momentum Direction: (0.725005,0.580732,0.370294)
+ New Polarization:       (0.563975,-0.809177,0.164816)
  *** FresnelRefraction *** 
 Track (trackID 398, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75804,0.64898,-0.064835)
- Old Polarization:       (-0.64119,0.72334,-0.25624)
- New Momentum Direction: (0.46346,0.88173,-0.088087)
- New Polarization:       (-0.87902,0.44491,-0.17142)
+ Old Momentum Direction: (0.75804,0.648979,-0.0648231)
+ Old Polarization:       (-0.641184,0.723339,-0.256248)
+ New Momentum Direction: (0.46347,0.881725,-0.0880709)
+ New Polarization:       (-0.87901,0.44492,-0.171426)
  *** FresnelRefraction *** 
 Track (trackID 397, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65833,-0.29807,0.6912)
- Old Polarization:       (-0.75137,-0.3154,0.57963)
- New Momentum Direction: (0.88779,-0.40197,0.22416)
- New Polarization:       (0.0076978,-0.47401,-0.88049)
+ Old Momentum Direction: (0.658319,-0.298075,0.691208)
+ Old Polarization:       (-0.751379,-0.315399,0.579615)
+ New Momentum Direction: (0.887777,-0.40197,0.224216)
+ New Polarization:       (0.00773265,-0.474042,-0.880468)
  *** FresnelRefraction *** 
 Track (trackID 396, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70917,0.61903,0.33745)
- Old Polarization:       (-0.69468,0.69524,0.18455)
- New Momentum Direction: (0.29668,0.83849,0.45708)
- New Polarization:       (-0.94893,0.31261,0.042478)
+ Old Momentum Direction: (0.70917,0.61903,0.337459)
+ Old Polarization:       (-0.694684,0.695242,0.184536)
+ New Momentum Direction: (0.296667,0.838484,0.457093)
+ New Polarization:       (-0.948936,0.312598,0.0424622)
  *** FresnelRefraction *** 
 Track (trackID 395, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
@@ -4555,128 +4541,128 @@ Track (trackID 395, parentID 1) is processed with stopping code 2
 Track (trackID 394, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70825,-0.65183,0.2711)
- Old Polarization:       (-0.69604,-0.70892,0.11388)
- New Momentum Direction: (0.30801,-0.87844,0.36535)
- New Polarization:       (-0.94548,-0.32533,0.014873)
+ Old Momentum Direction: (0.708247,-0.651831,0.271112)
+ Old Polarization:       (-0.696038,-0.708918,0.11387)
+ New Momentum Direction: (0.307988,-0.878438,0.365363)
+ New Polarization:       (-0.945489,-0.325316,0.0148588)
  *** FresnelRefraction *** 
 Track (trackID 393, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.73604,0.66694,0.11591)
-Old Polarization: (-0.66518,0.74435,-0.058949)
-New Polarization: (-0.97516,0.14692,-0.16575)
-Polarization Change: (-0.97516,0.14692,-0.16575)
-New Momentum Direction: (-0.13039,-0.98571,-0.10662)
-Momentum Change: (-0.13039,-0.98571,-0.10662)
+Old Momentum Direction: (0.73604,0.666939,0.115923)
+Old Polarization: (-0.665183,0.744349,-0.0589592)
+New Polarization: (-0.975162,0.146918,-0.165754)
+Polarization Change: (-0.975162,0.146918,-0.165754)
+New Momentum Direction: (-0.130387,-0.985715,-0.106611)
+Momentum Change: (-0.130387,-0.985715,-0.106611)
  Photon at Boundary! 
- Old Momentum Direction: (-0.13039,-0.98571,-0.10662)
- Old Polarization:       (-0.97516,0.14692,-0.16575)
- New Momentum Direction: (-0.13039,0.98571,-0.10662)
- New Polarization:       (-0.32353,-0.14395,-0.9352)
+ Old Momentum Direction: (-0.130387,-0.985715,-0.106611)
+ Old Polarization:       (-0.975162,0.146918,-0.165754)
+ New Momentum Direction: (-0.130387,0.985715,-0.106611)
+ New Polarization:       (-0.323611,-0.143951,-0.935176)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.13039,0.98571,-0.10662)
- Old Polarization:       (-0.32353,-0.14395,-0.9352)
- New Momentum Direction: (-0.17699,0.97351,-0.14473)
- New Polarization:       (-0.42995,-0.20875,-0.87839)
+ Old Momentum Direction: (-0.130387,0.985715,-0.106611)
+ Old Polarization:       (-0.323611,-0.143951,-0.935176)
+ New Momentum Direction: (-0.176994,0.973514,-0.144719)
+ New Polarization:       (-0.430021,-0.208754,-0.878353)
  *** FresnelRefraction *** 
 Track (trackID 392, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75614,-0.63696,-0.15009)
- Old Polarization:       (-0.64321,-0.68115,-0.34974)
- New Momentum Direction: (-0.75614,-0.63696,-0.15009)
- New Polarization:       (-0.52535,0.45407,0.7196)
+ Old Momentum Direction: (0.756142,-0.636966,-0.15008)
+ Old Polarization:       (-0.643209,-0.681146,-0.349746)
+ New Momentum Direction: (-0.756142,-0.636966,-0.15008)
+ New Polarization:       (-0.525313,0.454036,0.719651)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.75614,-0.63696,-0.15009)
- Old Polarization:       (-0.52535,0.45407,0.7196)
- New Momentum Direction: (-0.75614,0.63696,-0.15009)
- New Polarization:       (0.52535,0.45407,-0.7196)
+ Old Momentum Direction: (-0.756142,-0.636966,-0.15008)
+ Old Polarization:       (-0.525313,0.454036,0.719651)
+ New Momentum Direction: (-0.756142,0.636966,-0.15008)
+ New Polarization:       (0.525313,0.454036,-0.719651)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 391, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78718,0.54803,-0.28285)
- Old Polarization:       (-0.60892,0.61794,-0.49737)
- New Momentum Direction: (0.55037,0.74193,-0.38293)
- New Polarization:       (-0.82969,0.43474,-0.35016)
+ Old Momentum Direction: (0.787189,0.548029,-0.28284)
+ Old Polarization:       (-0.608908,0.617938,-0.497377)
+ New Momentum Direction: (0.550382,0.741928,-0.382913)
+ New Polarization:       (-0.82968,0.434754,-0.350171)
  *** FresnelRefraction *** 
 Track (trackID 390, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64859,0.042333,0.75996)
- Old Polarization:       (-0.76089,0.061494,0.64596)
- New Momentum Direction: (0.88002,0.057438,0.47145)
- New Polarization:       (0.4641,0.10685,-0.87932)
+ Old Momentum Direction: (0.648583,0.0423325,0.759966)
+ Old Polarization:       (-0.760897,0.0614954,0.645952)
+ New Momentum Direction: (0.880006,0.0574373,0.471477)
+ New Polarization:       (0.464125,0.106856,-0.879301)
  *** FresnelRefraction *** 
 Track (trackID 389, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82097,0.11651,-0.55895)
- Old Polarization:       (-0.57081,0.14471,-0.80823)
- New Momentum Direction: (0.63863,0.15702,-0.75332)
- New Polarization:       (-0.76941,0.11401,-0.6285)
+ Old Momentum Direction: (0.820982,0.116505,-0.558941)
+ Old Polarization:       (-0.5708,0.144709,-0.808237)
+ New Momentum Direction: (0.63865,0.157018,-0.753307)
+ New Polarization:       (-0.769391,0.114018,-0.62852)
  *** FresnelRefraction *** 
 Track (trackID 388, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68764,-0.5995,0.40958)
- Old Polarization:       (-0.71836,-0.64366,0.26393)
- New Momentum Direction: (-0.68764,-0.5995,0.40958)
- New Polarization:       (-0.71067,0.67125,-0.21063)
+ Old Momentum Direction: (0.687632,-0.599496,0.409595)
+ Old Polarization:       (-0.718366,-0.643657,0.263923)
+ New Momentum Direction: (-0.687632,-0.599496,0.409595)
+ New Polarization:       (-0.710677,0.671245,-0.210637)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68764,-0.5995,0.40958)
- Old Polarization:       (-0.71067,0.67125,-0.21063)
- New Momentum Direction: (-0.68764,0.5995,0.40958)
- New Polarization:       (0.71067,0.67125,0.21063)
+ Old Momentum Direction: (-0.687632,-0.599496,0.409595)
+ Old Polarization:       (-0.710677,0.671245,-0.210637)
+ New Momentum Direction: (-0.687632,0.599496,0.409595)
+ New Polarization:       (0.710677,0.671245,0.210637)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68764,0.5995,0.40958)
- Old Polarization:       (0.71067,0.67125,0.21063)
- New Momentum Direction: (-0.68764,0.5995,-0.40958)
- New Polarization:       (-0.71067,-0.67125,0.21063)
+ Old Momentum Direction: (-0.687632,0.599496,0.409595)
+ Old Polarization:       (0.710677,0.671245,0.210637)
+ New Momentum Direction: (-0.687632,0.599496,-0.409595)
+ New Polarization:       (-0.710677,-0.671245,0.210637)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68764,0.5995,-0.40958)
- Old Polarization:       (-0.71067,-0.67125,0.21063)
- New Momentum Direction: (-0.18217,0.81187,-0.55468)
- New Polarization:       (0.97511,0.076655,-0.20805)
+ Old Momentum Direction: (-0.687632,0.599496,-0.409595)
+ Old Polarization:       (-0.710677,-0.671245,0.210637)
+ New Momentum Direction: (-0.182125,0.811874,-0.554698)
+ New Polarization:       (0.975118,0.076615,-0.208027)
  *** FresnelRefraction *** 
 Track (trackID 387, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.71902,-0.68318,0.12755)
-Old Polarization: (-0.68373,-0.72826,-0.046411)
-New Polarization: (-0.8912,-0.42314,-0.16347)
-Polarization Change: (-0.8912,-0.42314,-0.16347)
-New Momentum Direction: (-0.37047,0.88689,-0.27599)
-Momentum Change: (-0.37047,0.88689,-0.27599)
+Old Momentum Direction: (0.71902,-0.683183,0.127559)
+Old Polarization: (-0.683727,-0.72826,-0.0464214)
+New Polarization: (-0.891195,-0.423137,-0.163483)
+Polarization Change: (-0.891195,-0.423137,-0.163483)
+New Momentum Direction: (-0.370469,0.886897,-0.275983)
+Momentum Change: (-0.370469,0.886897,-0.275983)
  Photon at Boundary! 
- Old Momentum Direction: (-0.37047,0.88689,-0.27599)
- Old Polarization:       (-0.8912,-0.42314,-0.16347)
- New Momentum Direction: (-0.504,0.77783,-0.37546)
- New Polarization:       (-0.77467,-0.59933,-0.20171)
+ Old Momentum Direction: (-0.370469,0.886897,-0.275983)
+ Old Polarization:       (-0.891195,-0.423137,-0.163483)
+ New Momentum Direction: (-0.503997,0.77783,-0.375456)
+ New Polarization:       (-0.774676,-0.599322,-0.20172)
  *** FresnelRefraction *** 
 Track (trackID 386, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65623,0.21453,0.72342)
- Old Polarization:       (-0.75284,0.25086,0.60853)
- New Momentum Direction: (0.88889,0.29059,0.35415)
- New Polarization:       (0.21262,0.42308,-0.88079)
+ Old Momentum Direction: (0.656221,0.21453,0.72343)
+ Old Polarization:       (-0.752848,0.250858,0.608515)
+ New Momentum Direction: (0.88888,0.29059,0.35419)
+ New Polarization:       (0.212643,0.423099,-0.880778)
  *** FresnelRefraction *** 
 Track (trackID 385, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77846,-0.54944,-0.3035)
- Old Polarization:       (-0.61851,-0.58906,-0.52005)
- New Momentum Direction: (0.52712,-0.74386,-0.41088)
- New Polarization:       (-0.84368,-0.40022,-0.3578)
+ Old Momentum Direction: (0.778467,-0.549443,-0.303483)
+ Old Polarization:       (-0.618503,-0.589059,-0.520062)
+ New Momentum Direction: (0.527128,-0.743857,-0.410868)
+ New Polarization:       (-0.843676,-0.400228,-0.357811)
  *** FresnelRefraction *** 
 Track (trackID 384, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
@@ -4685,42 +4671,42 @@ Track (trackID 384, parentID 1) is processed with stopping code 2
 Track (trackID 383, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81969,0.18634,-0.54164)
- Old Polarization:       (-0.57218,0.22241,-0.78939)
- New Momentum Direction: (0.63587,0.25108,-0.72981)
- New Polarization:       (-0.77137,0.1753,-0.61177)
+ Old Momentum Direction: (0.819703,0.186342,-0.54163)
+ Old Polarization:       (-0.572169,0.22241,-0.789403)
+ New Momentum Direction: (0.635895,0.251078,-0.729793)
+ New Polarization:       (-0.771348,0.175305,-0.611792)
  *** FresnelRefraction *** 
 Track (trackID 382, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80846,-0.23326,-0.54035)
- Old Polarization:       (-0.5863,-0.23901,-0.77403)
- New Momentum Direction: (0.59972,-0.31715,-0.73468)
- New Polarization:       (-0.79869,-0.18076,-0.57394)
+ Old Momentum Direction: (0.808471,-0.233259,-0.540338)
+ Old Polarization:       (-0.586287,-0.239009,-0.774043)
+ New Momentum Direction: (0.59974,-0.317148,-0.734663)
+ New Polarization:       (-0.798679,-0.180764,-0.573965)
  *** FresnelRefraction *** 
 Track (trackID 381, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78034,0.57709,-0.24091)
- Old Polarization:       (-0.61673,0.6464,-0.44924)
- New Momentum Direction: (0.52885,0.78321,-0.32695)
- New Polarization:       (-0.84299,0.4401,-0.30932)
+ Old Momentum Direction: (0.780345,0.577089,-0.240895)
+ Old Polarization:       (-0.616718,0.646401,-0.449249)
+ New Momentum Direction: (0.528868,0.783206,-0.326935)
+ New Polarization:       (-0.842982,0.440107,-0.309332)
  *** FresnelRefraction *** 
 Track (trackID 380, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81004,0.33594,-0.4806)
- Old Polarization:       (-0.58376,0.38475,-0.71498)
- New Momentum Direction: (0.60823,0.45476,-0.65058)
- New Polarization:       (-0.79199,0.29287,-0.53571)
+ Old Momentum Direction: (0.810051,0.335936,-0.480587)
+ Old Polarization:       (-0.583747,0.384749,-0.714988)
+ New Momentum Direction: (0.608246,0.454754,-0.650566)
+ New Polarization:       (-0.791971,0.292878,-0.535728)
  *** FresnelRefraction *** 
 Track (trackID 379, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72527,-0.67995,0.10793)
- Old Polarization:       (-0.67702,-0.73286,-0.067571)
- New Momentum Direction: (0.36266,-0.9204,0.1461)
- New Polarization:       (-0.9249,-0.37469,-0.064562)
+ Old Momentum Direction: (0.725266,-0.679954,0.107942)
+ Old Polarization:       (-0.677015,-0.73286,-0.0675808)
+ New Momentum Direction: (0.362657,-0.920397,0.146112)
+ New Polarization:       (-0.924902,-0.374682,-0.064572)
  *** FresnelRefraction *** 
 Track (trackID 378, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
@@ -4729,74 +4715,74 @@ Track (trackID 378, parentID 1) is processed with stopping code 2
 Track (trackID 377, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76285,0.64479,-0.048135)
- Old Polarization:       (-0.6353,0.73362,-0.24123)
- New Momentum Direction: (0.4925,0.8679,-0.06479)
- New Polarization:       (-0.86283,0.47718,-0.16679)
+ Old Momentum Direction: (0.762848,0.644784,-0.0481228)
+ Old Polarization:       (-0.635299,0.733622,-0.241235)
+ New Momentum Direction: (0.492506,0.867895,-0.0647746)
+ New Polarization:       (-0.86283,0.477182,-0.166797)
  *** FresnelRefraction *** 
 Track (trackID 376, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65055,0.074889,0.75576)
- Old Polarization:       (-0.75904,0.097416,0.64372)
- New Momentum Direction: (0.88138,0.10146,0.46138)
- New Polarization:       (0.4401,0.17861,-0.88001)
+ Old Momentum Direction: (0.650538,0.074888,0.755772)
+ Old Polarization:       (-0.759048,0.0974175,0.643705)
+ New Momentum Direction: (0.881368,0.10146,0.461407)
+ New Polarization:       (0.440124,0.178619,-0.879992)
  *** FresnelRefraction *** 
 Track (trackID 375, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78774,0.54334,-0.29024)
- Old Polarization:       (-0.60836,0.6122,-0.50509)
- New Momentum Direction: (0.55129,0.7359,-0.3931)
- New Polarization:       (-0.82919,0.43114,-0.35576)
+ Old Momentum Direction: (0.78775,0.543338,-0.29023)
+ Old Polarization:       (-0.608347,0.612199,-0.5051)
+ New Momentum Direction: (0.551305,0.735898,-0.393087)
+ New Polarization:       (-0.829179,0.431148,-0.355773)
  *** FresnelRefraction *** 
 Track (trackID 374, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81367,0.33432,-0.47558)
- Old Polarization:       (-0.57868,0.38778,-0.71746)
- New Momentum Direction: (0.62271,0.44998,-0.64012)
- New Polarization:       (-0.78063,0.30142,-0.54751)
+ Old Momentum Direction: (0.813677,0.334316,-0.475565)
+ Old Polarization:       (-0.578667,0.387784,-0.717474)
+ New Momentum Direction: (0.62273,0.44998,-0.640098)
+ New Polarization:       (-0.78061,0.301429,-0.547529)
  *** FresnelRefraction *** 
 Track (trackID 373, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78391,-0.51146,-0.35199)
- Old Polarization:       (-0.61269,-0.54554,-0.57184)
- New Momentum Direction: (0.53984,-0.69342,-0.47722)
- New Polarization:       (-0.83631,-0.37741,-0.39768)
+ Old Momentum Direction: (0.783918,-0.511456,-0.351974)
+ Old Polarization:       (-0.612683,-0.545535,-0.571849)
+ New Momentum Direction: (0.539858,-0.693422,-0.4772)
+ New Polarization:       (-0.836302,-0.377415,-0.397688)
  *** FresnelRefraction *** 
 Track (trackID 372, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78205,-0.51671,-0.34845)
- Old Polarization:       (-0.61496,-0.54905,-0.56601)
- New Momentum Direction: (0.53238,-0.70183,-0.47329)
- New Polarization:       (-0.84103,-0.37505,-0.38989)
+ Old Momentum Direction: (0.78205,-0.516711,-0.348435)
+ Old Polarization:       (-0.61495,-0.549049,-0.566022)
+ New Momentum Direction: (0.532396,-0.701834,-0.473269)
+ New Polarization:       (-0.841018,-0.375054,-0.389902)
  *** FresnelRefraction *** 
 Track (trackID 371, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72141,0.65463,0.22588)
- Old Polarization:       (-0.68116,0.72959,0.061027)
- New Momentum Direction: (0.33894,0.88935,0.30688)
- New Polarization:       (-0.93401,0.35723,-0.0036959)
+ Old Momentum Direction: (0.721411,0.654628,0.225895)
+ Old Polarization:       (-0.681156,0.729591,0.0610167)
+ New Momentum Direction: (0.338929,0.889351,0.306892)
+ New Polarization:       (-0.93401,0.357227,-0.00370684)
  *** FresnelRefraction *** 
 Track (trackID 370, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6858,-0.60718,0.40126)
- Old Polarization:       (-0.71996,-0.64666,0.25198)
- New Momentum Direction: (0.1456,-0.82539,0.54547)
- New Polarization:       (-0.98543,-0.16998,0.0058352)
+ Old Momentum Direction: (0.685795,-0.607179,0.401271)
+ Old Polarization:       (-0.719961,-0.646658,0.251972)
+ New Momentum Direction: (0.145546,-0.825389,0.545481)
+ New Polarization:       (-0.985438,-0.169936,0.00579936)
  *** FresnelRefraction *** 
 Track (trackID 369, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82062,0.14414,-0.553)
- Old Polarization:       (-0.57117,0.17546,-0.80186)
- New Momentum Direction: (0.63795,0.19423,-0.74518)
- New Polarization:       (-0.76987,0.1384,-0.62302)
+ Old Momentum Direction: (0.820631,0.144135,-0.552983)
+ Old Polarization:       (-0.571158,0.175461,-0.801868)
+ New Momentum Direction: (0.637974,0.194227,-0.745161)
+ New Polarization:       (-0.769851,0.138401,-0.623037)
  *** FresnelRefraction *** 
 Track (trackID 368, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
@@ -4805,93 +4791,93 @@ Track (trackID 368, parentID 1) is processed with stopping code 2
 Track (trackID 367, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73553,0.66734,0.11682)
- Old Polarization:       (-0.66574,0.74393,-0.057983)
- New Momentum Direction: (0.39159,0.90636,0.15867)
- New Polarization:       (-0.91285,0.40433,-0.056732)
+ Old Momentum Direction: (0.735534,0.667337,0.116835)
+ Old Polarization:       (-0.66574,0.743927,-0.0579931)
+ New Momentum Direction: (0.391585,0.906356,0.158682)
+ New Polarization:       (-0.912853,0.404326,-0.0567408)
  *** FresnelRefraction *** 
 Track (trackID 366, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79298,0.49631,-0.35336)
- Old Polarization:       (-0.60305,0.55685,-0.57118)
- New Momentum Direction: (0.56121,0.67425,-0.48004)
- New Polarization:       (-0.82353,0.3969,-0.40531)
+ Old Momentum Direction: (0.792983,0.496312,-0.353344)
+ Old Polarization:       (-0.603039,0.55685,-0.571194)
+ New Momentum Direction: (0.561223,0.674246,-0.480022)
+ New Polarization:       (-0.823516,0.396907,-0.405322)
  *** FresnelRefraction *** 
 Track (trackID 365, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79477,0.50733,-0.3331)
- Old Polarization:       (-0.60025,0.57597,-0.55494)
- New Momentum Direction: (0.57261,0.68531,-0.44996)
- New Polarization:       (-0.81531,0.41851,-0.40015)
+ Old Momentum Direction: (0.794775,0.507329,-0.333093)
+ Old Polarization:       (-0.60024,0.575967,-0.554954)
+ New Momentum Direction: (0.57263,0.685306,-0.449945)
+ New Polarization:       (-0.815299,0.41852,-0.40016)
  *** FresnelRefraction *** 
 Track (trackID 364, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.68236,0.49768,0.53545)
-Old Polarization: (-0.72405,0.56101,0.40126)
-New Polarization: (-0.26484,0.51875,0.81287)
-Polarization Change: (-0.26484,0.51875,0.81287)
-New Momentum Direction: (-0.86722,0.24048,-0.43601)
-Momentum Change: (-0.86722,0.24048,-0.43601)
+Old Momentum Direction: (0.68235,0.497676,0.535459)
+Old Polarization: (-0.724056,0.561016,0.401254)
+New Polarization: (-0.264845,0.518754,0.812866)
+Polarization Change: (-0.264845,0.518754,0.812866)
+New Momentum Direction: (-0.867215,0.240473,-0.436017)
+Momentum Change: (-0.867215,0.240473,-0.436017)
  Photon at Boundary! 
- Old Momentum Direction: (-0.86722,0.24048,-0.43601)
- Old Polarization:       (-0.26484,0.51875,0.81287)
- New Momentum Direction: (-0.86722,0.24048,0.43601)
- New Polarization:       (0.26484,-0.51875,0.81287)
+ Old Momentum Direction: (-0.867215,0.240473,-0.436017)
+ Old Polarization:       (-0.264845,0.518754,0.812866)
+ New Momentum Direction: (-0.867215,0.240473,0.436017)
+ New Polarization:       (0.264845,-0.518754,0.812866)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 363, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80534,-0.32038,-0.49878)
- Old Polarization:       (-0.58898,-0.33699,-0.73453)
- New Momentum Direction: (0.59635,-0.43383,-0.6754)
- New Polarization:       (-0.80013,-0.25364,-0.54356)
+ Old Momentum Direction: (0.805351,-0.320383,-0.498763)
+ Old Polarization:       (-0.588971,-0.336994,-0.734539)
+ New Momentum Direction: (0.596364,-0.433834,-0.67538)
+ New Polarization:       (-0.800117,-0.253649,-0.543575)
  *** FresnelRefraction *** 
 Track (trackID 362, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79366,0.48926,-0.36155)
- Old Polarization:       (-0.60236,0.54871,-0.57973)
- New Momentum Direction: (0.56254,0.66492,-0.49136)
- New Polarization:       (-0.82276,0.39174,-0.41183)
+ Old Momentum Direction: (0.793669,0.489262,-0.361542)
+ Old Polarization:       (-0.602346,0.548712,-0.579736)
+ New Momentum Direction: (0.562556,0.664916,-0.491342)
+ New Polarization:       (-0.822746,0.391753,-0.411848)
  *** FresnelRefraction *** 
 Track (trackID 361, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82082,0.17305,-0.54435)
- Old Polarization:       (-0.57068,0.20818,-0.79434)
- New Momentum Direction: (0.63962,0.23288,-0.73256)
- New Polarization:       (-0.76834,0.16483,-0.61846)
+ Old Momentum Direction: (0.820824,0.173047,-0.544337)
+ Old Polarization:       (-0.570671,0.208182,-0.794352)
+ New Momentum Direction: (0.639645,0.232879,-0.732545)
+ New Polarization:       (-0.768318,0.164835,-0.61848)
  *** FresnelRefraction *** 
 Track (trackID 360, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68343,0.5016,0.5304)
- Old Polarization:       (-0.72294,0.56597,0.39628)
- New Momentum Direction: (-0.68343,0.5016,0.5304)
- New Polarization:       (-0.71772,-0.59446,-0.36262)
+ Old Momentum Direction: (0.683421,0.501601,0.530407)
+ Old Polarization:       (-0.722944,0.565969,0.396271)
+ New Momentum Direction: (-0.683421,0.501601,0.530407)
+ New Polarization:       (-0.717731,-0.594447,-0.362623)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68343,0.5016,0.5304)
- Old Polarization:       (-0.71772,-0.59446,-0.36262)
- New Momentum Direction: (-0.68343,0.5016,-0.5304)
- New Polarization:       (0.71772,0.59446,-0.36262)
+ Old Momentum Direction: (-0.683421,0.501601,0.530407)
+ Old Polarization:       (-0.717731,-0.594447,-0.362623)
+ New Momentum Direction: (-0.683421,0.501601,-0.530407)
+ New Polarization:       (0.717731,0.594447,-0.362623)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68343,0.5016,-0.5304)
- Old Polarization:       (0.71772,0.59446,-0.36262)
- New Momentum Direction: (-0.68343,-0.5016,-0.5304)
- New Polarization:       (-0.71772,0.59446,0.36262)
+ Old Momentum Direction: (-0.683421,0.501601,-0.530407)
+ Old Polarization:       (0.717731,0.594447,-0.362623)
+ New Momentum Direction: (-0.683421,-0.501601,-0.530407)
+ New Polarization:       (-0.717731,0.594447,0.362623)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68343,-0.5016,-0.5304)
- Old Polarization:       (-0.71772,0.59446,0.36262)
- New Momentum Direction: (-0.1477,-0.67957,-0.71859)
- New Polarization:       (0.98279,-0.019329,-0.18372)
+ Old Momentum Direction: (-0.683421,-0.501601,-0.530407)
+ Old Polarization:       (-0.717731,0.594447,0.362623)
+ New Momentum Direction: (-0.147636,-0.679573,-0.718599)
+ New Polarization:       (0.982798,-0.0192893,-0.183674)
  *** FresnelRefraction *** 
 Track (trackID 359, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
@@ -4900,58 +4886,58 @@ Track (trackID 359, parentID 1) is processed with stopping code 2
 Track (trackID 358, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65712,0.099461,0.7472)
- Old Polarization:       (-0.75319,0.12624,0.64558)
- New Momentum Direction: (0.88407,0.13381,0.44778)
- New Polarization:       (0.41165,0.23067,-0.88167)
+ Old Momentum Direction: (0.657107,0.0994599,0.747207)
+ Old Polarization:       (-0.753195,0.126242,0.64557)
+ New Momentum Direction: (0.88406,0.133811,0.447809)
+ New Polarization:       (0.411674,0.230679,-0.881653)
  *** FresnelRefraction *** 
 Track (trackID 357, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.78736,0.53342,-0.30908)
-Old Polarization: (-0.60925,0.59664,-0.52233)
-New Polarization: (0.036721,-0.98713,0.15565)
-Polarization Change: (0.036721,-0.98713,0.15565)
-New Momentum Direction: (0.80941,0.12073,0.5747)
-Momentum Change: (0.80941,0.12073,0.5747)
+Old Momentum Direction: (0.787368,0.533416,-0.309063)
+Old Polarization: (-0.609241,0.596645,-0.522341)
+New Polarization: (0.0367115,-0.987128,0.155662)
+Polarization Change: (0.0367115,-0.987128,0.155662)
+New Momentum Direction: (0.809408,0.120728,0.574703)
+Momentum Change: (0.809408,0.120728,0.574703)
  Photon at Boundary! 
- Old Momentum Direction: (0.80941,0.12073,0.5747)
- Old Polarization:       (0.036721,-0.98713,0.15565)
- New Momentum Direction: (0.60238,0.1641,0.78116)
- New Polarization:       (-0.070802,-0.9638,0.25707)
+ Old Momentum Direction: (0.809408,0.120728,0.574703)
+ Old Polarization:       (0.0367115,-0.987128,0.155662)
+ New Momentum Direction: (0.602372,0.164099,0.781165)
+ New Polarization:       (-0.0707841,-0.963803,0.257049)
  *** FresnelRefraction *** 
 Track (trackID 356, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66064,0.31698,0.6805)
- Old Polarization:       (-0.74752,0.36122,0.55744)
- New Momentum Direction: (0.66064,0.31698,-0.6805)
- New Polarization:       (-0.11967,-0.85042,-0.51231)
+ Old Momentum Direction: (0.660629,0.316976,0.680512)
+ Old Polarization:       (-0.747524,0.361222,0.557429)
+ New Momentum Direction: (0.660629,0.316976,-0.680512)
+ New Polarization:       (-0.119576,-0.850483,-0.51223)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66064,0.31698,-0.6805)
- Old Polarization:       (-0.11967,-0.85042,-0.51231)
- New Momentum Direction: (-0.66064,0.31698,-0.6805)
- New Polarization:       (-0.11967,0.85042,0.51231)
+ Old Momentum Direction: (0.660629,0.316976,-0.680512)
+ Old Polarization:       (-0.119576,-0.850483,-0.51223)
+ New Momentum Direction: (-0.660629,0.316976,-0.680512)
+ New Polarization:       (-0.119576,0.850483,0.51223)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.66064,0.31698,-0.6805)
-Old Polarization: (-0.11967,0.85042,0.51231)
-New Polarization: (0.11761,-0.91411,0.38804)
-Polarization Change: (0.11761,-0.91411,0.38804)
-New Momentum Direction: (-0.062037,0.38323,0.92157)
-Momentum Change: (-0.062037,0.38323,0.92157)
+Old Momentum Direction: (-0.660629,0.316976,-0.680512)
+Old Polarization: (-0.119576,0.850483,0.51223)
+New Polarization: (0.117499,-0.914087,0.388122)
+Polarization Change: (0.117499,-0.914087,0.388122)
+New Momentum Direction: (-0.0620019,0.383315,0.921534)
+Momentum Change: (-0.0620019,0.383315,0.921534)
  Photon at Boundary! 
- Old Momentum Direction: (-0.062037,0.38323,0.92157)
- Old Polarization:       (0.11761,-0.91411,0.38804)
- New Momentum Direction: (-0.062037,-0.38323,0.92157)
- New Polarization:       (-0.11761,-0.91411,-0.38804)
+ Old Momentum Direction: (-0.0620019,0.383315,0.921534)
+ Old Polarization:       (0.117499,-0.914087,0.388122)
+ New Momentum Direction: (-0.0620019,-0.383315,0.921534)
+ New Polarization:       (-0.117499,-0.914087,-0.388122)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.062037,-0.38323,0.92157)
- Old Polarization:       (-0.11761,-0.91411,-0.38804)
- New Momentum Direction: (-0.084266,-0.52054,0.84967)
- New Polarization:       (-0.11423,-0.84203,-0.52719)
+ Old Momentum Direction: (-0.0620019,-0.383315,0.921534)
+ Old Polarization:       (-0.117499,-0.914087,-0.388122)
+ New Momentum Direction: (-0.0842183,-0.520663,0.849599)
+ New Polarization:       (-0.114113,-0.841979,-0.527305)
  *** FresnelRefraction *** 
 Track (trackID 355, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
@@ -4960,26 +4946,26 @@ Track (trackID 355, parentID 1) is processed with stopping code 2
 Track (trackID 354, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76524,-0.60276,-0.22604)
- Old Polarization:       (-0.63336,-0.64213,-0.43189)
- New Momentum Direction: (0.48426,-0.81922,-0.30722)
- New Polarization:       (-0.86818,-0.40639,-0.28481)
+ Old Momentum Direction: (0.76524,-0.60276,-0.22603)
+ Old Polarization:       (-0.633356,-0.642125,-0.431899)
+ New Momentum Direction: (0.484264,-0.819217,-0.307199)
+ New Polarization:       (-0.86817,-0.406396,-0.284823)
  *** FresnelRefraction *** 
 Track (trackID 353, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65223,-0.27547,0.70619)
- Old Polarization:       (-0.75694,-0.28644,0.58737)
- New Momentum Direction: (0.88481,-0.3737,0.27831)
- New Polarization:       (0.079933,-0.4667,-0.88079)
+ Old Momentum Direction: (0.652221,-0.275472,0.706203)
+ Old Polarization:       (-0.756947,-0.286438,0.587354)
+ New Momentum Direction: (0.884796,-0.373702,0.278356)
+ New Polarization:       (0.0799622,-0.466732,-0.880777)
  *** FresnelRefraction *** 
 Track (trackID 352, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80372,-0.38192,-0.45627)
- Old Polarization:       (-0.5898,-0.41003,-0.69571)
- New Momentum Direction: (0.59865,-0.51414,-0.61423)
- New Polarization:       (-0.79744,-0.31013,-0.5176)
+ Old Momentum Direction: (0.803722,-0.381916,-0.456257)
+ Old Polarization:       (-0.589787,-0.410027,-0.695722)
+ New Momentum Direction: (0.598663,-0.514139,-0.614218)
+ New Polarization:       (-0.797422,-0.310141,-0.51762)
  *** FresnelRefraction *** 
 Track (trackID 351, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
@@ -4988,231 +4974,231 @@ Track (trackID 351, parentID 1) is processed with stopping code 2
 Track (trackID 350, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72706,-0.6836,0.063883)
- Old Polarization:       (-0.67499,-0.7287,-0.11568)
- New Momentum Direction: (0.35715,-0.93,0.086909)
- New Polarization:       (-0.92703,-0.36431,-0.088827)
+ Old Momentum Direction: (0.727054,-0.683601,0.0638946)
+ Old Polarization:       (-0.674985,-0.728704,-0.115695)
+ New Momentum Direction: (0.357142,-0.929997,0.0869246)
+ New Polarization:       (-0.927032,-0.364307,-0.0888363)
  *** FresnelRefraction *** 
 Track (trackID 349, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8046,-0.33422,-0.49084)
- Old Polarization:       (-0.58971,-0.35263,-0.72656)
- New Momentum Direction: (0.59507,-0.45233,-0.66429)
- New Polarization:       (-0.80088,-0.26494,-0.53702)
+ Old Momentum Direction: (0.804603,-0.334222,-0.490824)
+ Old Polarization:       (-0.589701,-0.352631,-0.72657)
+ New Momentum Direction: (0.595092,-0.452332,-0.664275)
+ New Polarization:       (-0.800866,-0.264951,-0.537042)
  *** FresnelRefraction *** 
 Track (trackID 348, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69229,-0.62954,0.35272)
- Old Polarization:       (-0.71296,-0.67221,0.19957)
- New Momentum Direction: (0.19809,-0.85511,0.4791)
- New Polarization:       (-0.97559,-0.21929,0.011976)
+ Old Momentum Direction: (0.692284,-0.629543,0.352731)
+ Old Polarization:       (-0.712963,-0.672206,0.199558)
+ New Momentum Direction: (0.198057,-0.855114,0.479118)
+ New Polarization:       (-0.975592,-0.219265,0.0119519)
  *** FresnelRefraction *** 
 Track (trackID 347, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73847,0.66913,0.083187)
- Old Polarization:       (-0.66256,0.743,-0.094677)
- New Momentum Direction: (0.39791,0.91042,0.11318)
- New Polarization:       (-0.91015,0.40724,-0.076016)
+ Old Momentum Direction: (0.738475,0.669129,0.0831987)
+ Old Polarization:       (-0.662561,0.742999,-0.0946875)
+ New Momentum Direction: (0.397906,0.910415,0.1132)
+ New Polarization:       (-0.91015,0.407243,-0.0760246)
  *** FresnelRefraction *** 
 Track (trackID 346, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69479,-0.63952,0.32906)
- Old Polarization:       (-0.71018,-0.68232,0.17344)
- New Momentum Direction: (0.21131,-0.86912,0.4472)
- New Polarization:       (-0.97257,-0.2325,0.0076998)
+ Old Momentum Direction: (0.694785,-0.63952,0.32907)
+ Old Polarization:       (-0.710186,-0.682317,0.173431)
+ New Momentum Direction: (0.211276,-0.869117,0.447211)
+ New Polarization:       (-0.972572,-0.232474,0.00767852)
  *** FresnelRefraction *** 
 Track (trackID 345, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68947,0.54072,0.48193)
- Old Polarization:       (-0.71623,0.60806,0.34245)
- New Momentum Direction: (0.1892,0.73304,0.65334)
- New Polarization:       (-0.97767,0.20258,0.05584)
+ Old Momentum Direction: (0.689466,0.540714,0.481939)
+ Old Polarization:       (-0.716239,0.608059,0.342442)
+ New Momentum Direction: (0.18916,0.733037,0.653357)
+ New Polarization:       (-0.977681,0.202549,0.0558076)
  *** FresnelRefraction *** 
 Track (trackID 344, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8111,0.32605,-0.48559)
- Old Polarization:       (-0.58246,0.37445,-0.72148)
- New Momentum Direction: (0.61154,0.44106,-0.65688)
- New Polarization:       (-0.78955,0.28634,-0.54279)
+ Old Momentum Direction: (0.811112,0.326048,-0.485582)
+ Old Polarization:       (-0.582447,0.374451,-0.721486)
+ New Momentum Direction: (0.611561,0.441054,-0.65686)
+ New Polarization:       (-0.789531,0.286348,-0.542812)
  *** FresnelRefraction *** 
 Track (trackID 343, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73945,0.66791,0.084261)
- Old Polarization:       (-0.66147,0.74412,-0.093538)
- New Momentum Direction: (0.40442,0.90738,0.11447)
- New Polarization:       (-0.90724,0.41384,-0.075193)
+ Old Momentum Direction: (0.739454,0.667912,0.0842726)
+ Old Polarization:       (-0.661464,0.744119,-0.0935485)
+ New Momentum Direction: (0.404417,0.90738,0.114487)
+ New Polarization:       (-0.907237,0.413842,-0.0752015)
  *** FresnelRefraction *** 
 Track (trackID 342, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81106,0.34517,-0.47226)
- Old Polarization:       (-0.58214,0.3972,-0.70947)
- New Momentum Direction: (0.61342,0.46602,-0.6376)
- New Polarization:       (-0.78783,0.30474,-0.53522)
+ Old Momentum Direction: (0.811073,0.345173,-0.472246)
+ Old Polarization:       (-0.58213,0.397198,-0.709477)
+ New Momentum Direction: (0.613442,0.466021,-0.637583)
+ New Polarization:       (-0.787813,0.304751,-0.535236)
  *** FresnelRefraction *** 
 Track (trackID 341, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69123,-0.62397,0.36449)
- Old Polarization:       (-0.71416,-0.66687,0.21275)
- New Momentum Direction: (0.1937,-0.84712,0.49484)
- New Polarization:       (-0.97658,-0.21464,0.014825)
+ Old Momentum Direction: (0.691229,-0.623972,0.364502)
+ Old Polarization:       (-0.714164,-0.666868,0.212737)
+ New Momentum Direction: (0.193657,-0.847121,0.494857)
+ New Polarization:       (-0.976588,-0.214608,0.0147995)
  *** FresnelRefraction *** 
 Track (trackID 340, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65435,-0.34093,0.67497)
- Old Polarization:       (-0.75433,-0.35687,0.55103)
- New Momentum Direction: (0.65435,-0.34093,-0.67497)
- New Polarization:       (0.75433,0.35687,0.55103)
+ Old Momentum Direction: (0.654342,-0.34093,0.674984)
+ Old Polarization:       (-0.754338,-0.356871,0.551015)
+ New Momentum Direction: (0.654342,-0.34093,-0.674984)
+ New Polarization:       (0.754338,0.356871,0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65435,-0.34093,-0.67497)
- Old Polarization:       (0.75433,0.35687,0.55103)
- New Momentum Direction: (-0.65435,-0.34093,-0.67497)
- New Polarization:       (0.75433,-0.35687,-0.55103)
+ Old Momentum Direction: (0.654342,-0.34093,-0.674984)
+ Old Polarization:       (0.754338,0.356871,0.551015)
+ New Momentum Direction: (-0.654342,-0.34093,-0.674984)
+ New Polarization:       (0.754338,-0.356871,-0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,-0.34093,-0.67497)
- Old Polarization:       (0.75433,-0.35687,-0.55103)
- New Momentum Direction: (-0.65435,0.34093,-0.67497)
- New Polarization:       (-0.75433,-0.35687,0.55103)
+ Old Momentum Direction: (-0.654342,-0.34093,-0.674984)
+ Old Polarization:       (0.754338,-0.356871,-0.551015)
+ New Momentum Direction: (-0.654342,0.34093,-0.674984)
+ New Polarization:       (-0.754338,-0.356871,0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,0.34093,-0.67497)
- Old Polarization:       (-0.75433,-0.35687,0.55103)
- New Momentum Direction: (-0.65435,0.34093,0.67497)
- New Polarization:       (0.75433,0.35687,0.55103)
+ Old Momentum Direction: (-0.654342,0.34093,-0.674984)
+ Old Polarization:       (-0.754338,-0.356871,0.551015)
+ New Momentum Direction: (-0.654342,0.34093,0.674984)
+ New Polarization:       (0.754338,0.356871,0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,0.34093,0.67497)
- Old Polarization:       (0.75433,0.35687,0.55103)
- New Momentum Direction: (0.65435,0.34093,0.67497)
- New Polarization:       (0.75433,-0.35687,-0.55103)
+ Old Momentum Direction: (-0.654342,0.34093,0.674984)
+ Old Polarization:       (0.754338,0.356871,0.551015)
+ New Momentum Direction: (0.654342,0.34093,0.674984)
+ New Polarization:       (0.754338,-0.356871,-0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65435,0.34093,0.67497)
- Old Polarization:       (0.75433,-0.35687,-0.55103)
- New Momentum Direction: (0.65435,0.34093,-0.67497)
- New Polarization:       (-0.75433,0.35687,-0.55103)
+ Old Momentum Direction: (0.654342,0.34093,0.674984)
+ Old Polarization:       (0.754338,-0.356871,-0.551015)
+ New Momentum Direction: (0.654342,0.34093,-0.674984)
+ New Polarization:       (-0.754338,0.356871,-0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65435,0.34093,-0.67497)
- Old Polarization:       (-0.75433,0.35687,-0.55103)
- New Momentum Direction: (-0.65435,0.34093,-0.67497)
- New Polarization:       (-0.75433,-0.35687,0.55103)
+ Old Momentum Direction: (0.654342,0.34093,-0.674984)
+ Old Polarization:       (-0.754338,0.356871,-0.551015)
+ New Momentum Direction: (-0.654342,0.34093,-0.674984)
+ New Polarization:       (-0.754338,-0.356871,0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,0.34093,-0.67497)
- Old Polarization:       (-0.75433,-0.35687,0.55103)
- New Momentum Direction: (-0.65435,-0.34093,-0.67497)
- New Polarization:       (0.75433,-0.35687,-0.55103)
+ Old Momentum Direction: (-0.654342,0.34093,-0.674984)
+ Old Polarization:       (-0.754338,-0.356871,0.551015)
+ New Momentum Direction: (-0.654342,-0.34093,-0.674984)
+ New Polarization:       (0.754338,-0.356871,-0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,-0.34093,-0.67497)
- Old Polarization:       (0.75433,-0.35687,-0.55103)
- New Momentum Direction: (-0.65435,-0.34093,0.67497)
- New Polarization:       (-0.75433,0.35687,-0.55103)
+ Old Momentum Direction: (-0.654342,-0.34093,-0.674984)
+ Old Polarization:       (0.754338,-0.356871,-0.551015)
+ New Momentum Direction: (-0.654342,-0.34093,0.674984)
+ New Polarization:       (-0.754338,0.356871,-0.551015)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65435,-0.34093,0.67497)
- Old Polarization:       (-0.75433,0.35687,-0.55103)
- New Momentum Direction: (0.65435,-0.34093,0.67497)
- New Polarization:       (-0.75433,-0.35687,0.55103)
+ Old Momentum Direction: (-0.654342,-0.34093,0.674984)
+ Old Polarization:       (-0.754338,0.356871,-0.551015)
+ New Momentum Direction: (0.654342,-0.34093,0.674984)
+ New Polarization:       (-0.754338,-0.356871,0.551015)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 339, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66241,-0.34988,0.66242)
- Old Polarization:       (-0.74708,-0.37398,0.54955)
- New Momentum Direction: (-0.66241,-0.34988,0.66242)
- New Polarization:       (-0.74708,0.37398,-0.54955)
+ Old Momentum Direction: (0.662403,-0.349878,0.662425)
+ Old Polarization:       (-0.747092,-0.373982,0.549538)
+ New Momentum Direction: (-0.662403,-0.349878,0.662425)
+ New Polarization:       (-0.747092,0.373982,-0.549538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66241,-0.34988,0.66242)
- Old Polarization:       (-0.74708,0.37398,-0.54955)
- New Momentum Direction: (-0.66241,-0.34988,-0.66242)
- New Polarization:       (0.74708,-0.37398,-0.54955)
+ Old Momentum Direction: (-0.662403,-0.349878,0.662425)
+ Old Polarization:       (-0.747092,0.373982,-0.549538)
+ New Momentum Direction: (-0.662403,-0.349878,-0.662425)
+ New Polarization:       (0.747092,-0.373982,-0.549538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66241,-0.34988,-0.66242)
- Old Polarization:       (0.74708,-0.37398,-0.54955)
- New Momentum Direction: (-0.66241,0.34988,-0.66242)
- New Polarization:       (-0.74708,-0.37398,0.54955)
+ Old Momentum Direction: (-0.662403,-0.349878,-0.662425)
+ Old Polarization:       (0.747092,-0.373982,-0.549538)
+ New Momentum Direction: (-0.662403,0.349878,-0.662425)
+ New Polarization:       (-0.747092,-0.373982,0.549538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.66241,0.34988,-0.66242)
- Old Polarization:       (-0.74708,-0.37398,0.54955)
- New Momentum Direction: (0.66241,0.34988,-0.66242)
- New Polarization:       (-0.74708,0.37398,-0.54955)
+ Old Momentum Direction: (-0.662403,0.349878,-0.662425)
+ Old Polarization:       (-0.747092,-0.373982,0.549538)
+ New Momentum Direction: (0.662403,0.349878,-0.662425)
+ New Polarization:       (-0.747092,0.373982,-0.549538)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66241,0.34988,-0.66242)
- Old Polarization:       (-0.74708,0.37398,-0.54955)
- New Momentum Direction: (0.66241,0.34988,0.66242)
- New Polarization:       (0.74708,-0.37398,-0.54955)
+ Old Momentum Direction: (0.662403,0.349878,-0.662425)
+ Old Polarization:       (-0.747092,0.373982,-0.549538)
+ New Momentum Direction: (0.662403,0.349878,0.662425)
+ New Polarization:       (0.747092,-0.373982,-0.549538)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 338, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81745,0.21273,-0.53528)
- Old Polarization:       (-0.57514,0.25049,-0.77876)
- New Momentum Direction: (0.62841,0.28729,-0.72289)
- New Polarization:       (-0.77729,0.19559,-0.59797)
+ Old Momentum Direction: (0.817457,0.212727,-0.535267)
+ Old Polarization:       (-0.575123,0.25049,-0.778774)
+ New Momentum Direction: (0.628427,0.287286,-0.722873)
+ New Polarization:       (-0.777274,0.195596,-0.597986)
  *** FresnelRefraction *** 
 Track (trackID 337, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64718,0.022307,0.76201)
- Old Polarization:       (-0.76218,0.039484,0.64616)
- New Momentum Direction: (0.87922,0.030305,0.47545)
- New Polarization:       (0.47313,0.061468,-0.87885)
+ Old Momentum Direction: (0.647166,0.0223058,0.762023)
+ Old Polarization:       (-0.762188,0.0394853,0.64615)
+ New Momentum Direction: (0.879206,0.0303035,0.475476)
+ New Polarization:       (0.473155,0.0614695,-0.878832)
  *** FresnelRefraction *** 
 Track (trackID 336, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7576,0.65256,-0.014679)
- Old Polarization:       (-0.64122,0.73986,-0.20356)
- New Momentum Direction: (0.47521,0.87965,-0.019787)
- New Polarization:       (-0.87232,0.46807,-0.14128)
+ Old Momentum Direction: (0.757599,0.652555,-0.0146671)
+ Old Polarization:       (-0.641219,0.739863,-0.203569)
+ New Momentum Direction: (0.475212,0.879649,-0.0197713)
+ New Polarization:       (-0.87232,0.468077,-0.141284)
  *** FresnelRefraction *** 
 Track (trackID 335, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68321,-0.55739,0.47174)
- Old Polarization:       (-0.72373,-0.60278,0.33596)
- New Momentum Direction: (-0.68321,-0.55739,0.47174)
- New Polarization:       (-0.7178,0.63129,-0.29366)
+ Old Momentum Direction: (0.683206,-0.557388,0.47175)
+ Old Polarization:       (-0.72374,-0.602775,0.33595)
+ New Momentum Direction: (-0.683206,-0.557388,0.47175)
+ New Polarization:       (-0.717802,0.631285,-0.293665)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68321,-0.55739,0.47174)
- Old Polarization:       (-0.7178,0.63129,-0.29366)
- New Momentum Direction: (-0.68321,0.55739,0.47174)
- New Polarization:       (0.7178,0.63129,0.29366)
+ Old Momentum Direction: (-0.683206,-0.557388,0.47175)
+ Old Polarization:       (-0.717802,0.631285,-0.293665)
+ New Momentum Direction: (-0.683206,0.557388,0.47175)
+ New Polarization:       (0.717802,0.631285,0.293665)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.68321,0.55739,0.47174)
-Old Polarization: (0.7178,0.63129,0.29366)
-New Polarization: (-0.97333,-0.068454,0.21894)
-Polarization Change: (-0.97333,-0.068454,0.21894)
-New Momentum Direction: (0.079256,0.79531,0.601)
-Momentum Change: (0.079256,0.79531,0.601)
+Old Momentum Direction: (-0.683206,0.557388,0.47175)
+Old Polarization: (0.717802,0.631285,0.293665)
+New Polarization: (-0.973335,-0.0684429,0.218939)
+Polarization Change: (-0.973335,-0.0684429,0.218939)
+New Momentum Direction: (0.0792642,0.795305,0.601006)
+Momentum Change: (0.0792642,0.795305,0.601006)
  Photon at Boundary! 
- Old Momentum Direction: (0.079256,0.79531,0.601)
- Old Polarization:       (-0.97333,-0.068454,0.21894)
- New Momentum Direction: (0.079256,0.79531,-0.601)
- New Polarization:       (0.97333,0.068454,0.21894)
+ Old Momentum Direction: (0.0792642,0.795305,0.601006)
+ Old Polarization:       (-0.973335,-0.0684429,0.218939)
+ New Momentum Direction: (0.0792642,0.795305,-0.601006)
+ New Polarization:       (0.973335,0.0684429,0.218939)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -5223,10 +5209,10 @@ Track (trackID 334, parentID 1) is processed with stopping code 2
 Track (trackID 333, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75914,-0.62578,-0.17918)
- Old Polarization:       (-0.64,-0.66735,-0.38084)
- New Momentum Direction: (0.46634,-0.85043,-0.2435)
- New Polarization:       (-0.87756,-0.41009,-0.24842)
+ Old Momentum Direction: (0.759145,-0.625779,-0.179166)
+ Old Polarization:       (-0.639996,-0.667351,-0.380852)
+ New Momentum Direction: (0.466351,-0.85043,-0.243485)
+ New Polarization:       (-0.877555,-0.410097,-0.248431)
  *** FresnelRefraction *** 
 Track (trackID 332, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
@@ -5243,34 +5229,34 @@ Track (trackID 330, parentID 1) is processed with stopping code 2
 Track (trackID 329, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79818,0.45584,-0.39386)
- Old Polarization:       (-0.59727,0.51342,-0.61618)
- New Momentum Direction: (0.57543,0.61884,-0.53471)
- New Polarization:       (-0.81438,0.37344,-0.44421)
+ Old Momentum Direction: (0.798183,0.455835,-0.393849)
+ Old Polarization:       (-0.597255,0.513418,-0.616188)
+ New Momentum Direction: (0.575451,0.618841,-0.534689)
+ New Polarization:       (-0.81437,0.373455,-0.444222)
  *** FresnelRefraction *** 
 Track (trackID 328, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74363,0.66722,0.042664)
- Old Polarization:       (-0.65695,0.74106,-0.13877)
- New Momentum Direction: (0.41548,0.90775,0.058044)
- New Polarization:       (-0.9023,0.41937,-0.09987)
+ Old Momentum Direction: (0.743635,0.667223,0.0426758)
+ Old Polarization:       (-0.656945,0.741056,-0.138778)
+ New Momentum Direction: (0.41548,0.907748,0.0580599)
+ New Polarization:       (-0.902302,0.419375,-0.0998782)
  *** FresnelRefraction *** 
 Track (trackID 327, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75092,-0.65126,-0.10941)
- Old Polarization:       (-0.64891,-0.69692,-0.30531)
- New Momentum Direction: (0.44319,-0.88404,-0.14851)
- New Polarization:       (-0.88909,-0.41234,-0.19871)
+ Old Momentum Direction: (0.750926,-0.651262,-0.109396)
+ Old Polarization:       (-0.648906,-0.696923,-0.305318)
+ New Momentum Direction: (0.443193,-0.884041,-0.148497)
+ New Polarization:       (-0.889091,-0.412345,-0.198718)
  *** FresnelRefraction *** 
 Track (trackID 326, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78258,0.5728,-0.24387)
- Old Polarization:       (-0.61397,0.6453,-0.45457)
- New Momentum Direction: (0.53831,0.77539,-0.33013)
- New Polarization:       (-0.83701,0.44631,-0.31657)
+ Old Momentum Direction: (0.782584,0.572796,-0.243859)
+ Old Polarization:       (-0.613962,0.645299,-0.454576)
+ New Momentum Direction: (0.538326,0.775391,-0.330111)
+ New Polarization:       (-0.837003,0.446323,-0.316579)
  *** FresnelRefraction *** 
 Track (trackID 325, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
@@ -5283,22 +5269,22 @@ Track (trackID 324, parentID 1) is processed with stopping code 2
 Track (trackID 323, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76136,-0.61678,-0.19978)
- Old Polarization:       (-0.63763,-0.65661,-0.40287)
- New Momentum Direction: (-0.76136,-0.61678,-0.19978)
- New Polarization:       (-0.50459,0.37025,0.77994)
+ Old Momentum Direction: (0.761365,-0.616779,-0.199767)
+ Old Polarization:       (-0.63762,-0.656606,-0.402876)
+ New Momentum Direction: (-0.761365,-0.616779,-0.199767)
+ New Polarization:       (-0.50455,0.3702,0.779988)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.76136,-0.61678,-0.19978)
- Old Polarization:       (-0.50459,0.37025,0.77994)
- New Momentum Direction: (-0.76136,0.61678,-0.19978)
- New Polarization:       (0.50459,0.37025,-0.77994)
+ Old Momentum Direction: (-0.761365,-0.616779,-0.199767)
+ Old Polarization:       (-0.50455,0.3702,0.779988)
+ New Momentum Direction: (-0.761365,0.616779,-0.199767)
+ New Polarization:       (0.50455,0.3702,-0.779988)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.76136,0.61678,-0.19978)
- Old Polarization:       (0.50459,0.37025,-0.77994)
- New Momentum Direction: (-0.47193,0.83873,-0.27167)
- New Polarization:       (0.77176,0.24404,-0.58722)
+ Old Momentum Direction: (-0.761365,0.616779,-0.199767)
+ Old Polarization:       (0.50455,0.3702,-0.779988)
+ New Momentum Direction: (-0.471939,0.838735,-0.271656)
+ New Polarization:       (0.771725,0.244022,-0.587276)
  *** FresnelRefraction *** 
 Track (trackID 322, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
@@ -5311,60 +5297,60 @@ Track (trackID 321, parentID 1) is processed with stopping code 2
 Track (trackID 320, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.67086,-0.52233,0.52642)
-Old Polarization: (-0.73624,-0.55417,0.38839)
-New Polarization: (0.053264,-0.35963,0.93157)
-Polarization Change: (0.053264,-0.35963,0.93157)
-New Momentum Direction: (-0.8957,-0.42963,-0.11465)
-Momentum Change: (-0.8957,-0.42963,-0.11465)
+Old Momentum Direction: (0.670853,-0.522334,0.526426)
+Old Polarization: (-0.736247,-0.554171,0.388375)
+New Polarization: (0.0532529,-0.359641,0.93157)
+Polarization Change: (0.0532529,-0.359641,0.93157)
+New Momentum Direction: (-0.895697,-0.429628,-0.114659)
+Momentum Change: (-0.895697,-0.429628,-0.114659)
 Scattering Photon!
-Old Momentum Direction: (-0.8957,-0.42963,-0.11465)
-Old Polarization: (0.053264,-0.35963,0.93157)
-New Polarization: (-0.34645,0.47216,-0.81058)
-Polarization Change: (-0.34645,0.47216,-0.81058)
-New Momentum Direction: (0.82463,-0.2586,-0.50309)
-Momentum Change: (0.82463,-0.2586,-0.50309)
+Old Momentum Direction: (-0.895697,-0.429628,-0.114659)
+Old Polarization: (0.0532529,-0.359641,0.93157)
+New Polarization: (-0.346436,0.472177,-0.810574)
+Polarization Change: (-0.346436,0.472177,-0.810574)
+New Momentum Direction: (0.824626,-0.258624,-0.503096)
+Momentum Change: (0.824626,-0.258624,-0.503096)
 
 ** Photon absorbed! **
 Track (trackID 319, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75318,0.6574,0.023362)
- Old Polarization:       (-0.64611,0.74598,-0.1614)
- New Momentum Direction: (0.46303,0.88579,0.031478)
- New Polarization:       (-0.8787,0.4634,-0.11469)
+ Old Momentum Direction: (0.753179,0.657401,0.0233735)
+ Old Polarization:       (-0.64611,0.745982,-0.161408)
+ New Momentum Direction: (0.463027,0.885784,0.0314935)
+ New Polarization:       (-0.878695,0.4634,-0.1147)
  *** FresnelRefraction *** 
 Track (trackID 318, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66334,0.32749,0.67285)
- Old Polarization:       (-0.74493,0.37447,0.55214)
- New Momentum Direction: (0.66334,0.32749,-0.67285)
- New Polarization:       (0.74493,-0.37447,0.55214)
+ Old Momentum Direction: (0.663333,0.32749,0.672859)
+ Old Polarization:       (-0.744934,0.374466,0.55213)
+ New Momentum Direction: (0.663333,0.32749,-0.672859)
+ New Polarization:       (0.744934,-0.374466,0.55213)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.66334,0.32749,-0.67285)
- Old Polarization:       (0.74493,-0.37447,0.55214)
- New Momentum Direction: (-0.66334,0.32749,-0.67285)
- New Polarization:       (0.74493,0.37447,-0.55214)
+ Old Momentum Direction: (0.663333,0.32749,-0.672859)
+ Old Polarization:       (0.744934,-0.374466,0.55213)
+ New Momentum Direction: (-0.663333,0.32749,-0.672859)
+ New Polarization:       (0.744934,0.374466,-0.55213)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 317, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79806,-0.38527,-0.46332)
- Old Polarization:       (-0.59744,-0.40571,-0.69171)
- New Momentum Direction: (0.57481,-0.52319,-0.62918)
- New Polarization:       (-0.81484,-0.29544,-0.49875)
+ Old Momentum Direction: (0.798071,-0.385268,-0.463305)
+ Old Polarization:       (-0.597425,-0.405714,-0.691723)
+ New Momentum Direction: (0.574825,-0.523191,-0.629164)
+ New Polarization:       (-0.814825,-0.295443,-0.498772)
  *** FresnelRefraction *** 
 Track (trackID 316, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71729,0.64726,0.25795)
- Old Polarization:       (-0.68565,0.72157,0.096029)
- New Momentum Direction: (0.32243,0.87934,0.35044)
- New Polarization:       (-0.94001,0.34102,0.0091637)
+ Old Momentum Direction: (0.717291,0.647262,0.257963)
+ Old Polarization:       (-0.685653,0.721568,0.0960187)
+ New Momentum Direction: (0.322416,0.879335,0.350454)
+ New Polarization:       (-0.940013,0.341016,0.00915172)
  *** FresnelRefraction *** 
 Track (trackID 315, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
@@ -5373,10 +5359,10 @@ Track (trackID 315, parentID 1) is processed with stopping code 2
 Track (trackID 314, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68056,0.45125,0.57725)
- Old Polarization:       (-0.72673,0.51604,0.45339)
- New Momentum Direction: (0.15485,0.60844,0.77834)
- New Polarization:       (-0.98487,0.15708,0.073151)
+ Old Momentum Direction: (0.680547,0.451245,0.577264)
+ Old Polarization:       (-0.726739,0.516038,0.453381)
+ New Momentum Direction: (0.15479,0.60844,0.778358)
+ New Polarization:       (-0.984882,0.157046,0.0730983)
  *** FresnelRefraction *** 
 Track (trackID 313, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
@@ -5385,50 +5371,50 @@ Track (trackID 313, parentID 1) is processed with stopping code 2
 Track (trackID 312, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81865,0.070323,-0.56996)
- Old Polarization:       (-0.57427,0.092578,-0.81341)
- New Momentum Direction: (0.62908,0.095188,-0.77149)
- New Polarization:       (-0.77733,0.071586,-0.625)
+ Old Momentum Direction: (0.818663,0.0703221,-0.569952)
+ Old Polarization:       (-0.574257,0.0925784,-0.813424)
+ New Momentum Direction: (0.629097,0.0951867,-0.771476)
+ New Polarization:       (-0.777315,0.0715884,-0.625026)
  *** FresnelRefraction *** 
 Track (trackID 311, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76049,0.64759,-0.047847)
- Old Polarization:       (-0.63812,0.73164,-0.23981)
- New Momentum Direction: (0.48086,0.87441,-0.064606)
- New Polarization:       (-0.86942,0.46598,-0.16422)
+ Old Momentum Direction: (0.760488,0.647587,-0.0478354)
+ Old Polarization:       (-0.63811,0.731644,-0.239817)
+ New Momentum Direction: (0.480866,0.874412,-0.0645902)
+ New Polarization:       (-0.869416,0.465988,-0.164232)
  *** FresnelRefraction *** 
 Track (trackID 310, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65395,-0.16618,0.73806)
- Old Polarization:       (-0.75628,-0.16917,0.632)
- New Momentum Direction: (0.88167,-0.22405,0.41528)
- New Polarization:       (0.32908,-0.33878,-0.88144)
+ Old Momentum Direction: (0.65394,-0.166179,0.73807)
+ Old Polarization:       (-0.756287,-0.169173,0.63199)
+ New Momentum Direction: (0.881658,-0.224047,0.41531)
+ New Polarization:       (0.329104,-0.338799,-0.881423)
  *** FresnelRefraction *** 
 Track (trackID 309, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68039,-0.5739,0.45574)
- Old Polarization:       (-0.72604,-0.61245,0.31269)
- New Momentum Direction: (0.10277,-0.77897,0.61859)
- New Polarization:       (-0.99147,-0.1303,0.00063512)
+ Old Momentum Direction: (0.680386,-0.573903,0.455752)
+ Old Polarization:       (-0.726043,-0.612451,0.312675)
+ New Momentum Direction: (0.102681,-0.778968,0.6186)
+ New Polarization:       (-0.991483,-0.130236,0.000576917)
  *** FresnelRefraction *** 
 Track (trackID 308, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81507,0.13996,-0.56221)
- Old Polarization:       (-0.57911,0.16761,-0.79784)
- New Momentum Direction: (0.61601,0.1903,-0.7644)
- New Polarization:       (-0.78756,0.12819,-0.60276)
+ Old Momentum Direction: (0.815075,0.139959,-0.562196)
+ Old Polarization:       (-0.579093,0.167608,-0.797846)
+ New Momentum Direction: (0.616036,0.190294,-0.764387)
+ New Polarization:       (-0.78754,0.128193,-0.602782)
  *** FresnelRefraction *** 
 Track (trackID 307, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64776,0.077885,0.75786)
- Old Polarization:       (-0.76141,0.1,0.64051)
- New Momentum Direction: (0.88062,0.10589,0.46183)
- New Polarization:       (0.43891,0.1849,-0.8793)
+ Old Momentum Direction: (0.647744,0.0778846,0.757867)
+ Old Polarization:       (-0.761418,0.100001,0.640502)
+ New Momentum Direction: (0.880608,0.105884,0.461864)
+ New Polarization:       (0.438937,0.184911,-0.879285)
  *** FresnelRefraction *** 
 Track (trackID 306, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
@@ -5445,86 +5431,86 @@ Track (trackID 304, parentID 1) is processed with stopping code 2
 Track (trackID 1, parentID 0) is processed with stopping code 4
 ### pop requested out of 283 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59531,0.6576,0.4617)
- Old Polarization:       (-0.70457,0.70345,-0.093471)
- New Momentum Direction: (0.59531,-0.6576,0.4617)
- New Polarization:       (0.70457,0.70345,0.093471)
+ Old Momentum Direction: (0.595276,0.657602,0.461743)
+ Old Polarization:       (-0.704562,0.703453,-0.0935225)
+ New Momentum Direction: (0.595276,-0.657602,0.461743)
+ New Polarization:       (0.704562,0.703453,0.0935225)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.59531,-0.6576,0.4617)
- Old Polarization:       (0.70457,0.70345,0.093471)
- New Momentum Direction: (-0.59531,-0.6576,0.4617)
- New Polarization:       (0.70457,-0.70345,-0.093471)
+ Old Momentum Direction: (0.595276,-0.657602,0.461743)
+ Old Polarization:       (0.704562,0.703453,0.0935225)
+ New Momentum Direction: (-0.595276,-0.657602,0.461743)
+ New Polarization:       (0.704562,-0.703453,-0.0935225)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.59531,-0.6576,0.4617)
- Old Polarization:       (0.70457,-0.70345,-0.093471)
- New Momentum Direction: (-0.59531,-0.6576,-0.4617)
- New Polarization:       (-0.70457,0.70345,-0.093471)
+ Old Momentum Direction: (-0.595276,-0.657602,0.461743)
+ Old Polarization:       (0.704562,-0.703453,-0.0935225)
+ New Momentum Direction: (-0.595276,-0.657602,-0.461743)
+ New Polarization:       (-0.704562,0.703453,-0.0935225)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.59531,-0.6576,-0.4617)
- Old Polarization:       (-0.70457,0.70345,-0.093471)
- New Momentum Direction: (-0.59531,0.6576,-0.4617)
- New Polarization:       (0.70457,0.70345,0.093471)
+ Old Momentum Direction: (-0.595276,-0.657602,-0.461743)
+ Old Polarization:       (-0.704562,0.703453,-0.0935225)
+ New Momentum Direction: (-0.595276,0.657602,-0.461743)
+ New Polarization:       (0.704562,0.703453,0.0935225)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.59531,0.6576,-0.4617)
- Old Polarization:       (0.70457,0.70345,0.093471)
- New Momentum Direction: (0.59531,0.6576,-0.4617)
- New Polarization:       (0.70457,-0.70345,-0.093471)
+ Old Momentum Direction: (-0.595276,0.657602,-0.461743)
+ Old Polarization:       (0.704562,0.703453,0.0935225)
+ New Momentum Direction: (0.595276,0.657602,-0.461743)
+ New Polarization:       (0.704562,-0.703453,-0.0935225)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.59531,0.6576,-0.4617)
- Old Polarization:       (0.70457,-0.70345,-0.093471)
- New Momentum Direction: (0.59531,0.6576,0.4617)
- New Polarization:       (-0.70457,0.70345,-0.093471)
+ Old Momentum Direction: (0.595276,0.657602,-0.461743)
+ Old Polarization:       (0.704562,-0.703453,-0.0935225)
+ New Momentum Direction: (0.595276,0.657602,0.461743)
+ New Polarization:       (-0.704562,0.703453,-0.0935225)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.59531,0.6576,0.4617)
-Old Polarization: (-0.70457,0.70345,-0.093471)
-New Polarization: (0.36655,-0.81447,-0.44975)
-Polarization Change: (0.36655,-0.81447,-0.44975)
-New Momentum Direction: (-0.67618,0.098838,-0.73008)
-Momentum Change: (-0.67618,0.098838,-0.73008)
+Old Momentum Direction: (0.595276,0.657602,0.461743)
+Old Polarization: (-0.704562,0.703453,-0.0935225)
+New Polarization: (0.366568,-0.814487,-0.44971)
+Polarization Change: (0.366568,-0.814487,-0.44971)
+New Momentum Direction: (-0.676151,0.0988124,-0.730107)
+Momentum Change: (-0.676151,0.0988124,-0.730107)
  Photon at Boundary! 
- Old Momentum Direction: (-0.67618,0.098838,-0.73008)
- Old Polarization:       (0.36655,-0.81447,-0.44975)
- New Momentum Direction: (-0.67618,0.098838,0.73008)
- New Polarization:       (0.37374,0.9,0.22431)
+ Old Momentum Direction: (-0.676151,0.0988124,-0.730107)
+ Old Polarization:       (0.366568,-0.814487,-0.44971)
+ New Momentum Direction: (-0.676151,0.0988124,0.730107)
+ New Polarization:       (0.373624,0.900078,0.224197)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67618,0.098838,0.73008)
- Old Polarization:       (0.37374,0.9,0.22431)
- New Momentum Direction: (0.67618,0.098838,0.73008)
- New Polarization:       (0.36306,-0.90699,-0.21347)
+ Old Momentum Direction: (-0.676151,0.0988124,0.730107)
+ Old Polarization:       (0.373624,0.900078,0.224197)
+ New Momentum Direction: (0.676151,0.0988124,0.730107)
+ New Polarization:       (0.363775,-0.906524,-0.214203)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.67618,0.098838,0.73008)
- Old Polarization:       (0.36306,-0.90699,-0.21347)
- New Momentum Direction: (0.9176,0.13413,0.3742)
- New Polarization:       (0.29324,-0.86394,-0.40941)
+ Old Momentum Direction: (0.676151,0.0988124,0.730107)
+ Old Polarization:       (0.363775,-0.906524,-0.214203)
+ New Momentum Direction: (0.917559,0.134092,0.374306)
+ New Polarization:       (0.293671,-0.863201,-0.41066)
  *** FresnelRefraction *** 
 Track (trackID 868, parentID 1) is processed with stopping code 2
 ### pop requested out of 282 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.43995,-0.32201,0.8383)
-Old Polarization: (-0.87387,-0.36855,0.31705)
-New Polarization: (0.93349,-0.2297,-0.27538)
-Polarization Change: (0.93349,-0.2297,-0.27538)
-New Momentum Direction: (-0.19124,-0.96849,0.15954)
-Momentum Change: (-0.19124,-0.96849,0.15954)
+Old Momentum Direction: (0.439891,-0.32201,0.838335)
+Old Polarization: (-0.873893,-0.368551,0.316986)
+New Polarization: (0.933507,-0.229695,-0.275327)
+Polarization Change: (0.933507,-0.229695,-0.275327)
+New Momentum Direction: (-0.191259,-0.968493,0.159504)
+Momentum Change: (-0.191259,-0.968493,0.159504)
  Photon at Boundary! 
- Old Momentum Direction: (-0.19124,-0.96849,0.15954)
- Old Polarization:       (0.93349,-0.2297,-0.27538)
- New Momentum Direction: (-0.19124,-0.96849,-0.15954)
- New Polarization:       (-0.93349,0.2297,-0.27538)
+ Old Momentum Direction: (-0.191259,-0.968493,0.159504)
+ Old Polarization:       (0.933507,-0.229695,-0.275327)
+ New Momentum Direction: (-0.191259,-0.968493,-0.159504)
+ New Polarization:       (-0.933507,0.229695,-0.275327)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.19124,-0.96849,-0.15954)
- Old Polarization:       (-0.93349,0.2297,-0.27538)
- New Momentum Direction: (-0.25994,-0.94096,-0.21685)
- New Polarization:       (-0.87873,0.32361,-0.35088)
+ Old Momentum Direction: (-0.191259,-0.968493,-0.159504)
+ Old Polarization:       (-0.933507,0.229695,-0.275327)
+ New Momentum Direction: (-0.259964,-0.940965,-0.216802)
+ New Polarization:       (-0.878754,0.323606,-0.350814)
  *** FresnelRefraction *** 
 Track (trackID 867, parentID 1) is processed with stopping code 2
 ### pop requested out of 281 stacked tracks.
@@ -5533,40 +5519,40 @@ Track (trackID 867, parentID 1) is processed with stopping code 2
 Track (trackID 866, parentID 1) is processed with stopping code 2
 ### pop requested out of 280 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52792,-0.54526,0.65114)
- Old Polarization:       (-0.77893,-0.61641,0.11535)
- New Momentum Direction: (0.52792,-0.54526,-0.65114)
- New Polarization:       (0.77893,0.61641,0.11535)
+ Old Momentum Direction: (0.527877,-0.545259,0.651182)
+ Old Polarization:       (-0.778936,-0.616413,0.115295)
+ New Momentum Direction: (0.527877,-0.545259,-0.651182)
+ New Polarization:       (0.778936,0.616413,0.115295)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52792,-0.54526,-0.65114)
- Old Polarization:       (0.77893,0.61641,0.11535)
- New Momentum Direction: (0.52792,0.54526,-0.65114)
- New Polarization:       (-0.77893,0.61641,-0.11535)
+ Old Momentum Direction: (0.527877,-0.545259,-0.651182)
+ Old Polarization:       (0.778936,0.616413,0.115295)
+ New Momentum Direction: (0.527877,0.545259,-0.651182)
+ New Polarization:       (-0.778936,0.616413,-0.115295)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52792,0.54526,-0.65114)
- Old Polarization:       (-0.77893,0.61641,-0.11535)
- New Momentum Direction: (-0.52792,0.54526,-0.65114)
- New Polarization:       (-0.77893,-0.61641,0.11535)
+ Old Momentum Direction: (0.527877,0.545259,-0.651182)
+ Old Polarization:       (-0.778936,0.616413,-0.115295)
+ New Momentum Direction: (-0.527877,0.545259,-0.651182)
+ New Polarization:       (-0.778936,-0.616413,0.115295)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52792,0.54526,-0.65114)
- Old Polarization:       (-0.77893,-0.61641,0.11535)
- New Momentum Direction: (-0.52792,0.54526,0.65114)
- New Polarization:       (0.77893,0.61641,0.11535)
+ Old Momentum Direction: (-0.527877,0.545259,-0.651182)
+ Old Polarization:       (-0.778936,-0.616413,0.115295)
+ New Momentum Direction: (-0.527877,0.545259,0.651182)
+ New Polarization:       (0.778936,0.616413,0.115295)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52792,0.54526,0.65114)
- Old Polarization:       (0.77893,0.61641,0.11535)
- New Momentum Direction: (-0.52792,-0.54526,0.65114)
- New Polarization:       (-0.77893,0.61641,-0.11535)
+ Old Momentum Direction: (-0.527877,0.545259,0.651182)
+ Old Polarization:       (0.778936,0.616413,0.115295)
+ New Momentum Direction: (-0.527877,-0.545259,0.651182)
+ New Polarization:       (-0.778936,0.616413,-0.115295)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52792,-0.54526,0.65114)
- Old Polarization:       (-0.77893,0.61641,-0.11535)
- New Momentum Direction: (0.52792,-0.54526,0.65114)
- New Polarization:       (-0.77893,-0.61641,0.11535)
+ Old Momentum Direction: (-0.527877,-0.545259,0.651182)
+ Old Polarization:       (-0.778936,0.616413,-0.115295)
+ New Momentum Direction: (0.527877,-0.545259,0.651182)
+ New Polarization:       (-0.778936,-0.616413,0.115295)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -5577,137 +5563,137 @@ Track (trackID 865, parentID 1) is processed with stopping code 2
 Track (trackID 864, parentID 1) is processed with stopping code 2
 ### pop requested out of 278 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.663,-0.66017,0.35299)
- Old Polarization:       (-0.63054,-0.74663,-0.21206)
- New Momentum Direction: (-0.663,-0.66017,0.35299)
- New Polarization:       (-0.63054,0.74663,0.21206)
+ Old Momentum Direction: (0.662978,-0.660169,0.35304)
+ Old Polarization:       (-0.630517,-0.746631,-0.212111)
+ New Momentum Direction: (-0.662978,-0.660169,0.35304)
+ New Polarization:       (-0.630517,0.746631,0.212111)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.663,-0.66017,0.35299)
- Old Polarization:       (-0.63054,0.74663,0.21206)
- New Momentum Direction: (-0.663,0.66017,0.35299)
- New Polarization:       (0.63054,0.74663,-0.21206)
+ Old Momentum Direction: (-0.662978,-0.660169,0.35304)
+ Old Polarization:       (-0.630517,0.746631,0.212111)
+ New Momentum Direction: (-0.662978,0.660169,0.35304)
+ New Polarization:       (0.630517,0.746631,-0.212111)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.663,0.66017,0.35299)
- Old Polarization:       (0.63054,0.74663,-0.21206)
- New Momentum Direction: (-0.663,0.66017,-0.35299)
- New Polarization:       (-0.63054,-0.74663,-0.21206)
+ Old Momentum Direction: (-0.662978,0.660169,0.35304)
+ Old Polarization:       (0.630517,0.746631,-0.212111)
+ New Momentum Direction: (-0.662978,0.660169,-0.35304)
+ New Polarization:       (-0.630517,-0.746631,-0.212111)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 863, parentID 1) is processed with stopping code 2
 ### pop requested out of 277 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86796,0.47453,-0.14655)
- Old Polarization:       (-0.40489,0.50522,-0.76211)
- New Momentum Direction: (0.74004,0.64262,-0.19845)
- New Polarization:       (-0.59863,0.49486,-0.62989)
+ Old Momentum Direction: (0.867965,0.474532,-0.146479)
+ Old Polarization:       (-0.404834,0.505221,-0.762143)
+ New Momentum Direction: (0.740061,0.642621,-0.198365)
+ New Polarization:       (-0.598567,0.49488,-0.629929)
  *** FresnelRefraction *** 
 Track (trackID 862, parentID 1) is processed with stopping code 2
 ### pop requested out of 276 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5638,0.63403,0.52928)
- Old Polarization:       (-0.73845,0.67399,-0.020772)
- New Momentum Direction: (0.5638,-0.63403,0.52928)
- New Polarization:       (0.73845,0.67399,0.020772)
+ Old Momentum Direction: (0.563758,0.63403,0.529322)
+ Old Polarization:       (-0.738448,0.673989,-0.0208261)
+ New Momentum Direction: (0.563758,-0.63403,0.529322)
+ New Polarization:       (0.738448,0.673989,0.0208261)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5638,-0.63403,0.52928)
- Old Polarization:       (0.73845,0.67399,0.020772)
- New Momentum Direction: (-0.5638,-0.63403,0.52928)
- New Polarization:       (0.73845,-0.67399,-0.020772)
+ Old Momentum Direction: (0.563758,-0.63403,0.529322)
+ Old Polarization:       (0.738448,0.673989,0.0208261)
+ New Momentum Direction: (-0.563758,-0.63403,0.529322)
+ New Polarization:       (0.738448,-0.673989,-0.0208261)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5638,-0.63403,0.52928)
- Old Polarization:       (0.73845,-0.67399,-0.020772)
- New Momentum Direction: (-0.5638,-0.63403,-0.52928)
- New Polarization:       (-0.73845,0.67399,-0.020772)
+ Old Momentum Direction: (-0.563758,-0.63403,0.529322)
+ Old Polarization:       (0.738448,-0.673989,-0.0208261)
+ New Momentum Direction: (-0.563758,-0.63403,-0.529322)
+ New Polarization:       (-0.738448,0.673989,-0.0208261)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 861, parentID 1) is processed with stopping code 2
 ### pop requested out of 275 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45385,0.405,0.79373)
- Old Polarization:       (-0.86091,0.4291,0.27331)
- New Momentum Direction: (0.61434,0.54822,0.56749)
- New Polarization:       (-0.29501,0.82664,-0.47921)
+ Old Momentum Direction: (0.453785,0.404997,0.793761)
+ Old Polarization:       (-0.860934,0.429101,0.273249)
+ New Momentum Direction: (0.614261,0.54822,0.567573)
+ New Polarization:       (-0.295101,0.826666,-0.479103)
  *** FresnelRefraction *** 
 Track (trackID 860, parentID 1) is processed with stopping code 2
 ### pop requested out of 274 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93444,0.20041,-0.29438)
- Old Polarization:       (-0.33346,0.20222,-0.92082)
- New Momentum Direction: (0.87528,0.27216,-0.39978)
- New Polarization:       (-0.46651,0.25718,-0.8463)
+ Old Momentum Direction: (0.934459,0.200415,-0.294314)
+ Old Polarization:       (-0.333395,0.202215,-0.920846)
+ New Momentum Direction: (0.875317,0.272165,-0.399681)
+ New Polarization:       (-0.466426,0.257215,-0.846338)
  *** FresnelRefraction *** 
 Track (trackID 859, parentID 1) is processed with stopping code 2
 ### pop requested out of 273 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43595,0.34399,0.83164)
- Old Polarization:       (-0.87924,0.35997,0.31202)
- New Momentum Direction: (0.59152,0.46674,0.65746)
- New Polarization:       (-0.091575,0.84903,-0.52034)
+ Old Momentum Direction: (0.43589,0.343988,0.831669)
+ Old Polarization:       (-0.879268,0.359962,0.311953)
+ New Momentum Direction: (0.591435,0.466738,0.657541)
+ New Polarization:       (-0.0916675,0.849082,-0.520247)
  *** FresnelRefraction *** 
 Track (trackID 858, parentID 1) is processed with stopping code 2
 ### pop requested out of 272 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92511,-0.28236,-0.25388)
- Old Polarization:       (-0.34181,-0.32806,-0.88065)
- New Momentum Direction: (0.85776,-0.38226,-0.3437)
- New Polarization:       (-0.48469,-0.37866,-0.78848)
+ Old Momentum Direction: (0.925125,-0.282357,-0.253806)
+ Old Polarization:       (-0.341739,-0.328062,-0.880676)
+ New Momentum Direction: (0.857796,-0.382258,-0.343605)
+ New Polarization:       (-0.484607,-0.37869,-0.788511)
  *** FresnelRefraction *** 
 Track (trackID 857, parentID 1) is processed with stopping code 2
 ### pop requested out of 271 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73122,0.66089,0.16893)
- Old Polarization:       (-0.5546,0.72017,-0.41686)
- New Momentum Direction: (0.39626,0.88954,0.22738)
- New Polarization:       (-0.82533,0.45361,-0.33626)
+ Old Momentum Direction: (0.73121,0.660889,0.168987)
+ Old Polarization:       (-0.554566,0.720174,-0.416901)
+ New Momentum Direction: (0.396215,0.889539,0.227452)
+ New Polarization:       (-0.825315,0.453601,-0.336306)
  *** FresnelRefraction *** 
 Track (trackID 856, parentID 1) is processed with stopping code 2
 ### pop requested out of 270 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56871,0.63849,0.51855)
- Old Polarization:       (-0.73317,0.67928,-0.032316)
- New Momentum Direction: (0.56871,-0.63849,0.51855)
- New Polarization:       (0.73317,0.67928,0.032316)
+ Old Momentum Direction: (0.568667,0.638496,0.518595)
+ Old Polarization:       (-0.733168,0.679277,-0.0323692)
+ New Momentum Direction: (0.568667,-0.638496,0.518595)
+ New Polarization:       (0.733168,0.679277,0.0323692)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.56871,-0.63849,0.51855)
-Old Polarization: (0.73317,0.67928,0.032316)
-New Polarization: (0.72587,0.55442,0.4071)
-Polarization Change: (0.72587,0.55442,0.4071)
-New Momentum Direction: (-0.16513,-0.43409,0.88561)
-Momentum Change: (-0.16513,-0.43409,0.88561)
+Old Momentum Direction: (0.568667,-0.638496,0.518595)
+Old Polarization: (0.733168,0.679277,0.0323692)
+New Polarization: (0.725851,0.554409,0.40715)
+Polarization Change: (0.725851,0.554409,0.40715)
+New Momentum Direction: (-0.165167,-0.434119,0.885585)
+Momentum Change: (-0.165167,-0.434119,0.885585)
  Photon at Boundary! 
- Old Momentum Direction: (-0.16513,-0.43409,0.88561)
- Old Polarization:       (0.72587,0.55442,0.4071)
- New Momentum Direction: (-0.22457,-0.59033,0.77529)
- New Polarization:       (0.087548,-0.80462,-0.58731)
+ Old Momentum Direction: (-0.165167,-0.434119,0.885585)
+ Old Polarization:       (0.725851,0.554409,0.40715)
+ New Momentum Direction: (-0.224618,-0.590379,0.775242)
+ New Polarization:       (0.0874833,-0.804576,-0.58737)
  *** FresnelRefraction *** 
 Track (trackID 855, parentID 1) is processed with stopping code 2
 ### pop requested out of 269 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.74468,-0.64839,0.15824)
-Old Polarization: (-0.54113,-0.72534,-0.4255)
-New Polarization: (0.98201,0.023166,0.18742)
-Polarization Change: (0.98201,0.023166,0.18742)
-New Momentum Direction: (-0.097031,0.91332,0.39552)
-Momentum Change: (-0.097031,0.91332,0.39552)
+Old Momentum Direction: (0.744675,-0.648383,0.158298)
+Old Polarization: (-0.541095,-0.725347,-0.425544)
+New Polarization: (0.982001,0.0231916,0.187448)
+Polarization Change: (0.982001,0.0231916,0.187448)
+New Momentum Direction: (-0.0970723,0.913302,0.395546)
+Momentum Change: (-0.0970723,0.913302,0.395546)
 Scattering Photon!
-Old Momentum Direction: (-0.097031,0.91332,0.39552)
-Old Polarization: (0.98201,0.023166,0.18742)
-New Polarization: (0.98306,0.096273,0.15595)
-Polarization Change: (0.98306,0.096273,0.15595)
-New Momentum Direction: (0.025887,-0.91533,0.40187)
-Momentum Change: (0.025887,-0.91533,0.40187)
+Old Momentum Direction: (-0.0970723,0.913302,0.395546)
+Old Polarization: (0.982001,0.0231916,0.187448)
+New Polarization: (0.983055,0.0962984,0.155978)
+Polarization Change: (0.983055,0.0962984,0.155978)
+New Momentum Direction: (0.0259002,-0.915329,0.401873)
+Momentum Change: (0.0259002,-0.915329,0.401873)
  Photon at Boundary! 
- Old Momentum Direction: (0.025887,-0.91533,0.40187)
- Old Polarization:       (0.98306,0.096273,0.15595)
- New Momentum Direction: (0.035176,-0.837,0.54607)
- New Polarization:       (0.96235,0.17574,0.20738)
+ Old Momentum Direction: (0.0259002,-0.915329,0.401873)
+ Old Polarization:       (0.983055,0.0962984,0.155978)
+ New Momentum Direction: (0.0351934,-0.837001,0.546069)
+ New Polarization:       (0.96233,0.175783,0.207415)
  *** FresnelRefraction *** 
 Track (trackID 854, parentID 1) is processed with stopping code 2
 ### pop requested out of 268 stacked tracks.
@@ -5716,26 +5702,26 @@ Track (trackID 854, parentID 1) is processed with stopping code 2
 Track (trackID 853, parentID 1) is processed with stopping code 2
 ### pop requested out of 267 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77016,0.63426,0.06758)
- Old Polarization:       (-0.51287,0.67876,-0.5256)
- New Momentum Direction: (0.50163,0.86021,0.091655)
- New Polarization:       (-0.77018,0.49234,-0.40549)
+ Old Momentum Direction: (0.770153,0.634263,0.0676387)
+ Old Polarization:       (-0.51283,0.678758,-0.525635)
+ New Momentum Direction: (0.501611,0.860216,0.0917347)
+ New Polarization:       (-0.770156,0.492342,-0.405537)
  *** FresnelRefraction *** 
 Track (trackID 852, parentID 1) is processed with stopping code 2
 ### pop requested out of 266 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94661,-0.058661,-0.31701)
- Old Polarization:       (-0.32102,-0.080964,-0.94361)
- New Momentum Direction: (0.89878,-0.079768,-0.43107)
- New Polarization:       (-0.4374,-0.096975,-0.89402)
+ Old Momentum Direction: (0.946631,-0.0586566,-0.316936)
+ Old Polarization:       (-0.320948,-0.0809648,-0.94363)
+ New Momentum Direction: (0.898831,-0.0797626,-0.430977)
+ New Polarization:       (-0.437301,-0.0969863,-0.89407)
  *** FresnelRefraction *** 
 Track (trackID 851, parentID 1) is processed with stopping code 2
 ### pop requested out of 265 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91626,-0.3305,-0.22636)
- Old Polarization:       (-0.3496,-0.38386,-0.85465)
- New Momentum Direction: (0.84133,-0.44595,-0.30543)
- New Polarization:       (-0.50023,-0.42831,-0.75255)
+ Old Momentum Direction: (0.916276,-0.330497,-0.226294)
+ Old Polarization:       (-0.349538,-0.383857,-0.85468)
+ New Momentum Direction: (0.841368,-0.445944,-0.305341)
+ New Polarization:       (-0.500149,-0.42834,-0.75258)
  *** FresnelRefraction *** 
 Track (trackID 850, parentID 1) is processed with stopping code 2
 ### pop requested out of 264 stacked tracks.
@@ -5744,10 +5730,10 @@ Track (trackID 850, parentID 1) is processed with stopping code 2
 Track (trackID 849, parentID 1) is processed with stopping code 2
 ### pop requested out of 263 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74468,0.65529,0.12666)
- Old Polarization:       (-0.54064,0.70354,-0.46124)
- New Momentum Direction: (0.42711,0.88777,0.17159)
- New Polarization:       (-0.81119,0.46005,-0.36101)
+ Old Momentum Direction: (0.74467,0.655293,0.126716)
+ Old Polarization:       (-0.540605,0.703538,-0.461281)
+ New Momentum Direction: (0.427075,0.88777,0.171671)
+ New Polarization:       (-0.811172,0.460044,-0.361054)
  *** FresnelRefraction *** 
 Track (trackID 848, parentID 1) is processed with stopping code 2
 ### pop requested out of 262 stacked tracks.
@@ -5756,124 +5742,124 @@ Track (trackID 848, parentID 1) is processed with stopping code 2
 Track (trackID 847, parentID 1) is processed with stopping code 2
 ### pop requested out of 261 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43938,0.36331,0.82155)
- Old Polarization:       (-0.87494,0.38031,0.29974)
- New Momentum Direction: (0.59675,0.49344,0.63278)
- New Polarization:       (-0.15925,0.84572,-0.5093)
+ Old Momentum Direction: (0.439316,0.363311,0.821588)
+ Old Polarization:       (-0.874961,0.380309,0.29968)
+ New Momentum Direction: (0.596664,0.493437,0.632861)
+ New Polarization:       (-0.159346,0.845765,-0.509205)
  *** FresnelRefraction *** 
 Track (trackID 846, parentID 1) is processed with stopping code 2
 ### pop requested out of 260 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63971,-0.65783,0.39753)
- Old Polarization:       (-0.65587,-0.73686,-0.16391)
- New Momentum Direction: (0.63971,0.65783,0.39753)
- New Polarization:       (0.65587,-0.73686,0.16391)
+ Old Momentum Direction: (0.639688,-0.657823,0.397578)
+ Old Polarization:       (-0.655855,-0.736867,-0.163956)
+ New Momentum Direction: (0.639688,0.657823,0.397578)
+ New Polarization:       (0.655855,-0.736867,0.163956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63971,0.65783,0.39753)
- Old Polarization:       (0.65587,-0.73686,0.16391)
- New Momentum Direction: (-0.63971,0.65783,0.39753)
- New Polarization:       (0.65587,0.73686,-0.16391)
+ Old Momentum Direction: (0.639688,0.657823,0.397578)
+ Old Polarization:       (0.655855,-0.736867,0.163956)
+ New Momentum Direction: (-0.639688,0.657823,0.397578)
+ New Polarization:       (0.655855,0.736867,-0.163956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63971,0.65783,0.39753)
- Old Polarization:       (0.65587,0.73686,-0.16391)
- New Momentum Direction: (-0.63971,0.65783,-0.39753)
- New Polarization:       (-0.65587,-0.73686,-0.16391)
+ Old Momentum Direction: (-0.639688,0.657823,0.397578)
+ Old Polarization:       (0.655855,0.736867,-0.163956)
+ New Momentum Direction: (-0.639688,0.657823,-0.397578)
+ New Polarization:       (-0.655855,-0.736867,-0.163956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63971,0.65783,-0.39753)
- Old Polarization:       (-0.65587,-0.73686,-0.16391)
- New Momentum Direction: (-0.63971,-0.65783,-0.39753)
- New Polarization:       (0.65587,-0.73686,0.16391)
+ Old Momentum Direction: (-0.639688,0.657823,-0.397578)
+ Old Polarization:       (-0.655855,-0.736867,-0.163956)
+ New Momentum Direction: (-0.639688,-0.657823,-0.397578)
+ New Polarization:       (0.655855,-0.736867,0.163956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63971,-0.65783,-0.39753)
- Old Polarization:       (0.65587,-0.73686,0.16391)
- New Momentum Direction: (0.63971,-0.65783,-0.39753)
- New Polarization:       (0.65587,0.73686,-0.16391)
+ Old Momentum Direction: (-0.639688,-0.657823,-0.397578)
+ Old Polarization:       (0.655855,-0.736867,0.163956)
+ New Momentum Direction: (0.639688,-0.657823,-0.397578)
+ New Polarization:       (0.655855,0.736867,-0.163956)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 845, parentID 1) is processed with stopping code 2
 ### pop requested out of 259 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42648,-0.22581,0.87586)
- Old Polarization:       (-0.89182,-0.26655,0.36553)
- New Momentum Direction: (0.57659,-0.30529,0.75786)
- New Polarization:       (0.32056,-0.76867,-0.55353)
+ Old Momentum Direction: (0.426414,-0.225807,0.875889)
+ Old Polarization:       (-0.891843,-0.266556,0.365463)
+ New Momentum Direction: (0.576502,-0.305285,0.757923)
+ New Polarization:       (0.320509,-0.768753,-0.553438)
  *** FresnelRefraction *** 
 Track (trackID 844, parentID 1) is processed with stopping code 2
 ### pop requested out of 258 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5467,0.60901,0.57466)
- Old Polarization:       (-0.75809,0.65142,0.030842)
- New Momentum Direction: (0.5467,-0.60901,0.57466)
- New Polarization:       (0.75809,0.65142,-0.030842)
+ Old Momentum Direction: (0.546653,0.60901,0.574698)
+ Old Polarization:       (-0.758093,0.651419,0.0307865)
+ New Momentum Direction: (0.546653,-0.60901,0.574698)
+ New Polarization:       (0.758093,0.651419,-0.0307865)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5467,-0.60901,0.57466)
- Old Polarization:       (0.75809,0.65142,-0.030842)
- New Momentum Direction: (0.5467,-0.60901,-0.57466)
- New Polarization:       (-0.75809,-0.65142,-0.030842)
+ Old Momentum Direction: (0.546653,-0.60901,0.574698)
+ Old Polarization:       (0.758093,0.651419,-0.0307865)
+ New Momentum Direction: (0.546653,-0.60901,-0.574698)
+ New Polarization:       (-0.758093,-0.651419,-0.0307865)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5467,-0.60901,-0.57466)
- Old Polarization:       (-0.75809,-0.65142,-0.030842)
- New Momentum Direction: (-0.5467,-0.60901,-0.57466)
- New Polarization:       (-0.75809,0.65142,0.030842)
+ Old Momentum Direction: (0.546653,-0.60901,-0.574698)
+ Old Polarization:       (-0.758093,-0.651419,-0.0307865)
+ New Momentum Direction: (-0.546653,-0.60901,-0.574698)
+ New Polarization:       (-0.758093,0.651419,0.0307865)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 843, parentID 1) is processed with stopping code 2
 ### pop requested out of 257 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52502,0.58367,0.61942)
- Old Polarization:       (-0.78088,0.61981,0.077849)
- New Momentum Direction: (0.52502,0.58367,-0.61942)
- New Polarization:       (0.78088,-0.61981,0.077849)
+ Old Momentum Direction: (0.524977,0.583672,0.619457)
+ Old Polarization:       (-0.780892,0.619803,0.0777915)
+ New Momentum Direction: (0.524977,0.583672,-0.619457)
+ New Polarization:       (0.780892,-0.619803,0.0777915)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52502,0.58367,-0.61942)
- Old Polarization:       (0.78088,-0.61981,0.077849)
- New Momentum Direction: (0.52502,-0.58367,-0.61942)
- New Polarization:       (-0.78088,-0.61981,-0.077849)
+ Old Momentum Direction: (0.524977,0.583672,-0.619457)
+ Old Polarization:       (0.780892,-0.619803,0.0777915)
+ New Momentum Direction: (0.524977,-0.583672,-0.619457)
+ New Polarization:       (-0.780892,-0.619803,-0.0777915)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52502,-0.58367,-0.61942)
- Old Polarization:       (-0.78088,-0.61981,-0.077849)
- New Momentum Direction: (-0.52502,-0.58367,-0.61942)
- New Polarization:       (-0.78088,0.61981,0.077849)
+ Old Momentum Direction: (0.524977,-0.583672,-0.619457)
+ Old Polarization:       (-0.780892,-0.619803,-0.0777915)
+ New Momentum Direction: (-0.524977,-0.583672,-0.619457)
+ New Polarization:       (-0.780892,0.619803,0.0777915)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 842, parentID 1) is processed with stopping code 2
 ### pop requested out of 256 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7311,-0.65433,0.19322)
- Old Polarization:       (-0.55567,-0.73539,-0.38785)
- New Momentum Direction: (-0.7311,-0.65433,0.19322)
- New Polarization:       (-0.3268,0.58446,0.7427)
+ Old Momentum Direction: (0.731092,-0.654331,0.193274)
+ Old Polarization:       (-0.555636,-0.735394,-0.387897)
+ New Momentum Direction: (-0.731092,-0.654331,0.193274)
+ New Polarization:       (-0.326794,0.584499,0.742675)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.7311,-0.65433,0.19322)
- Old Polarization:       (-0.3268,0.58446,0.7427)
- New Momentum Direction: (-0.7311,0.65433,0.19322)
- New Polarization:       (0.3268,0.58446,-0.7427)
+ Old Momentum Direction: (-0.731092,-0.654331,0.193274)
+ Old Polarization:       (-0.326794,0.584499,0.742675)
+ New Momentum Direction: (-0.731092,0.654331,0.193274)
+ New Polarization:       (0.326794,0.584499,-0.742675)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.7311,0.65433,0.19322)
- Old Polarization:       (0.3268,0.58446,-0.7427)
- New Momentum Direction: (-0.37994,0.88714,0.26196)
- New Polarization:       (0.58395,0.44967,-0.67587)
+ Old Momentum Direction: (-0.731092,0.654331,0.193274)
+ Old Polarization:       (0.326794,0.584499,-0.742675)
+ New Momentum Direction: (-0.3799,0.887137,0.262039)
+ New Polarization:       (0.58394,0.449694,-0.675862)
  *** FresnelRefraction *** 
 Track (trackID 841, parentID 1) is processed with stopping code 2
 ### pop requested out of 255 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4876,-0.44868,0.74895)
- Old Polarization:       (-0.82562,-0.51592,0.22844)
- New Momentum Direction: (0.65738,-0.6049,0.44938)
- New Polarization:       (-0.44187,-0.79249,-0.42036)
+ Old Momentum Direction: (0.48755,-0.448675,0.74899)
+ Old Polarization:       (-0.825631,-0.515921,0.228382)
+ New Momentum Direction: (0.657312,-0.6049,0.449485)
+ New Polarization:       (-0.441942,-0.792512,-0.420252)
  *** FresnelRefraction *** 
 Track (trackID 840, parentID 1) is processed with stopping code 2
 ### pop requested out of 254 stacked tracks.
@@ -5882,57 +5868,57 @@ Track (trackID 840, parentID 1) is processed with stopping code 2
 Track (trackID 839, parentID 1) is processed with stopping code 2
 ### pop requested out of 253 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.67897,-0.66566,0.30966)
-Old Polarization: (-0.61291,-0.74613,-0.26005)
-New Polarization: (0.62554,0.30839,0.71666)
-Polarization Change: (0.62554,0.30839,0.71666)
-New Momentum Direction: (0.18755,0.83219,-0.52181)
-Momentum Change: (0.18755,0.83219,-0.52181)
+Old Momentum Direction: (0.678951,-0.665661,0.309711)
+Old Polarization: (-0.612887,-0.746137,-0.260096)
+New Polarization: (0.625511,0.308378,0.716686)
+Polarization Change: (0.625511,0.308378,0.716686)
+New Momentum Direction: (0.187547,0.832212,-0.521775)
+Momentum Change: (0.187547,0.832212,-0.521775)
  Photon at Boundary! 
- Old Momentum Direction: (0.18755,0.83219,-0.52181)
- Old Polarization:       (0.62554,0.30839,0.71666)
- New Momentum Direction: (0.25454,0.65852,-0.70821)
- New Polarization:       (0.838,-0.5157,-0.17833)
+ Old Momentum Direction: (0.187547,0.832212,-0.521775)
+ Old Polarization:       (0.625511,0.308378,0.716686)
+ New Momentum Direction: (0.25454,0.658578,-0.708156)
+ New Polarization:       (0.838014,-0.515676,-0.178357)
  *** FresnelRefraction *** 
 Track (trackID 838, parentID 1) is processed with stopping code 2
 ### pop requested out of 252 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75735,-0.63801,0.13915)
- Old Polarization:       (-0.52623,-0.72248,-0.44845)
- New Momentum Direction: (0.47024,-0.86227,0.18806)
- New Polarization:       (-0.78717,-0.50615,-0.35239)
+ Old Momentum Direction: (0.757343,-0.638006,0.13921)
+ Old Polarization:       (-0.526197,-0.722478,-0.448489)
+ New Momentum Direction: (0.470221,-0.862262,0.188141)
+ New Polarization:       (-0.787145,-0.506156,-0.352434)
  *** FresnelRefraction *** 
 Track (trackID 837, parentID 1) is processed with stopping code 2
 ### pop requested out of 251 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87906,-0.45467,-0.14331)
- Old Polarization:       (-0.39214,-0.51871,-0.75971)
- New Momentum Direction: (0.76428,-0.61506,-0.19387)
- New Polarization:       (-0.57671,-0.51733,-0.63228)
+ Old Momentum Direction: (0.87907,-0.454662,-0.143245)
+ Old Polarization:       (-0.392082,-0.518711,-0.759744)
+ New Momentum Direction: (0.764306,-0.61505,-0.193777)
+ New Polarization:       (-0.576641,-0.517359,-0.632317)
  *** FresnelRefraction *** 
 Track (trackID 836, parentID 1) is processed with stopping code 2
 ### pop requested out of 250 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.709,-0.65844,0.25254)
- Old Polarization:       (-0.57956,-0.74805,-0.32331)
- New Momentum Direction: (0.30808,-0.88827,0.34068)
- New Polarization:       (-0.86527,-0.41047,-0.28777)
+ Old Momentum Direction: (0.708981,-0.65844,0.25259)
+ Old Polarization:       (-0.57953,-0.748057,-0.32335)
+ New Momentum Direction: (0.308015,-0.888264,0.340755)
+ New Polarization:       (-0.865265,-0.410455,-0.287824)
  *** FresnelRefraction *** 
 Track (trackID 835, parentID 1) is processed with stopping code 2
 ### pop requested out of 249 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76426,-0.63488,0.1133)
- Old Polarization:       (-0.51977,-0.71038,-0.47454)
- New Momentum Direction: (0.48155,-0.86279,0.15397)
- New Polarization:       (-0.78252,-0.50238,-0.3678)
+ Old Momentum Direction: (0.764255,-0.634873,0.113357)
+ Old Polarization:       (-0.519733,-0.710387,-0.474583)
+ New Momentum Direction: (0.48153,-0.862785,0.154051)
+ New Polarization:       (-0.782489,-0.502395,-0.367846)
  *** FresnelRefraction *** 
 Track (trackID 834, parentID 1) is processed with stopping code 2
 ### pop requested out of 248 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78837,0.61395,0.039174)
- Old Polarization:       (-0.49109,0.6664,-0.56102)
- New Momentum Direction: (0.55952,0.82713,0.052777)
- New Polarization:       (-0.73152,0.52277,-0.4377)
+ Old Momentum Direction: (0.788366,0.613954,0.0392346)
+ Old Polarization:       (-0.491046,0.666397,-0.561061)
+ New Momentum Direction: (0.559511,0.827136,0.0528579)
+ New Polarization:       (-0.731487,0.522784,-0.437748)
  *** FresnelRefraction *** 
 Track (trackID 833, parentID 1) is processed with stopping code 2
 ### pop requested out of 247 stacked tracks.
@@ -5941,84 +5927,84 @@ Track (trackID 833, parentID 1) is processed with stopping code 2
 Track (trackID 832, parentID 1) is processed with stopping code 2
 ### pop requested out of 246 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.94436,-0.14306,-0.29617)
-Old Polarization: (-0.31873,-0.17571,-0.93142)
-New Polarization: (0.22166,0.40928,-0.88507)
-Polarization Change: (0.22166,0.40928,-0.88507)
-New Momentum Direction: (-0.6423,-0.62166,-0.44833)
-Momentum Change: (-0.6423,-0.62166,-0.44833)
+Old Momentum Direction: (0.944384,-0.143059,-0.296096)
+Old Polarization: (-0.318656,-0.175707,-0.931443)
+New Polarization: (0.221674,0.409334,-0.885046)
+Polarization Change: (0.221674,0.409334,-0.885046)
+New Momentum Direction: (-0.642209,-0.621703,-0.448389)
+Momentum Change: (-0.642209,-0.621703,-0.448389)
  Photon at Boundary! 
- Old Momentum Direction: (-0.6423,-0.62166,-0.44833)
- Old Polarization:       (0.22166,0.40928,-0.88507)
- New Momentum Direction: (-0.6423,0.62166,-0.44833)
- New Polarization:       (-0.22166,0.40928,0.88507)
+ Old Momentum Direction: (-0.642209,-0.621703,-0.448389)
+ Old Polarization:       (0.221674,0.409334,-0.885046)
+ New Momentum Direction: (-0.642209,0.621703,-0.448389)
+ New Polarization:       (-0.221674,0.409334,0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6423,0.62166,-0.44833)
- Old Polarization:       (-0.22166,0.40928,0.88507)
- New Momentum Direction: (-0.6423,0.62166,0.44833)
- New Polarization:       (0.22166,-0.40928,0.88507)
+ Old Momentum Direction: (-0.642209,0.621703,-0.448389)
+ Old Polarization:       (-0.221674,0.409334,0.885046)
+ New Momentum Direction: (-0.642209,0.621703,0.448389)
+ New Polarization:       (0.221674,-0.409334,0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6423,0.62166,0.44833)
- Old Polarization:       (0.22166,-0.40928,0.88507)
- New Momentum Direction: (0.6423,0.62166,0.44833)
- New Polarization:       (0.22166,0.40928,-0.88507)
+ Old Momentum Direction: (-0.642209,0.621703,0.448389)
+ Old Polarization:       (0.221674,-0.409334,0.885046)
+ New Momentum Direction: (0.642209,0.621703,0.448389)
+ New Polarization:       (0.221674,0.409334,-0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6423,0.62166,0.44833)
- Old Polarization:       (0.22166,0.40928,-0.88507)
- New Momentum Direction: (0.6423,-0.62166,0.44833)
- New Polarization:       (-0.22166,0.40928,0.88507)
+ Old Momentum Direction: (0.642209,0.621703,0.448389)
+ Old Polarization:       (0.221674,0.409334,-0.885046)
+ New Momentum Direction: (0.642209,-0.621703,0.448389)
+ New Polarization:       (-0.221674,0.409334,0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6423,-0.62166,0.44833)
- Old Polarization:       (-0.22166,0.40928,0.88507)
- New Momentum Direction: (0.6423,-0.62166,-0.44833)
- New Polarization:       (0.22166,-0.40928,0.88507)
+ Old Momentum Direction: (0.642209,-0.621703,0.448389)
+ Old Polarization:       (-0.221674,0.409334,0.885046)
+ New Momentum Direction: (0.642209,-0.621703,-0.448389)
+ New Polarization:       (0.221674,-0.409334,0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6423,-0.62166,-0.44833)
- Old Polarization:       (0.22166,-0.40928,0.88507)
- New Momentum Direction: (-0.6423,-0.62166,-0.44833)
- New Polarization:       (0.22166,0.40928,-0.88507)
+ Old Momentum Direction: (0.642209,-0.621703,-0.448389)
+ Old Polarization:       (0.221674,-0.409334,0.885046)
+ New Momentum Direction: (-0.642209,-0.621703,-0.448389)
+ New Polarization:       (0.221674,0.409334,-0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6423,-0.62166,-0.44833)
- Old Polarization:       (0.22166,0.40928,-0.88507)
- New Momentum Direction: (-0.6423,0.62166,-0.44833)
- New Polarization:       (-0.22166,0.40928,0.88507)
+ Old Momentum Direction: (-0.642209,-0.621703,-0.448389)
+ Old Polarization:       (0.221674,0.409334,-0.885046)
+ New Momentum Direction: (-0.642209,0.621703,-0.448389)
+ New Polarization:       (-0.221674,0.409334,0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6423,0.62166,-0.44833)
- Old Polarization:       (-0.22166,0.40928,0.88507)
- New Momentum Direction: (0.6423,0.62166,-0.44833)
- New Polarization:       (-0.22166,-0.40928,-0.88507)
+ Old Momentum Direction: (-0.642209,0.621703,-0.448389)
+ Old Polarization:       (-0.221674,0.409334,0.885046)
+ New Momentum Direction: (0.642209,0.621703,-0.448389)
+ New Polarization:       (-0.221674,-0.409334,-0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6423,0.62166,-0.44833)
- Old Polarization:       (-0.22166,-0.40928,-0.88507)
- New Momentum Direction: (0.6423,0.62166,0.44833)
- New Polarization:       (0.22166,0.40928,-0.88507)
+ Old Momentum Direction: (0.642209,0.621703,-0.448389)
+ Old Polarization:       (-0.221674,-0.409334,-0.885046)
+ New Momentum Direction: (0.642209,0.621703,0.448389)
+ New Polarization:       (0.221674,0.409334,-0.885046)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6423,0.62166,0.44833)
- Old Polarization:       (0.22166,0.40928,-0.88507)
- New Momentum Direction: (0.6423,-0.62166,0.44833)
- New Polarization:       (-0.22166,0.40928,0.88507)
+ Old Momentum Direction: (0.642209,0.621703,0.448389)
+ Old Polarization:       (0.221674,0.409334,-0.885046)
+ New Momentum Direction: (0.642209,-0.621703,0.448389)
+ New Polarization:       (-0.221674,0.409334,0.885046)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.6423,-0.62166,0.44833)
-Old Polarization: (-0.22166,0.40928,0.88507)
-New Polarization: (-0.36347,-0.23908,0.90041)
-Polarization Change: (-0.36347,-0.23908,0.90041)
-New Momentum Direction: (0.098544,0.95122,0.29235)
-Momentum Change: (0.098544,0.95122,0.29235)
+Old Momentum Direction: (0.642209,-0.621703,0.448389)
+Old Polarization: (-0.221674,0.409334,0.885046)
+New Polarization: (-0.363498,-0.239027,0.900409)
+Polarization Change: (-0.363498,-0.239027,0.900409)
+New Momentum Direction: (0.0985626,0.951231,0.292308)
+Momentum Change: (0.0985626,0.951231,0.292308)
  Photon at Boundary! 
- Old Momentum Direction: (0.098544,0.95122,0.29235)
- Old Polarization:       (-0.36347,-0.23908,0.90041)
- New Momentum Direction: (0.13303,0.90915,0.39466)
- New Polarization:       (-0.23861,-0.35711,0.90307)
+ Old Momentum Direction: (0.0985626,0.951231,0.292308)
+ Old Polarization:       (-0.363498,-0.239027,0.900409)
+ New Momentum Direction: (0.133053,0.909169,0.394598)
+ New Polarization:       (-0.238627,-0.357039,0.903095)
  *** FresnelRefraction *** 
 Track (trackID 831, parentID 1) is processed with stopping code 2
 ### pop requested out of 245 stacked tracks.
@@ -6035,181 +6021,181 @@ Track (trackID 829, parentID 1) is processed with stopping code 2
 Track (trackID 828, parentID 1) is processed with stopping code 2
 ### pop requested out of 242 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62049,0.67399,0.40091)
- Old Polarization:       (-0.67674,0.71851,-0.16052)
- New Momentum Direction: (0.62049,-0.67399,0.40091)
- New Polarization:       (0.67674,0.71851,0.16052)
+ Old Momentum Direction: (0.620459,0.673992,0.400956)
+ Old Polarization:       (-0.676733,0.718505,-0.160571)
+ New Momentum Direction: (0.620459,-0.673992,0.400956)
+ New Polarization:       (0.676733,0.718505,0.160571)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62049,-0.67399,0.40091)
- Old Polarization:       (0.67674,0.71851,0.16052)
- New Momentum Direction: (-0.62049,-0.67399,0.40091)
- New Polarization:       (0.67674,-0.71851,-0.16052)
+ Old Momentum Direction: (0.620459,-0.673992,0.400956)
+ Old Polarization:       (0.676733,0.718505,0.160571)
+ New Momentum Direction: (-0.620459,-0.673992,0.400956)
+ New Polarization:       (0.676733,-0.718505,-0.160571)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62049,-0.67399,0.40091)
- Old Polarization:       (0.67674,-0.71851,-0.16052)
- New Momentum Direction: (-0.62049,-0.67399,-0.40091)
- New Polarization:       (-0.67674,0.71851,-0.16052)
+ Old Momentum Direction: (-0.620459,-0.673992,0.400956)
+ Old Polarization:       (0.676733,-0.718505,-0.160571)
+ New Momentum Direction: (-0.620459,-0.673992,-0.400956)
+ New Polarization:       (-0.676733,0.718505,-0.160571)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 827, parentID 1) is processed with stopping code 2
 ### pop requested out of 241 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41253,-0.015106,0.91082)
- Old Polarization:       (-0.9106,-0.034089,0.41187)
- New Momentum Direction: (0.5549,-0.020319,0.83167)
- New Polarization:       (0.82828,-0.079849,-0.55459)
+ Old Momentum Direction: (0.412465,-0.0151054,0.910848)
+ Old Polarization:       (-0.910635,-0.0340932,0.411803)
+ New Momentum Direction: (0.554809,-0.0203183,0.83173)
+ New Polarization:       (0.828343,-0.0798615,-0.5545)
  *** FresnelRefraction *** 
 Track (trackID 826, parentID 1) is processed with stopping code 2
 ### pop requested out of 240 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.941,0.14976,-0.30345)
-Old Polarization: (-0.32475,0.14762,-0.93421)
-New Polarization: (0.16864,-0.40003,-0.90085)
-Polarization Change: (0.16864,-0.40003,-0.90085)
-New Momentum Direction: (0.65247,-0.63973,0.40623)
-Momentum Change: (0.65247,-0.63973,0.40623)
+Old Momentum Direction: (0.941026,0.149765,-0.303381)
+Old Polarization: (-0.324685,0.147624,-0.934231)
+New Polarization: (0.168667,-0.400071,-0.90083)
+Polarization Change: (0.168667,-0.400071,-0.90083)
+New Momentum Direction: (0.652395,-0.639776,0.406285)
+Momentum Change: (0.652395,-0.639776,0.406285)
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,0.40623)
- Old Polarization:       (0.16864,-0.40003,-0.90085)
- New Momentum Direction: (-0.65247,-0.63973,0.40623)
- New Polarization:       (0.16864,0.40003,0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,0.406285)
+ Old Polarization:       (0.168667,-0.400071,-0.90083)
+ New Momentum Direction: (-0.652395,-0.639776,0.406285)
+ New Polarization:       (0.168667,0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,-0.63973,0.40623)
- Old Polarization:       (0.16864,0.40003,0.90085)
- New Momentum Direction: (-0.65247,0.63973,0.40623)
- New Polarization:       (-0.16864,0.40003,-0.90085)
+ Old Momentum Direction: (-0.652395,-0.639776,0.406285)
+ Old Polarization:       (0.168667,0.400071,0.90083)
+ New Momentum Direction: (-0.652395,0.639776,0.406285)
+ New Polarization:       (-0.168667,0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,0.63973,0.40623)
- Old Polarization:       (-0.16864,0.40003,-0.90085)
- New Momentum Direction: (-0.65247,0.63973,-0.40623)
- New Polarization:       (0.16864,-0.40003,-0.90085)
+ Old Momentum Direction: (-0.652395,0.639776,0.406285)
+ Old Polarization:       (-0.168667,0.400071,-0.90083)
+ New Momentum Direction: (-0.652395,0.639776,-0.406285)
+ New Polarization:       (0.168667,-0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,0.63973,-0.40623)
- Old Polarization:       (0.16864,-0.40003,-0.90085)
- New Momentum Direction: (0.65247,0.63973,-0.40623)
- New Polarization:       (0.16864,0.40003,0.90085)
+ Old Momentum Direction: (-0.652395,0.639776,-0.406285)
+ Old Polarization:       (0.168667,-0.400071,-0.90083)
+ New Momentum Direction: (0.652395,0.639776,-0.406285)
+ New Polarization:       (0.168667,0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,0.63973,-0.40623)
- Old Polarization:       (0.16864,0.40003,0.90085)
- New Momentum Direction: (0.65247,-0.63973,-0.40623)
- New Polarization:       (-0.16864,0.40003,-0.90085)
+ Old Momentum Direction: (0.652395,0.639776,-0.406285)
+ Old Polarization:       (0.168667,0.400071,0.90083)
+ New Momentum Direction: (0.652395,-0.639776,-0.406285)
+ New Polarization:       (-0.168667,0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,-0.40623)
- Old Polarization:       (-0.16864,0.40003,-0.90085)
- New Momentum Direction: (-0.65247,-0.63973,-0.40623)
- New Polarization:       (-0.16864,-0.40003,0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,-0.406285)
+ Old Polarization:       (-0.168667,0.400071,-0.90083)
+ New Momentum Direction: (-0.652395,-0.639776,-0.406285)
+ New Polarization:       (-0.168667,-0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,-0.63973,-0.40623)
- Old Polarization:       (-0.16864,-0.40003,0.90085)
- New Momentum Direction: (-0.65247,-0.63973,0.40623)
- New Polarization:       (0.16864,0.40003,0.90085)
+ Old Momentum Direction: (-0.652395,-0.639776,-0.406285)
+ Old Polarization:       (-0.168667,-0.400071,0.90083)
+ New Momentum Direction: (-0.652395,-0.639776,0.406285)
+ New Polarization:       (0.168667,0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,-0.63973,0.40623)
- Old Polarization:       (0.16864,0.40003,0.90085)
- New Momentum Direction: (-0.65247,0.63973,0.40623)
- New Polarization:       (-0.16864,0.40003,-0.90085)
+ Old Momentum Direction: (-0.652395,-0.639776,0.406285)
+ Old Polarization:       (0.168667,0.400071,0.90083)
+ New Momentum Direction: (-0.652395,0.639776,0.406285)
+ New Polarization:       (-0.168667,0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,0.63973,0.40623)
- Old Polarization:       (-0.16864,0.40003,-0.90085)
- New Momentum Direction: (0.65247,0.63973,0.40623)
- New Polarization:       (-0.16864,-0.40003,0.90085)
+ Old Momentum Direction: (-0.652395,0.639776,0.406285)
+ Old Polarization:       (-0.168667,0.400071,-0.90083)
+ New Momentum Direction: (0.652395,0.639776,0.406285)
+ New Polarization:       (-0.168667,-0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,0.63973,0.40623)
- Old Polarization:       (-0.16864,-0.40003,0.90085)
- New Momentum Direction: (0.65247,-0.63973,0.40623)
- New Polarization:       (0.16864,-0.40003,-0.90085)
+ Old Momentum Direction: (0.652395,0.639776,0.406285)
+ Old Polarization:       (-0.168667,-0.400071,0.90083)
+ New Momentum Direction: (0.652395,-0.639776,0.406285)
+ New Polarization:       (0.168667,-0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,0.40623)
- Old Polarization:       (0.16864,-0.40003,-0.90085)
- New Momentum Direction: (0.65247,-0.63973,-0.40623)
- New Polarization:       (-0.16864,0.40003,-0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,0.406285)
+ Old Polarization:       (0.168667,-0.400071,-0.90083)
+ New Momentum Direction: (0.652395,-0.639776,-0.406285)
+ New Polarization:       (-0.168667,0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,-0.40623)
- Old Polarization:       (-0.16864,0.40003,-0.90085)
- New Momentum Direction: (-0.65247,-0.63973,-0.40623)
- New Polarization:       (-0.16864,-0.40003,0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,-0.406285)
+ Old Polarization:       (-0.168667,0.400071,-0.90083)
+ New Momentum Direction: (-0.652395,-0.639776,-0.406285)
+ New Polarization:       (-0.168667,-0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,-0.63973,-0.40623)
- Old Polarization:       (-0.16864,-0.40003,0.90085)
- New Momentum Direction: (-0.65247,0.63973,-0.40623)
- New Polarization:       (0.16864,-0.40003,-0.90085)
+ Old Momentum Direction: (-0.652395,-0.639776,-0.406285)
+ Old Polarization:       (-0.168667,-0.400071,0.90083)
+ New Momentum Direction: (-0.652395,0.639776,-0.406285)
+ New Polarization:       (0.168667,-0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65247,0.63973,-0.40623)
- Old Polarization:       (0.16864,-0.40003,-0.90085)
- New Momentum Direction: (0.65247,0.63973,-0.40623)
- New Polarization:       (0.16864,0.40003,0.90085)
+ Old Momentum Direction: (-0.652395,0.639776,-0.406285)
+ Old Polarization:       (0.168667,-0.400071,-0.90083)
+ New Momentum Direction: (0.652395,0.639776,-0.406285)
+ New Polarization:       (0.168667,0.400071,0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,0.63973,-0.40623)
- Old Polarization:       (0.16864,0.40003,0.90085)
- New Momentum Direction: (0.65247,-0.63973,-0.40623)
- New Polarization:       (-0.16864,0.40003,-0.90085)
+ Old Momentum Direction: (0.652395,0.639776,-0.406285)
+ Old Polarization:       (0.168667,0.400071,0.90083)
+ New Momentum Direction: (0.652395,-0.639776,-0.406285)
+ New Polarization:       (-0.168667,0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,-0.40623)
- Old Polarization:       (-0.16864,0.40003,-0.90085)
- New Momentum Direction: (0.65247,-0.63973,0.40623)
- New Polarization:       (0.16864,-0.40003,-0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,-0.406285)
+ Old Polarization:       (-0.168667,0.400071,-0.90083)
+ New Momentum Direction: (0.652395,-0.639776,0.406285)
+ New Polarization:       (0.168667,-0.400071,-0.90083)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65247,-0.63973,0.40623)
- Old Polarization:       (0.16864,-0.40003,-0.90085)
- New Momentum Direction: (-0.65247,-0.63973,0.40623)
- New Polarization:       (0.16864,0.40003,0.90085)
+ Old Momentum Direction: (0.652395,-0.639776,0.406285)
+ Old Polarization:       (0.168667,-0.400071,-0.90083)
+ New Momentum Direction: (-0.652395,-0.639776,0.406285)
+ New Polarization:       (0.168667,0.400071,0.90083)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 825, parentID 1) is processed with stopping code 2
 ### pop requested out of 239 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52668,-0.53113,0.66371)
- Old Polarization:       (-0.78236,-0.60822,0.13412)
- New Momentum Direction: (0.52668,-0.53113,-0.66371)
- New Polarization:       (0.78236,0.60822,0.13412)
+ Old Momentum Direction: (0.526636,-0.531127,0.663746)
+ Old Polarization:       (-0.782366,-0.60822,0.134057)
+ New Momentum Direction: (0.526636,-0.531127,-0.663746)
+ New Polarization:       (0.782366,0.60822,0.134057)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52668,-0.53113,-0.66371)
- Old Polarization:       (0.78236,0.60822,0.13412)
- New Momentum Direction: (0.52668,0.53113,-0.66371)
- New Polarization:       (-0.78236,0.60822,-0.13412)
+ Old Momentum Direction: (0.526636,-0.531127,-0.663746)
+ Old Polarization:       (0.782366,0.60822,0.134057)
+ New Momentum Direction: (0.526636,0.531127,-0.663746)
+ New Polarization:       (-0.782366,0.60822,-0.134057)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52668,0.53113,-0.66371)
- Old Polarization:       (-0.78236,0.60822,-0.13412)
- New Momentum Direction: (-0.52668,0.53113,-0.66371)
- New Polarization:       (-0.78236,-0.60822,0.13412)
+ Old Momentum Direction: (0.526636,0.531127,-0.663746)
+ Old Polarization:       (-0.782366,0.60822,-0.134057)
+ New Momentum Direction: (-0.526636,0.531127,-0.663746)
+ New Polarization:       (-0.782366,-0.60822,0.134057)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52668,0.53113,-0.66371)
- Old Polarization:       (-0.78236,-0.60822,0.13412)
- New Momentum Direction: (-0.52668,0.53113,0.66371)
- New Polarization:       (0.78236,0.60822,0.13412)
+ Old Momentum Direction: (-0.526636,0.531127,-0.663746)
+ Old Polarization:       (-0.782366,-0.60822,0.134057)
+ New Momentum Direction: (-0.526636,0.531127,0.663746)
+ New Polarization:       (0.782366,0.60822,0.134057)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 824, parentID 1) is processed with stopping code 2
 ### pop requested out of 238 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42978,0.30669,0.84926)
- Old Polarization:       (-0.88685,0.3201,0.33321)
- New Momentum Direction: (0.58232,0.41554,0.69874)
- New Polarization:       (0.042816,0.84263,-0.53679)
+ Old Momentum Direction: (0.429714,0.306686,0.849288)
+ Old Polarization:       (-0.886878,0.320098,0.333143)
+ New Momentum Direction: (0.582233,0.415539,0.698808)
+ New Polarization:       (0.0427305,0.842691,-0.536699)
  *** FresnelRefraction *** 
 Track (trackID 823, parentID 1) is processed with stopping code 2
 ### pop requested out of 237 stacked tracks.
@@ -6218,41 +6204,41 @@ Track (trackID 823, parentID 1) is processed with stopping code 2
 Track (trackID 822, parentID 1) is processed with stopping code 2
 ### pop requested out of 236 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.56253,0.62794,0.53782)
-Old Polarization: (-0.74064,0.67183,-0.0097261)
-New Polarization: (-0.016801,0.99985,0.003669)
-Polarization Change: (-0.016801,0.99985,0.003669)
-New Momentum Direction: (-0.99972,-0.016737,-0.016777)
-Momentum Change: (-0.99972,-0.016737,-0.016777)
+Old Momentum Direction: (0.56249,0.627936,0.537868)
+Old Polarization: (-0.740643,0.671827,-0.00978028)
+New Polarization: (-0.0168037,0.999852,0.00363199)
+Polarization Change: (-0.0168037,0.999852,0.00363199)
+New Momentum Direction: (-0.999718,-0.0167404,-0.0168164)
+Momentum Change: (-0.999718,-0.0167404,-0.0168164)
 
 ** Photon absorbed! **
 Track (trackID 821, parentID 1) is processed with stopping code 2
 ### pop requested out of 235 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8359,-0.54746,-0.039509)
- Old Polarization:       (-0.43902,-0.62366,-0.64677)
- New Momentum Direction: (0.67139,-0.73918,-0.053346)
- New Polarization:       (-0.65266,-0.55563,-0.51509)
+ Old Momentum Direction: (0.835907,-0.547452,-0.0394467)
+ Old Polarization:       (-0.438971,-0.623663,-0.646799)
+ New Momentum Direction: (0.671403,-0.739176,-0.0532615)
+ New Polarization:       (-0.652604,-0.555651,-0.515131)
  *** FresnelRefraction *** 
 Track (trackID 820, parentID 1) is processed with stopping code 2
 ### pop requested out of 234 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82313,-0.56766,-0.014878)
- Old Polarization:       (-0.45412,-0.6423,-0.61743)
- New Momentum Direction: (-0.82313,-0.56766,-0.014878)
- New Polarization:       (0.070043,-0.12749,0.98936)
+ Old Momentum Direction: (0.823129,-0.567661,-0.0148167)
+ Old Polarization:       (-0.454072,-0.642304,-0.617466)
+ New Momentum Direction: (-0.823129,-0.567661,-0.0148167)
+ New Polarization:       (0.0700373,-0.127381,0.989378)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.82313,-0.56766,-0.014878)
- Old Polarization:       (0.070043,-0.12749,0.98936)
- New Momentum Direction: (-0.82313,0.56766,-0.014878)
- New Polarization:       (-0.070043,-0.12749,-0.98936)
+ Old Momentum Direction: (-0.823129,-0.567661,-0.0148167)
+ Old Polarization:       (0.0700373,-0.127381,0.989378)
+ New Momentum Direction: (-0.823129,0.567661,-0.0148167)
+ New Polarization:       (-0.0700373,-0.127381,-0.989378)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.82313,0.56766,-0.014878)
- Old Polarization:       (-0.070043,-0.12749,-0.98936)
- New Momentum Direction: (-0.63953,0.7685,-0.020142)
- New Polarization:       (0.13233,0.084236,-0.98762)
+ Old Momentum Direction: (-0.823129,0.567661,-0.0148167)
+ Old Polarization:       (-0.0700373,-0.127381,-0.989378)
+ New Momentum Direction: (-0.639537,0.768498,-0.0200588)
+ New Polarization:       (0.13232,0.0843374,-0.987613)
  *** FresnelRefraction *** 
 Track (trackID 819, parentID 1) is processed with stopping code 2
 ### pop requested out of 233 stacked tracks.
@@ -6261,71 +6247,71 @@ Track (trackID 819, parentID 1) is processed with stopping code 2
 Track (trackID 818, parentID 1) is processed with stopping code 2
 ### pop requested out of 232 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94024,-0.1902,-0.28243)
- Old Polarization:       (-0.32221,-0.22877,-0.91861)
- New Momentum Direction: (0.88849,-0.25632,-0.38063)
- New Polarization:       (-0.44504,-0.27905,-0.85093)
+ Old Momentum Direction: (0.940266,-0.190192,-0.28236)
+ Old Polarization:       (-0.322139,-0.228774,-0.918634)
+ New Momentum Direction: (0.888536,-0.256318,-0.380532)
+ New Polarization:       (-0.444946,-0.279078,-0.850963)
  *** FresnelRefraction *** 
 Track (trackID 817, parentID 1) is processed with stopping code 2
 ### pop requested out of 231 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50853,-0.5177,0.68803)
- Old Polarization:       (-0.79888,-0.58179,0.15269)
- New Momentum Direction: (0.50853,-0.5177,-0.68803)
- New Polarization:       (0.62996,0.76842,-0.11258)
+ Old Momentum Direction: (0.508477,-0.517702,0.688066)
+ Old Polarization:       (-0.798887,-0.581793,0.152631)
+ New Momentum Direction: (0.508477,-0.517702,-0.688066)
+ New Polarization:       (0.630084,0.768339,-0.112471)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50853,-0.5177,-0.68803)
- Old Polarization:       (0.62996,0.76842,-0.11258)
- New Momentum Direction: (0.50853,0.5177,-0.68803)
- New Polarization:       (-0.62996,0.76842,0.11258)
+ Old Momentum Direction: (0.508477,-0.517702,-0.688066)
+ Old Polarization:       (0.630084,0.768339,-0.112471)
+ New Momentum Direction: (0.508477,0.517702,-0.688066)
+ New Polarization:       (-0.630084,0.768339,0.112471)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50853,0.5177,-0.68803)
- Old Polarization:       (-0.62996,0.76842,0.11258)
- New Momentum Direction: (-0.50853,0.5177,-0.68803)
- New Polarization:       (-0.62996,-0.76842,-0.11258)
+ Old Momentum Direction: (0.508477,0.517702,-0.688066)
+ Old Polarization:       (-0.630084,0.768339,0.112471)
+ New Momentum Direction: (-0.508477,0.517702,-0.688066)
+ New Polarization:       (-0.630084,-0.768339,-0.112471)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.50853,0.5177,-0.68803)
- Old Polarization:       (-0.62996,-0.76842,-0.11258)
- New Momentum Direction: (-0.69142,0.7039,-0.16265)
- New Polarization:       (-0.71926,-0.64957,0.24641)
+ Old Momentum Direction: (-0.508477,0.517702,-0.688066)
+ Old Polarization:       (-0.630084,-0.768339,-0.112471)
+ New Momentum Direction: (-0.691357,0.7039,-0.162945)
+ New Polarization:       (-0.719362,-0.649568,0.24613)
  *** FresnelRefraction *** 
 Track (trackID 816, parentID 1) is processed with stopping code 2
 ### pop requested out of 230 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50138,-0.49121,0.71227)
- Old Polarization:       (-0.80871,-0.5587,0.18396)
- New Momentum Direction: (0.67843,-0.66466,0.31298)
- New Polarization:       (-0.56145,-0.74383,-0.36262)
+ Old Momentum Direction: (0.50133,-0.491206,0.712309)
+ Old Polarization:       (-0.808718,-0.558708,0.183901)
+ New Momentum Direction: (0.67836,-0.66466,0.313137)
+ New Polarization:       (-0.561498,-0.743852,-0.362497)
  *** FresnelRefraction *** 
 Track (trackID 815, parentID 1) is processed with stopping code 2
 ### pop requested out of 229 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41566,-0.19452,0.88848)
- Old Polarization:       (-0.89999,-0.22904,0.3709)
- New Momentum Direction: (0.56534,-0.26458,0.78127)
- New Polarization:       (0.42929,-0.7144,-0.55257)
+ Old Momentum Direction: (0.415592,-0.194523,0.888506)
+ Old Polarization:       (-0.900013,-0.229047,0.370829)
+ New Momentum Direction: (0.565257,-0.264575,0.781335)
+ New Polarization:       (0.429255,-0.714493,-0.552485)
  *** FresnelRefraction *** 
 Track (trackID 814, parentID 1) is processed with stopping code 2
 ### pop requested out of 228 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.4815,-0.45745,0.74759)
-Old Polarization: (-0.82838,-0.51611,0.21773)
-New Polarization: (-0.61186,-0.79022,0.034365)
-Polarization Change: (-0.61186,-0.79022,0.034365)
-New Momentum Direction: (-0.68296,0.54972,0.48101)
-Momentum Change: (-0.68296,0.54972,0.48101)
+Old Momentum Direction: (0.48145,-0.457449,0.747628)
+Old Polarization: (-0.828398,-0.516117,0.217669)
+New Polarization: (-0.61186,-0.790221,0.0343059)
+Polarization Change: (-0.61186,-0.790221,0.0343059)
+New Momentum Direction: (-0.682982,0.549708,0.480995)
+Momentum Change: (-0.682982,0.549708,0.480995)
 
 ** Photon absorbed! **
 Track (trackID 813, parentID 1) is processed with stopping code 2
 ### pop requested out of 227 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43847,-0.29533,0.84884)
- Old Polarization:       (-0.87798,-0.3426,0.33433)
- New Momentum Direction: (0.5934,-0.39968,0.69867)
- New Polarization:       (0.066378,-0.84075,-0.53734)
+ Old Momentum Direction: (0.438411,-0.295327,0.848869)
+ Old Polarization:       (-0.878003,-0.342609,0.334262)
+ New Momentum Direction: (0.593316,-0.399677,0.698737)
+ New Polarization:       (0.0663014,-0.840817,-0.537244)
  *** FresnelRefraction *** 
 Track (trackID 812, parentID 1) is processed with stopping code 2
 ### pop requested out of 226 stacked tracks.
@@ -6334,10 +6320,10 @@ Track (trackID 812, parentID 1) is processed with stopping code 2
 Track (trackID 811, parentID 1) is processed with stopping code 2
 ### pop requested out of 225 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94193,-0.15136,-0.29976)
- Old Polarization:       (-0.32471,-0.18292,-0.92796)
- New Momentum Direction: (0.89016,-0.20538,-0.40673)
- New Polarization:       (-0.44741,-0.22508,-0.86554)
+ Old Momentum Direction: (0.941952,-0.15136,-0.299694)
+ Old Polarization:       (-0.324641,-0.18292,-0.927981)
+ New Momentum Direction: (0.890209,-0.20537,-0.406634)
+ New Polarization:       (-0.447318,-0.22511,-0.865582)
  *** FresnelRefraction *** 
 Track (trackID 810, parentID 1) is processed with stopping code 2
 ### pop requested out of 224 stacked tracks.
@@ -6346,28 +6332,28 @@ Track (trackID 810, parentID 1) is processed with stopping code 2
 Track (trackID 809, parentID 1) is processed with stopping code 2
 ### pop requested out of 223 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63493,-0.65646,0.40734)
- Old Polarization:       (-0.66105,-0.73451,-0.15331)
- New Momentum Direction: (0.63493,0.65646,0.40734)
- New Polarization:       (0.66105,-0.73451,0.15331)
+ Old Momentum Direction: (0.634903,-0.656455,0.407389)
+ Old Polarization:       (-0.66104,-0.734511,-0.153361)
+ New Momentum Direction: (0.634903,0.656455,0.407389)
+ New Polarization:       (0.66104,-0.734511,0.153361)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 808, parentID 1) is processed with stopping code 2
 ### pop requested out of 222 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93034,0.23534,-0.28123)
- Old Polarization:       (-0.33631,0.24188,-0.91016)
- New Momentum Direction: (0.86794,0.31874,-0.38089)
- New Polarization:       (-0.47337,0.29877,-0.82865)
+ Old Momentum Direction: (0.930358,0.235341,-0.281155)
+ Old Polarization:       (-0.336244,0.241881,-0.910183)
+ New Momentum Direction: (0.867983,0.318747,-0.380798)
+ New Polarization:       (-0.473285,0.298802,-0.828685)
  *** FresnelRefraction *** 
 Track (trackID 807, parentID 1) is processed with stopping code 2
 ### pop requested out of 221 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78292,0.61997,0.051757)
- Old Polarization:       (-0.4971,0.67343,-0.54715)
- New Momentum Direction: (0.54573,0.83505,0.069713)
- New Polarization:       (-0.74041,0.51949,-0.42652)
+ Old Momentum Direction: (0.782911,0.619972,0.0518164)
+ Old Polarization:       (-0.497063,0.673433,-0.547189)
+ New Momentum Direction: (0.545717,0.835058,0.0697931)
+ New Polarization:       (-0.740381,0.519497,-0.426567)
  *** FresnelRefraction *** 
 Track (trackID 806, parentID 1) is processed with stopping code 2
 ### pop requested out of 220 stacked tracks.
@@ -6376,48 +6362,48 @@ Track (trackID 806, parentID 1) is processed with stopping code 2
 Track (trackID 805, parentID 1) is processed with stopping code 2
 ### pop requested out of 219 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52406,-0.52228,0.67274)
- Old Polarization:       (-0.78599,-0.60079,0.14587)
- New Momentum Direction: (0.52406,-0.52228,-0.67274)
- New Polarization:       (0.61714,0.77723,-0.12264)
+ Old Momentum Direction: (0.524016,-0.522274,0.672783)
+ Old Polarization:       (-0.785997,-0.600789,0.14581)
+ New Momentum Direction: (0.524016,-0.522274,-0.672783)
+ New Polarization:       (0.617295,0.777138,-0.122487)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52406,-0.52228,-0.67274)
- Old Polarization:       (0.61714,0.77723,-0.12264)
- New Momentum Direction: (-0.52406,-0.52228,-0.67274)
- New Polarization:       (0.61714,-0.77723,0.12264)
+ Old Momentum Direction: (0.524016,-0.522274,-0.672783)
+ Old Polarization:       (0.617295,0.777138,-0.122487)
+ New Momentum Direction: (-0.524016,-0.522274,-0.672783)
+ New Polarization:       (0.617295,-0.777138,0.122487)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52406,-0.52228,-0.67274)
- Old Polarization:       (0.61714,-0.77723,0.12264)
- New Momentum Direction: (-0.52406,0.52228,-0.67274)
- New Polarization:       (-0.61714,-0.77723,-0.12264)
+ Old Momentum Direction: (-0.524016,-0.522274,-0.672783)
+ Old Polarization:       (0.617295,-0.777138,0.122487)
+ New Momentum Direction: (-0.524016,0.522274,-0.672783)
+ New Polarization:       (-0.617295,-0.777138,-0.122487)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 804, parentID 1) is processed with stopping code 2
 ### pop requested out of 218 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8271,0.55996,-0.048527)
- Old Polarization:       (-0.44828,0.60512,-0.65794)
- New Momentum Direction: (0.65242,0.75503,-0.065432)
- New Polarization:       (-0.66639,0.53041,-0.524)
+ Old Momentum Direction: (0.8271,0.559962,-0.0484639)
+ Old Polarization:       (-0.448229,0.605118,-0.657969)
+ New Momentum Direction: (0.65242,0.755035,-0.0653472)
+ New Polarization:       (-0.666348,0.530431,-0.524045)
  *** FresnelRefraction *** 
 Track (trackID 803, parentID 1) is processed with stopping code 2
 ### pop requested out of 217 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43336,-0.22832,0.87182)
- Old Polarization:       (-0.88805,-0.273,0.36993)
- New Momentum Direction: (0.58225,-0.30676,0.75292)
- New Polarization:       (0.31393,-0.76943,-0.55626)
+ Old Momentum Direction: (0.433293,-0.228316,0.871854)
+ Old Polarization:       (-0.888073,-0.273,0.369862)
+ New Momentum Direction: (0.582164,-0.306761,0.752982)
+ New Polarization:       (0.313886,-0.76951,-0.556174)
  *** FresnelRefraction *** 
 Track (trackID 802, parentID 1) is processed with stopping code 2
 ### pop requested out of 216 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69414,0.67783,0.24232)
- Old Polarization:       (-0.59617,0.72999,-0.3342)
- New Momentum Direction: (0.2256,0.91736,0.32795)
- New Polarization:       (-0.89533,0.32793,-0.3014)
+ Old Momentum Direction: (0.694119,0.677832,0.24237)
+ Old Polarization:       (-0.596152,0.72999,-0.334241)
+ New Momentum Direction: (0.225483,0.917366,0.32802)
+ New Polarization:       (-0.895336,0.327862,-0.301464)
  *** FresnelRefraction *** 
 Track (trackID 801, parentID 1) is processed with stopping code 2
 ### pop requested out of 215 stacked tracks.
@@ -6426,174 +6412,174 @@ Track (trackID 801, parentID 1) is processed with stopping code 2
 Track (trackID 800, parentID 1) is processed with stopping code 2
 ### pop requested out of 214 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67213,-0.659,0.33757)
- Old Polarization:       (-0.6205,-0.75008,-0.22884)
- New Momentum Direction: (-0.67213,-0.659,0.33757)
- New Polarization:       (-0.59804,0.75198,0.27726)
+ Old Momentum Direction: (0.672111,-0.658999,0.337619)
+ Old Polarization:       (-0.620474,-0.750082,-0.228885)
+ New Momentum Direction: (-0.672111,-0.658999,0.337619)
+ New Polarization:       (-0.598179,0.751977,0.27697)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67213,-0.659,0.33757)
- Old Polarization:       (-0.59804,0.75198,0.27726)
- New Momentum Direction: (-0.67213,0.659,0.33757)
- New Polarization:       (0.59804,0.75198,-0.27726)
+ Old Momentum Direction: (-0.672111,-0.658999,0.337619)
+ Old Polarization:       (-0.598179,0.751977,0.27697)
+ New Momentum Direction: (-0.672111,0.658999,0.337619)
+ New Polarization:       (0.598179,0.751977,-0.27697)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67213,0.659,0.33757)
- Old Polarization:       (0.59804,0.75198,-0.27726)
- New Momentum Direction: (-0.67213,0.659,-0.33757)
- New Polarization:       (-0.59804,-0.75198,-0.27726)
+ Old Momentum Direction: (-0.672111,0.658999,0.337619)
+ Old Polarization:       (0.598179,0.751977,-0.27697)
+ New Momentum Direction: (-0.672111,0.658999,-0.337619)
+ New Polarization:       (-0.598179,-0.751977,-0.27697)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 799, parentID 1) is processed with stopping code 2
 ### pop requested out of 213 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.58699,0.65095,0.48136)
- Old Polarization:       (-0.71376,0.6967,-0.071772)
- New Momentum Direction: (0.58699,-0.65095,0.48136)
- New Polarization:       (0.71376,0.6967,0.071772)
+ Old Momentum Direction: (0.58695,0.65095,0.481409)
+ Old Polarization:       (-0.713758,0.6967,-0.0718243)
+ New Momentum Direction: (0.58695,-0.65095,0.481409)
+ New Polarization:       (0.713758,0.6967,0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58699,-0.65095,0.48136)
- Old Polarization:       (0.71376,0.6967,0.071772)
- New Momentum Direction: (-0.58699,-0.65095,0.48136)
- New Polarization:       (0.71376,-0.6967,-0.071772)
+ Old Momentum Direction: (0.58695,-0.65095,0.481409)
+ Old Polarization:       (0.713758,0.6967,0.0718243)
+ New Momentum Direction: (-0.58695,-0.65095,0.481409)
+ New Polarization:       (0.713758,-0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,-0.65095,0.48136)
- Old Polarization:       (0.71376,-0.6967,-0.071772)
- New Momentum Direction: (-0.58699,-0.65095,-0.48136)
- New Polarization:       (-0.71376,0.6967,-0.071772)
+ Old Momentum Direction: (-0.58695,-0.65095,0.481409)
+ Old Polarization:       (0.713758,-0.6967,-0.0718243)
+ New Momentum Direction: (-0.58695,-0.65095,-0.481409)
+ New Polarization:       (-0.713758,0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,-0.65095,-0.48136)
- Old Polarization:       (-0.71376,0.6967,-0.071772)
- New Momentum Direction: (-0.58699,0.65095,-0.48136)
- New Polarization:       (0.71376,0.6967,0.071772)
+ Old Momentum Direction: (-0.58695,-0.65095,-0.481409)
+ Old Polarization:       (-0.713758,0.6967,-0.0718243)
+ New Momentum Direction: (-0.58695,0.65095,-0.481409)
+ New Polarization:       (0.713758,0.6967,0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,0.65095,-0.48136)
- Old Polarization:       (0.71376,0.6967,0.071772)
- New Momentum Direction: (0.58699,0.65095,-0.48136)
- New Polarization:       (0.71376,-0.6967,-0.071772)
+ Old Momentum Direction: (-0.58695,0.65095,-0.481409)
+ Old Polarization:       (0.713758,0.6967,0.0718243)
+ New Momentum Direction: (0.58695,0.65095,-0.481409)
+ New Polarization:       (0.713758,-0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58699,0.65095,-0.48136)
- Old Polarization:       (0.71376,-0.6967,-0.071772)
- New Momentum Direction: (0.58699,0.65095,0.48136)
- New Polarization:       (-0.71376,0.6967,-0.071772)
+ Old Momentum Direction: (0.58695,0.65095,-0.481409)
+ Old Polarization:       (0.713758,-0.6967,-0.0718243)
+ New Momentum Direction: (0.58695,0.65095,0.481409)
+ New Polarization:       (-0.713758,0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58699,0.65095,0.48136)
- Old Polarization:       (-0.71376,0.6967,-0.071772)
- New Momentum Direction: (0.58699,-0.65095,0.48136)
- New Polarization:       (0.71376,0.6967,0.071772)
+ Old Momentum Direction: (0.58695,0.65095,0.481409)
+ Old Polarization:       (-0.713758,0.6967,-0.0718243)
+ New Momentum Direction: (0.58695,-0.65095,0.481409)
+ New Polarization:       (0.713758,0.6967,0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58699,-0.65095,0.48136)
- Old Polarization:       (0.71376,0.6967,0.071772)
- New Momentum Direction: (-0.58699,-0.65095,0.48136)
- New Polarization:       (0.71376,-0.6967,-0.071772)
+ Old Momentum Direction: (0.58695,-0.65095,0.481409)
+ Old Polarization:       (0.713758,0.6967,0.0718243)
+ New Momentum Direction: (-0.58695,-0.65095,0.481409)
+ New Polarization:       (0.713758,-0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,-0.65095,0.48136)
- Old Polarization:       (0.71376,-0.6967,-0.071772)
- New Momentum Direction: (-0.58699,-0.65095,-0.48136)
- New Polarization:       (-0.71376,0.6967,-0.071772)
+ Old Momentum Direction: (-0.58695,-0.65095,0.481409)
+ Old Polarization:       (0.713758,-0.6967,-0.0718243)
+ New Momentum Direction: (-0.58695,-0.65095,-0.481409)
+ New Polarization:       (-0.713758,0.6967,-0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,-0.65095,-0.48136)
- Old Polarization:       (-0.71376,0.6967,-0.071772)
- New Momentum Direction: (-0.58699,0.65095,-0.48136)
- New Polarization:       (0.71376,0.6967,0.071772)
+ Old Momentum Direction: (-0.58695,-0.65095,-0.481409)
+ Old Polarization:       (-0.713758,0.6967,-0.0718243)
+ New Momentum Direction: (-0.58695,0.65095,-0.481409)
+ New Polarization:       (0.713758,0.6967,0.0718243)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58699,0.65095,-0.48136)
- Old Polarization:       (0.71376,0.6967,0.071772)
- New Momentum Direction: (0.58699,0.65095,-0.48136)
- New Polarization:       (0.71376,-0.6967,-0.071772)
+ Old Momentum Direction: (-0.58695,0.65095,-0.481409)
+ Old Polarization:       (0.713758,0.6967,0.0718243)
+ New Momentum Direction: (0.58695,0.65095,-0.481409)
+ New Polarization:       (0.713758,-0.6967,-0.0718243)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 798, parentID 1) is processed with stopping code 2
 ### pop requested out of 212 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69008,-0.66661,0.28181)
- Old Polarization:       (-0.6008,-0.74475,-0.2905)
- New Momentum Direction: (0.1797,-0.90608,0.38304)
- New Polarization:       (-0.9092,-0.30164,-0.28699)
+ Old Momentum Direction: (0.690062,-0.66661,0.28186)
+ Old Polarization:       (-0.60077,-0.744755,-0.290543)
+ New Momentum Direction: (0.179569,-0.906079,0.383114)
+ New Polarization:       (-0.909207,-0.301564,-0.287058)
  *** FresnelRefraction *** 
 Track (trackID 797, parentID 1) is processed with stopping code 2
 ### pop requested out of 211 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40734,-0.0829,0.9095)
- Old Polarization:       (-0.91094,-0.108,0.39814)
- New Momentum Direction: (0.55241,-0.11242,0.82596)
- New Polarization:       (0.74827,-0.36979,-0.55078)
+ Old Momentum Direction: (0.407277,-0.0828995,0.909535)
+ Old Polarization:       (-0.910972,-0.108005,0.398077)
+ New Momentum Direction: (0.552318,-0.112422,0.826018)
+ New Polarization:       (0.748301,-0.369848,-0.550689)
  *** FresnelRefraction *** 
 Track (trackID 796, parentID 1) is processed with stopping code 2
 ### pop requested out of 210 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93393,-0.23119,-0.27262)
- Old Polarization:       (-0.33116,-0.27257,-0.90335)
- New Momentum Direction: (0.8755,-0.31253,-0.36853)
- New Polarization:       (-0.46313,-0.32516,-0.82449)
+ Old Momentum Direction: (0.933954,-0.231191,-0.272546)
+ Old Polarization:       (-0.331094,-0.27257,-0.903373)
+ New Momentum Direction: (0.875546,-0.312529,-0.368435)
+ New Polarization:       (-0.463043,-0.325195,-0.824523)
  *** FresnelRefraction *** 
 Track (trackID 795, parentID 1) is processed with stopping code 2
 ### pop requested out of 209 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92145,0.28528,-0.26372)
- Old Polarization:       (-0.34648,0.29639,-0.89)
- New Momentum Direction: (0.85016,0.38663,-0.35741)
- New Polarization:       (-0.49385,0.35014,-0.79594)
+ Old Momentum Direction: (0.92147,0.285279,-0.263647)
+ Old Polarization:       (-0.346411,0.296391,-0.890029)
+ New Momentum Direction: (0.8502,0.386634,-0.357316)
+ New Polarization:       (-0.49377,0.350175,-0.79597)
  *** FresnelRefraction *** 
 Track (trackID 794, parentID 1) is processed with stopping code 2
 ### pop requested out of 208 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44166,-0.33384,0.83276)
- Old Polarization:       (-0.8714,-0.38056,0.30959)
- New Momentum Direction: (0.60097,-0.45427,0.65762)
- New Polarization:       (-0.075271,-0.85129,-0.51926)
+ Old Momentum Direction: (0.441596,-0.33384,0.832792)
+ Old Polarization:       (-0.871417,-0.380562,0.309522)
+ New Momentum Direction: (0.600893,-0.454266,0.6577)
+ New Polarization:       (-0.0753574,-0.851345,-0.519166)
  *** FresnelRefraction *** 
 Track (trackID 793, parentID 1) is processed with stopping code 2
 ### pop requested out of 207 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90605,0.35321,-0.23304)
- Old Polarization:       (-0.36408,0.37001,-0.85472)
- New Momentum Direction: (0.81871,0.47929,-0.31622)
- New Polarization:       (-0.52753,0.41031,-0.74388)
+ Old Momentum Direction: (0.906071,0.353215,-0.23297)
+ Old Polarization:       (-0.364014,0.37001,-0.854743)
+ New Momentum Direction: (0.818742,0.479295,-0.316129)
+ New Polarization:       (-0.527455,0.410344,-0.743915)
  *** FresnelRefraction *** 
 Track (trackID 792, parentID 1) is processed with stopping code 2
 ### pop requested out of 206 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45391,0.3852,0.80348)
- Old Polarization:       (-0.86366,0.41203,0.29038)
- New Momentum Direction: (0.61132,0.51878,0.59763)
- New Polarization:       (-0.22719,0.83842,-0.49542)
+ Old Momentum Direction: (0.453852,0.385205,0.803515)
+ Old Polarization:       (-0.863686,0.412024,0.290314)
+ New Momentum Direction: (0.611235,0.518783,0.597709)
+ New Polarization:       (-0.227276,0.838454,-0.495319)
  *** FresnelRefraction *** 
 Track (trackID 791, parentID 1) is processed with stopping code 2
 ### pop requested out of 205 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92843,-0.26625,-0.25908)
- Old Polarization:       (-0.33721,-0.31134,-0.88846)
- New Momentum Direction: (0.86476,-0.35991,-0.35021)
- New Polarization:       (-0.47568,-0.36354,-0.80098)
+ Old Momentum Direction: (0.928453,-0.26625,-0.259009)
+ Old Polarization:       (-0.337141,-0.311343,-0.888483)
+ New Momentum Direction: (0.864804,-0.359905,-0.350117)
+ New Polarization:       (-0.475599,-0.363572,-0.801013)
  *** FresnelRefraction *** 
 Track (trackID 790, parentID 1) is processed with stopping code 2
 ### pop requested out of 204 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80032,-0.59834,0.038512)
- Old Polarization:       (-0.4791,-0.6768,-0.55893)
- New Momentum Direction: (0.58461,-0.80964,0.052112)
- New Polarization:       (-0.71666,-0.54544,-0.43462)
+ Old Momentum Direction: (0.800317,-0.598335,0.0385716)
+ Old Polarization:       (-0.479052,-0.676802,-0.55897)
+ New Momentum Direction: (0.584609,-0.809635,0.0521931)
+ New Polarization:       (-0.716616,-0.545463,-0.434662)
  *** FresnelRefraction *** 
 Track (trackID 789, parentID 1) is processed with stopping code 2
 ### pop requested out of 203 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72453,-0.65764,0.20633)
- Old Polarization:       (-0.56301,-0.73737,-0.37324)
- New Momentum Direction: (0.35349,-0.89254,0.28002)
- New Polarization:       (-0.847,-0.43245,-0.30916)
+ Old Momentum Direction: (0.724513,-0.657638,0.206379)
+ Old Polarization:       (-0.56298,-0.737371,-0.37328)
+ New Momentum Direction: (0.353445,-0.892538,0.280095)
+ New Polarization:       (-0.846984,-0.432442,-0.309211)
  *** FresnelRefraction *** 
 Track (trackID 788, parentID 1) is processed with stopping code 2
 ### pop requested out of 202 stacked tracks.
@@ -6602,24 +6588,24 @@ Track (trackID 788, parentID 1) is processed with stopping code 2
 Track (trackID 787, parentID 1) is processed with stopping code 2
 ### pop requested out of 201 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94975,0.045532,-0.30969)
- Old Polarization:       (-0.31129,0.033536,-0.94972)
- New Momentum Direction: (0.90677,0.061331,-0.41714)
- New Polarization:       (-0.42036,0.054735,-0.90571)
+ Old Momentum Direction: (0.949771,0.0455361,-0.309614)
+ Old Polarization:       (-0.311214,0.0335354,-0.949748)
+ New Momentum Direction: (0.906814,0.0613363,-0.417045)
+ New Polarization:       (-0.420259,0.0547478,-0.905751)
  *** FresnelRefraction *** 
 Track (trackID 786, parentID 1) is processed with stopping code 2
 ### pop requested out of 200 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82368,-0.56696,-0.010639)
- Old Polarization:       (-0.45244,-0.64577,-0.61505)
- New Momentum Direction: (-0.82368,-0.56696,-0.010639)
- New Polarization:       (0.074157,-0.1263,0.98922)
+ Old Momentum Direction: (0.823681,-0.566954,-0.0105775)
+ Old Polarization:       (-0.452391,-0.645767,-0.615083)
+ New Momentum Direction: (-0.823681,-0.566954,-0.0105775)
+ New Polarization:       (0.0741488,-0.12618,0.989232)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.82368,-0.56696,-0.010639)
- Old Polarization:       (0.074157,-0.1263,0.98922)
- New Momentum Direction: (-0.82368,0.56696,-0.010639)
- New Polarization:       (-0.074157,-0.1263,-0.98922)
+ Old Momentum Direction: (-0.823681,-0.566954,-0.0105775)
+ Old Polarization:       (0.0741488,-0.12618,0.989232)
+ New Momentum Direction: (-0.823681,0.566954,-0.0105775)
+ New Polarization:       (-0.0741488,-0.12618,-0.989232)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -6638,10 +6624,10 @@ Track (trackID 783, parentID 1) is processed with stopping code 2
 Track (trackID 782, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9303,0.23924,-0.27805)
- Old Polarization:       (-0.33528,0.24715,-0.90912)
- New Momentum Direction: (0.86836,0.32346,-0.37594)
- New Polarization:       (-0.47168,0.30447,-0.82754)
+ Old Momentum Direction: (0.930318,0.239241,-0.277979)
+ Old Polarization:       (-0.335212,0.247155,-0.909147)
+ New Momentum Direction: (0.868398,0.323465,-0.37584)
+ New Polarization:       (-0.471593,0.304503,-0.827573)
  *** FresnelRefraction *** 
 Track (trackID 781, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
@@ -6650,54 +6636,54 @@ Track (trackID 781, parentID 1) is processed with stopping code 2
 Track (trackID 780, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89975,0.37976,-0.21502)
- Old Polarization:       (-0.36966,0.40132,-0.83803)
- New Momentum Direction: (0.80687,0.51406,-0.29105)
- New Polarization:       (-0.53748,0.43439,-0.72279)
+ Old Momentum Direction: (0.899763,0.379767,-0.21495)
+ Old Polarization:       (-0.369595,0.401318,-0.838059)
+ New Momentum Direction: (0.806898,0.514061,-0.29096)
+ New Polarization:       (-0.537407,0.434423,-0.722821)
  *** FresnelRefraction *** 
 Track (trackID 779, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.55926,0.61255,0.55858)
- Old Polarization:       (-0.74629,0.66539,0.017518)
- New Momentum Direction: (0.55926,-0.61255,0.55858)
- New Polarization:       (0.74629,0.66539,-0.017518)
+ Old Momentum Direction: (0.559214,0.612552,0.558623)
+ Old Polarization:       (-0.746295,0.665386,0.0174632)
+ New Momentum Direction: (0.559214,-0.612552,0.558623)
+ New Polarization:       (0.746295,0.665386,-0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.55926,-0.61255,0.55858)
- Old Polarization:       (0.74629,0.66539,-0.017518)
- New Momentum Direction: (-0.55926,-0.61255,0.55858)
- New Polarization:       (0.74629,-0.66539,0.017518)
+ Old Momentum Direction: (0.559214,-0.612552,0.558623)
+ Old Polarization:       (0.746295,0.665386,-0.0174632)
+ New Momentum Direction: (-0.559214,-0.612552,0.558623)
+ New Polarization:       (0.746295,-0.665386,0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.55926,-0.61255,0.55858)
- Old Polarization:       (0.74629,-0.66539,0.017518)
- New Momentum Direction: (-0.55926,-0.61255,-0.55858)
- New Polarization:       (-0.74629,0.66539,0.017518)
+ Old Momentum Direction: (-0.559214,-0.612552,0.558623)
+ Old Polarization:       (0.746295,-0.665386,0.0174632)
+ New Momentum Direction: (-0.559214,-0.612552,-0.558623)
+ New Polarization:       (-0.746295,0.665386,0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.55926,-0.61255,-0.55858)
- Old Polarization:       (-0.74629,0.66539,0.017518)
- New Momentum Direction: (-0.55926,0.61255,-0.55858)
- New Polarization:       (0.74629,0.66539,-0.017518)
+ Old Momentum Direction: (-0.559214,-0.612552,-0.558623)
+ Old Polarization:       (-0.746295,0.665386,0.0174632)
+ New Momentum Direction: (-0.559214,0.612552,-0.558623)
+ New Polarization:       (0.746295,0.665386,-0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.55926,0.61255,-0.55858)
- Old Polarization:       (0.74629,0.66539,-0.017518)
- New Momentum Direction: (0.55926,0.61255,-0.55858)
- New Polarization:       (0.74629,-0.66539,0.017518)
+ Old Momentum Direction: (-0.559214,0.612552,-0.558623)
+ Old Polarization:       (0.746295,0.665386,-0.0174632)
+ New Momentum Direction: (0.559214,0.612552,-0.558623)
+ New Polarization:       (0.746295,-0.665386,0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.55926,0.61255,-0.55858)
- Old Polarization:       (0.74629,-0.66539,0.017518)
- New Momentum Direction: (0.55926,0.61255,0.55858)
- New Polarization:       (-0.74629,0.66539,0.017518)
+ Old Momentum Direction: (0.559214,0.612552,-0.558623)
+ Old Polarization:       (0.746295,-0.665386,0.0174632)
+ New Momentum Direction: (0.559214,0.612552,0.558623)
+ New Polarization:       (-0.746295,0.665386,0.0174632)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.55926,0.61255,0.55858)
- Old Polarization:       (-0.74629,0.66539,0.017518)
- New Momentum Direction: (0.55926,-0.61255,0.55858)
- New Polarization:       (0.74629,0.66539,-0.017518)
+ Old Momentum Direction: (0.559214,0.612552,0.558623)
+ Old Polarization:       (-0.746295,0.665386,0.0174632)
+ New Momentum Direction: (0.559214,-0.612552,0.558623)
+ New Polarization:       (0.746295,0.665386,-0.0174632)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -6708,192 +6694,192 @@ Track (trackID 778, parentID 1) is processed with stopping code 2
 Track (trackID 777, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85399,-0.5114,-0.095773)
- Old Polarization:       (-0.42234,-0.57388,-0.70163)
- New Momentum Direction: (0.7062,-0.69591,-0.13033)
- New Polarization:       (-0.6298,-0.53336,-0.5647)
+ Old Momentum Direction: (0.853999,-0.511396,-0.0957086)
+ Old Polarization:       (-0.422289,-0.573878,-0.701667)
+ New Momentum Direction: (0.706225,-0.695905,-0.13024)
+ New Polarization:       (-0.629739,-0.533386,-0.564737)
  *** FresnelRefraction *** 
 Track (trackID 776, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51616,-0.53147,0.67165)
- Old Polarization:       (-0.79065,-0.59718,0.13508)
- New Momentum Direction: (0.51616,-0.53147,-0.67165)
- New Polarization:       (0.79065,0.59718,0.13508)
+ Old Momentum Direction: (0.516117,-0.531467,0.671688)
+ Old Polarization:       (-0.790661,-0.597181,0.13502)
+ New Momentum Direction: (0.516117,-0.531467,-0.671688)
+ New Polarization:       (0.790661,0.597181,0.13502)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51616,-0.53147,-0.67165)
- Old Polarization:       (0.79065,0.59718,0.13508)
- New Momentum Direction: (0.51616,0.53147,-0.67165)
- New Polarization:       (-0.79065,0.59718,-0.13508)
+ Old Momentum Direction: (0.516117,-0.531467,-0.671688)
+ Old Polarization:       (0.790661,0.597181,0.13502)
+ New Momentum Direction: (0.516117,0.531467,-0.671688)
+ New Polarization:       (-0.790661,0.597181,-0.13502)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51616,0.53147,-0.67165)
- Old Polarization:       (-0.79065,0.59718,-0.13508)
- New Momentum Direction: (-0.51616,0.53147,-0.67165)
- New Polarization:       (-0.79065,-0.59718,0.13508)
+ Old Momentum Direction: (0.516117,0.531467,-0.671688)
+ Old Polarization:       (-0.790661,0.597181,-0.13502)
+ New Momentum Direction: (-0.516117,0.531467,-0.671688)
+ New Polarization:       (-0.790661,-0.597181,0.13502)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 775, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68942,-0.66693,0.28267)
- Old Polarization:       (-0.60153,-0.74453,-0.28954)
- New Momentum Direction: (0.17302,-0.90683,0.38435)
- New Polarization:       (-0.91102,-0.29565,-0.28746)
+ Old Momentum Direction: (0.689404,-0.666926,0.282722)
+ Old Polarization:       (-0.601502,-0.744536,-0.289589)
+ New Momentum Direction: (0.172886,-0.906825,0.38442)
+ New Polarization:       (-0.911021,-0.295576,-0.287532)
  *** FresnelRefraction *** 
 Track (trackID 774, parentID 1) is processed with stopping code 2
 ### pop requested out of 188 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49406,0.51368,0.70145)
- Old Polarization:       (-0.81706,0.5501,0.17265)
- New Momentum Direction: (0.49406,0.51368,-0.70145)
- New Polarization:       (0.64476,-0.75772,-0.10075)
+ Old Momentum Direction: (0.49401,0.513681,0.701488)
+ Old Polarization:       (-0.817074,0.550093,0.172591)
+ New Momentum Direction: (0.49401,0.513681,-0.701488)
+ New Polarization:       (0.644863,-0.75764,-0.100666)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49406,0.51368,-0.70145)
- Old Polarization:       (0.64476,-0.75772,-0.10075)
- New Momentum Direction: (0.49406,-0.51368,-0.70145)
- New Polarization:       (-0.64476,-0.75772,0.10075)
+ Old Momentum Direction: (0.49401,0.513681,-0.701488)
+ Old Polarization:       (0.644863,-0.75764,-0.100666)
+ New Momentum Direction: (0.49401,-0.513681,-0.701488)
+ New Polarization:       (-0.644863,-0.75764,0.100666)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49406,-0.51368,-0.70145)
- Old Polarization:       (-0.64476,-0.75772,0.10075)
- New Momentum Direction: (-0.49406,-0.51368,-0.70145)
- New Polarization:       (-0.64476,0.75772,-0.10075)
+ Old Momentum Direction: (0.49401,-0.513681,-0.701488)
+ Old Polarization:       (-0.644863,-0.75764,0.100666)
+ New Momentum Direction: (-0.49401,-0.513681,-0.701488)
+ New Polarization:       (-0.644863,0.75764,-0.100666)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49406,-0.51368,-0.70145)
- Old Polarization:       (-0.64476,0.75772,-0.10075)
- New Momentum Direction: (-0.6681,-0.69463,-0.26669)
- New Polarization:       (-0.74365,0.63542,0.20792)
+ Old Momentum Direction: (-0.49401,-0.513681,-0.701488)
+ Old Polarization:       (-0.644863,0.75764,-0.100666)
+ New Momentum Direction: (-0.668032,-0.694632,-0.266869)
+ New Polarization:       (-0.743703,0.635413,0.20774)
  *** FresnelRefraction *** 
 Track (trackID 773, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,-0.73708,0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,-0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,-0.73708,0.14219)
- New Momentum Direction: (-0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,-0.737084,0.142238)
+ New Momentum Direction: (-0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (-0.63581,0.65015,-0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,0.650151,-0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,-0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (-0.63581,-0.65015,-0.41598)
- New Polarization:       (0.66068,-0.73708,0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,-0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,-0.650151,-0.416027)
+ New Polarization:       (0.660663,-0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,-0.65015,-0.41598)
- Old Polarization:       (0.66068,-0.73708,0.14219)
- New Momentum Direction: (0.63581,-0.65015,-0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,-0.650151,-0.416027)
+ Old Polarization:       (0.660663,-0.737084,0.142238)
+ New Momentum Direction: (0.635787,-0.650151,-0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,-0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (0.63581,-0.65015,0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,-0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (0.635787,-0.650151,0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,-0.73708,0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,-0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,-0.73708,0.14219)
- New Momentum Direction: (-0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,-0.737084,0.142238)
+ New Momentum Direction: (-0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (-0.63581,-0.65015,0.41598)
- New Polarization:       (-0.66068,0.73708,0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,-0.650151,0.416027)
+ New Polarization:       (-0.660663,0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,0.73708,0.14219)
- New Momentum Direction: (0.63581,-0.65015,0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,0.737084,0.142238)
+ New Momentum Direction: (0.635787,-0.650151,0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (0.63581,-0.65015,-0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (0.635787,-0.650151,-0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,-0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (0.63581,0.65015,-0.41598)
- New Polarization:       (-0.66068,0.73708,0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,-0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (0.635787,0.650151,-0.416027)
+ New Polarization:       (-0.660663,0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,0.65015,-0.41598)
- Old Polarization:       (-0.66068,0.73708,0.14219)
- New Momentum Direction: (-0.63581,0.65015,-0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,0.650151,-0.416027)
+ Old Polarization:       (-0.660663,0.737084,0.142238)
+ New Momentum Direction: (-0.635787,0.650151,-0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,-0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (-0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,-0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (-0.63581,-0.65015,0.41598)
- New Polarization:       (-0.66068,0.73708,0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,-0.650151,0.416027)
+ New Polarization:       (-0.660663,0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,0.73708,0.14219)
- New Momentum Direction: (0.63581,-0.65015,0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,0.737084,0.142238)
+ New Momentum Direction: (0.635787,-0.650151,0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,-0.65015,0.41598)
- Old Polarization:       (-0.66068,-0.73708,-0.14219)
- New Momentum Direction: (0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,-0.73708,0.14219)
+ Old Momentum Direction: (0.635787,-0.650151,0.416027)
+ Old Polarization:       (-0.660663,-0.737084,-0.142238)
+ New Momentum Direction: (0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,-0.737084,0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,-0.73708,0.14219)
- New Momentum Direction: (-0.63581,0.65015,0.41598)
- New Polarization:       (0.66068,0.73708,-0.14219)
+ Old Momentum Direction: (0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,-0.737084,0.142238)
+ New Momentum Direction: (-0.635787,0.650151,0.416027)
+ New Polarization:       (0.660663,0.737084,-0.142238)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63581,0.65015,0.41598)
- Old Polarization:       (0.66068,0.73708,-0.14219)
- New Momentum Direction: (-0.63581,0.65015,-0.41598)
- New Polarization:       (-0.66068,-0.73708,-0.14219)
+ Old Momentum Direction: (-0.635787,0.650151,0.416027)
+ Old Polarization:       (0.660663,0.737084,-0.142238)
+ New Momentum Direction: (-0.635787,0.650151,-0.416027)
+ New Polarization:       (-0.660663,-0.737084,-0.142238)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 772, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40471,-0.0098013,0.91439)
- Old Polarization:       (-0.91419,-0.027818,0.40433)
- New Momentum Direction: (0.54854,-0.013284,0.83602)
- New Polarization:       (0.83434,-0.056591,-0.54834)
+ Old Momentum Direction: (0.404645,-0.0098005,0.914421)
+ Old Polarization:       (-0.914222,-0.0278218,0.404259)
+ New Momentum Direction: (0.548447,-0.0132834,0.83608)
+ New Polarization:       (0.834401,-0.0565997,-0.548245)
  *** FresnelRefraction *** 
 Track (trackID 771, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
@@ -6910,34 +6896,34 @@ Track (trackID 769, parentID 1) is processed with stopping code 2
 Track (trackID 768, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67883,0.68211,0.27186)
- Old Polarization:       (-0.61306,0.73026,-0.30146)
- New Momentum Direction: (0.67883,-0.68211,0.27186)
- New Polarization:       (-0.65622,-0.72968,-0.19224)
+ Old Momentum Direction: (0.67881,0.682115,0.271911)
+ Old Polarization:       (-0.61304,0.730259,-0.301505)
+ New Momentum Direction: (0.67881,-0.682115,0.271911)
+ New Polarization:       (-0.656201,-0.729675,-0.192289)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.67883,-0.68211,0.27186)
- Old Polarization:       (-0.65622,-0.72968,-0.19224)
- New Momentum Direction: (-0.67883,-0.68211,0.27186)
- New Polarization:       (-0.63335,0.73125,0.25328)
+ Old Momentum Direction: (0.67881,-0.682115,0.271911)
+ Old Polarization:       (-0.656201,-0.729675,-0.192289)
+ New Momentum Direction: (-0.67881,-0.682115,0.271911)
+ New Polarization:       (-0.633428,0.731245,0.253079)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67883,-0.68211,0.27186)
- Old Polarization:       (-0.63335,0.73125,0.25328)
- New Momentum Direction: (-0.67883,-0.68211,-0.27186)
- New Polarization:       (0.63335,-0.73125,0.25328)
+ Old Momentum Direction: (-0.67881,-0.682115,0.271911)
+ Old Polarization:       (-0.633428,0.731245,0.253079)
+ New Momentum Direction: (-0.67881,-0.682115,-0.271911)
+ New Polarization:       (0.633428,-0.731245,0.253079)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67883,-0.68211,-0.27186)
- Old Polarization:       (0.63335,-0.73125,0.25328)
- New Momentum Direction: (-0.67883,0.68211,-0.27186)
- New Polarization:       (0.63306,0.73125,0.25399)
+ Old Momentum Direction: (-0.67881,-0.682115,-0.271911)
+ Old Polarization:       (0.633428,-0.731245,0.253079)
+ New Momentum Direction: (-0.67881,0.682115,-0.271911)
+ New Polarization:       (0.632918,0.731245,0.254353)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.67883,0.68211,-0.27186)
- Old Polarization:       (0.63306,0.73125,0.25399)
- New Momentum Direction: (-0.083703,0.92568,-0.36893)
- New Polarization:       (0.94302,0.19323,0.27087)
+ Old Momentum Direction: (-0.67881,0.682115,-0.271911)
+ Old Polarization:       (0.632918,0.731245,0.254353)
+ New Momentum Direction: (-0.0833676,0.925681,-0.369004)
+ New Polarization:       (0.942976,0.193025,0.271179)
  *** FresnelRefraction *** 
 Track (trackID 767, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
@@ -6946,234 +6932,234 @@ Track (trackID 767, parentID 1) is processed with stopping code 2
 Track (trackID 766, parentID 1) is processed with stopping code 2
 ### pop requested out of 180 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,0.65074,0.47496)
- Old Polarization:       (-0.70848,0.70147,-0.077422)
- New Momentum Direction: (0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,0.70147,0.077422)
+ Old Momentum Direction: (0.592365,0.650746,0.475009)
+ Old Polarization:       (-0.708477,0.701469,-0.0774738)
+ New Momentum Direction: (0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,0.70147,0.077422)
- New Momentum Direction: (-0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,-0.70147,-0.077422)
+ Old Momentum Direction: (0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,0.701469,0.0774738)
+ New Momentum Direction: (-0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,-0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,-0.70147,-0.077422)
- New Momentum Direction: (-0.5924,-0.65074,-0.47496)
- New Polarization:       (-0.70848,0.70147,-0.077422)
+ Old Momentum Direction: (-0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,-0.701469,-0.0774738)
+ New Momentum Direction: (-0.592365,-0.650746,-0.475009)
+ New Polarization:       (-0.708477,0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,-0.65074,-0.47496)
- Old Polarization:       (-0.70848,0.70147,-0.077422)
- New Momentum Direction: (-0.5924,0.65074,-0.47496)
- New Polarization:       (0.70848,0.70147,0.077422)
+ Old Momentum Direction: (-0.592365,-0.650746,-0.475009)
+ Old Polarization:       (-0.708477,0.701469,-0.0774738)
+ New Momentum Direction: (-0.592365,0.650746,-0.475009)
+ New Polarization:       (0.708477,0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,0.65074,-0.47496)
- Old Polarization:       (0.70848,0.70147,0.077422)
- New Momentum Direction: (0.5924,0.65074,-0.47496)
- New Polarization:       (0.70848,-0.70147,-0.077422)
+ Old Momentum Direction: (-0.592365,0.650746,-0.475009)
+ Old Polarization:       (0.708477,0.701469,0.0774738)
+ New Momentum Direction: (0.592365,0.650746,-0.475009)
+ New Polarization:       (0.708477,-0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,0.65074,-0.47496)
- Old Polarization:       (0.70848,-0.70147,-0.077422)
- New Momentum Direction: (0.5924,0.65074,0.47496)
- New Polarization:       (-0.70848,0.70147,-0.077422)
+ Old Momentum Direction: (0.592365,0.650746,-0.475009)
+ Old Polarization:       (0.708477,-0.701469,-0.0774738)
+ New Momentum Direction: (0.592365,0.650746,0.475009)
+ New Polarization:       (-0.708477,0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,0.65074,0.47496)
- Old Polarization:       (-0.70848,0.70147,-0.077422)
- New Momentum Direction: (0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,0.70147,0.077422)
+ Old Momentum Direction: (0.592365,0.650746,0.475009)
+ Old Polarization:       (-0.708477,0.701469,-0.0774738)
+ New Momentum Direction: (0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,0.70147,0.077422)
- New Momentum Direction: (-0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,-0.70147,-0.077422)
+ Old Momentum Direction: (0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,0.701469,0.0774738)
+ New Momentum Direction: (-0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,-0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,-0.70147,-0.077422)
- New Momentum Direction: (-0.5924,-0.65074,-0.47496)
- New Polarization:       (-0.70848,0.70147,-0.077422)
+ Old Momentum Direction: (-0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,-0.701469,-0.0774738)
+ New Momentum Direction: (-0.592365,-0.650746,-0.475009)
+ New Polarization:       (-0.708477,0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,-0.65074,-0.47496)
- Old Polarization:       (-0.70848,0.70147,-0.077422)
- New Momentum Direction: (-0.5924,0.65074,-0.47496)
- New Polarization:       (0.70848,0.70147,0.077422)
+ Old Momentum Direction: (-0.592365,-0.650746,-0.475009)
+ Old Polarization:       (-0.708477,0.701469,-0.0774738)
+ New Momentum Direction: (-0.592365,0.650746,-0.475009)
+ New Polarization:       (0.708477,0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,0.65074,-0.47496)
- Old Polarization:       (0.70848,0.70147,0.077422)
- New Momentum Direction: (0.5924,0.65074,-0.47496)
- New Polarization:       (0.70848,-0.70147,-0.077422)
+ Old Momentum Direction: (-0.592365,0.650746,-0.475009)
+ Old Polarization:       (0.708477,0.701469,0.0774738)
+ New Momentum Direction: (0.592365,0.650746,-0.475009)
+ New Polarization:       (0.708477,-0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,0.65074,-0.47496)
- Old Polarization:       (0.70848,-0.70147,-0.077422)
- New Momentum Direction: (0.5924,-0.65074,-0.47496)
- New Polarization:       (-0.70848,-0.70147,0.077422)
+ Old Momentum Direction: (0.592365,0.650746,-0.475009)
+ Old Polarization:       (0.708477,-0.701469,-0.0774738)
+ New Momentum Direction: (0.592365,-0.650746,-0.475009)
+ New Polarization:       (-0.708477,-0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,-0.65074,-0.47496)
- Old Polarization:       (-0.70848,-0.70147,0.077422)
- New Momentum Direction: (0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,0.70147,0.077422)
+ Old Momentum Direction: (0.592365,-0.650746,-0.475009)
+ Old Polarization:       (-0.708477,-0.701469,0.0774738)
+ New Momentum Direction: (0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,0.701469,0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,0.70147,0.077422)
- New Momentum Direction: (-0.5924,-0.65074,0.47496)
- New Polarization:       (0.70848,-0.70147,-0.077422)
+ Old Momentum Direction: (0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,0.701469,0.0774738)
+ New Momentum Direction: (-0.592365,-0.650746,0.475009)
+ New Polarization:       (0.708477,-0.701469,-0.0774738)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5924,-0.65074,0.47496)
- Old Polarization:       (0.70848,-0.70147,-0.077422)
- New Momentum Direction: (-0.5924,0.65074,0.47496)
- New Polarization:       (-0.70848,-0.70147,0.077422)
+ Old Momentum Direction: (-0.592365,-0.650746,0.475009)
+ Old Polarization:       (0.708477,-0.701469,-0.0774738)
+ New Momentum Direction: (-0.592365,0.650746,0.475009)
+ New Polarization:       (-0.708477,-0.701469,0.0774738)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 765, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57028,-0.6091,0.55117)
- Old Polarization:       (-0.73156,-0.68177,0.003494)
- New Momentum Direction: (0.57028,0.6091,0.55117)
- New Polarization:       (0.73156,-0.68177,-0.003494)
+ Old Momentum Direction: (0.570237,-0.609094,0.551212)
+ Old Polarization:       (-0.731555,-0.681774,0.00343924)
+ New Momentum Direction: (0.570237,0.609094,0.551212)
+ New Polarization:       (0.731555,-0.681774,-0.00343924)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.57028,0.6091,0.55117)
- Old Polarization:       (0.73156,-0.68177,-0.003494)
- New Momentum Direction: (-0.57028,0.6091,0.55117)
- New Polarization:       (0.73156,0.68177,0.003494)
+ Old Momentum Direction: (0.570237,0.609094,0.551212)
+ Old Polarization:       (0.731555,-0.681774,-0.00343924)
+ New Momentum Direction: (-0.570237,0.609094,0.551212)
+ New Polarization:       (0.731555,0.681774,0.00343924)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.57028,0.6091,0.55117)
- Old Polarization:       (0.73156,0.68177,0.003494)
- New Momentum Direction: (-0.57028,0.6091,-0.55117)
- New Polarization:       (-0.73156,-0.68177,0.003494)
+ Old Momentum Direction: (-0.570237,0.609094,0.551212)
+ Old Polarization:       (0.731555,0.681774,0.00343924)
+ New Momentum Direction: (-0.570237,0.609094,-0.551212)
+ New Polarization:       (-0.731555,-0.681774,0.00343924)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.57028,0.6091,-0.55117)
- Old Polarization:       (-0.73156,-0.68177,0.003494)
- New Momentum Direction: (-0.57028,-0.6091,-0.55117)
- New Polarization:       (0.73156,-0.68177,-0.003494)
+ Old Momentum Direction: (-0.570237,0.609094,-0.551212)
+ Old Polarization:       (-0.731555,-0.681774,0.00343924)
+ New Momentum Direction: (-0.570237,-0.609094,-0.551212)
+ New Polarization:       (0.731555,-0.681774,-0.00343924)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.57028,-0.6091,-0.55117)
- Old Polarization:       (0.73156,-0.68177,-0.003494)
- New Momentum Direction: (0.57028,-0.6091,-0.55117)
- New Polarization:       (0.73156,0.68177,0.003494)
+ Old Momentum Direction: (-0.570237,-0.609094,-0.551212)
+ Old Polarization:       (0.731555,-0.681774,-0.00343924)
+ New Momentum Direction: (0.570237,-0.609094,-0.551212)
+ New Polarization:       (0.731555,0.681774,0.00343924)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.57028,-0.6091,-0.55117)
- Old Polarization:       (0.73156,0.68177,0.003494)
- New Momentum Direction: (0.57028,-0.6091,0.55117)
- New Polarization:       (-0.73156,-0.68177,0.003494)
+ Old Momentum Direction: (0.570237,-0.609094,-0.551212)
+ Old Polarization:       (0.731555,0.681774,0.00343924)
+ New Momentum Direction: (0.570237,-0.609094,0.551212)
+ New Polarization:       (-0.731555,-0.681774,0.00343924)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 764, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,0.6658,0.42322)
- Old Polarization:       (-0.68398,0.71694,-0.13477)
- New Momentum Direction: (0.61449,-0.6658,0.42322)
- New Polarization:       (0.68398,0.71694,0.13477)
+ Old Momentum Direction: (0.614455,0.6658,0.423269)
+ Old Polarization:       (-0.683974,0.716939,-0.134823)
+ New Momentum Direction: (0.614455,-0.6658,0.423269)
+ New Polarization:       (0.683974,0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,-0.6658,0.42322)
- Old Polarization:       (0.68398,0.71694,0.13477)
- New Momentum Direction: (-0.61449,-0.6658,0.42322)
- New Polarization:       (0.68398,-0.71694,-0.13477)
+ Old Momentum Direction: (0.614455,-0.6658,0.423269)
+ Old Polarization:       (0.683974,0.716939,0.134823)
+ New Momentum Direction: (-0.614455,-0.6658,0.423269)
+ New Polarization:       (0.683974,-0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,-0.6658,0.42322)
- Old Polarization:       (0.68398,-0.71694,-0.13477)
- New Momentum Direction: (-0.61449,-0.6658,-0.42322)
- New Polarization:       (-0.68398,0.71694,-0.13477)
+ Old Momentum Direction: (-0.614455,-0.6658,0.423269)
+ Old Polarization:       (0.683974,-0.716939,-0.134823)
+ New Momentum Direction: (-0.614455,-0.6658,-0.423269)
+ New Polarization:       (-0.683974,0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,-0.6658,-0.42322)
- Old Polarization:       (-0.68398,0.71694,-0.13477)
- New Momentum Direction: (-0.61449,0.6658,-0.42322)
- New Polarization:       (0.68398,0.71694,0.13477)
+ Old Momentum Direction: (-0.614455,-0.6658,-0.423269)
+ Old Polarization:       (-0.683974,0.716939,-0.134823)
+ New Momentum Direction: (-0.614455,0.6658,-0.423269)
+ New Polarization:       (0.683974,0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,0.6658,-0.42322)
- Old Polarization:       (0.68398,0.71694,0.13477)
- New Momentum Direction: (0.61449,0.6658,-0.42322)
- New Polarization:       (0.68398,-0.71694,-0.13477)
+ Old Momentum Direction: (-0.614455,0.6658,-0.423269)
+ Old Polarization:       (0.683974,0.716939,0.134823)
+ New Momentum Direction: (0.614455,0.6658,-0.423269)
+ New Polarization:       (0.683974,-0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,0.6658,-0.42322)
- Old Polarization:       (0.68398,-0.71694,-0.13477)
- New Momentum Direction: (0.61449,0.6658,0.42322)
- New Polarization:       (-0.68398,0.71694,-0.13477)
+ Old Momentum Direction: (0.614455,0.6658,-0.423269)
+ Old Polarization:       (0.683974,-0.716939,-0.134823)
+ New Momentum Direction: (0.614455,0.6658,0.423269)
+ New Polarization:       (-0.683974,0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,0.6658,0.42322)
- Old Polarization:       (-0.68398,0.71694,-0.13477)
- New Momentum Direction: (0.61449,-0.6658,0.42322)
- New Polarization:       (0.68398,0.71694,0.13477)
+ Old Momentum Direction: (0.614455,0.6658,0.423269)
+ Old Polarization:       (-0.683974,0.716939,-0.134823)
+ New Momentum Direction: (0.614455,-0.6658,0.423269)
+ New Polarization:       (0.683974,0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,-0.6658,0.42322)
- Old Polarization:       (0.68398,0.71694,0.13477)
- New Momentum Direction: (-0.61449,-0.6658,0.42322)
- New Polarization:       (0.68398,-0.71694,-0.13477)
+ Old Momentum Direction: (0.614455,-0.6658,0.423269)
+ Old Polarization:       (0.683974,0.716939,0.134823)
+ New Momentum Direction: (-0.614455,-0.6658,0.423269)
+ New Polarization:       (0.683974,-0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,-0.6658,0.42322)
- Old Polarization:       (0.68398,-0.71694,-0.13477)
- New Momentum Direction: (-0.61449,0.6658,0.42322)
- New Polarization:       (-0.68398,-0.71694,0.13477)
+ Old Momentum Direction: (-0.614455,-0.6658,0.423269)
+ Old Polarization:       (0.683974,-0.716939,-0.134823)
+ New Momentum Direction: (-0.614455,0.6658,0.423269)
+ New Polarization:       (-0.683974,-0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,0.6658,0.42322)
- Old Polarization:       (-0.68398,-0.71694,0.13477)
- New Momentum Direction: (0.61449,0.6658,0.42322)
- New Polarization:       (-0.68398,0.71694,-0.13477)
+ Old Momentum Direction: (-0.614455,0.6658,0.423269)
+ Old Polarization:       (-0.683974,-0.716939,0.134823)
+ New Momentum Direction: (0.614455,0.6658,0.423269)
+ New Polarization:       (-0.683974,0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,0.6658,0.42322)
- Old Polarization:       (-0.68398,0.71694,-0.13477)
- New Momentum Direction: (0.61449,0.6658,-0.42322)
- New Polarization:       (0.68398,-0.71694,-0.13477)
+ Old Momentum Direction: (0.614455,0.6658,0.423269)
+ Old Polarization:       (-0.683974,0.716939,-0.134823)
+ New Momentum Direction: (0.614455,0.6658,-0.423269)
+ New Polarization:       (0.683974,-0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,0.6658,-0.42322)
- Old Polarization:       (0.68398,-0.71694,-0.13477)
- New Momentum Direction: (0.61449,-0.6658,-0.42322)
- New Polarization:       (-0.68398,-0.71694,0.13477)
+ Old Momentum Direction: (0.614455,0.6658,-0.423269)
+ Old Polarization:       (0.683974,-0.716939,-0.134823)
+ New Momentum Direction: (0.614455,-0.6658,-0.423269)
+ New Polarization:       (-0.683974,-0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.61449,-0.6658,-0.42322)
- Old Polarization:       (-0.68398,-0.71694,0.13477)
- New Momentum Direction: (-0.61449,-0.6658,-0.42322)
- New Polarization:       (-0.68398,0.71694,-0.13477)
+ Old Momentum Direction: (0.614455,-0.6658,-0.423269)
+ Old Polarization:       (-0.683974,-0.716939,0.134823)
+ New Momentum Direction: (-0.614455,-0.6658,-0.423269)
+ New Polarization:       (-0.683974,0.716939,-0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,-0.6658,-0.42322)
- Old Polarization:       (-0.68398,0.71694,-0.13477)
- New Momentum Direction: (-0.61449,0.6658,-0.42322)
- New Polarization:       (0.68398,0.71694,0.13477)
+ Old Momentum Direction: (-0.614455,-0.6658,-0.423269)
+ Old Polarization:       (-0.683974,0.716939,-0.134823)
+ New Momentum Direction: (-0.614455,0.6658,-0.423269)
+ New Polarization:       (0.683974,0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,0.6658,-0.42322)
- Old Polarization:       (0.68398,0.71694,0.13477)
- New Momentum Direction: (-0.61449,0.6658,0.42322)
- New Polarization:       (-0.68398,-0.71694,0.13477)
+ Old Momentum Direction: (-0.614455,0.6658,-0.423269)
+ Old Polarization:       (0.683974,0.716939,0.134823)
+ New Momentum Direction: (-0.614455,0.6658,0.423269)
+ New Polarization:       (-0.683974,-0.716939,0.134823)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.61449,0.6658,0.42322)
- Old Polarization:       (-0.68398,-0.71694,0.13477)
- New Momentum Direction: (0.61449,0.6658,0.42322)
- New Polarization:       (-0.68398,0.71694,-0.13477)
+ Old Momentum Direction: (-0.614455,0.6658,0.423269)
+ Old Polarization:       (-0.683974,-0.716939,0.134823)
+ New Momentum Direction: (0.614455,0.6658,0.423269)
+ New Polarization:       (-0.683974,0.716939,-0.134823)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -7184,34 +7170,34 @@ Track (trackID 763, parentID 1) is processed with stopping code 2
 Track (trackID 762, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8357,0.54458,-0.071005)
- Old Polarization:       (-0.43944,0.58554,-0.6812)
- New Momentum Direction: (0.67051,0.73567,-0.09592)
- New Polarization:       (-0.65362,0.52461,-0.5455)
+ Old Momentum Direction: (0.835702,0.544582,-0.0709411)
+ Old Polarization:       (-0.439395,0.585543,-0.681228)
+ New Momentum Direction: (0.67052,0.735676,-0.0958343)
+ New Polarization:       (-0.653575,0.524625,-0.545535)
  *** FresnelRefraction *** 
 Track (trackID 761, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74999,0.64934,0.12596)
- Old Polarization:       (-0.53373,0.70659,-0.46461)
- New Momentum Direction: (0.45464,0.87438,0.16961)
- New Polarization:       (-0.79485,0.48422,-0.3657)
+ Old Momentum Direction: (0.749982,0.649343,0.126016)
+ Old Polarization:       (-0.533697,0.706587,-0.464653)
+ New Momentum Direction: (0.454602,0.874381,0.169689)
+ New Polarization:       (-0.794832,0.484222,-0.365748)
  *** FresnelRefraction *** 
 Track (trackID 760, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46498,-0.40006,0.78978)
- Old Polarization:       (-0.84819,-0.45694,0.26791)
- New Momentum Direction: (0.62997,-0.54201,0.55621)
- New Polarization:       (-0.29585,-0.82967,-0.47342)
+ Old Momentum Direction: (0.46492,-0.400056,0.789813)
+ Old Polarization:       (-0.848211,-0.456943,0.267845)
+ New Momentum Direction: (0.629889,-0.54201,0.556296)
+ New Polarization:       (-0.295929,-0.829699,-0.473313)
  *** FresnelRefraction *** 
 Track (trackID 759, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78512,-0.61486,0.07431)
- Old Polarization:       (-0.49572,-0.6958,-0.51974)
- New Momentum Direction: (0.54624,-0.83158,0.1005)
- New Polarization:       (-0.7417,-0.53594,-0.4033)
+ Old Momentum Direction: (0.785122,-0.61486,0.074369)
+ Old Polarization:       (-0.495673,-0.695799,-0.519781)
+ New Momentum Direction: (0.546233,-0.831573,0.100581)
+ New Polarization:       (-0.741663,-0.535959,-0.403341)
  *** FresnelRefraction *** 
 Track (trackID 758, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
@@ -7224,18 +7210,18 @@ Track (trackID 757, parentID 1) is processed with stopping code 2
 Track (trackID 756, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4828,-0.46124,0.74442)
- Old Polarization:       (-0.82689,-0.52003,0.21407)
- New Momentum Direction: (0.65653,-0.62722,0.41901)
- New Polarization:       (-0.48177,-0.7761,-0.40689)
+ Old Momentum Direction: (0.482743,-0.461238,0.744459)
+ Old Polarization:       (-0.8269,-0.520037,0.214006)
+ New Momentum Direction: (0.656457,-0.627215,0.419125)
+ New Polarization:       (-0.48184,-0.776123,-0.406773)
  *** FresnelRefraction *** 
 Track (trackID 755, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68602,-0.66379,0.29792)
- Old Polarization:       (-0.60513,-0.74789,-0.27291)
- New Momentum Direction: (0.1716,-0.89879,0.4034)
- New Polarization:       (-0.91107,-0.30058,-0.28215)
+ Old Momentum Direction: (0.686004,-0.663784,0.297976)
+ Old Polarization:       (-0.605106,-0.747892,-0.272954)
+ New Momentum Direction: (0.171465,-0.898784,0.403469)
+ New Polarization:       (-0.911072,-0.300499,-0.28222)
  *** FresnelRefraction *** 
 Track (trackID 754, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
@@ -7244,79 +7230,79 @@ Track (trackID 754, parentID 1) is processed with stopping code 2
 Track (trackID 753, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.42261,-0.22127,0.87889)
-Old Polarization: (-0.8942,-0.25983,0.36455)
-New Polarization: (-0.58484,-0.51965,-0.62284)
-Polarization Change: (-0.58484,-0.51965,-0.62284)
-New Momentum Direction: (0.71164,0.039783,-0.70142)
-Momentum Change: (0.71164,0.039783,-0.70142)
+Old Momentum Direction: (0.422542,-0.221273,0.878918)
+Old Polarization: (-0.894224,-0.259834,0.364485)
+New Polarization: (-0.5848,-0.519634,-0.622888)
+Polarization Change: (-0.5848,-0.519634,-0.622888)
+New Momentum Direction: (0.711688,0.0397943,-0.701368)
+Momentum Change: (0.711688,0.0397943,-0.701368)
  Photon at Boundary! 
- Old Momentum Direction: (0.71164,0.039783,-0.70142)
- Old Polarization:       (-0.58484,-0.51965,-0.62284)
- New Momentum Direction: (0.3038,0.05395,-0.95121)
- New Polarization:       (-0.87377,-0.38219,-0.30075)
+ Old Momentum Direction: (0.711688,0.0397943,-0.701368)
+ Old Polarization:       (-0.5848,-0.519634,-0.622888)
+ New Momentum Direction: (0.304009,0.0539659,-0.951139)
+ New Polarization:       (-0.873702,-0.382201,-0.300943)
  *** FresnelRefraction *** 
 Track (trackID 752, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56785,0.63261,0.52664)
- Old Polarization:       (-0.73495,0.67778,-0.021703)
- New Momentum Direction: (0.56785,-0.63261,0.52664)
- New Polarization:       (0.73495,0.67778,0.021703)
+ Old Momentum Direction: (0.56781,0.632614,0.526679)
+ Old Polarization:       (-0.734948,0.677774,-0.0217568)
+ New Momentum Direction: (0.56781,-0.632614,0.526679)
+ New Polarization:       (0.734948,0.677774,0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56785,-0.63261,0.52664)
- Old Polarization:       (0.73495,0.67778,0.021703)
- New Momentum Direction: (-0.56785,-0.63261,0.52664)
- New Polarization:       (0.73495,-0.67778,-0.021703)
+ Old Momentum Direction: (0.56781,-0.632614,0.526679)
+ Old Polarization:       (0.734948,0.677774,0.0217568)
+ New Momentum Direction: (-0.56781,-0.632614,0.526679)
+ New Polarization:       (0.734948,-0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56785,-0.63261,0.52664)
- Old Polarization:       (0.73495,-0.67778,-0.021703)
- New Momentum Direction: (-0.56785,-0.63261,-0.52664)
- New Polarization:       (-0.73495,0.67778,-0.021703)
+ Old Momentum Direction: (-0.56781,-0.632614,0.526679)
+ Old Polarization:       (0.734948,-0.677774,-0.0217568)
+ New Momentum Direction: (-0.56781,-0.632614,-0.526679)
+ New Polarization:       (-0.734948,0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56785,-0.63261,-0.52664)
- Old Polarization:       (-0.73495,0.67778,-0.021703)
- New Momentum Direction: (-0.56785,0.63261,-0.52664)
- New Polarization:       (0.73495,0.67778,0.021703)
+ Old Momentum Direction: (-0.56781,-0.632614,-0.526679)
+ Old Polarization:       (-0.734948,0.677774,-0.0217568)
+ New Momentum Direction: (-0.56781,0.632614,-0.526679)
+ New Polarization:       (0.734948,0.677774,0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56785,0.63261,-0.52664)
- Old Polarization:       (0.73495,0.67778,0.021703)
- New Momentum Direction: (0.56785,0.63261,-0.52664)
- New Polarization:       (0.73495,-0.67778,-0.021703)
+ Old Momentum Direction: (-0.56781,0.632614,-0.526679)
+ Old Polarization:       (0.734948,0.677774,0.0217568)
+ New Momentum Direction: (0.56781,0.632614,-0.526679)
+ New Polarization:       (0.734948,-0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56785,0.63261,-0.52664)
- Old Polarization:       (0.73495,-0.67778,-0.021703)
- New Momentum Direction: (0.56785,0.63261,0.52664)
- New Polarization:       (-0.73495,0.67778,-0.021703)
+ Old Momentum Direction: (0.56781,0.632614,-0.526679)
+ Old Polarization:       (0.734948,-0.677774,-0.0217568)
+ New Momentum Direction: (0.56781,0.632614,0.526679)
+ New Polarization:       (-0.734948,0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56785,0.63261,0.52664)
- Old Polarization:       (-0.73495,0.67778,-0.021703)
- New Momentum Direction: (0.56785,-0.63261,0.52664)
- New Polarization:       (0.73495,0.67778,0.021703)
+ Old Momentum Direction: (0.56781,0.632614,0.526679)
+ Old Polarization:       (-0.734948,0.677774,-0.0217568)
+ New Momentum Direction: (0.56781,-0.632614,0.526679)
+ New Polarization:       (0.734948,0.677774,0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56785,-0.63261,0.52664)
- Old Polarization:       (0.73495,0.67778,0.021703)
- New Momentum Direction: (-0.56785,-0.63261,0.52664)
- New Polarization:       (0.73495,-0.67778,-0.021703)
+ Old Momentum Direction: (0.56781,-0.632614,0.526679)
+ Old Polarization:       (0.734948,0.677774,0.0217568)
+ New Momentum Direction: (-0.56781,-0.632614,0.526679)
+ New Polarization:       (0.734948,-0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56785,-0.63261,0.52664)
- Old Polarization:       (0.73495,-0.67778,-0.021703)
- New Momentum Direction: (-0.56785,-0.63261,-0.52664)
- New Polarization:       (-0.73495,0.67778,-0.021703)
+ Old Momentum Direction: (-0.56781,-0.632614,0.526679)
+ Old Polarization:       (0.734948,-0.677774,-0.0217568)
+ New Momentum Direction: (-0.56781,-0.632614,-0.526679)
+ New Polarization:       (-0.734948,0.677774,-0.0217568)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56785,-0.63261,-0.52664)
- Old Polarization:       (-0.73495,0.67778,-0.021703)
- New Momentum Direction: (-0.56785,0.63261,-0.52664)
- New Polarization:       (0.73495,0.67778,0.021703)
+ Old Momentum Direction: (-0.56781,-0.632614,-0.526679)
+ Old Polarization:       (-0.734948,0.677774,-0.0217568)
+ New Momentum Direction: (-0.56781,0.632614,-0.526679)
+ New Polarization:       (0.734948,0.677774,0.0217568)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -7327,133 +7313,133 @@ Track (trackID 751, parentID 1) is processed with stopping code 2
 Track (trackID 750, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5198,0.5592,0.64583)
- Old Polarization:       (-0.78948,0.60327,0.11307)
- New Momentum Direction: (0.5198,0.5592,-0.64583)
- New Polarization:       (0.78948,-0.60327,0.11307)
+ Old Momentum Direction: (0.519752,0.559203,0.645871)
+ Old Polarization:       (-0.789491,0.603269,0.113009)
+ New Momentum Direction: (0.519752,0.559203,-0.645871)
+ New Polarization:       (0.789491,-0.603269,0.113009)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5198,0.5592,-0.64583)
- Old Polarization:       (0.78948,-0.60327,0.11307)
- New Momentum Direction: (0.5198,-0.5592,-0.64583)
- New Polarization:       (-0.78948,-0.60327,-0.11307)
+ Old Momentum Direction: (0.519752,0.559203,-0.645871)
+ Old Polarization:       (0.789491,-0.603269,0.113009)
+ New Momentum Direction: (0.519752,-0.559203,-0.645871)
+ New Polarization:       (-0.789491,-0.603269,-0.113009)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5198,-0.5592,-0.64583)
- Old Polarization:       (-0.78948,-0.60327,-0.11307)
- New Momentum Direction: (-0.5198,-0.5592,-0.64583)
- New Polarization:       (-0.78948,0.60327,0.11307)
+ Old Momentum Direction: (0.519752,-0.559203,-0.645871)
+ Old Polarization:       (-0.789491,-0.603269,-0.113009)
+ New Momentum Direction: (-0.519752,-0.559203,-0.645871)
+ New Polarization:       (-0.789491,0.603269,0.113009)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 749, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94987,-0.062783,-0.30629)
- Old Polarization:       (-0.31094,-0.087168,-0.94642)
- New Momentum Direction: (0.90705,-0.084541,-0.41244)
- New Polarization:       (-0.41975,-0.10578,-0.90145)
+ Old Momentum Direction: (0.949889,-0.0627789,-0.306219)
+ Old Polarization:       (-0.310871,-0.0871685,-0.946447)
+ New Momentum Direction: (0.907099,-0.0845352,-0.412341)
+ New Polarization:       (-0.419654,-0.105797,-0.901497)
  *** FresnelRefraction *** 
 Track (trackID 748, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9112,-0.35525,-0.20859)
- Old Polarization:       (-0.35346,-0.41408,-0.83881)
- New Momentum Direction: (0.8324,-0.47788,-0.2806)
- New Polarization:       (-0.50739,-0.45362,-0.73265)
+ Old Momentum Direction: (0.911219,-0.355244,-0.208523)
+ Old Polarization:       (-0.353392,-0.414084,-0.838837)
+ New Momentum Direction: (0.832439,-0.477873,-0.280504)
+ New Polarization:       (-0.507316,-0.453653,-0.732686)
  *** FresnelRefraction *** 
 Track (trackID 747, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41021,0.17521,0.895)
- Old Polarization:       (-0.90756,0.17506,0.3817)
- New Momentum Direction: (0.5565,0.23769,0.79612)
- New Polarization:       (0.51308,0.65535,-0.55431)
+ Old Momentum Direction: (0.410147,0.175208,0.895032)
+ Old Polarization:       (-0.907587,0.175053,0.381632)
+ New Momentum Direction: (0.556414,0.237691,0.796182)
+ New Polarization:       (0.513055,0.655445,-0.554226)
  *** FresnelRefraction *** 
 Track (trackID 746, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.91167,-0.33995,-0.23084)
-Old Polarization: (-0.3594,-0.38734,-0.849)
-New Polarization: (-0.10922,0.24827,-0.96251)
-Polarization Change: (-0.10922,0.24827,-0.96251)
-New Momentum Direction: (0.42543,0.88681,0.18046)
-Momentum Change: (0.42543,0.88681,0.18046)
+Old Momentum Direction: (0.911693,-0.339941,-0.230773)
+Old Polarization: (-0.359339,-0.387345,-0.849022)
+New Polarization: (-0.10921,0.248293,-0.962509)
+Polarization Change: (-0.10921,0.248293,-0.962509)
+New Momentum Direction: (0.425343,0.886847,0.180514)
+Momentum Change: (0.425343,0.886847,0.180514)
 
 ** Photon absorbed! **
 Track (trackID 745, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85642,-0.50766,-0.093998)
- Old Polarization:       (-0.41794,-0.57481,-0.70351)
- New Momentum Direction: (0.71441,-0.68803,-0.1274)
- New Polarization:       (-0.62063,-0.53897,-0.5695)
+ Old Momentum Direction: (0.856426,-0.507652,-0.0939336)
+ Old Polarization:       (-0.417886,-0.574808,-0.703539)
+ New Momentum Direction: (0.714431,-0.688026,-0.127309)
+ New Polarization:       (-0.62057,-0.539001,-0.569535)
  *** FresnelRefraction *** 
 Track (trackID 744, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,0.56038,0.64938)
- Old Polarization:       (-0.79378,0.59768,0.11263)
- New Momentum Direction: (0.51408,0.56038,-0.64938)
- New Polarization:       (0.79378,-0.59768,0.11263)
+ Old Momentum Direction: (0.51403,0.560378,0.649423)
+ Old Polarization:       (-0.793795,0.597676,0.112576)
+ New Momentum Direction: (0.51403,0.560378,-0.649423)
+ New Polarization:       (0.793795,-0.597676,0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,0.56038,-0.64938)
- Old Polarization:       (0.79378,-0.59768,0.11263)
- New Momentum Direction: (0.51408,-0.56038,-0.64938)
- New Polarization:       (-0.79378,-0.59768,-0.11263)
+ Old Momentum Direction: (0.51403,0.560378,-0.649423)
+ Old Polarization:       (0.793795,-0.597676,0.112576)
+ New Momentum Direction: (0.51403,-0.560378,-0.649423)
+ New Polarization:       (-0.793795,-0.597676,-0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,-0.56038,-0.64938)
- Old Polarization:       (-0.79378,-0.59768,-0.11263)
- New Momentum Direction: (-0.51408,-0.56038,-0.64938)
- New Polarization:       (-0.79378,0.59768,0.11263)
+ Old Momentum Direction: (0.51403,-0.560378,-0.649423)
+ Old Polarization:       (-0.793795,-0.597676,-0.112576)
+ New Momentum Direction: (-0.51403,-0.560378,-0.649423)
+ New Polarization:       (-0.793795,0.597676,0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51408,-0.56038,-0.64938)
- Old Polarization:       (-0.79378,0.59768,0.11263)
- New Momentum Direction: (-0.51408,-0.56038,0.64938)
- New Polarization:       (0.79378,-0.59768,0.11263)
+ Old Momentum Direction: (-0.51403,-0.560378,-0.649423)
+ Old Polarization:       (-0.793795,0.597676,0.112576)
+ New Momentum Direction: (-0.51403,-0.560378,0.649423)
+ New Polarization:       (0.793795,-0.597676,0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51408,-0.56038,0.64938)
- Old Polarization:       (0.79378,-0.59768,0.11263)
- New Momentum Direction: (-0.51408,0.56038,0.64938)
- New Polarization:       (-0.79378,-0.59768,-0.11263)
+ Old Momentum Direction: (-0.51403,-0.560378,0.649423)
+ Old Polarization:       (0.793795,-0.597676,0.112576)
+ New Momentum Direction: (-0.51403,0.560378,0.649423)
+ New Polarization:       (-0.793795,-0.597676,-0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51408,0.56038,0.64938)
- Old Polarization:       (-0.79378,-0.59768,-0.11263)
- New Momentum Direction: (0.51408,0.56038,0.64938)
- New Polarization:       (-0.79378,0.59768,0.11263)
+ Old Momentum Direction: (-0.51403,0.560378,0.649423)
+ Old Polarization:       (-0.793795,-0.597676,-0.112576)
+ New Momentum Direction: (0.51403,0.560378,0.649423)
+ New Polarization:       (-0.793795,0.597676,0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,0.56038,0.64938)
- Old Polarization:       (-0.79378,0.59768,0.11263)
- New Momentum Direction: (0.51408,0.56038,-0.64938)
- New Polarization:       (0.79378,-0.59768,0.11263)
+ Old Momentum Direction: (0.51403,0.560378,0.649423)
+ Old Polarization:       (-0.793795,0.597676,0.112576)
+ New Momentum Direction: (0.51403,0.560378,-0.649423)
+ New Polarization:       (0.793795,-0.597676,0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,0.56038,-0.64938)
- Old Polarization:       (0.79378,-0.59768,0.11263)
- New Momentum Direction: (0.51408,-0.56038,-0.64938)
- New Polarization:       (-0.79378,-0.59768,-0.11263)
+ Old Momentum Direction: (0.51403,0.560378,-0.649423)
+ Old Polarization:       (0.793795,-0.597676,0.112576)
+ New Momentum Direction: (0.51403,-0.560378,-0.649423)
+ New Polarization:       (-0.793795,-0.597676,-0.112576)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51408,-0.56038,-0.64938)
- Old Polarization:       (-0.79378,-0.59768,-0.11263)
- New Momentum Direction: (-0.51408,-0.56038,-0.64938)
- New Polarization:       (-0.79378,0.59768,0.11263)
+ Old Momentum Direction: (0.51403,-0.560378,-0.649423)
+ Old Polarization:       (-0.793795,-0.597676,-0.112576)
+ New Momentum Direction: (-0.51403,-0.560378,-0.649423)
+ New Polarization:       (-0.793795,0.597676,0.112576)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 743, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93718,-0.19772,-0.2874)
- Old Polarization:       (-0.32982,-0.23381,-0.91463)
- New Momentum Direction: (0.88093,-0.26823,-0.38989)
- New Polarization:       (-0.45894,-0.28317,-0.84213)
+ Old Momentum Direction: (0.937202,-0.197719,-0.287331)
+ Old Polarization:       (-0.329745,-0.233809,-0.914659)
+ New Momentum Direction: (0.880972,-0.268229,-0.389797)
+ New Polarization:       (-0.458854,-0.283197,-0.842171)
  *** FresnelRefraction *** 
 Track (trackID 742, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
@@ -7462,18 +7448,18 @@ Track (trackID 742, parentID 1) is processed with stopping code 2
 Track (trackID 741, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40899,-0.11996,0.90462)
- Old Polarization:       (-0.90836,-0.14829,0.39101)
- New Momentum Direction: (0.55531,-0.16288,0.81554)
- New Polarization:       (0.66208,-0.50685,-0.55205)
+ Old Momentum Direction: (0.408922,-0.119961,0.90465)
+ Old Polarization:       (-0.908388,-0.148295,0.390947)
+ New Momentum Direction: (0.555221,-0.162879,0.815598)
+ New Polarization:       (0.662091,-0.506932,-0.551957)
  *** FresnelRefraction *** 
 Track (trackID 740, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84716,-0.52694,-0.068164)
- Old Polarization:       (-0.42713,-0.59909,-0.67724)
- New Momentum Direction: (0.69561,-0.71248,-0.092165)
- New Polarization:       (-0.63442,-0.549,-0.54416)
+ Old Momentum Direction: (0.847171,-0.526939,-0.0681)
+ Old Polarization:       (-0.427074,-0.599088,-0.677275)
+ New Momentum Direction: (0.695627,-0.712478,-0.0920785)
+ New Polarization:       (-0.634364,-0.54903,-0.544195)
  *** FresnelRefraction *** 
 Track (trackID 739, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
@@ -7482,50 +7468,50 @@ Track (trackID 739, parentID 1) is processed with stopping code 2
 Track (trackID 738, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40825,-0.039827,0.912)
- Old Polarization:       (-0.91201,-0.061109,0.40559)
- New Momentum Direction: (0.5519,-0.05384,0.83217)
- New Polarization:       (0.81262,-0.18936,-0.55118)
+ Old Momentum Direction: (0.408187,-0.0398257,0.912029)
+ Old Polarization:       (-0.91204,-0.0611136,0.405523)
+ New Momentum Direction: (0.551809,-0.0538385,0.832231)
+ New Polarization:       (0.81267,-0.189388,-0.55109)
  *** FresnelRefraction *** 
 Track (trackID 737, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62561,-0.65326,0.42646)
- Old Polarization:       (-0.67112,-0.72937,-0.13273)
- New Momentum Direction: (0.62561,0.65326,0.42646)
- New Polarization:       (0.67112,-0.72937,0.13273)
+ Old Momentum Direction: (0.625581,-0.653254,0.426507)
+ Old Polarization:       (-0.671107,-0.729372,-0.132783)
+ New Momentum Direction: (0.625581,0.653254,0.426507)
+ New Polarization:       (0.671107,-0.729372,0.132783)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62561,0.65326,0.42646)
- Old Polarization:       (0.67112,-0.72937,0.13273)
- New Momentum Direction: (-0.62561,0.65326,0.42646)
- New Polarization:       (0.67112,0.72937,-0.13273)
+ Old Momentum Direction: (0.625581,0.653254,0.426507)
+ Old Polarization:       (0.671107,-0.729372,0.132783)
+ New Momentum Direction: (-0.625581,0.653254,0.426507)
+ New Polarization:       (0.671107,0.729372,-0.132783)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62561,0.65326,0.42646)
- Old Polarization:       (0.67112,0.72937,-0.13273)
- New Momentum Direction: (-0.62561,0.65326,-0.42646)
- New Polarization:       (-0.67112,-0.72937,-0.13273)
+ Old Momentum Direction: (-0.625581,0.653254,0.426507)
+ Old Polarization:       (0.671107,0.729372,-0.132783)
+ New Momentum Direction: (-0.625581,0.653254,-0.426507)
+ New Polarization:       (-0.671107,-0.729372,-0.132783)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 736, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94329,0.10543,-0.3148)
- Old Polarization:       (-0.32487,0.097923,-0.94068)
- New Momentum Direction: (-0.94329,0.10543,-0.3148)
- New Polarization:       (0.31784,0.56059,-0.76467)
+ Old Momentum Direction: (0.943309,0.105431,-0.314726)
+ Old Polarization:       (-0.3248,0.0979225,-0.9407)
+ New Momentum Direction: (-0.943309,0.105431,-0.314726)
+ New Polarization:       (0.317773,0.560711,-0.764607)
  *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 735, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4924,0.49979,0.71257)
- Old Polarization:       (-0.82065,0.53935,0.18878)
- New Momentum Direction: (0.66334,0.6733,0.32657)
- New Polarization:       (-0.56798,0.73714,-0.36609)
+ Old Momentum Direction: (0.492344,0.499792,0.712605)
+ Old Polarization:       (-0.820662,0.53935,0.188723)
+ New Momentum Direction: (0.663265,0.6733,0.32672)
+ New Polarization:       (-0.568036,0.737158,-0.365969)
  *** FresnelRefraction *** 
 Track (trackID 734, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
@@ -7534,106 +7520,106 @@ Track (trackID 734, parentID 1) is processed with stopping code 2
 Track (trackID 733, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81564,-0.57855,-0.0034119)
- Old Polarization:       (-0.46343,-0.6498,-0.60249)
- New Momentum Direction: (0.61857,-0.78571,-0.0046336)
- New Polarization:       (-0.69487,-0.54429,-0.47)
+ Old Momentum Direction: (0.815646,-0.578542,-0.00335078)
+ Old Polarization:       (-0.463381,-0.649799,-0.602527)
+ New Momentum Direction: (0.618581,-0.785708,-0.00455064)
+ New Polarization:       (-0.694828,-0.544309,-0.470044)
  *** FresnelRefraction *** 
 Track (trackID 732, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52259,-0.54173,0.65835)
- Old Polarization:       (-0.78383,-0.60907,0.12101)
- New Momentum Direction: (0.52259,-0.54173,-0.65835)
- New Polarization:       (0.78383,0.60907,0.12101)
+ Old Momentum Direction: (0.522546,-0.541728,0.65839)
+ Old Polarization:       (-0.783835,-0.609075,0.120956)
+ New Momentum Direction: (0.522546,-0.541728,-0.65839)
+ New Polarization:       (0.783835,0.609075,0.120956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52259,-0.54173,-0.65835)
- Old Polarization:       (0.78383,0.60907,0.12101)
- New Momentum Direction: (0.52259,0.54173,-0.65835)
- New Polarization:       (-0.78383,0.60907,-0.12101)
+ Old Momentum Direction: (0.522546,-0.541728,-0.65839)
+ Old Polarization:       (0.783835,0.609075,0.120956)
+ New Momentum Direction: (0.522546,0.541728,-0.65839)
+ New Polarization:       (-0.783835,0.609075,-0.120956)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52259,0.54173,-0.65835)
- Old Polarization:       (-0.78383,0.60907,-0.12101)
- New Momentum Direction: (-0.52259,0.54173,-0.65835)
- New Polarization:       (-0.78383,-0.60907,0.12101)
+ Old Momentum Direction: (0.522546,0.541728,-0.65839)
+ Old Polarization:       (-0.783835,0.609075,-0.120956)
+ New Momentum Direction: (-0.522546,0.541728,-0.65839)
+ New Polarization:       (-0.783835,-0.609075,0.120956)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 731, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.58439,0.64313,0.49484)
- Old Polarization:       (-0.71752,0.69436,-0.055075)
- New Momentum Direction: (0.58439,-0.64313,0.49484)
- New Polarization:       (0.71752,0.69436,0.055075)
+ Old Momentum Direction: (0.584355,0.643132,0.494884)
+ Old Polarization:       (-0.717514,0.694359,-0.0551278)
+ New Momentum Direction: (0.584355,-0.643132,0.494884)
+ New Polarization:       (0.717514,0.694359,0.0551278)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.58439,-0.64313,0.49484)
- Old Polarization:       (0.71752,0.69436,0.055075)
- New Momentum Direction: (-0.58439,-0.64313,0.49484)
- New Polarization:       (0.71752,-0.69436,-0.055075)
+ Old Momentum Direction: (0.584355,-0.643132,0.494884)
+ Old Polarization:       (0.717514,0.694359,0.0551278)
+ New Momentum Direction: (-0.584355,-0.643132,0.494884)
+ New Polarization:       (0.717514,-0.694359,-0.0551278)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58439,-0.64313,0.49484)
- Old Polarization:       (0.71752,-0.69436,-0.055075)
- New Momentum Direction: (-0.58439,-0.64313,-0.49484)
- New Polarization:       (-0.71752,0.69436,-0.055075)
+ Old Momentum Direction: (-0.584355,-0.643132,0.494884)
+ Old Polarization:       (0.717514,-0.694359,-0.0551278)
+ New Momentum Direction: (-0.584355,-0.643132,-0.494884)
+ New Polarization:       (-0.717514,0.694359,-0.0551278)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58439,-0.64313,-0.49484)
- Old Polarization:       (-0.71752,0.69436,-0.055075)
- New Momentum Direction: (-0.58439,0.64313,-0.49484)
- New Polarization:       (0.71752,0.69436,0.055075)
+ Old Momentum Direction: (-0.584355,-0.643132,-0.494884)
+ Old Polarization:       (-0.717514,0.694359,-0.0551278)
+ New Momentum Direction: (-0.584355,0.643132,-0.494884)
+ New Polarization:       (0.717514,0.694359,0.0551278)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.58439,0.64313,-0.49484)
- Old Polarization:       (0.71752,0.69436,0.055075)
- New Momentum Direction: (0.58439,0.64313,-0.49484)
- New Polarization:       (0.71752,-0.69436,-0.055075)
+ Old Momentum Direction: (-0.584355,0.643132,-0.494884)
+ Old Polarization:       (0.717514,0.694359,0.0551278)
+ New Momentum Direction: (0.584355,0.643132,-0.494884)
+ New Polarization:       (0.717514,-0.694359,-0.0551278)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 730, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40335,0.06357,0.91284)
- Old Polarization:       (-0.91477,0.0526,0.40054)
- New Momentum Direction: (0.54745,0.086283,0.83238)
- New Polarization:       (0.79165,0.26903,-0.54856)
+ Old Momentum Direction: (0.403279,0.0635712,0.912866)
+ Old Polarization:       (-0.914799,0.0525959,0.400471)
+ New Momentum Direction: (0.547362,0.0862837,0.832436)
+ New Polarization:       (0.791697,0.269078,-0.548465)
  *** FresnelRefraction *** 
 Track (trackID 729, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47792,-0.42703,0.76762)
- Old Polarization:       (-0.83566,-0.4903,0.24753)
- New Momentum Direction: (0.64525,-0.57655,0.50124)
- New Polarization:       (-0.37816,-0.81112,-0.44618)
+ Old Momentum Direction: (0.477863,-0.427028,0.767655)
+ Old Polarization:       (-0.835681,-0.490306,0.247464)
+ New Momentum Direction: (0.64518,-0.576546,0.501336)
+ New Polarization:       (-0.378234,-0.811145,-0.446074)
  *** FresnelRefraction *** 
 Track (trackID 728, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42536,0.28841,0.85784)
- Old Polarization:       (-0.89107,0.29929,0.34121)
- New Momentum Direction: (0.57695,0.39118,0.71701)
- New Polarization:       (0.10882,0.83321,-0.54214)
+ Old Momentum Direction: (0.425298,0.288407,0.857871)
+ Old Polarization:       (-0.891091,0.299288,0.34115)
+ New Momentum Direction: (0.576859,0.391185,0.717083)
+ New Polarization:       (0.108735,0.833284,-0.542047)
  *** FresnelRefraction *** 
 Track (trackID 727, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88263,0.43273,-0.18359)
- Old Polarization:       (-0.39011,0.4564,-0.7997)
- New Momentum Direction: (0.76977,0.58762,-0.24931)
- New Polarization:       (-0.57435,0.46721,-0.67219)
+ Old Momentum Direction: (0.882644,0.432732,-0.183528)
+ Old Polarization:       (-0.390046,0.456403,-0.799725)
+ New Momentum Direction: (0.769799,0.587622,-0.249218)
+ New Polarization:       (-0.574289,0.467232,-0.672225)
  *** FresnelRefraction *** 
 Track (trackID 726, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.66441,0.68454,0.29995)
- Old Polarization:       (-0.6288,0.72893,-0.2707)
- New Momentum Direction: (0.90388,0.12844,0.40806)
- New Polarization:       (0.11412,-0.99169,0.059373)
+ Old Momentum Direction: (0.664384,0.684539,0.3)
+ Old Polarization:       (-0.628783,0.728924,-0.270743)
+ New Momentum Direction: (0.903843,0.128457,0.408127)
+ New Polarization:       (0.114124,-0.99169,0.0593898)
  *** FresnelRefraction *** 
 Track (trackID 725, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
@@ -7642,108 +7628,108 @@ Track (trackID 725, parentID 1) is processed with stopping code 2
 Track (trackID 724, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94722,-0.043354,-0.31764)
- Old Polarization:       (-0.31992,-0.06435,-0.94526)
- New Momentum Direction: (0.90012,-0.058915,-0.43165)
- New Polarization:       (-0.43517,-0.075194,-0.8972)
+ Old Momentum Direction: (0.947245,-0.0433495,-0.317565)
+ Old Polarization:       (-0.319851,-0.0643507,-0.94528)
+ New Momentum Direction: (0.900164,-0.058909,-0.431549)
+ New Polarization:       (-0.435073,-0.0752019,-0.897249)
  *** FresnelRefraction *** 
 Track (trackID 723, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73335,0.66385,0.14663)
- Old Polarization:       (-0.55351,0.70825,-0.43819)
- New Momentum Direction: (-0.73335,0.66385,0.14663)
- New Polarization:       (-0.32104,-0.52827,0.78605)
+ Old Momentum Direction: (0.733338,0.663851,0.146686)
+ Old Polarization:       (-0.55348,0.708247,-0.438231)
+ New Momentum Direction: (-0.733338,0.663851,0.146686)
+ New Polarization:       (-0.321035,-0.528318,0.786013)
  *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 722, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41022,0.072146,0.90913)
- Old Polarization:       (-0.91156,0.063018,0.40632)
- New Momentum Direction: (0.55312,0.097278,0.8274)
- New Polarization:       (0.77585,0.30166,-0.55413)
+ Old Momentum Direction: (0.410155,0.0721464,0.909158)
+ Old Polarization:       (-0.911586,0.0630145,0.406251)
+ New Momentum Direction: (0.553033,0.0972786,0.827461)
+ New Polarization:       (0.775894,0.30171,-0.554039)
  *** FresnelRefraction *** 
 Track (trackID 721, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47361,-0.43551,0.76552)
- Old Polarization:       (-0.83718,-0.49258,0.23771)
- New Momentum Direction: (0.64368,-0.59189,0.48512)
- New Polarization:       (-0.40707,-0.80159,-0.43789)
+ Old Momentum Direction: (0.473558,-0.435511,0.765555)
+ Old Polarization:       (-0.83719,-0.49258,0.23765)
+ New Momentum Direction: (0.643601,-0.591892,0.485223)
+ New Polarization:       (-0.407151,-0.801607,-0.437783)
  *** FresnelRefraction *** 
 Track (trackID 720, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45155,0.39927,0.79793)
- Old Polarization:       (-0.8631,0.42219,0.27717)
- New Momentum Direction: (0.61162,0.5408,0.57745)
- New Polarization:       (-0.27701,0.83007,-0.48399)
+ Old Momentum Direction: (0.451487,0.399266,0.797964)
+ Old Polarization:       (-0.863117,0.422184,0.277108)
+ New Momentum Direction: (0.611538,0.540805,0.577539)
+ New Polarization:       (-0.277101,0.8301,-0.483889)
  *** FresnelRefraction *** 
 Track (trackID 719, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,0.51989,0.69813)
- Old Polarization:       (-0.81729,0.55206,0.16516)
- New Momentum Direction: (0.49226,0.51989,-0.69813)
- New Polarization:       (0.64882,-0.75382,-0.10388)
+ Old Momentum Direction: (0.492205,0.519895,0.698171)
+ Old Polarization:       (-0.8173,0.552052,0.165102)
+ New Momentum Direction: (0.492205,0.519895,-0.698171)
+ New Polarization:       (0.648928,-0.753738,-0.103785)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,0.51989,-0.69813)
- Old Polarization:       (0.64882,-0.75382,-0.10388)
- New Momentum Direction: (0.49226,-0.51989,-0.69813)
- New Polarization:       (-0.64882,-0.75382,0.10388)
+ Old Momentum Direction: (0.492205,0.519895,-0.698171)
+ Old Polarization:       (0.648928,-0.753738,-0.103785)
+ New Momentum Direction: (0.492205,-0.519895,-0.698171)
+ New Polarization:       (-0.648928,-0.753738,0.103785)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,-0.51989,-0.69813)
- Old Polarization:       (-0.64882,-0.75382,0.10388)
- New Momentum Direction: (-0.49226,-0.51989,-0.69813)
- New Polarization:       (-0.64882,0.75382,-0.10388)
+ Old Momentum Direction: (0.492205,-0.519895,-0.698171)
+ Old Polarization:       (-0.648928,-0.753738,0.103785)
+ New Momentum Direction: (-0.492205,-0.519895,-0.698171)
+ New Polarization:       (-0.648928,0.753738,-0.103785)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49226,-0.51989,-0.69813)
- Old Polarization:       (-0.64882,0.75382,-0.10388)
- New Momentum Direction: (-0.49226,-0.51989,0.69813)
- New Polarization:       (0.76653,-0.63894,0.064669)
+ Old Momentum Direction: (-0.492205,-0.519895,-0.698171)
+ Old Polarization:       (-0.648928,0.753738,-0.103785)
+ New Momentum Direction: (-0.492205,-0.519895,0.698171)
+ New Polarization:       (0.766518,-0.638967,0.0645798)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49226,-0.51989,0.69813)
- Old Polarization:       (0.76653,-0.63894,0.064669)
- New Momentum Direction: (-0.49226,0.51989,0.69813)
- New Polarization:       (-0.76653,-0.63894,-0.064669)
+ Old Momentum Direction: (-0.492205,-0.519895,0.698171)
+ Old Polarization:       (0.766518,-0.638967,0.0645798)
+ New Momentum Direction: (-0.492205,0.519895,0.698171)
+ New Polarization:       (-0.766518,-0.638967,-0.0645798)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49226,0.51989,0.69813)
- Old Polarization:       (-0.76653,-0.63894,-0.064669)
- New Momentum Direction: (0.49226,0.51989,0.69813)
- New Polarization:       (-0.76653,0.63894,0.064669)
+ Old Momentum Direction: (-0.492205,0.519895,0.698171)
+ Old Polarization:       (-0.766518,-0.638967,-0.0645798)
+ New Momentum Direction: (0.492205,0.519895,0.698171)
+ New Polarization:       (-0.766518,0.638967,0.0645798)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,0.51989,0.69813)
- Old Polarization:       (-0.76653,0.63894,0.064669)
- New Momentum Direction: (0.49226,0.51989,-0.69813)
- New Polarization:       (0.69812,-0.71486,-0.0401)
+ Old Momentum Direction: (0.492205,0.519895,0.698171)
+ Old Polarization:       (-0.766518,0.638967,0.0645798)
+ New Momentum Direction: (0.492205,0.519895,-0.698171)
+ New Polarization:       (0.698212,-0.714772,-0.0400236)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,0.51989,-0.69813)
- Old Polarization:       (0.69812,-0.71486,-0.0401)
- New Momentum Direction: (0.49226,-0.51989,-0.69813)
- New Polarization:       (-0.69812,-0.71486,0.0401)
+ Old Momentum Direction: (0.492205,0.519895,-0.698171)
+ Old Polarization:       (0.698212,-0.714772,-0.0400236)
+ New Momentum Direction: (0.492205,-0.519895,-0.698171)
+ New Polarization:       (-0.698212,-0.714772,0.0400236)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49226,-0.51989,-0.69813)
- Old Polarization:       (-0.69812,-0.71486,0.0401)
- New Momentum Direction: (0.6683,-0.70582,-0.23496)
- New Polarization:       (-0.70906,-0.69991,0.085744)
+ Old Momentum Direction: (0.492205,-0.519895,-0.698171)
+ Old Polarization:       (-0.698212,-0.714772,0.0400236)
+ New Momentum Direction: (0.668223,-0.705816,-0.235162)
+ New Polarization:       (-0.709127,-0.699869,0.0855738)
  *** FresnelRefraction *** 
 Track (trackID 718, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94123,0.14778,-0.30371)
- Old Polarization:       (-0.32443,0.14548,-0.93466)
- New Momentum Direction: (0.88919,0.20019,-0.41141)
- New Polarization:       (-0.44759,0.19418,-0.8729)
+ Old Momentum Direction: (0.941257,0.147783,-0.303637)
+ Old Polarization:       (-0.324357,0.145483,-0.93468)
+ New Momentum Direction: (0.889238,0.20019,-0.411314)
+ New Polarization:       (-0.447497,0.194205,-0.872944)
  *** FresnelRefraction *** 
 Track (trackID 717, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
@@ -7752,34 +7738,34 @@ Track (trackID 717, parentID 1) is processed with stopping code 2
 Track (trackID 716, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40121,-0.0020296,0.91598)
- Old Polarization:       (-0.91583,-0.019195,0.4011)
- New Momentum Direction: (0.54561,-0.0027601,0.83803)
- New Polarization:       (0.83781,-0.021527,-0.54554)
+ Old Momentum Direction: (0.401143,-0.00202886,0.916013)
+ Old Polarization:       (-0.915862,-0.0191995,0.401034)
+ New Momentum Direction: (0.545522,-0.00275909,0.838092)
+ New Polarization:       (0.837868,-0.0215284,-0.545448)
  *** FresnelRefraction *** 
 Track (trackID 715, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45465,-0.37761,0.80666)
- Old Polarization:       (-0.85784,-0.42928,0.28255)
- New Momentum Direction: (0.61795,-0.51324,0.59558)
- New Polarization:       (-0.22458,-0.8412,-0.49188)
+ Old Momentum Direction: (0.454595,-0.377608,0.806694)
+ Old Polarization:       (-0.857858,-0.429281,0.282484)
+ New Momentum Direction: (0.617876,-0.513236,0.595666)
+ New Polarization:       (-0.224668,-0.841236,-0.491779)
  *** FresnelRefraction *** 
 Track (trackID 714, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94935,-0.017122,-0.31377)
- Old Polarization:       (-0.31419,-0.036019,-0.94868)
- New Momentum Direction: (0.90527,-0.023149,-0.4242)
- New Polarization:       (-0.4248,-0.03779,-0.9045)
+ Old Momentum Direction: (0.94937,-0.0171182,-0.313694)
+ Old Polarization:       (-0.314122,-0.0360189,-0.948699)
+ New Momentum Direction: (0.90532,-0.0231429,-0.424099)
+ New Polarization:       (-0.424702,-0.0377917,-0.904544)
  *** FresnelRefraction *** 
 Track (trackID 713, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49156,0.52039,0.69825)
- Old Polarization:       (-0.8177,0.55163,0.16453)
- New Momentum Direction: (0.66788,0.70705,0.23242)
- New Polarization:       (-0.62508,0.70238,-0.34051)
+ Old Momentum Direction: (0.491509,0.520394,0.69829)
+ Old Polarization:       (-0.817714,0.551628,0.164473)
+ New Momentum Direction: (0.667806,0.707052,0.232621)
+ New Polarization:       (-0.625124,0.702405,-0.340362)
  *** FresnelRefraction *** 
 Track (trackID 712, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
@@ -7792,64 +7778,64 @@ Track (trackID 711, parentID 1) is processed with stopping code 2
 Track (trackID 710, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45818,-0.35604,0.81444)
- Old Polarization:       (-0.85878,-0.41368,0.30227)
- New Momentum Direction: (0.61721,-0.47963,0.62371)
- New Polarization:       (-0.14633,-0.84886,-0.50796)
+ Old Momentum Direction: (0.45812,-0.356042,0.814469)
+ Old Polarization:       (-0.858797,-0.413687,0.302211)
+ New Momentum Direction: (0.617132,-0.479624,0.623786)
+ New Polarization:       (-0.146409,-0.848903,-0.507866)
  *** FresnelRefraction *** 
 Track (trackID 709, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44846,0.40028,0.79916)
- Old Polarization:       (-0.86477,0.42035,0.27474)
- New Momentum Direction: (0.60935,0.54388,0.57696)
- New Polarization:       (-0.28243,0.82881,-0.48302)
+ Old Momentum Direction: (0.448404,0.400285,0.799191)
+ Old Polarization:       (-0.864791,0.420344,0.274676)
+ New Momentum Direction: (0.609265,0.543884,0.577049)
+ New Polarization:       (-0.28252,0.828841,-0.482912)
  *** FresnelRefraction *** 
 Track (trackID 708, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54479,-0.57176,0.61344)
- Old Polarization:       (-0.76035,-0.64531,0.073786)
- New Momentum Direction: (0.54479,-0.57176,-0.61344)
- New Polarization:       (0.76035,0.64531,0.073786)
+ Old Momentum Direction: (0.544743,-0.571754,0.613476)
+ Old Polarization:       (-0.760348,-0.645318,0.0737296)
+ New Momentum Direction: (0.544743,-0.571754,-0.613476)
+ New Polarization:       (0.760348,0.645318,0.0737296)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54479,-0.57176,-0.61344)
- Old Polarization:       (0.76035,0.64531,0.073786)
- New Momentum Direction: (0.54479,0.57176,-0.61344)
- New Polarization:       (-0.76035,0.64531,-0.073786)
+ Old Momentum Direction: (0.544743,-0.571754,-0.613476)
+ Old Polarization:       (0.760348,0.645318,0.0737296)
+ New Momentum Direction: (0.544743,0.571754,-0.613476)
+ New Polarization:       (-0.760348,0.645318,-0.0737296)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54479,0.57176,-0.61344)
- Old Polarization:       (-0.76035,0.64531,-0.073786)
- New Momentum Direction: (-0.54479,0.57176,-0.61344)
- New Polarization:       (-0.76035,-0.64531,0.073786)
+ Old Momentum Direction: (0.544743,0.571754,-0.613476)
+ Old Polarization:       (-0.760348,0.645318,-0.0737296)
+ New Momentum Direction: (-0.544743,0.571754,-0.613476)
+ New Polarization:       (-0.760348,-0.645318,0.0737296)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 707, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87457,-0.46618,-0.13344)
- Old Polarization:       (-0.39725,-0.53102,-0.74847)
- New Momentum Direction: (0.75461,-0.63084,-0.18057)
- New Polarization:       (-0.5855,-0.5231,-0.61932)
+ Old Momentum Direction: (0.874582,-0.466173,-0.133375)
+ Old Polarization:       (-0.397195,-0.531022,-0.7485)
+ New Momentum Direction: (0.754635,-0.630834,-0.180486)
+ New Polarization:       (-0.585438,-0.523129,-0.619354)
  *** FresnelRefraction *** 
 Track (trackID 706, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87401,-0.46687,-0.13468)
- Old Polarization:       (-0.39853,-0.53019,-0.74838)
- New Momentum Direction: (0.75263,-0.63264,-0.18251)
- New Polarization:       (-0.58815,-0.52133,-0.6183)
+ Old Momentum Direction: (0.874024,-0.466862,-0.134617)
+ Old Polarization:       (-0.398471,-0.530187,-0.748414)
+ New Momentum Direction: (0.752658,-0.632637,-0.182417)
+ New Polarization:       (-0.588085,-0.521361,-0.618335)
  *** FresnelRefraction *** 
 Track (trackID 705, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.408,-0.040835,0.91207)
- Old Polarization:       (-0.9121,-0.062189,0.40523)
- New Momentum Direction: (0.55172,-0.055219,0.8322)
- New Polarization:       (0.8117,-0.19381,-0.55098)
+ Old Momentum Direction: (0.407932,-0.0408344,0.912099)
+ Old Polarization:       (-0.912128,-0.0621928,0.405161)
+ New Momentum Direction: (0.551625,-0.0552183,0.832262)
+ New Polarization:       (0.811753,-0.193841,-0.550893)
  *** FresnelRefraction *** 
 Track (trackID 704, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
@@ -7862,18 +7848,18 @@ Track (trackID 703, parentID 1) is processed with stopping code 2
 Track (trackID 702, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88536,-0.43616,-0.16094)
- Old Polarization:       (-0.38597,-0.49662,-0.77743)
- New Momentum Direction: (0.77669,-0.59093,-0.21805)
- New Polarization:       (-0.56654,-0.5041,-0.65186)
+ Old Momentum Direction: (0.885375,-0.436157,-0.160871)
+ Old Polarization:       (-0.38591,-0.496621,-0.777458)
+ New Momentum Direction: (0.776723,-0.590929,-0.217957)
+ New Polarization:       (-0.566469,-0.504128,-0.651896)
  *** FresnelRefraction *** 
 Track (trackID 701, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90238,-0.38314,-0.19728)
- Old Polarization:       (-0.36616,-0.44024,-0.81983)
- New Momentum Direction: (0.81269,-0.51805,-0.26675)
- New Polarization:       (-0.531,-0.46991,-0.70514)
+ Old Momentum Direction: (0.902394,-0.383134,-0.197215)
+ Old Polarization:       (-0.366093,-0.440243,-0.819855)
+ New Momentum Direction: (0.812723,-0.518048,-0.266661)
+ New Polarization:       (-0.530927,-0.469943,-0.705174)
  *** FresnelRefraction *** 
 Track (trackID 700, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
@@ -7882,253 +7868,253 @@ Track (trackID 700, parentID 1) is processed with stopping code 2
 Track (trackID 699, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73745,0.6615,0.13632)
- Old Polarization:       (-0.54912,0.70474,-0.44922)
- New Momentum Direction: (0.39591,0.89939,0.18534)
- New Polarization:       (-0.82772,0.43692,-0.35212)
+ Old Momentum Direction: (0.737438,0.661504,0.136374)
+ Old Polarization:       (-0.549092,0.704741,-0.449264)
+ New Momentum Direction: (0.395865,0.899395,0.185418)
+ New Polarization:       (-0.827701,0.436911,-0.352165)
  *** FresnelRefraction *** 
 Track (trackID 698, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95102,0.025997,-0.30804)
- Old Polarization:       (-0.30842,0.011871,-0.95118)
- New Momentum Direction: (0.90959,0.034943,-0.41403)
- New Polarization:       (-0.41498,0.02614,-0.90946)
+ Old Momentum Direction: (0.951041,0.0260016,-0.307968)
+ Old Polarization:       (-0.308345,0.0118708,-0.951201)
+ New Momentum Direction: (0.909635,0.0349484,-0.413936)
+ New Polarization:       (-0.41488,0.0261485,-0.9095)
  *** FresnelRefraction *** 
 Track (trackID 697, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80107,0.59856,-0.0038255)
- Old Polarization:       (-0.47936,0.63769,-0.60296)
- New Momentum Direction: (0.58242,0.81287,-0.0051952)
- New Polarization:       (-0.71978,0.51273,-0.468)
+ Old Momentum Direction: (0.80107,0.598559,-0.00376438)
+ Old Polarization:       (-0.479318,0.637693,-0.602994)
+ New Momentum Direction: (0.582413,0.812877,-0.00511224)
+ New Polarization:       (-0.719744,0.512741,-0.468045)
  *** FresnelRefraction *** 
 Track (trackID 696, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56774,0.63197,0.52753)
- Old Polarization:       (-0.73516,0.67758,-0.02053)
- New Momentum Direction: (0.56774,-0.63197,0.52753)
- New Polarization:       (0.73516,0.67758,0.02053)
+ Old Momentum Direction: (0.5677,0.631967,0.527574)
+ Old Polarization:       (-0.735159,0.677582,-0.020584)
+ New Momentum Direction: (0.5677,-0.631967,0.527574)
+ New Polarization:       (0.735159,0.677582,0.020584)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56774,-0.63197,0.52753)
- Old Polarization:       (0.73516,0.67758,0.02053)
- New Momentum Direction: (-0.56774,-0.63197,0.52753)
- New Polarization:       (0.73516,-0.67758,-0.02053)
+ Old Momentum Direction: (0.5677,-0.631967,0.527574)
+ Old Polarization:       (0.735159,0.677582,0.020584)
+ New Momentum Direction: (-0.5677,-0.631967,0.527574)
+ New Polarization:       (0.735159,-0.677582,-0.020584)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56774,-0.63197,0.52753)
- Old Polarization:       (0.73516,-0.67758,-0.02053)
- New Momentum Direction: (-0.56774,-0.63197,-0.52753)
- New Polarization:       (-0.73516,0.67758,-0.02053)
+ Old Momentum Direction: (-0.5677,-0.631967,0.527574)
+ Old Polarization:       (0.735159,-0.677582,-0.020584)
+ New Momentum Direction: (-0.5677,-0.631967,-0.527574)
+ New Polarization:       (-0.735159,0.677582,-0.020584)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 695, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86352,-0.49216,-0.11005)
- Old Polarization:       (-0.41001,-0.5581,-0.7214)
- New Momentum Direction: (0.73012,-0.66685,-0.14911)
- New Polarization:       (-0.6074,-0.5334,-0.58868)
+ Old Momentum Direction: (0.863534,-0.492151,-0.10998)
+ Old Polarization:       (-0.409957,-0.558098,-0.721431)
+ New Momentum Direction: (0.730147,-0.666842,-0.149018)
+ New Polarization:       (-0.607337,-0.533432,-0.588721)
  *** FresnelRefraction *** 
 Track (trackID 694, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41573,0.20861,0.88524)
- Old Polarization:       (-0.90278,0.21266,0.37386)
- New Momentum Direction: (0.56286,0.28244,0.7768)
- New Polarization:       (0.39998,0.72936,-0.55502)
+ Old Momentum Direction: (0.415667,0.208614,0.885269)
+ Old Polarization:       (-0.902807,0.212654,0.373789)
+ New Momentum Direction: (0.56277,0.282442,0.776863)
+ New Polarization:       (0.399942,0.729453,-0.554928)
  *** FresnelRefraction *** 
 Track (trackID 693, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,0.56055,0.6459)
- Old Polarization:       (-0.79046,0.60226,0.11158)
- New Momentum Direction: (0.51826,0.56055,-0.6459)
- New Polarization:       (0.79046,-0.60226,0.11158)
+ Old Momentum Direction: (0.518208,0.560552,0.645943)
+ Old Polarization:       (-0.790475,0.602257,0.111517)
+ New Momentum Direction: (0.518208,0.560552,-0.645943)
+ New Polarization:       (0.790475,-0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,0.56055,-0.6459)
- Old Polarization:       (0.79046,-0.60226,0.11158)
- New Momentum Direction: (0.51826,-0.56055,-0.6459)
- New Polarization:       (-0.79046,-0.60226,-0.11158)
+ Old Momentum Direction: (0.518208,0.560552,-0.645943)
+ Old Polarization:       (0.790475,-0.602257,0.111517)
+ New Momentum Direction: (0.518208,-0.560552,-0.645943)
+ New Polarization:       (-0.790475,-0.602257,-0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,-0.56055,-0.6459)
- Old Polarization:       (-0.79046,-0.60226,-0.11158)
- New Momentum Direction: (-0.51826,-0.56055,-0.6459)
- New Polarization:       (-0.79046,0.60226,0.11158)
+ Old Momentum Direction: (0.518208,-0.560552,-0.645943)
+ Old Polarization:       (-0.790475,-0.602257,-0.111517)
+ New Momentum Direction: (-0.518208,-0.560552,-0.645943)
+ New Polarization:       (-0.790475,0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,-0.56055,-0.6459)
- Old Polarization:       (-0.79046,0.60226,0.11158)
- New Momentum Direction: (-0.51826,-0.56055,0.6459)
- New Polarization:       (0.79046,-0.60226,0.11158)
+ Old Momentum Direction: (-0.518208,-0.560552,-0.645943)
+ Old Polarization:       (-0.790475,0.602257,0.111517)
+ New Momentum Direction: (-0.518208,-0.560552,0.645943)
+ New Polarization:       (0.790475,-0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,-0.56055,0.6459)
- Old Polarization:       (0.79046,-0.60226,0.11158)
- New Momentum Direction: (-0.51826,0.56055,0.6459)
- New Polarization:       (-0.79046,-0.60226,-0.11158)
+ Old Momentum Direction: (-0.518208,-0.560552,0.645943)
+ Old Polarization:       (0.790475,-0.602257,0.111517)
+ New Momentum Direction: (-0.518208,0.560552,0.645943)
+ New Polarization:       (-0.790475,-0.602257,-0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,0.56055,0.6459)
- Old Polarization:       (-0.79046,-0.60226,-0.11158)
- New Momentum Direction: (0.51826,0.56055,0.6459)
- New Polarization:       (-0.79046,0.60226,0.11158)
+ Old Momentum Direction: (-0.518208,0.560552,0.645943)
+ Old Polarization:       (-0.790475,-0.602257,-0.111517)
+ New Momentum Direction: (0.518208,0.560552,0.645943)
+ New Polarization:       (-0.790475,0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,0.56055,0.6459)
- Old Polarization:       (-0.79046,0.60226,0.11158)
- New Momentum Direction: (0.51826,0.56055,-0.6459)
- New Polarization:       (0.79046,-0.60226,0.11158)
+ Old Momentum Direction: (0.518208,0.560552,0.645943)
+ Old Polarization:       (-0.790475,0.602257,0.111517)
+ New Momentum Direction: (0.518208,0.560552,-0.645943)
+ New Polarization:       (0.790475,-0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,0.56055,-0.6459)
- Old Polarization:       (0.79046,-0.60226,0.11158)
- New Momentum Direction: (0.51826,-0.56055,-0.6459)
- New Polarization:       (-0.79046,-0.60226,-0.11158)
+ Old Momentum Direction: (0.518208,0.560552,-0.645943)
+ Old Polarization:       (0.790475,-0.602257,0.111517)
+ New Momentum Direction: (0.518208,-0.560552,-0.645943)
+ New Polarization:       (-0.790475,-0.602257,-0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,-0.56055,-0.6459)
- Old Polarization:       (-0.79046,-0.60226,-0.11158)
- New Momentum Direction: (-0.51826,-0.56055,-0.6459)
- New Polarization:       (-0.79046,0.60226,0.11158)
+ Old Momentum Direction: (0.518208,-0.560552,-0.645943)
+ Old Polarization:       (-0.790475,-0.602257,-0.111517)
+ New Momentum Direction: (-0.518208,-0.560552,-0.645943)
+ New Polarization:       (-0.790475,0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,-0.56055,-0.6459)
- Old Polarization:       (-0.79046,0.60226,0.11158)
- New Momentum Direction: (-0.51826,-0.56055,0.6459)
- New Polarization:       (0.79046,-0.60226,0.11158)
+ Old Momentum Direction: (-0.518208,-0.560552,-0.645943)
+ Old Polarization:       (-0.790475,0.602257,0.111517)
+ New Momentum Direction: (-0.518208,-0.560552,0.645943)
+ New Polarization:       (0.790475,-0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,-0.56055,0.6459)
- Old Polarization:       (0.79046,-0.60226,0.11158)
- New Momentum Direction: (-0.51826,0.56055,0.6459)
- New Polarization:       (-0.79046,-0.60226,-0.11158)
+ Old Momentum Direction: (-0.518208,-0.560552,0.645943)
+ Old Polarization:       (0.790475,-0.602257,0.111517)
+ New Momentum Direction: (-0.518208,0.560552,0.645943)
+ New Polarization:       (-0.790475,-0.602257,-0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51826,0.56055,0.6459)
- Old Polarization:       (-0.79046,-0.60226,-0.11158)
- New Momentum Direction: (0.51826,0.56055,0.6459)
- New Polarization:       (-0.79046,0.60226,0.11158)
+ Old Momentum Direction: (-0.518208,0.560552,0.645943)
+ Old Polarization:       (-0.790475,-0.602257,-0.111517)
+ New Momentum Direction: (0.518208,0.560552,0.645943)
+ New Polarization:       (-0.790475,0.602257,0.111517)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51826,0.56055,0.6459)
- Old Polarization:       (-0.79046,0.60226,0.11158)
- New Momentum Direction: (0.51826,0.56055,-0.6459)
- New Polarization:       (0.79046,-0.60226,0.11158)
+ Old Momentum Direction: (0.518208,0.560552,0.645943)
+ Old Polarization:       (-0.790475,0.602257,0.111517)
+ New Momentum Direction: (0.518208,0.560552,-0.645943)
+ New Polarization:       (0.790475,-0.602257,0.111517)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 692, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93834,0.18737,-0.29055)
- Old Polarization:       (-0.32493,0.19087,-0.92628)
- New Momentum Direction: (0.8846,0.25274,-0.39193)
- New Polarization:       (-0.45057,0.24631,-0.85809)
+ Old Momentum Direction: (0.938358,0.187369,-0.290478)
+ Old Polarization:       (-0.324859,0.190872,-0.926302)
+ New Momentum Direction: (0.884637,0.252749,-0.391836)
+ New Polarization:       (-0.450478,0.246346,-0.858128)
  *** FresnelRefraction *** 
 Track (trackID 691, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94044,0.15478,-0.30269)
- Old Polarization:       (-0.32551,0.15307,-0.93307)
- New Momentum Direction: (0.88757,0.20973,-0.41016)
- New Polarization:       (-0.44987,0.20294,-0.86973)
+ Old Momentum Direction: (0.94046,0.15478,-0.302617)
+ Old Polarization:       (-0.325438,0.153066,-0.933092)
+ New Momentum Direction: (0.887614,0.209736,-0.410063)
+ New Polarization:       (-0.44978,0.20297,-0.869771)
  *** FresnelRefraction *** 
 Track (trackID 690, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94554,-0.1201,-0.30253)
- Old Polarization:       (-0.31851,-0.14973,-0.93602)
- New Momentum Direction: (0.89793,-0.16239,-0.40908)
- New Polarization:       (-0.43496,-0.18537,-0.88116)
+ Old Momentum Direction: (0.945565,-0.120092,-0.302463)
+ Old Polarization:       (-0.318434,-0.149727,-0.936046)
+ New Momentum Direction: (0.897977,-0.162386,-0.408983)
+ New Polarization:       (-0.434869,-0.185394,-0.881203)
  *** FresnelRefraction *** 
 Track (trackID 689, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88863,-0.42652,-0.16854)
- Old Polarization:       (-0.38235,-0.48607,-0.78584)
- New Momentum Direction: (0.78355,-0.57785,-0.22834)
- New Polarization:       (-0.5602,-0.49806,-0.6619)
+ Old Momentum Direction: (0.88865,-0.426518,-0.168476)
+ Old Polarization:       (-0.382286,-0.48607,-0.785871)
+ New Momentum Direction: (0.78358,-0.577844,-0.22825)
+ New Polarization:       (-0.560131,-0.498095,-0.661933)
  *** FresnelRefraction *** 
 Track (trackID 688, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40346,0.014009,0.91489)
- Old Polarization:       (-0.91497,-0.0016724,0.40352)
- New Momentum Direction: (0.54734,0.019005,0.83669)
- New Polarization:       (0.83523,0.050893,-0.54754)
+ Old Momentum Direction: (0.403396,0.0140098,0.914918)
+ Old Polarization:       (-0.914997,-0.00167647,0.403457)
+ New Momentum Direction: (0.547249,0.0190058,0.836754)
+ New Polarization:       (0.83529,0.050905,-0.547447)
  *** FresnelRefraction *** 
 Track (trackID 687, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51171,-0.50171,0.69745)
- Old Polarization:       (-0.79917,-0.57595,0.17204)
- New Momentum Direction: (0.6893,-0.67582,0.26102)
- New Polarization:       (-0.58778,-0.73231,-0.34386)
+ Old Momentum Direction: (0.511665,-0.501705,0.697489)
+ Old Polarization:       (-0.799184,-0.575959,0.171979)
+ New Momentum Direction: (0.689233,-0.675817,0.261207)
+ New Polarization:       (-0.58782,-0.73234,-0.343724)
  *** FresnelRefraction *** 
 Track (trackID 686, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45627,-0.35365,0.81654)
- Old Polarization:       (-0.86025,-0.40997,0.30313)
- New Momentum Direction: (0.61536,-0.47695,0.62757)
- New Polarization:       (-0.13877,-0.84928,-0.50938)
+ Old Momentum Direction: (0.456216,-0.35365,0.816577)
+ Old Polarization:       (-0.860271,-0.409979,0.303071)
+ New Momentum Direction: (0.61528,-0.476953,0.627651)
+ New Polarization:       (-0.138854,-0.849323,-0.509283)
  *** FresnelRefraction *** 
 Track (trackID 685, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.5411,-0.57345,0.61511)
-Old Polarization: (-0.76321,-0.64204,0.072831)
-New Polarization: (-0.9959,-0.010781,0.089769)
-Polarization Change: (-0.9959,-0.010781,0.089769)
-New Momentum Direction: (-0.011307,0.99992,-0.0053508)
-Momentum Change: (-0.011307,0.99992,-0.0053508)
+Old Momentum Direction: (0.541061,-0.573446,0.615152)
+Old Polarization: (-0.763209,-0.64204,0.0727743)
+New Polarization: (-0.995908,-0.0107861,0.0897254)
+Polarization Change: (-0.995908,-0.0107861,0.0897254)
+New Momentum Direction: (-0.0113084,0.999922,-0.00531448)
+Momentum Change: (-0.0113084,0.999922,-0.00531448)
  Photon at Boundary! 
- Old Momentum Direction: (-0.011307,0.99992,-0.0053508)
- Old Polarization:       (-0.9959,-0.010781,0.089769)
- New Momentum Direction: (-0.01538,0.99986,-0.0072782)
- New Polarization:       (-0.99931,-0.015617,-0.033655)
+ Old Momentum Direction: (-0.0113084,0.999922,-0.00531448)
+ Old Polarization:       (-0.995908,-0.0107861,0.0897254)
+ New Momentum Direction: (-0.0153818,0.999856,-0.00722884)
+ New Polarization:       (-0.999325,-0.0156141,-0.0332476)
  *** FresnelRefraction *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.01538,0.99986,-0.0072782)
- Old Polarization:       (-0.99931,-0.015617,-0.033655)
- New Momentum Direction: (-0.011307,0.99992,-0.0053508)
- New Polarization:       (-0.99591,-0.010781,0.089761)
+ Old Momentum Direction: (-0.0153818,0.999856,-0.00722884)
+ Old Polarization:       (-0.999325,-0.0156141,-0.0332476)
+ New Momentum Direction: (-0.0113084,0.999922,-0.00531448)
+ New Polarization:       (-0.995909,-0.0107862,0.0897166)
  *** FresnelRefraction *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.011307,0.99992,-0.0053508)
- Old Polarization:       (-0.99591,-0.010781,0.089761)
- New Momentum Direction: (-0.01538,0.99986,-0.0072782)
- New Polarization:       (-0.99931,-0.015617,-0.033663)
+ Old Momentum Direction: (-0.0113084,0.999922,-0.00531448)
+ Old Polarization:       (-0.995909,-0.0107862,0.0897166)
+ New Momentum Direction: (-0.0153818,0.999856,-0.00722884)
+ New Polarization:       (-0.999325,-0.0156141,-0.033255)
  *** FresnelRefraction *** 
 Track (trackID 684, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92049,0.28501,-0.26735)
- Old Polarization:       (-0.34942,0.29398,-0.88965)
- New Momentum Direction: (0.84719,0.3875,-0.36349)
- New Polarization:       (-0.4993,0.34686,-0.79397)
+ Old Momentum Direction: (0.920506,0.285012,-0.267276)
+ Old Polarization:       (-0.349349,0.293978,-0.889681)
+ New Momentum Direction: (0.847224,0.387504,-0.36339)
+ New Polarization:       (-0.499225,0.346894,-0.794002)
  *** FresnelRefraction *** 
 Track (trackID 683, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95016,0.02582,-0.31068)
- Old Polarization:       (-0.31105,0.011564,-0.95032)
- New Momentum Direction: (0.90749,0.03479,-0.41863)
- New Polarization:       (-0.41955,0.025665,-0.90737)
+ Old Momentum Direction: (0.950186,0.0258238,-0.310612)
+ Old Polarization:       (-0.310979,0.0115641,-0.950346)
+ New Momentum Direction: (0.907536,0.0347958,-0.41853)
+ New Polarization:       (-0.419457,0.0256732,-0.907412)
  *** FresnelRefraction *** 
 Track (trackID 682, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42089,0.27643,0.86397)
- Old Polarization:       (-0.89452,0.28462,0.3447)
- New Momentum Direction: (0.57223,0.37583,0.7289)
- New Polarization:       (0.15123,0.8252,-0.54421)
+ Old Momentum Direction: (0.42082,0.27643,0.864)
+ Old Polarization:       (-0.894548,0.28462,0.344637)
+ New Momentum Direction: (0.572145,0.375833,0.728971)
+ New Polarization:       (0.151156,0.825277,-0.544123)
  *** FresnelRefraction *** 
 Track (trackID 681, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
@@ -8145,42 +8131,42 @@ Track (trackID 679, parentID 1) is processed with stopping code 2
 Track (trackID 678, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81983,0.57063,-0.047535)
- Old Polarization:       (-0.45923,0.60565,-0.64985)
- New Momentum Direction: (0.62766,0.7758,-0.064627)
- New Polarization:       (-0.68896,0.51491,-0.5101)
+ Old Momentum Direction: (0.819835,0.570629,-0.0474728)
+ Old Polarization:       (-0.459179,0.605646,-0.649883)
+ New Momentum Direction: (0.62766,0.775808,-0.0645425)
+ New Polarization:       (-0.68892,0.514923,-0.510141)
  *** FresnelRefraction *** 
 Track (trackID 677, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81583,0.5779,-0.021176)
- Old Polarization:       (-0.46036,0.62687,-0.62857)
- New Momentum Direction: (0.62734,0.77823,-0.028517)
- New Polarization:       (-0.68432,0.53342,-0.49716)
+ Old Momentum Direction: (0.815833,0.577903,-0.0211142)
+ Old Polarization:       (-0.460319,0.626871,-0.628601)
+ New Momentum Direction: (0.627336,0.778229,-0.0284333)
+ New Polarization:       (-0.684279,0.533437,-0.497199)
  *** FresnelRefraction *** 
 Track (trackID 676, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42105,0.27002,0.86591)
- Old Polarization:       (-0.89505,0.27837,0.34841)
- New Momentum Direction: (0.57179,0.3667,0.73389)
- New Polarization:       (0.1756,0.81912,-0.54609)
+ Old Momentum Direction: (0.420982,0.270025,0.865945)
+ Old Polarization:       (-0.895081,0.278362,0.348346)
+ New Momentum Direction: (0.571698,0.366697,0.733958)
+ New Polarization:       (0.17552,0.819193,-0.545999)
  *** FresnelRefraction *** 
 Track (trackID 675, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49297,0.49473,0.7157)
- Old Polarization:       (-0.82111,0.53655,0.19468)
- New Momentum Direction: (0.66257,0.66494,0.34475)
- New Polarization:       (-0.55364,0.7448,-0.3725)
+ Old Momentum Direction: (0.492912,0.494735,0.715733)
+ Old Polarization:       (-0.821123,0.536545,0.194617)
+ New Momentum Direction: (0.662494,0.664944,0.344891)
+ New Polarization:       (-0.553705,0.744811,-0.372381)
  *** FresnelRefraction *** 
 Track (trackID 674, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94191,-0.16048,-0.29504)
- Old Polarization:       (-0.32318,-0.1939,-0.92626)
- New Momentum Direction: (0.89069,-0.21722,-0.39936)
- New Polarization:       (-0.44515,-0.23843,-0.86313)
+ Old Momentum Direction: (0.941934,-0.160474,-0.294973)
+ Old Polarization:       (-0.323106,-0.193899,-0.926286)
+ New Momentum Direction: (0.890734,-0.217212,-0.399263)
+ New Polarization:       (-0.445057,-0.238454,-0.863171)
  *** FresnelRefraction *** 
 Track (trackID 673, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
@@ -8189,10 +8175,10 @@ Track (trackID 673, parentID 1) is processed with stopping code 2
 Track (trackID 672, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94161,-0.1459,-0.30346)
- Old Polarization:       (-0.32656,-0.17606,-0.92863)
- New Momentum Direction: (0.88899,-0.19842,-0.41272)
- New Polarization:       (-0.45044,-0.21653,-0.86615)
+ Old Momentum Direction: (0.94163,-0.145892,-0.303394)
+ Old Polarization:       (-0.326492,-0.17606,-0.928658)
+ New Momentum Direction: (0.889031,-0.198415,-0.412619)
+ New Polarization:       (-0.45035,-0.216558,-0.866191)
  *** FresnelRefraction *** 
 Track (trackID 671, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
@@ -8201,96 +8187,96 @@ Track (trackID 671, parentID 1) is processed with stopping code 2
 Track (trackID 670, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75396,-0.63996,0.14832)
- Old Polarization:       (-0.52984,-0.72588,-0.4386)
- New Momentum Direction: (0.46151,-0.86423,0.2003)
- New Polarization:       (-0.79183,-0.5031,-0.34625)
+ Old Momentum Direction: (0.75395,-0.639955,0.148378)
+ Old Polarization:       (-0.529803,-0.725879,-0.438643)
+ New Momentum Direction: (0.461488,-0.864221,0.200376)
+ New Polarization:       (-0.791808,-0.503111,-0.346294)
  *** FresnelRefraction *** 
 Track (trackID 669, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48603,-0.46744,0.73843)
- Old Polarization:       (-0.82364,-0.52751,0.2082)
- New Momentum Direction: (0.48603,-0.46744,-0.73843)
- New Polarization:       (0.6281,0.77434,-0.076754)
+ Old Momentum Direction: (0.485982,-0.467435,0.738462)
+ Old Polarization:       (-0.823653,-0.527518,0.208136)
+ New Momentum Direction: (0.485982,-0.467435,-0.738462)
+ New Polarization:       (0.628193,0.774269,-0.0766857)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48603,-0.46744,-0.73843)
- Old Polarization:       (0.6281,0.77434,-0.076754)
- New Momentum Direction: (-0.48603,-0.46744,-0.73843)
- New Polarization:       (0.6281,-0.77434,0.076754)
+ Old Momentum Direction: (0.485982,-0.467435,-0.738462)
+ Old Polarization:       (0.628193,0.774269,-0.0766857)
+ New Momentum Direction: (-0.485982,-0.467435,-0.738462)
+ New Polarization:       (0.628193,-0.774269,0.0766857)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48603,-0.46744,-0.73843)
- Old Polarization:       (0.6281,-0.77434,0.076754)
- New Momentum Direction: (-0.48603,0.46744,-0.73843)
- New Polarization:       (-0.6281,-0.77434,-0.076754)
+ Old Momentum Direction: (-0.485982,-0.467435,-0.738462)
+ Old Polarization:       (0.628193,-0.774269,0.0766857)
+ New Momentum Direction: (-0.485982,0.467435,-0.738462)
+ New Polarization:       (-0.628193,-0.774269,-0.0766857)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48603,0.46744,-0.73843)
- Old Polarization:       (-0.6281,-0.77434,-0.076754)
- New Momentum Direction: (-0.66051,0.63524,-0.40024)
- New Polarization:       (-0.7318,-0.6639,0.15397)
+ Old Momentum Direction: (-0.485982,0.467435,-0.738462)
+ Old Polarization:       (-0.628193,-0.774269,-0.0766857)
+ New Momentum Direction: (-0.660442,0.635237,-0.400362)
+ New Polarization:       (-0.731821,-0.663909,0.153827)
  *** FresnelRefraction *** 
 Track (trackID 668, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40216,-0.036395,0.91484)
- Old Polarization:       (-0.91481,-0.056674,0.39989)
- New Momentum Direction: (0.5469,-0.049493,0.83574)
- New Polarization:       (0.81894,-0.17573,-0.54631)
+ Old Momentum Direction: (0.402094,-0.0363942,0.914875)
+ Old Polarization:       (-0.914838,-0.0566779,0.399824)
+ New Momentum Direction: (0.546805,-0.0494922,0.835796)
+ New Polarization:       (0.818994,-0.175759,-0.546221)
  *** FresnelRefraction *** 
 Track (trackID 667, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85901,0.49441,-0.13289)
- Old Polarization:       (-0.4162,0.52324,-0.74364)
- New Momentum Direction: (0.71843,0.67176,-0.18055)
- New Polarization:       (-0.61888,0.49879,-0.6068)
+ Old Momentum Direction: (0.859017,0.494417,-0.132821)
+ Old Polarization:       (-0.416141,0.523236,-0.743674)
+ New Momentum Direction: (0.718451,0.67176,-0.180463)
+ New Polarization:       (-0.618821,0.49881,-0.606835)
  *** FresnelRefraction *** 
 Track (trackID 666, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4071,-0.010858,0.91332)
- Old Polarization:       (-0.91312,-0.029089,0.40666)
- New Momentum Direction: (0.55048,-0.014682,0.83472)
- New Polarization:       (0.83275,-0.061233,-0.55025)
+ Old Momentum Direction: (0.407028,-0.0108574,0.913351)
+ Old Polarization:       (-0.913147,-0.0290934,0.406591)
+ New Momentum Direction: (0.550385,-0.0146814,0.834782)
+ New Polarization:       (0.832809,-0.0612415,-0.550162)
  *** FresnelRefraction *** 
 Track (trackID 665, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40769,0.1452,0.9015)
- Old Polarization:       (-0.9103,0.14215,0.38878)
- New Momentum Direction: (0.55311,0.19699,0.80949)
- New Polarization:       (0.60657,0.57084,-0.55337)
+ Old Momentum Direction: (0.407628,0.145199,0.90153)
+ Old Polarization:       (-0.910328,0.142143,0.388713)
+ New Momentum Direction: (0.553014,0.196987,0.80955)
+ New Polarization:       (0.606566,0.570931,-0.553277)
  *** FresnelRefraction *** 
 Track (trackID 664, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93787,0.18618,-0.29281)
- Old Polarization:       (-0.32661,0.18875,-0.92612)
- New Momentum Direction: (0.88324,0.2516,-0.39571)
- New Polarization:       (-0.4535,0.24363,-0.85731)
+ Old Momentum Direction: (0.937891,0.18618,-0.292743)
+ Old Polarization:       (-0.326545,0.18875,-0.926143)
+ New Momentum Direction: (0.883281,0.251604,-0.395614)
+ New Polarization:       (-0.453407,0.243663,-0.857351)
  *** FresnelRefraction *** 
 Track (trackID 663, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7375,-0.65139,0.17828)
- Old Polarization:       (-0.54867,-0.73183,-0.4042)
- New Momentum Direction: (-0.7375,-0.65139,0.17828)
- New Polarization:       (-0.29765,0.55048,0.77999)
+ Old Momentum Direction: (0.737492,-0.651385,0.178335)
+ Old Polarization:       (-0.548641,-0.731837,-0.404237)
+ New Momentum Direction: (-0.737492,-0.651385,0.178335)
+ New Polarization:       (-0.297641,0.550522,0.779958)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.7375,-0.65139,0.17828)
- Old Polarization:       (-0.29765,0.55048,0.77999)
- New Momentum Direction: (-0.7375,0.65139,0.17828)
- New Polarization:       (0.29765,0.55048,-0.77999)
+ Old Momentum Direction: (-0.737492,-0.651385,0.178335)
+ Old Polarization:       (-0.297641,0.550522,0.779958)
+ New Momentum Direction: (-0.737492,0.651385,0.178335)
+ New Polarization:       (0.297641,0.550522,-0.779958)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.7375,0.65139,0.17828)
- Old Polarization:       (0.29765,0.55048,-0.77999)
- New Momentum Direction: (-0.40161,0.88333,0.24176)
- New Polarization:       (0.53898,0.4414,-0.7174)
+ Old Momentum Direction: (-0.737492,0.651385,0.178335)
+ Old Polarization:       (0.297641,0.550522,-0.779958)
+ New Momentum Direction: (-0.401571,0.883321,0.241835)
+ New Polarization:       (0.538969,0.44143,-0.717392)
  *** FresnelRefraction *** 
 Track (trackID 662, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
@@ -8307,40 +8293,40 @@ Track (trackID 660, parentID 1) is processed with stopping code 2
 Track (trackID 659, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54281,-0.57527,0.6119)
- Old Polarization:       (-0.76145,-0.64447,0.069577)
- New Momentum Direction: (0.54281,-0.57527,-0.6119)
- New Polarization:       (0.76145,0.64447,0.069577)
+ Old Momentum Direction: (0.542763,-0.575268,0.611944)
+ Old Polarization:       (-0.761456,-0.644478,0.06952)
+ New Momentum Direction: (0.542763,-0.575268,-0.611944)
+ New Polarization:       (0.761456,0.644478,0.06952)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54281,-0.57527,-0.6119)
- Old Polarization:       (0.76145,0.64447,0.069577)
- New Momentum Direction: (0.54281,0.57527,-0.6119)
- New Polarization:       (-0.76145,0.64447,-0.069577)
+ Old Momentum Direction: (0.542763,-0.575268,-0.611944)
+ Old Polarization:       (0.761456,0.644478,0.06952)
+ New Momentum Direction: (0.542763,0.575268,-0.611944)
+ New Polarization:       (-0.761456,0.644478,-0.06952)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54281,0.57527,-0.6119)
- Old Polarization:       (-0.76145,0.64447,-0.069577)
- New Momentum Direction: (-0.54281,0.57527,-0.6119)
- New Polarization:       (-0.76145,-0.64447,0.069577)
+ Old Momentum Direction: (0.542763,0.575268,-0.611944)
+ Old Polarization:       (-0.761456,0.644478,-0.06952)
+ New Momentum Direction: (-0.542763,0.575268,-0.611944)
+ New Polarization:       (-0.761456,-0.644478,0.06952)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 658, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82858,0.5575,-0.051511)
- Old Polarization:       (-0.44657,0.6026,-0.66139)
- New Momentum Direction: (0.65597,0.75159,-0.069445)
- New Polarization:       (-0.66362,0.53045,-0.52747)
+ Old Momentum Direction: (0.828582,0.557499,-0.0514479)
+ Old Polarization:       (-0.446523,0.602604,-0.661427)
+ New Momentum Direction: (0.655971,0.751593,-0.0693594)
+ New Polarization:       (-0.663574,0.53047,-0.527513)
  *** FresnelRefraction *** 
 Track (trackID 657, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49059,-0.47434,0.73097)
- Old Polarization:       (-0.81931,-0.53675,0.20157)
- New Momentum Direction: (0.49059,-0.47434,-0.73097)
- New Polarization:       (0.62679,0.77484,-0.08214)
+ Old Momentum Direction: (0.490539,-0.474339,0.731009)
+ Old Polarization:       (-0.819323,-0.536751,0.201513)
+ New Momentum Direction: (0.490539,-0.474339,-0.731009)
+ New Polarization:       (0.626887,0.774776,-0.0820699)
  *** FresnelReflection *** 
 
 ** Photon absorbed! **
@@ -8351,84 +8337,84 @@ Track (trackID 656, parentID 1) is processed with stopping code 2
 Track (trackID 655, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42075,0.20234,0.88433)
- Old Polarization:       (-0.90082,0.20842,0.38091)
- New Momentum Direction: (0.56648,0.27242,0.77775)
- New Polarization:       (0.42385,0.71306,-0.55847)
+ Old Momentum Direction: (0.420682,0.202337,0.884356)
+ Old Polarization:       (-0.900846,0.208414,0.380842)
+ New Momentum Direction: (0.566388,0.272417,0.777813)
+ New Polarization:       (0.423817,0.713151,-0.558386)
  *** FresnelRefraction *** 
 Track (trackID 654, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70522,-0.66073,0.25711)
- Old Polarization:       (-0.5839,-0.74695,-0.318)
- New Momentum Direction: (-0.70522,-0.66073,0.25711)
- New Polarization:       (-0.43932,0.69186,0.573)
+ Old Momentum Direction: (0.705199,-0.660729,0.25716)
+ Old Polarization:       (-0.583872,-0.746955,-0.318045)
+ New Momentum Direction: (-0.705199,-0.660729,0.25716)
+ New Polarization:       (-0.439324,0.691892,0.572957)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70522,-0.66073,0.25711)
- Old Polarization:       (-0.43932,0.69186,0.573)
- New Momentum Direction: (-0.70522,0.66073,0.25711)
- New Polarization:       (0.43932,0.69186,-0.573)
+ Old Momentum Direction: (-0.705199,-0.660729,0.25716)
+ Old Polarization:       (-0.439324,0.691892,0.572957)
+ New Momentum Direction: (-0.705199,0.660729,0.25716)
+ New Polarization:       (0.439324,0.691892,-0.572957)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70522,0.66073,0.25711)
- Old Polarization:       (0.43932,0.69186,-0.573)
- New Momentum Direction: (-0.70522,0.66073,-0.25711)
- New Polarization:       (-0.43932,-0.69186,-0.573)
+ Old Momentum Direction: (-0.705199,0.660729,0.25716)
+ Old Polarization:       (0.439324,0.691892,-0.572957)
+ New Momentum Direction: (-0.705199,0.660729,-0.25716)
+ New Polarization:       (-0.439324,-0.691892,-0.572957)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70522,0.66073,-0.25711)
- Old Polarization:       (-0.43932,-0.69186,-0.573)
- New Momentum Direction: (0.70522,0.66073,-0.25711)
- New Polarization:       (0.27966,0.073998,0.95724)
+ Old Momentum Direction: (-0.705199,0.660729,-0.25716)
+ Old Polarization:       (-0.439324,-0.691892,-0.572957)
+ New Momentum Direction: (0.705199,0.660729,-0.25716)
+ New Polarization:       (0.279715,0.0740176,0.957226)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70522,0.66073,-0.25711)
- Old Polarization:       (0.27966,0.073998,0.95724)
- New Momentum Direction: (0.70522,-0.66073,-0.25711)
- New Polarization:       (-0.27966,0.073998,-0.95724)
+ Old Momentum Direction: (0.705199,0.660729,-0.25716)
+ Old Polarization:       (0.279715,0.0740176,0.957226)
+ New Momentum Direction: (0.705199,-0.660729,-0.25716)
+ New Polarization:       (-0.279715,0.0740176,-0.957226)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 653, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87218,0.46321,-0.15731)
- Old Polarization:       (-0.40064,0.49183,-0.77304)
- New Momentum Direction: (0.7486,0.62781,-0.21321)
- New Polarization:       (-0.5918,0.48768,-0.64183)
+ Old Momentum Direction: (0.872187,0.463209,-0.157247)
+ Old Polarization:       (-0.400584,0.491834,-0.773067)
+ New Momentum Direction: (0.748619,0.627812,-0.213125)
+ New Polarization:       (-0.591736,0.487705,-0.641867)
  *** FresnelRefraction *** 
 Track (trackID 652, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82214,0.56677,-0.053361)
- Old Polarization:       (-0.45684,0.60093,-0.65588)
- New Momentum Direction: (0.63285,0.77087,-0.072577)
- New Polarization:       (-0.68543,0.51417,-0.51557)
+ Old Momentum Direction: (0.822145,0.566778,-0.0532987)
+ Old Polarization:       (-0.456795,0.600927,-0.655915)
+ New Momentum Direction: (0.632854,0.77087,-0.0724912)
+ New Polarization:       (-0.685388,0.514189,-0.515609)
  *** FresnelRefraction *** 
 Track (trackID 651, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94457,-0.1401,-0.29691)
- Old Polarization:       (-0.31856,-0.17238,-0.9321)
- New Momentum Direction: (0.89641,-0.18914,-0.40085)
- New Polarization:       (-0.43598,-0.2133,-0.87431)
+ Old Momentum Direction: (0.944595,-0.140093,-0.296841)
+ Old Polarization:       (-0.318487,-0.172383,-0.932121)
+ New Momentum Direction: (0.896449,-0.189136,-0.400757)
+ New Polarization:       (-0.435887,-0.213327,-0.874353)
  *** FresnelRefraction *** 
 Track (trackID 650, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94797,-0.089562,-0.30551)
- Old Polarization:       (-0.3146,-0.11645,-0.94205)
- New Momentum Direction: (0.90297,-0.12088,-0.41234)
- New Polarization:       (-0.42692,-0.14361,-0.89281)
+ Old Momentum Direction: (0.947992,-0.0895575,-0.305436)
+ Old Polarization:       (-0.314532,-0.116451,-0.942077)
+ New Momentum Direction: (0.90302,-0.120874,-0.412243)
+ New Polarization:       (-0.426828,-0.143628,-0.892854)
  *** FresnelRefraction *** 
 Track (trackID 649, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92825,-0.26129,-0.26473)
- Old Polarization:       (-0.33939,-0.30373,-0.89026)
- New Momentum Direction: (0.86345,-0.35435,-0.35901)
- New Polarization:       (-0.47943,-0.35522,-0.80247)
+ Old Momentum Direction: (0.92827,-0.261286,-0.26466)
+ Old Polarization:       (-0.339323,-0.303731,-0.890285)
+ New Momentum Direction: (0.863495,-0.354339,-0.358915)
+ New Polarization:       (-0.479347,-0.355255,-0.802509)
  *** FresnelRefraction *** 
 Track (trackID 648, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
@@ -8437,30 +8423,30 @@ Track (trackID 648, parentID 1) is processed with stopping code 2
 Track (trackID 647, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90983,0.33621,-0.24325)
- Old Polarization:       (-0.3606,0.35046,-0.86438)
- New Momentum Direction: (0.82594,0.45676,-0.33046)
- New Polarization:       (-0.52106,0.39468,-0.75679)
+ Old Momentum Direction: (0.909849,0.336215,-0.243177)
+ Old Polarization:       (-0.360535,0.35046,-0.864403)
+ New Momentum Direction: (0.82597,0.456762,-0.330366)
+ New Polarization:       (-0.520982,0.394707,-0.756825)
  *** FresnelRefraction *** 
 Track (trackID 646, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60828,0.66008,0.44078)
- Old Polarization:       (-0.69114,0.71355,-0.11478)
- New Momentum Direction: (0.60828,-0.66008,0.44078)
- New Polarization:       (0.69114,0.71355,0.11478)
+ Old Momentum Direction: (0.608241,0.660084,0.440831)
+ Old Polarization:       (-0.691136,0.713544,-0.114832)
+ New Momentum Direction: (0.608241,-0.660084,0.440831)
+ New Polarization:       (0.691136,0.713544,0.114832)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.60828,-0.66008,0.44078)
- Old Polarization:       (0.69114,0.71355,0.11478)
- New Momentum Direction: (-0.60828,-0.66008,0.44078)
- New Polarization:       (0.69114,-0.71355,-0.11478)
+ Old Momentum Direction: (0.608241,-0.660084,0.440831)
+ Old Polarization:       (0.691136,0.713544,0.114832)
+ New Momentum Direction: (-0.608241,-0.660084,0.440831)
+ New Polarization:       (0.691136,-0.713544,-0.114832)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60828,-0.66008,0.44078)
- Old Polarization:       (0.69114,-0.71355,-0.11478)
- New Momentum Direction: (-0.60828,-0.66008,-0.44078)
- New Polarization:       (-0.69114,0.71355,-0.11478)
+ Old Momentum Direction: (-0.608241,-0.660084,0.440831)
+ Old Polarization:       (0.691136,-0.713544,-0.114832)
+ New Momentum Direction: (-0.608241,-0.660084,-0.440831)
+ New Polarization:       (-0.691136,0.713544,-0.114832)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -8483,18 +8469,18 @@ Track (trackID 642, parentID 1) is processed with stopping code 2
 Track (trackID 641, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90068,-0.38683,-0.19786)
- Old Polarization:       (-0.36938,-0.44193,-0.81747)
- New Momentum Direction: (0.80818,-0.52433,-0.26819)
- New Polarization:       (-0.53716,-0.46956,-0.70069)
+ Old Momentum Direction: (0.900694,-0.386821,-0.197788)
+ Old Polarization:       (-0.369316,-0.441935,-0.817496)
+ New Momentum Direction: (0.808211,-0.524327,-0.268098)
+ New Polarization:       (-0.53709,-0.469588,-0.70073)
  *** FresnelRefraction *** 
 Track (trackID 640, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9425,-0.15311,-0.29707)
- Old Polarization:       (-0.3227,-0.18567,-0.92811)
- New Momentum Direction: (0.89177,-0.2073,-0.40221)
- New Polarization:       (-0.44393,-0.22871,-0.86638)
+ Old Momentum Direction: (0.942523,-0.153106,-0.297001)
+ Old Polarization:       (-0.322629,-0.185675,-0.928135)
+ New Momentum Direction: (0.891814,-0.207293,-0.402116)
+ New Polarization:       (-0.443835,-0.22874,-0.866423)
  *** FresnelRefraction *** 
 Track (trackID 639, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
@@ -8503,24 +8489,24 @@ Track (trackID 639, parentID 1) is processed with stopping code 2
 Track (trackID 638, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6359,0.67376,0.37639)
- Old Polarization:       (-0.66048,0.72739,-0.18621)
- New Momentum Direction: (0.85963,0.046357,0.50882)
- New Polarization:       (-0.011932,-0.99378,0.1107)
+ Old Momentum Direction: (0.635871,0.673766,0.37644)
+ Old Polarization:       (-0.660468,0.727386,-0.186259)
+ New Momentum Direction: (0.859586,0.0463941,0.50888)
+ New Polarization:       (-0.0119114,-0.99378,0.110722)
  *** FresnelRefraction *** 
 Track (trackID 637, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93978,0.18284,-0.28876)
- Old Polarization:       (-0.32159,0.18701,-0.92823)
- New Momentum Direction: (-0.93978,0.18284,-0.28876)
- New Polarization:       (0.30239,0.83857,-0.45316)
+ Old Momentum Direction: (0.939802,0.182844,-0.288687)
+ Old Polarization:       (-0.321523,0.187012,-0.928251)
+ New Momentum Direction: (-0.939802,0.182844,-0.288687)
+ New Polarization:       (0.302321,0.83869,-0.452991)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.93978,0.18284,-0.28876)
- Old Polarization:       (0.30239,0.83857,-0.45316)
- New Momentum Direction: (-0.88802,0.24598,-0.38847)
- New Polarization:       (0.42862,0.74867,-0.50574)
+ Old Momentum Direction: (-0.939802,0.182844,-0.288687)
+ Old Polarization:       (0.302321,0.83869,-0.452991)
+ New Momentum Direction: (-0.888062,0.245985,-0.388378)
+ New Polarization:       (0.428536,0.748801,-0.505622)
  *** FresnelRefraction *** 
 Track (trackID 636, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
@@ -8529,10 +8515,10 @@ Track (trackID 636, parentID 1) is processed with stopping code 2
 Track (trackID 635, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43815,-0.29908,0.84769)
- Old Polarization:       (-0.8777,-0.34593,0.33161)
- New Momentum Direction: (0.59361,-0.40519,0.69531)
- New Polarization:       (0.052098,-0.84283,-0.53565)
+ Old Momentum Direction: (0.438089,-0.299079,0.847721)
+ Old Polarization:       (-0.877727,-0.345932,0.33155)
+ New Momentum Direction: (0.593523,-0.405192,0.695378)
+ New Polarization:       (0.0520203,-0.842898,-0.535552)
  *** FresnelRefraction *** 
 Track (trackID 634, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
@@ -8541,162 +8527,162 @@ Track (trackID 634, parentID 1) is processed with stopping code 2
 Track (trackID 633, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48618,0.5035,0.71422)
- Old Polarization:       (-0.8244,0.53533,0.18379)
- New Momentum Direction: (0.48618,0.5035,-0.71422)
- New Polarization:       (0.64675,-0.75696,-0.093378)
+ Old Momentum Direction: (0.486128,0.503503,0.714258)
+ Old Polarization:       (-0.824419,0.535328,0.183734)
+ New Momentum Direction: (0.486128,0.503503,-0.714258)
+ New Polarization:       (0.646853,-0.756885,-0.0933008)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48618,0.5035,-0.71422)
- Old Polarization:       (0.64675,-0.75696,-0.093378)
- New Momentum Direction: (0.48618,-0.5035,-0.71422)
- New Polarization:       (-0.64675,-0.75696,0.093378)
+ Old Momentum Direction: (0.486128,0.503503,-0.714258)
+ Old Polarization:       (0.646853,-0.756885,-0.0933008)
+ New Momentum Direction: (0.486128,-0.503503,-0.714258)
+ New Polarization:       (-0.646853,-0.756885,0.0933008)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48618,-0.5035,-0.71422)
- Old Polarization:       (-0.64675,-0.75696,0.093378)
- New Momentum Direction: (-0.48618,-0.5035,-0.71422)
- New Polarization:       (-0.64675,0.75696,-0.093378)
+ Old Momentum Direction: (0.486128,-0.503503,-0.714258)
+ Old Polarization:       (-0.646853,-0.756885,0.0933008)
+ New Momentum Direction: (-0.486128,-0.503503,-0.714258)
+ New Polarization:       (-0.646853,0.756885,-0.0933008)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 632, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94869,0.0018497,-0.31621)
- Old Polarization:       (-0.31615,-0.015029,-0.94859)
- New Momentum Direction: (0.90363,0.0025053,-0.4283)
- New Polarization:       (-0.42826,-0.0097977,-0.9036)
+ Old Momentum Direction: (0.94871,0.00185379,-0.316142)
+ Old Polarization:       (-0.31608,-0.0150296,-0.948613)
+ New Momentum Direction: (0.90368,0.00251089,-0.428202)
+ New Polarization:       (-0.42816,-0.00979491,-0.90365)
  *** FresnelRefraction *** 
 Track (trackID 631, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94002,0.15277,-0.305)
- Old Polarization:       (-0.32713,0.15023,-0.93296)
- New Momentum Direction: (0.88632,0.20739,-0.41404)
- New Polarization:       (-0.45265,0.19936,-0.86912)
+ Old Momentum Direction: (0.940042,0.152774,-0.304928)
+ Old Polarization:       (-0.327055,0.150229,-0.932988)
+ New Momentum Direction: (0.886362,0.207394,-0.413945)
+ New Polarization:       (-0.452563,0.199388,-0.869156)
  *** FresnelRefraction *** 
 Track (trackID 630, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50035,-0.50267,0.70496)
- Old Polarization:       (-0.80753,-0.56462,0.17055)
- New Momentum Direction: (0.50035,-0.50267,-0.70496)
- New Polarization:       (0.63161,0.76882,-0.099913)
+ Old Momentum Direction: (0.500304,-0.502668,0.704997)
+ Old Polarization:       (-0.807544,-0.564627,0.170494)
+ New Momentum Direction: (0.500304,-0.502668,-0.704997)
+ New Polarization:       (0.631711,0.76875,-0.0998276)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50035,-0.50267,-0.70496)
- Old Polarization:       (0.63161,0.76882,-0.099913)
- New Momentum Direction: (0.50035,0.50267,-0.70496)
- New Polarization:       (-0.63161,0.76882,0.099913)
+ Old Momentum Direction: (0.500304,-0.502668,-0.704997)
+ Old Polarization:       (0.631711,0.76875,-0.0998276)
+ New Momentum Direction: (0.500304,0.502668,-0.704997)
+ New Polarization:       (-0.631711,0.76875,0.0998276)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50035,0.50267,-0.70496)
- Old Polarization:       (-0.63161,0.76882,0.099913)
- New Momentum Direction: (-0.50035,0.50267,-0.70496)
- New Polarization:       (-0.63161,-0.76882,-0.099913)
+ Old Momentum Direction: (0.500304,0.502668,-0.704997)
+ Old Polarization:       (-0.631711,0.76875,0.0998276)
+ New Momentum Direction: (-0.500304,0.502668,-0.704997)
+ New Polarization:       (-0.631711,-0.76875,-0.0998276)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 629, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47657,-0.44136,0.76032)
- Old Polarization:       (-0.83429,-0.49975,0.23283)
- New Momentum Direction: (0.64722,-0.59941,0.47096)
- New Polarization:       (-0.424,-0.7965,-0.43106)
+ Old Momentum Direction: (0.476514,-0.441361,0.760352)
+ Old Polarization:       (-0.834306,-0.49975,0.232772)
+ New Momentum Direction: (0.64715,-0.599409,0.471068)
+ New Polarization:       (-0.424073,-0.796523,-0.430945)
  *** FresnelRefraction *** 
 Track (trackID 628, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74137,0.65737,0.13505)
- Old Polarization:       (-0.5442,0.70664,-0.45222)
- New Momentum Direction: (0.41744,0.89012,0.18287)
- New Polarization:       (-0.81603,0.45573,-0.35553)
+ Old Momentum Direction: (0.741358,0.657369,0.13511)
+ Old Polarization:       (-0.544166,0.706644,-0.452259)
+ New Momentum Direction: (0.417396,0.890118,0.182947)
+ New Polarization:       (-0.816014,0.455728,-0.355574)
  *** FresnelRefraction *** 
 Track (trackID 627, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92463,-0.29345,-0.24279)
- Old Polarization:       (-0.33914,-0.3442,-0.87551)
- New Momentum Direction: (0.85844,-0.39519,-0.32697)
- New Polarization:       (-0.48019,-0.39516,-0.78311)
+ Old Momentum Direction: (0.924648,-0.293448,-0.242724)
+ Old Polarization:       (-0.339068,-0.344205,-0.875531)
+ New Momentum Direction: (0.858477,-0.395184,-0.326875)
+ New Polarization:       (-0.480111,-0.395194,-0.783144)
  *** FresnelRefraction *** 
 Track (trackID 626, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.86684,-0.48348,-0.12183)
-Old Polarization: (-0.40739,-0.54593,-0.73212)
-New Polarization: (-0.70271,-0.3214,-0.63474)
-Polarization Change: (-0.70271,-0.3214,-0.63474)
-New Momentum Direction: (0.64722,-0.65927,-0.3827)
-Momentum Change: (0.64722,-0.65927,-0.3827)
+Old Momentum Direction: (0.86685,-0.483471,-0.121767)
+Old Polarization: (-0.407331,-0.545933,-0.732147)
+New Polarization: (-0.70267,-0.321429,-0.634774)
+Polarization Change: (-0.70267,-0.321429,-0.634774)
+New Momentum Direction: (0.647281,-0.659211,-0.382711)
+Momentum Change: (0.647281,-0.659211,-0.382711)
  Photon at Boundary! 
- Old Momentum Direction: (0.64722,-0.65927,-0.3827)
- Old Polarization:       (-0.70271,-0.3214,-0.63474)
- New Momentum Direction: (-0.64722,-0.65927,-0.3827)
- New Polarization:       (-0.70271,0.3214,0.63474)
+ Old Momentum Direction: (0.647281,-0.659211,-0.382711)
+ Old Polarization:       (-0.70267,-0.321429,-0.634774)
+ New Momentum Direction: (-0.647281,-0.659211,-0.382711)
+ New Polarization:       (-0.70267,0.321429,0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.64722,-0.65927,-0.3827)
- Old Polarization:       (-0.70271,0.3214,0.63474)
- New Momentum Direction: (-0.64722,0.65927,-0.3827)
- New Polarization:       (0.70271,0.3214,-0.63474)
+ Old Momentum Direction: (-0.647281,-0.659211,-0.382711)
+ Old Polarization:       (-0.70267,0.321429,0.634774)
+ New Momentum Direction: (-0.647281,0.659211,-0.382711)
+ New Polarization:       (0.70267,0.321429,-0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.64722,0.65927,-0.3827)
- Old Polarization:       (0.70271,0.3214,-0.63474)
- New Momentum Direction: (-0.64722,0.65927,0.3827)
- New Polarization:       (-0.70271,-0.3214,-0.63474)
+ Old Momentum Direction: (-0.647281,0.659211,-0.382711)
+ Old Polarization:       (0.70267,0.321429,-0.634774)
+ New Momentum Direction: (-0.647281,0.659211,0.382711)
+ New Polarization:       (-0.70267,-0.321429,-0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.64722,0.65927,0.3827)
- Old Polarization:       (-0.70271,-0.3214,-0.63474)
- New Momentum Direction: (0.64722,0.65927,0.3827)
- New Polarization:       (-0.70271,0.3214,0.63474)
+ Old Momentum Direction: (-0.647281,0.659211,0.382711)
+ Old Polarization:       (-0.70267,-0.321429,-0.634774)
+ New Momentum Direction: (0.647281,0.659211,0.382711)
+ New Polarization:       (-0.70267,0.321429,0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.64722,0.65927,0.3827)
- Old Polarization:       (-0.70271,0.3214,0.63474)
- New Momentum Direction: (0.64722,-0.65927,0.3827)
- New Polarization:       (0.70271,0.3214,-0.63474)
+ Old Momentum Direction: (0.647281,0.659211,0.382711)
+ Old Polarization:       (-0.70267,0.321429,0.634774)
+ New Momentum Direction: (0.647281,-0.659211,0.382711)
+ New Polarization:       (0.70267,0.321429,-0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.64722,-0.65927,0.3827)
- Old Polarization:       (0.70271,0.3214,-0.63474)
- New Momentum Direction: (0.64722,-0.65927,-0.3827)
- New Polarization:       (-0.70271,-0.3214,-0.63474)
+ Old Momentum Direction: (0.647281,-0.659211,0.382711)
+ Old Polarization:       (0.70267,0.321429,-0.634774)
+ New Momentum Direction: (0.647281,-0.659211,-0.382711)
+ New Polarization:       (-0.70267,-0.321429,-0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.64722,-0.65927,-0.3827)
- Old Polarization:       (-0.70271,-0.3214,-0.63474)
- New Momentum Direction: (-0.64722,-0.65927,-0.3827)
- New Polarization:       (-0.70271,0.3214,0.63474)
+ Old Momentum Direction: (0.647281,-0.659211,-0.382711)
+ Old Polarization:       (-0.70267,-0.321429,-0.634774)
+ New Momentum Direction: (-0.647281,-0.659211,-0.382711)
+ New Polarization:       (-0.70267,0.321429,0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.64722,-0.65927,-0.3827)
- Old Polarization:       (-0.70271,0.3214,0.63474)
- New Momentum Direction: (-0.64722,0.65927,-0.3827)
- New Polarization:       (0.70271,0.3214,-0.63474)
+ Old Momentum Direction: (-0.647281,-0.659211,-0.382711)
+ Old Polarization:       (-0.70267,0.321429,0.634774)
+ New Momentum Direction: (-0.647281,0.659211,-0.382711)
+ New Polarization:       (0.70267,0.321429,-0.634774)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.64722,0.65927,-0.3827)
- Old Polarization:       (0.70271,0.3214,-0.63474)
- New Momentum Direction: (-0.64722,0.65927,0.3827)
- New Polarization:       (-0.70271,-0.3214,-0.63474)
+ Old Momentum Direction: (-0.647281,0.659211,-0.382711)
+ Old Polarization:       (0.70267,0.321429,-0.634774)
+ New Momentum Direction: (-0.647281,0.659211,0.382711)
+ New Polarization:       (-0.70267,-0.321429,-0.634774)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.64722,0.65927,0.3827)
-Old Polarization: (-0.70271,-0.3214,-0.63474)
-New Polarization: (0.73256,-0.46556,0.49661)
-Polarization Change: (0.73256,-0.46556,0.49661)
-New Momentum Direction: (0.27877,0.87075,0.40508)
-Momentum Change: (0.27877,0.87075,0.40508)
+Old Momentum Direction: (-0.647281,0.659211,0.382711)
+Old Polarization: (-0.70267,-0.321429,-0.634774)
+New Polarization: (0.732563,-0.465526,0.496626)
+Polarization Change: (0.732563,-0.465526,0.496626)
+New Momentum Direction: (0.278714,0.870754,0.4051)
+Momentum Change: (0.278714,0.870754,0.4051)
  Photon at Boundary! 
- Old Momentum Direction: (0.27877,0.87075,0.40508)
- Old Polarization:       (0.73256,-0.46556,0.49661)
- New Momentum Direction: (0.37856,0.74439,0.55007)
- New Polarization:       (0.60559,-0.64864,0.461)
+ Old Momentum Direction: (0.278714,0.870754,0.4051)
+ Old Polarization:       (0.732563,-0.465526,0.496626)
+ New Momentum Direction: (0.378479,0.744405,0.550105)
+ New Polarization:       (0.605601,-0.648607,0.461038)
  *** FresnelRefraction *** 
 Track (trackID 625, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
@@ -8709,65 +8695,65 @@ Track (trackID 624, parentID 1) is processed with stopping code 2
 Track (trackID 623, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40896,0.0089027,0.91251)
- Old Polarization:       (-0.91249,-0.0072656,0.40902)
- New Momentum Direction: (0.5518,0.012012,0.83389)
- New Polarization:       (0.83345,0.027357,-0.55191)
+ Old Momentum Direction: (0.408892,0.00890355,0.912539)
+ Old Polarization:       (-0.912525,-0.00726966,0.408957)
+ New Momentum Direction: (0.551712,0.0120134,0.833948)
+ New Polarization:       (0.833514,0.0273644,-0.55182)
  *** FresnelRefraction *** 
 Track (trackID 622, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.47613,-0.43794,0.76256)
-Old Polarization: (-0.83512,-0.4968,0.23612)
-New Polarization: (0.77188,-0.23936,-0.58899)
-Polarization Change: (0.77188,-0.23936,-0.58899)
-New Momentum Direction: (-0.43102,-0.87803,-0.20805)
-Momentum Change: (-0.43102,-0.87803,-0.20805)
+Old Momentum Direction: (0.476079,-0.43794,0.762599)
+Old Polarization: (-0.835139,-0.496808,0.236061)
+New Polarization: (0.771914,-0.239339,-0.588953)
+Polarization Change: (0.771914,-0.239339,-0.588953)
+New Momentum Direction: (-0.431017,-0.878019,-0.208104)
+Momentum Change: (-0.431017,-0.878019,-0.208104)
  Photon at Boundary! 
- Old Momentum Direction: (-0.43102,-0.87803,-0.20805)
- Old Polarization:       (0.77188,-0.23936,-0.58899)
- New Momentum Direction: (-0.58494,-0.76035,-0.28234)
- New Polarization:       (-0.088796,0.40605,-0.90953)
+ Old Momentum Direction: (-0.431017,-0.878019,-0.208104)
+ Old Polarization:       (0.771914,-0.239339,-0.588953)
+ New Momentum Direction: (-0.584926,-0.760331,-0.282415)
+ New Polarization:       (-0.0886383,0.40603,-0.909551)
  *** FresnelRefraction *** 
 Track (trackID 621, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42618,-0.24035,0.87213)
- Old Polarization:       (-0.89054,-0.28102,0.35773)
- New Momentum Direction: (0.5777,-0.32581,0.74841)
- New Polarization:       (0.2667,-0.79122,-0.55031)
+ Old Momentum Direction: (0.426115,-0.24035,0.872157)
+ Old Polarization:       (-0.890563,-0.281025,0.357662)
+ New Momentum Direction: (0.577615,-0.325804,0.748473)
+ New Polarization:       (0.266644,-0.7913,-0.550222)
  *** FresnelRefraction *** 
 Track (trackID 620, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67802,-0.66013,0.32329)
- Old Polarization:       (-0.61394,-0.75045,-0.24475)
- New Momentum Direction: (0.13171,-0.89026,0.436)
- New Polarization:       (-0.92062,-0.27295,-0.27922)
+ Old Momentum Direction: (0.678001,-0.660124,0.323343)
+ Old Polarization:       (-0.613921,-0.750452,-0.244792)
+ New Momentum Direction: (0.131515,-0.890253,0.436066)
+ New Polarization:       (-0.920629,-0.272814,-0.27931)
  *** FresnelRefraction *** 
 Track (trackID 619, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87049,-0.47679,-0.12216)
- Old Polarization:       (-0.4013,-0.54385,-0.73701)
- New Momentum Direction: (0.74648,-0.64458,-0.16515)
- New Polarization:       (-0.59197,-0.52998,-0.60721)
+ Old Momentum Direction: (0.870501,-0.476782,-0.122093)
+ Old Polarization:       (-0.401245,-0.543847,-0.737043)
+ New Momentum Direction: (0.746509,-0.644576,-0.165062)
+ New Polarization:       (-0.591903,-0.530004,-0.607245)
  *** FresnelRefraction *** 
 Track (trackID 618, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42223,0.28055,0.86198)
- Old Polarization:       (-0.89345,0.28954,0.3434)
- New Momentum Direction: (0.57369,0.38119,0.72496)
- New Polarization:       (0.13649,0.82824,-0.5435)
+ Old Momentum Direction: (0.422161,0.280553,0.862015)
+ Old Polarization:       (-0.893472,0.289535,0.343334)
+ New Momentum Direction: (0.573601,0.381195,0.725032)
+ New Polarization:       (0.136406,0.82831,-0.543411)
  *** FresnelRefraction *** 
 Track (trackID 617, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65999,0.67811,0.32339)
- Old Polarization:       (-0.6339,0.73367,-0.24472)
- New Momentum Direction: (0.89139,0.12108,0.43677)
- New Polarization:       (0.093002,-0.99201,0.085208)
+ Old Momentum Direction: (0.659965,0.67811,0.32344)
+ Old Polarization:       (-0.633886,0.733673,-0.244769)
+ New Momentum Direction: (0.891351,0.121101,0.43684)
+ New Polarization:       (0.0930089,-0.992011,0.0852248)
  *** FresnelRefraction *** 
 Track (trackID 616, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
@@ -8776,45 +8762,45 @@ Track (trackID 616, parentID 1) is processed with stopping code 2
 Track (trackID 615, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.47863,0.49224,0.72706)
-Old Polarization: (-0.8315,0.52006,0.1953)
-New Polarization: (0.97909,-0.031324,0.20101)
-Polarization Change: (0.97909,-0.031324,0.20101)
-New Momentum Direction: (-0.093027,0.80978,0.57932)
-Momentum Change: (-0.093027,0.80978,0.57932)
+Old Momentum Direction: (0.478579,0.492237,0.727093)
+Old Polarization: (-0.831517,0.52006,0.195235)
+New Polarization: (0.979078,-0.0313067,0.201062)
+Polarization Change: (0.979078,-0.0313067,0.201062)
+New Momentum Direction: (-0.0930671,0.809795,0.579284)
+Momentum Change: (-0.0930671,0.809795,0.579284)
  Photon at Boundary! 
- Old Momentum Direction: (-0.093027,0.80978,0.57932)
- Old Polarization:       (0.97909,-0.031324,0.20101)
- New Momentum Direction: (-0.093027,-0.80978,0.57932)
- New Polarization:       (-0.9875,0.00066346,-0.15765)
+ Old Momentum Direction: (-0.0930671,0.809795,0.579284)
+ Old Polarization:       (0.979078,-0.0313067,0.201062)
+ New Momentum Direction: (-0.0930671,-0.809795,0.579284)
+ New Polarization:       (-0.987484,0.000665925,-0.157717)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.093027,-0.80978,0.57932)
- Old Polarization:       (-0.9875,0.00066346,-0.15765)
- New Momentum Direction: (-0.093027,-0.80978,-0.57932)
- New Polarization:       (0.9875,-0.00066346,-0.15765)
+ Old Momentum Direction: (-0.0930671,-0.809795,0.579284)
+ Old Polarization:       (-0.987484,0.000665925,-0.157717)
+ New Momentum Direction: (-0.0930671,-0.809795,-0.579284)
+ New Polarization:       (0.987484,-0.000665925,-0.157717)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.093027,-0.80978,-0.57932)
- Old Polarization:       (0.9875,-0.00066346,-0.15765)
- New Momentum Direction: (-0.12648,-0.603,-0.78765)
- New Polarization:       (0.9872,0.0012824,-0.15951)
+ Old Momentum Direction: (-0.0930671,-0.809795,-0.579284)
+ Old Polarization:       (0.987484,-0.000665925,-0.157717)
+ New Momentum Direction: (-0.126536,-0.603042,-0.78761)
+ New Polarization:       (0.987183,0.00128718,-0.159585)
  *** FresnelRefraction *** 
 Track (trackID 614, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78375,0.61978,0.040146)
- Old Polarization:       (-0.49755,0.66524,-0.55669)
- New Momentum Direction: (0.54103,0.83924,0.054361)
- New Polarization:       (-0.74549,0.5085,-0.43089)
+ Old Momentum Direction: (0.78374,0.619786,0.0402057)
+ Old Polarization:       (-0.497511,0.665235,-0.556728)
+ New Momentum Direction: (0.541018,0.839247,0.0544422)
+ New Polarization:       (-0.745459,0.508512,-0.430936)
  *** FresnelRefraction *** 
 Track (trackID 613, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87389,0.45884,-0.16055)
- Old Polarization:       (-0.39862,0.48736,-0.77691)
- New Momentum Direction: (0.75243,0.62172,-0.21753)
- New Polarization:       (-0.58827,0.48573,-0.64653)
+ Old Momentum Direction: (0.873903,0.458847,-0.160479)
+ Old Polarization:       (-0.398562,0.487356,-0.776938)
+ New Momentum Direction: (0.75245,0.621721,-0.217443)
+ New Polarization:       (-0.588208,0.485757,-0.646569)
  *** FresnelRefraction *** 
 Track (trackID 612, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
@@ -8823,10 +8809,10 @@ Track (trackID 612, parentID 1) is processed with stopping code 2
 Track (trackID 611, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91313,0.32307,-0.24863)
- Old Polarization:       (-0.35646,0.33681,-0.87149)
- New Momentum Direction: (0.83298,0.43849,-0.33746)
- New Polarization:       (-0.51316,0.38415,-0.76752)
+ Old Momentum Direction: (0.913149,0.323073,-0.248559)
+ Old Polarization:       (-0.35639,0.336806,-0.87152)
+ New Momentum Direction: (0.833012,0.438496,-0.337361)
+ New Polarization:       (-0.513087,0.384184,-0.767558)
  *** FresnelRefraction *** 
 Track (trackID 610, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
@@ -8835,18 +8821,18 @@ Track (trackID 610, parentID 1) is processed with stopping code 2
 Track (trackID 609, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42395,-0.24649,0.8715)
- Old Polarization:       (-0.89105,-0.2858,0.35262)
- New Momentum Direction: (0.57652,-0.3352,0.74516)
- New Polarization:       (0.24266,-0.80059,-0.54788)
+ Old Momentum Direction: (0.423882,-0.246493,0.87153)
+ Old Polarization:       (-0.891078,-0.285806,0.352556)
+ New Momentum Direction: (0.576433,-0.335203,0.745227)
+ New Polarization:       (0.242601,-0.800668,-0.547792)
  *** FresnelRefraction *** 
 Track (trackID 608, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79373,0.60816,0.011644)
- Old Polarization:       (-0.48753,0.6475,-0.58571)
- New Momentum Direction: (0.56298,0.82632,0.015821)
- New Polarization:       (-0.73283,0.50795,-0.45271)
+ Old Momentum Direction: (0.793725,0.608165,0.0117044)
+ Old Polarization:       (-0.48749,0.647503,-0.585742)
+ New Momentum Direction: (0.562974,0.826322,0.015903)
+ New Polarization:       (-0.732794,0.507966,-0.452751)
  *** FresnelRefraction *** 
 Track (trackID 607, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
@@ -8855,30 +8841,30 @@ Track (trackID 607, parentID 1) is processed with stopping code 2
 Track (trackID 606, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46158,0.42148,0.78057)
- Old Polarization:       (-0.85379,0.44993,0.26193)
- New Momentum Direction: (0.62317,0.56903,0.53652)
- New Polarization:       (-0.34529,0.81572,-0.46409)
+ Old Momentum Direction: (0.461522,0.421482,0.780609)
+ Old Polarization:       (-0.853809,0.449929,0.261865)
+ New Momentum Direction: (0.623092,0.569035,0.536615)
+ New Polarization:       (-0.345377,0.815739,-0.463987)
  *** FresnelRefraction *** 
 Track (trackID 605, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6364,-0.65068,0.41426)
- Old Polarization:       (-0.66001,-0.7373,-0.14415)
- New Momentum Direction: (0.6364,0.65068,0.41426)
- New Polarization:       (0.66001,-0.7373,0.14415)
+ Old Momentum Direction: (0.63637,-0.650676,0.414312)
+ Old Polarization:       (-0.659994,-0.737302,-0.1442)
+ New Momentum Direction: (0.63637,0.650676,0.414312)
+ New Polarization:       (0.659994,-0.737302,0.1442)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6364,0.65068,0.41426)
- Old Polarization:       (0.66001,-0.7373,0.14415)
- New Momentum Direction: (-0.6364,0.65068,0.41426)
- New Polarization:       (0.66001,0.7373,-0.14415)
+ Old Momentum Direction: (0.63637,0.650676,0.414312)
+ Old Polarization:       (0.659994,-0.737302,0.1442)
+ New Momentum Direction: (-0.63637,0.650676,0.414312)
+ New Polarization:       (0.659994,0.737302,-0.1442)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6364,0.65068,0.41426)
- Old Polarization:       (0.66001,0.7373,-0.14415)
- New Momentum Direction: (-0.6364,0.65068,-0.41426)
- New Polarization:       (-0.66001,-0.7373,-0.14415)
+ Old Momentum Direction: (-0.63637,0.650676,0.414312)
+ Old Polarization:       (0.659994,0.737302,-0.1442)
+ New Momentum Direction: (-0.63637,0.650676,-0.414312)
+ New Polarization:       (-0.659994,-0.737302,-0.1442)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -8897,10 +8883,10 @@ Track (trackID 602, parentID 1) is processed with stopping code 2
 Track (trackID 601, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92268,-0.29844,-0.24412)
- Old Polarization:       (-0.34323,-0.34733,-0.87267)
- New Momentum Direction: (0.85362,-0.40319,-0.3298)
- New Polarization:       (-0.48782,-0.39676,-0.77757)
+ Old Momentum Direction: (0.922702,-0.298432,-0.244048)
+ Old Polarization:       (-0.34316,-0.34733,-0.872698)
+ New Momentum Direction: (0.853661,-0.403182,-0.329709)
+ New Polarization:       (-0.487738,-0.396798,-0.777601)
  *** FresnelRefraction *** 
 Track (trackID 600, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
@@ -8909,34 +8895,34 @@ Track (trackID 600, parentID 1) is processed with stopping code 2
 Track (trackID 599, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60971,0.6609,0.43756)
- Old Polarization:       (-0.68956,0.71449,-0.11834)
- New Momentum Direction: (0.60971,-0.6609,0.43756)
- New Polarization:       (0.68956,0.71449,0.11834)
+ Old Momentum Direction: (0.609672,0.660906,0.437611)
+ Old Polarization:       (-0.689557,0.71449,-0.118388)
+ New Momentum Direction: (0.609672,-0.660906,0.437611)
+ New Polarization:       (0.689557,0.71449,0.118388)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.60971,-0.6609,0.43756)
- Old Polarization:       (0.68956,0.71449,0.11834)
- New Momentum Direction: (-0.60971,-0.6609,0.43756)
- New Polarization:       (0.68956,-0.71449,-0.11834)
+ Old Momentum Direction: (0.609672,-0.660906,0.437611)
+ Old Polarization:       (0.689557,0.71449,0.118388)
+ New Momentum Direction: (-0.609672,-0.660906,0.437611)
+ New Polarization:       (0.689557,-0.71449,-0.118388)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60971,-0.6609,0.43756)
- Old Polarization:       (0.68956,-0.71449,-0.11834)
- New Momentum Direction: (-0.60971,-0.6609,-0.43756)
- New Polarization:       (-0.68956,0.71449,-0.11834)
+ Old Momentum Direction: (-0.609672,-0.660906,0.437611)
+ Old Polarization:       (0.689557,-0.71449,-0.118388)
+ New Momentum Direction: (-0.609672,-0.660906,-0.437611)
+ New Polarization:       (-0.689557,0.71449,-0.118388)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60971,-0.6609,-0.43756)
- Old Polarization:       (-0.68956,0.71449,-0.11834)
- New Momentum Direction: (-0.60971,0.6609,-0.43756)
- New Polarization:       (0.68956,0.71449,0.11834)
+ Old Momentum Direction: (-0.609672,-0.660906,-0.437611)
+ Old Polarization:       (-0.689557,0.71449,-0.118388)
+ New Momentum Direction: (-0.609672,0.660906,-0.437611)
+ New Polarization:       (0.689557,0.71449,0.118388)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.60971,0.6609,-0.43756)
- Old Polarization:       (0.68956,0.71449,0.11834)
- New Momentum Direction: (0.60971,0.6609,-0.43756)
- New Polarization:       (0.68956,-0.71449,-0.11834)
+ Old Momentum Direction: (-0.609672,0.660906,-0.437611)
+ Old Polarization:       (0.689557,0.71449,0.118388)
+ New Momentum Direction: (0.609672,0.660906,-0.437611)
+ New Polarization:       (0.689557,-0.71449,-0.118388)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -8947,96 +8933,96 @@ Track (trackID 598, parentID 1) is processed with stopping code 2
 Track (trackID 597, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5907,0.64647,0.48286)
- Old Polarization:       (-0.71082,0.7001,-0.067743)
- New Momentum Direction: (0.5907,-0.64647,0.48286)
- New Polarization:       (0.71082,0.7001,0.067743)
+ Old Momentum Direction: (0.590664,0.646468,0.482902)
+ Old Polarization:       (-0.710818,0.700101,-0.0677948)
+ New Momentum Direction: (0.590664,-0.646468,0.482902)
+ New Polarization:       (0.710818,0.700101,0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5907,-0.64647,0.48286)
- Old Polarization:       (0.71082,0.7001,0.067743)
- New Momentum Direction: (-0.5907,-0.64647,0.48286)
- New Polarization:       (0.71082,-0.7001,-0.067743)
+ Old Momentum Direction: (0.590664,-0.646468,0.482902)
+ Old Polarization:       (0.710818,0.700101,0.0677948)
+ New Momentum Direction: (-0.590664,-0.646468,0.482902)
+ New Polarization:       (0.710818,-0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,-0.64647,0.48286)
- Old Polarization:       (0.71082,-0.7001,-0.067743)
- New Momentum Direction: (-0.5907,-0.64647,-0.48286)
- New Polarization:       (-0.71082,0.7001,-0.067743)
+ Old Momentum Direction: (-0.590664,-0.646468,0.482902)
+ Old Polarization:       (0.710818,-0.700101,-0.0677948)
+ New Momentum Direction: (-0.590664,-0.646468,-0.482902)
+ New Polarization:       (-0.710818,0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,-0.64647,-0.48286)
- Old Polarization:       (-0.71082,0.7001,-0.067743)
- New Momentum Direction: (-0.5907,0.64647,-0.48286)
- New Polarization:       (0.71082,0.7001,0.067743)
+ Old Momentum Direction: (-0.590664,-0.646468,-0.482902)
+ Old Polarization:       (-0.710818,0.700101,-0.0677948)
+ New Momentum Direction: (-0.590664,0.646468,-0.482902)
+ New Polarization:       (0.710818,0.700101,0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,0.64647,-0.48286)
- Old Polarization:       (0.71082,0.7001,0.067743)
- New Momentum Direction: (0.5907,0.64647,-0.48286)
- New Polarization:       (0.71082,-0.7001,-0.067743)
+ Old Momentum Direction: (-0.590664,0.646468,-0.482902)
+ Old Polarization:       (0.710818,0.700101,0.0677948)
+ New Momentum Direction: (0.590664,0.646468,-0.482902)
+ New Polarization:       (0.710818,-0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5907,0.64647,-0.48286)
- Old Polarization:       (0.71082,-0.7001,-0.067743)
- New Momentum Direction: (0.5907,0.64647,0.48286)
- New Polarization:       (-0.71082,0.7001,-0.067743)
+ Old Momentum Direction: (0.590664,0.646468,-0.482902)
+ Old Polarization:       (0.710818,-0.700101,-0.0677948)
+ New Momentum Direction: (0.590664,0.646468,0.482902)
+ New Polarization:       (-0.710818,0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5907,0.64647,0.48286)
- Old Polarization:       (-0.71082,0.7001,-0.067743)
- New Momentum Direction: (0.5907,-0.64647,0.48286)
- New Polarization:       (0.71082,0.7001,0.067743)
+ Old Momentum Direction: (0.590664,0.646468,0.482902)
+ Old Polarization:       (-0.710818,0.700101,-0.0677948)
+ New Momentum Direction: (0.590664,-0.646468,0.482902)
+ New Polarization:       (0.710818,0.700101,0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5907,-0.64647,0.48286)
- Old Polarization:       (0.71082,0.7001,0.067743)
- New Momentum Direction: (-0.5907,-0.64647,0.48286)
- New Polarization:       (0.71082,-0.7001,-0.067743)
+ Old Momentum Direction: (0.590664,-0.646468,0.482902)
+ Old Polarization:       (0.710818,0.700101,0.0677948)
+ New Momentum Direction: (-0.590664,-0.646468,0.482902)
+ New Polarization:       (0.710818,-0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,-0.64647,0.48286)
- Old Polarization:       (0.71082,-0.7001,-0.067743)
- New Momentum Direction: (-0.5907,-0.64647,-0.48286)
- New Polarization:       (-0.71082,0.7001,-0.067743)
+ Old Momentum Direction: (-0.590664,-0.646468,0.482902)
+ Old Polarization:       (0.710818,-0.700101,-0.0677948)
+ New Momentum Direction: (-0.590664,-0.646468,-0.482902)
+ New Polarization:       (-0.710818,0.700101,-0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,-0.64647,-0.48286)
- Old Polarization:       (-0.71082,0.7001,-0.067743)
- New Momentum Direction: (-0.5907,0.64647,-0.48286)
- New Polarization:       (0.71082,0.7001,0.067743)
+ Old Momentum Direction: (-0.590664,-0.646468,-0.482902)
+ Old Polarization:       (-0.710818,0.700101,-0.0677948)
+ New Momentum Direction: (-0.590664,0.646468,-0.482902)
+ New Polarization:       (0.710818,0.700101,0.0677948)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5907,0.64647,-0.48286)
- Old Polarization:       (0.71082,0.7001,0.067743)
- New Momentum Direction: (0.5907,0.64647,-0.48286)
- New Polarization:       (0.71082,-0.7001,-0.067743)
+ Old Momentum Direction: (-0.590664,0.646468,-0.482902)
+ Old Polarization:       (0.710818,0.700101,0.0677948)
+ New Momentum Direction: (0.590664,0.646468,-0.482902)
+ New Polarization:       (0.710818,-0.700101,-0.0677948)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 596, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49303,0.50027,0.71179)
- Old Polarization:       (-0.82011,0.54034,0.18829)
- New Momentum Direction: (0.66395,0.6737,0.3245)
- New Polarization:       (-0.56908,0.73674,-0.36518)
+ Old Momentum Direction: (0.492979,0.500272,0.711828)
+ Old Polarization:       (-0.820126,0.540335,0.188234)
+ New Momentum Direction: (0.663878,0.6737,0.324646)
+ New Polarization:       (-0.569141,0.736759,-0.365055)
  *** FresnelRefraction *** 
 Track (trackID 595, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40276,0.11214,0.90841)
- Old Polarization:       (-0.91385,0.1052,0.39218)
- New Momentum Direction: (0.54797,0.15257,0.82247)
- New Polarization:       (0.69615,0.46197,-0.54951)
+ Old Momentum Direction: (0.402689,0.112143,0.908441)
+ Old Polarization:       (-0.913882,0.105194,0.392115)
+ New Momentum Direction: (0.547874,0.152574,0.82253)
+ New Polarization:       (0.696171,0.462047,-0.549416)
  *** FresnelRefraction *** 
 Track (trackID 594, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40261,0.083666,0.91154)
- Old Polarization:       (-0.91472,0.074371,0.39718)
- New Momentum Direction: (0.54717,0.11371,0.82926)
- New Polarization:       (0.75816,0.35249,-0.54858)
+ Old Momentum Direction: (0.40254,0.0836665,0.911571)
+ Old Polarization:       (-0.91475,0.0743669,0.397118)
+ New Momentum Direction: (0.547076,0.113708,0.829324)
+ New Polarization:       (0.758198,0.352549,-0.548494)
  *** FresnelRefraction *** 
 Track (trackID 593, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
@@ -9045,62 +9031,62 @@ Track (trackID 593, parentID 1) is processed with stopping code 2
 Track (trackID 592, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40666,0.1025,0.90781)
- Old Polarization:       (-0.91242,0.095685,0.39792)
- New Momentum Direction: (0.55087,0.13886,0.82296)
- New Polarization:       (0.71808,0.42366,-0.55215)
+ Old Momentum Direction: (0.406591,0.102505,0.907842)
+ Old Polarization:       (-0.912447,0.0956807,0.39785)
+ New Momentum Direction: (0.550779,0.138856,0.82302)
+ New Polarization:       (0.718108,0.423734,-0.55206)
  *** FresnelRefraction *** 
 Track (trackID 591, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40535,0.031928,0.91361)
- Old Polarization:       (-0.91416,0.018082,0.40496)
- New Momentum Direction: (0.54885,0.043232,0.8348)
- New Polarization:       (0.82529,0.13077,-0.54936)
+ Old Momentum Direction: (0.405279,0.0319292,0.913635)
+ Old Polarization:       (-0.914186,0.0180783,0.404891)
+ New Momentum Direction: (0.548756,0.0432327,0.834864)
+ New Polarization:       (0.825344,0.130795,-0.549272)
  *** FresnelRefraction *** 
 Track (trackID 590, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49029,0.52094,0.69874)
- Old Polarization:       (-0.81852,0.55063,0.16381)
- New Momentum Direction: (0.49029,0.52094,-0.69874)
- New Polarization:       (0.65077,-0.7521,-0.10409)
+ Old Momentum Direction: (0.490238,0.520942,0.698774)
+ Old Polarization:       (-0.818529,0.550631,0.163754)
+ New Momentum Direction: (0.490238,0.520942,-0.698774)
+ New Polarization:       (0.650881,-0.752022,-0.104002)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49029,0.52094,-0.69874)
- Old Polarization:       (0.65077,-0.7521,-0.10409)
- New Momentum Direction: (0.49029,-0.52094,-0.69874)
- New Polarization:       (-0.65077,-0.7521,0.10409)
+ Old Momentum Direction: (0.490238,0.520942,-0.698774)
+ Old Polarization:       (0.650881,-0.752022,-0.104002)
+ New Momentum Direction: (0.490238,-0.520942,-0.698774)
+ New Polarization:       (-0.650881,-0.752022,0.104002)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49029,-0.52094,-0.69874)
- Old Polarization:       (-0.65077,-0.7521,0.10409)
- New Momentum Direction: (-0.49029,-0.52094,-0.69874)
- New Polarization:       (-0.65077,0.7521,-0.10409)
+ Old Momentum Direction: (0.490238,-0.520942,-0.698774)
+ Old Polarization:       (-0.650881,-0.752022,0.104002)
+ New Momentum Direction: (-0.490238,-0.520942,-0.698774)
+ New Polarization:       (-0.650881,0.752022,-0.104002)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49029,-0.52094,-0.69874)
- Old Polarization:       (-0.65077,0.7521,-0.10409)
- New Momentum Direction: (-0.49029,-0.52094,0.69874)
- New Polarization:       (0.76899,-0.63589,0.065503)
+ Old Momentum Direction: (-0.490238,-0.520942,-0.698774)
+ Old Polarization:       (-0.650881,0.752022,-0.104002)
+ New Momentum Direction: (-0.490238,-0.520942,0.698774)
+ New Polarization:       (0.768981,-0.635917,0.0654114)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49029,-0.52094,0.69874)
- Old Polarization:       (0.76899,-0.63589,0.065503)
- New Momentum Direction: (-0.49029,0.52094,0.69874)
- New Polarization:       (-0.76899,-0.63589,-0.065503)
+ Old Momentum Direction: (-0.490238,-0.520942,0.698774)
+ Old Polarization:       (0.768981,-0.635917,0.0654114)
+ New Momentum Direction: (-0.490238,0.520942,0.698774)
+ New Polarization:       (-0.768981,-0.635917,-0.0654114)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49029,0.52094,0.69874)
- Old Polarization:       (-0.76899,-0.63589,-0.065503)
- New Momentum Direction: (0.49029,0.52094,0.69874)
- New Polarization:       (-0.76899,0.63589,0.065503)
+ Old Momentum Direction: (-0.490238,0.520942,0.698774)
+ Old Polarization:       (-0.768981,-0.635917,-0.0654114)
+ New Momentum Direction: (0.490238,0.520942,0.698774)
+ New Polarization:       (-0.768981,0.635917,0.0654114)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49029,0.52094,0.69874)
- Old Polarization:       (-0.76899,0.63589,0.065503)
- New Momentum Direction: (0.66702,0.70872,0.22979)
- New Polarization:       (-0.69781,0.70234,-0.14061)
+ Old Momentum Direction: (0.490238,0.520942,0.698774)
+ Old Polarization:       (-0.768981,0.635917,0.0654114)
+ New Momentum Direction: (0.666947,0.708719,0.229997)
+ New Polarization:       (-0.697885,0.702314,-0.140397)
  *** FresnelRefraction *** 
 Track (trackID 589, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
@@ -9109,124 +9095,124 @@ Track (trackID 589, parentID 1) is processed with stopping code 2
 Track (trackID 588, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (0.53436,-0.55255,-0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (0.53432,-0.552545,-0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,-0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,-0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (-0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,-0.62657,0.10402)
+ Old Momentum Direction: (0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (-0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,-0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (-0.53436,0.55255,0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (-0.53432,0.552545,0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (-0.53436,-0.55255,0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (-0.53432,-0.552545,0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (0.53436,-0.55255,0.63964)
- New Polarization:       (-0.7724,-0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (0.53432,-0.552545,0.639684)
+ New Polarization:       (-0.772401,-0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (0.53436,-0.55255,-0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (0.53432,-0.552545,-0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,-0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,-0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (-0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,-0.62657,0.10402)
+ Old Momentum Direction: (0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (-0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,-0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (-0.53436,0.55255,0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (-0.53432,0.552545,0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (-0.53436,-0.55255,0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (-0.53432,-0.552545,0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (0.53436,-0.55255,0.63964)
- New Polarization:       (-0.7724,-0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (0.53432,-0.552545,0.639684)
+ New Polarization:       (-0.772401,-0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (0.53436,-0.55255,-0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (0.53432,-0.552545,-0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,-0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,-0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (-0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,-0.62657,0.10402)
+ Old Momentum Direction: (0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (-0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,-0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,-0.63964)
- Old Polarization:       (-0.7724,-0.62657,0.10402)
- New Momentum Direction: (-0.53436,0.55255,0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,-0.639684)
+ Old Polarization:       (-0.772401,-0.62657,0.10396)
+ New Momentum Direction: (-0.53432,0.552545,0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,0.55255,0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (-0.53436,-0.55255,0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (-0.53432,0.552545,0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (-0.53432,-0.552545,0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,-0.55255,0.63964)
- Old Polarization:       (-0.7724,0.62657,-0.10402)
- New Momentum Direction: (-0.53436,-0.55255,-0.63964)
- New Polarization:       (0.7724,-0.62657,-0.10402)
+ Old Momentum Direction: (-0.53432,-0.552545,0.639684)
+ Old Polarization:       (-0.772401,0.62657,-0.10396)
+ New Momentum Direction: (-0.53432,-0.552545,-0.639684)
+ New Polarization:       (0.772401,-0.62657,-0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.53436,-0.55255,-0.63964)
- Old Polarization:       (0.7724,-0.62657,-0.10402)
- New Momentum Direction: (0.53436,-0.55255,-0.63964)
- New Polarization:       (0.7724,0.62657,0.10402)
+ Old Momentum Direction: (-0.53432,-0.552545,-0.639684)
+ Old Polarization:       (0.772401,-0.62657,-0.10396)
+ New Momentum Direction: (0.53432,-0.552545,-0.639684)
+ New Polarization:       (0.772401,0.62657,0.10396)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.53436,-0.55255,-0.63964)
- Old Polarization:       (0.7724,0.62657,0.10402)
- New Momentum Direction: (0.53436,0.55255,-0.63964)
- New Polarization:       (-0.7724,0.62657,-0.10402)
+ Old Momentum Direction: (0.53432,-0.552545,-0.639684)
+ Old Polarization:       (0.772401,0.62657,0.10396)
+ New Momentum Direction: (0.53432,0.552545,-0.639684)
+ New Polarization:       (-0.772401,0.62657,-0.10396)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -9243,419 +9229,348 @@ Track (trackID 1065, parentID 1) is processed with stopping code 2
 Track (trackID 1064, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29957,-0.64737,0.70084)
- Old Polarization:       (-0.74792,-0.61541,-0.24876)
- New Momentum Direction: (0.40751,-0.88063,0.24174)
- New Polarization:       (-0.73107,-0.47323,-0.49153)
+ Old Momentum Direction: (0.299462,-0.647364,0.700887)
+ Old Polarization:       (-0.747903,-0.615398,-0.248853)
+ New Momentum Direction: (0.407365,-0.880623,0.241985)
+ New Polarization:       (-0.730989,-0.47324,-0.491629)
  *** FresnelRefraction *** 
 Track (trackID 1063, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89956,0.40625,0.16048)
- Old Polarization:       (-0.092269,0.53584,-0.83926)
- New Momentum Direction: (0.80443,0.5525,0.21825)
- New Polarization:       (-0.17016,0.56631,-0.80644)
+ Old Momentum Direction: (0.899549,0.40623,0.160591)
+ Old Polarization:       (-0.092146,0.535832,-0.839281)
+ New Momentum Direction: (0.804409,0.552473,0.218404)
+ New Polarization:       (-0.169941,0.566268,-0.806511)
  *** FresnelRefraction *** 
 Track (trackID 1062, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29455,0.48789,0.82171)
- Old Polarization:       (-0.76052,0.64034,-0.10759)
- New Momentum Direction: (0.39597,0.65588,0.64267)
- New Polarization:       (-0.74098,0.64159,-0.19825)
+ Old Momentum Direction: (0.294454,0.487895,0.821739)
+ Old Polarization:       (-0.760492,0.640355,-0.107693)
+ New Momentum Direction: (0.39584,0.655886,0.642748)
+ New Polarization:       (-0.740918,0.641612,-0.198428)
  *** FresnelRefraction *** 
 Track (trackID 1061, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93141,-0.359,0.059891)
- Old Polarization:       (-0.055314,-0.30227,-0.95162)
- New Momentum Direction: (0.86953,-0.48715,0.081269)
- New Polarization:       (-0.10189,-0.33795,-0.93563)
+ Old Momentum Direction: (0.931398,-0.359021,0.0600178)
+ Old Polarization:       (-0.055196,-0.302276,-0.951621)
+ New Momentum Direction: (0.869499,-0.487175,0.0814413)
+ New Polarization:       (-0.101673,-0.337883,-0.93568)
  *** FresnelRefraction *** 
 Track (trackID 1060, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.31453,-0.64911,0.69262)
- Old Polarization:       (-0.7355,-0.62792,-0.25448)
- New Momentum Direction: (0.31453,-0.64911,-0.69262)
- New Polarization:       (0.80473,0.56933,-0.16813)
+ Old Momentum Direction: (0.314425,-0.649108,0.692673)
+ Old Polarization:       (-0.735477,-0.62791,-0.254563)
+ New Momentum Direction: (0.314425,-0.649108,-0.692673)
+ New Polarization:       (0.804822,0.569218,-0.168084)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.31453,-0.64911,-0.69262)
- Old Polarization:       (0.80473,0.56933,-0.16813)
- New Momentum Direction: (0.31453,0.64911,-0.69262)
- New Polarization:       (-0.80473,0.56933,0.16813)
+ Old Momentum Direction: (0.314425,-0.649108,-0.692673)
+ Old Polarization:       (0.804822,0.569218,-0.168084)
+ New Momentum Direction: (0.314425,0.649108,-0.692673)
+ New Polarization:       (-0.804822,0.569218,0.168084)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.31453,0.64911,-0.69262)
- Old Polarization:       (-0.80473,0.56933,0.16813)
- New Momentum Direction: (-0.31453,0.64911,-0.69262)
- New Polarization:       (-0.80473,-0.56933,-0.16813)
+ Old Momentum Direction: (0.314425,0.649108,-0.692673)
+ Old Polarization:       (-0.804822,0.569218,0.168084)
+ New Momentum Direction: (-0.314425,0.649108,-0.692673)
+ New Polarization:       (-0.804822,-0.569218,-0.168084)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.31453,0.64911,-0.69262)
- Old Polarization:       (-0.80473,-0.56933,-0.16813)
- New Momentum Direction: (-0.42478,0.87665,-0.22594)
- New Polarization:       (-0.87686,-0.33636,0.34347)
+ Old Momentum Direction: (-0.314425,0.649108,-0.692673)
+ Old Polarization:       (-0.804822,-0.569218,-0.168084)
+ New Momentum Direction: (-0.424644,0.876645,-0.22621)
+ New Polarization:       (-0.87697,-0.336202,0.343353)
  *** FresnelRefraction *** 
 Track (trackID 1059, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57057,0.62621,0.53132)
- Old Polarization:       (-0.45168,0.77962,-0.43381)
- New Momentum Direction: (0.57057,-0.62621,0.53132)
- New Polarization:       (0.45168,0.77962,0.43381)
+ Old Momentum Direction: (0.57052,0.626202,0.531392)
+ Old Polarization:       (-0.451599,0.779624,-0.433871)
+ New Momentum Direction: (0.57052,-0.626202,0.531392)
+ New Polarization:       (0.451599,0.779624,0.433871)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.57057,-0.62621,0.53132)
- Old Polarization:       (0.45168,0.77962,0.43381)
- New Momentum Direction: (-0.57057,-0.62621,0.53132)
- New Polarization:       (0.45168,-0.77962,-0.43381)
+ Old Momentum Direction: (0.57052,-0.626202,0.531392)
+ Old Polarization:       (0.451599,0.779624,0.433871)
+ New Momentum Direction: (-0.57052,-0.626202,0.531392)
+ New Polarization:       (0.451599,-0.779624,-0.433871)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.57057,-0.62621,0.53132)
- Old Polarization:       (0.45168,-0.77962,-0.43381)
- New Momentum Direction: (-0.57057,-0.62621,-0.53132)
- New Polarization:       (-0.45168,0.77962,-0.43381)
+ Old Momentum Direction: (-0.57052,-0.626202,0.531392)
+ Old Polarization:       (0.451599,-0.779624,-0.433871)
+ New Momentum Direction: (-0.57052,-0.626202,-0.531392)
+ New Polarization:       (-0.451599,0.779624,-0.433871)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.57057,-0.62621,-0.53132)
- Old Polarization:       (-0.45168,0.77962,-0.43381)
- New Momentum Direction: (-0.57057,0.62621,-0.53132)
- New Polarization:       (0.45168,0.77962,0.43381)
+ Old Momentum Direction: (-0.57052,-0.626202,-0.531392)
+ Old Polarization:       (-0.451599,0.779624,-0.433871)
+ New Momentum Direction: (-0.57052,0.626202,-0.531392)
+ New Polarization:       (0.451599,0.779624,0.433871)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.57057,0.62621,-0.53132)
-Old Polarization: (0.45168,0.77962,0.43381)
-New Polarization: (0.29037,-0.90343,-0.31542)
-Polarization Change: (0.29037,-0.90343,-0.31542)
-New Momentum Direction: (-0.93418,-0.19621,-0.298)
-Momentum Change: (-0.93418,-0.19621,-0.298)
+Old Momentum Direction: (-0.57052,0.626202,-0.531392)
+Old Polarization: (0.451599,0.779624,0.433871)
+New Polarization: (0.290456,-0.903391,-0.315469)
+Polarization Change: (0.290456,-0.903391,-0.315469)
+New Momentum Direction: (-0.934155,-0.196266,-0.298051)
+Momentum Change: (-0.934155,-0.196266,-0.298051)
  Photon at Boundary! 
- Old Momentum Direction: (-0.93418,-0.19621,-0.298)
- Old Polarization:       (0.29037,-0.90343,-0.31542)
- New Momentum Direction: (-0.87493,-0.2663,-0.40445)
- New Polarization:       (0.42947,-0.81259,-0.39404)
+ Old Momentum Direction: (-0.934155,-0.196266,-0.298051)
+ Old Polarization:       (0.290456,-0.903391,-0.315469)
+ New Momentum Direction: (-0.874883,-0.266368,-0.404509)
+ New Polarization:       (0.429572,-0.812525,-0.394045)
  *** FresnelRefraction *** 
 Track (trackID 1058, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.20001,-0.54274,0.81574)
- Old Polarization:       (-0.85661,-0.50102,-0.12331)
- New Momentum Direction: (0.27211,-0.73837,0.61707)
- New Polarization:       (-0.83319,-0.5016,-0.23279)
+ Old Momentum Direction: (0.199898,-0.542737,0.815768)
+ Old Polarization:       (-0.856602,-0.501001,-0.123415)
+ New Momentum Direction: (0.271949,-0.738358,0.617148)
+ New Polarization:       (-0.833146,-0.501589,-0.232974)
  *** FresnelRefraction *** 
 Track (trackID 1057, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93795,-0.34264,0.053458)
- Old Polarization:       (-0.04903,-0.28363,-0.95768)
- New Momentum Direction: (-0.93795,-0.34264,0.053458)
- New Polarization:       (0.033046,0.065141,0.99733)
+ Old Momentum Direction: (0.937931,-0.342657,0.0535851)
+ Old Polarization:       (-0.0489107,-0.283643,-0.957682)
+ New Momentum Direction: (-0.937931,-0.342657,0.0535851)
+ New Polarization:       (0.0329609,0.0657362,0.997293)
  *** FresnelReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.93795,-0.34264,0.053458)
-Old Polarization: (0.033046,0.065141,0.99733)
-New Polarization: (-0.78297,0.1327,-0.60773)
-Polarization Change: (-0.78297,0.1327,-0.60773)
-New Momentum Direction: (-0.5819,0.18909,0.79098)
-Momentum Change: (-0.5819,0.18909,0.79098)
+Old Momentum Direction: (-0.937931,-0.342657,0.0535851)
+Old Polarization: (0.0329609,0.0657362,0.997293)
+New Polarization: (-0.783724,0.128755,-0.607617)
+Polarization Change: (-0.783724,0.128755,-0.607617)
+New Momentum Direction: (-0.582602,0.186705,0.791022)
+Momentum Change: (-0.582602,0.186705,0.791022)
 Scattering Photon!
-Old Momentum Direction: (-0.5819,0.18909,0.79098)
-Old Polarization: (-0.78297,0.1327,-0.60773)
-New Polarization: (0.35069,0.84899,0.39526)
-Polarization Change: (0.35069,0.84899,0.39526)
-New Momentum Direction: (-0.70114,0.51782,-0.49017)
-Momentum Change: (-0.70114,0.51782,-0.49017)
+Old Momentum Direction: (-0.582602,0.186705,0.791022)
+Old Polarization: (-0.783724,0.128755,-0.607617)
+New Polarization: (0.346447,0.850744,0.395233)
+Polarization Change: (0.346447,0.850744,0.395233)
+New Momentum Direction: (-0.703823,0.51428,-0.490051)
+Momentum Change: (-0.703823,0.51428,-0.490051)
  Photon at Boundary! 
- Old Momentum Direction: (-0.70114,0.51782,-0.49017)
- Old Polarization:       (0.35069,0.84899,0.39526)
- New Momentum Direction: (-0.70114,-0.51782,-0.49017)
- New Polarization:       (-0.35069,0.84899,-0.39526)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70114,-0.51782,-0.49017)
- Old Polarization:       (-0.35069,0.84899,-0.39526)
- New Momentum Direction: (0.70114,-0.51782,-0.49017)
- New Polarization:       (0.2275,-0.48905,0.84207)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.70114,-0.51782,-0.49017)
- Old Polarization:       (0.2275,-0.48905,0.84207)
- New Momentum Direction: (0.70114,-0.51782,0.49017)
- New Polarization:       (-0.2275,0.48905,0.84207)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.70114,-0.51782,0.49017)
- Old Polarization:       (-0.2275,0.48905,0.84207)
- New Momentum Direction: (-0.70114,-0.51782,0.49017)
- New Polarization:       (-0.14027,-0.57384,-0.80686)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70114,-0.51782,0.49017)
- Old Polarization:       (-0.14027,-0.57384,-0.80686)
- New Momentum Direction: (-0.70114,0.51782,0.49017)
- New Polarization:       (0.14027,-0.57384,0.80686)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70114,0.51782,0.49017)
- Old Polarization:       (0.14027,-0.57384,0.80686)
- New Momentum Direction: (-0.70114,0.51782,-0.49017)
- New Polarization:       (-0.14027,0.57384,0.80686)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.70114,0.51782,-0.49017)
-Old Polarization: (-0.14027,0.57384,0.80686)
-New Polarization: (-0.30262,0.9531,-0.0050685)
-Polarization Change: (-0.30262,0.9531,-0.0050685)
-New Momentum Direction: (-0.045444,-0.01974,-0.99877)
-Momentum Change: (-0.045444,-0.01974,-0.99877)
- Photon at Boundary! 
- Old Momentum Direction: (-0.045444,-0.01974,-0.99877)
- Old Polarization:       (-0.30262,0.9531,-0.0050685)
- New Momentum Direction: (0.045444,-0.01974,-0.99877)
- New Polarization:       (-0.30262,-0.9531,0.0050685)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.045444,-0.01974,-0.99877)
- Old Polarization:       (-0.30262,-0.9531,0.0050685)
- New Momentum Direction: (0.061722,-0.026811,-0.99773)
- New Polarization:       (-0.26798,-0.96338,0.0093102)
+ Old Momentum Direction: (-0.703823,0.51428,-0.490051)
+ Old Polarization:       (0.346447,0.850744,0.395233)
+ New Momentum Direction: (-0.262871,0.698494,-0.665586)
+ New Polarization:       (0.633986,0.645062,0.426565)
  *** FresnelRefraction *** 
 Track (trackID 1056, parentID 1) is processed with stopping code 2
 ### pop requested out of 188 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.28364,-0.62155,0.73022)
- Old Polarization:       (-0.77117,-0.60046,-0.21155)
- New Momentum Direction: (0.28364,-0.62155,-0.73022)
- New Polarization:       (0.86611,0.4929,-0.083122)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.28364,-0.62155,-0.73022)
- Old Polarization:       (0.86611,0.4929,-0.083122)
- New Momentum Direction: (0.28364,0.62155,-0.73022)
- New Polarization:       (-0.86611,0.4929,0.083122)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.28364,0.62155,-0.73022)
- Old Polarization:       (-0.86611,0.4929,0.083122)
- New Momentum Direction: (-0.28364,0.62155,-0.73022)
- New Polarization:       (-0.86611,-0.4929,-0.083122)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1055, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.124241,-0.382014,0.915767)
+ Old Polarization:       (-0.944129,-0.329443,-0.00933877)
+ New Momentum Direction: (0.168196,-0.517167,0.839195)
+ New Polarization:       (-0.942213,-0.334565,-0.0173374)
+ *** FresnelRefraction *** 
 Track (trackID 1054, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93553,-0.34904,0.054319)
- Old Polarization:       (-0.052672,-0.28989,-0.95561)
- New Momentum Direction: (0.87712,-0.47455,0.073852)
- New Polarization:       (-0.097372,-0.3263,-0.94024)
+ Old Momentum Direction: (0.935518,-0.349059,0.054446)
+ Old Polarization:       (-0.0525526,-0.289903,-0.955612)
+ New Momentum Direction: (0.877093,-0.474582,0.0740251)
+ New Polarization:       (-0.0971572,-0.326225,-0.940286)
  *** FresnelRefraction *** 
 Track (trackID 1053, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.989428,0.138955,0.0415146)
+ Old Polarization:       (0.00644498,0.243847,-0.969792)
+ New Momentum Direction: (0.98037,0.188917,0.0564416)
+ New Polarization:       (-0.0119196,0.342524,-0.939433)
+ *** FresnelRefraction *** 
 Track (trackID 1052, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.675647,0.607685,0.417398)
+ Old Polarization:       (-0.336458,0.757944,-0.558853)
+ New Momentum Direction: (-0.675647,0.607685,0.417398)
+ New Polarization:       (-0.336458,-0.757944,0.558853)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.675647,0.607685,0.417398)
+ Old Polarization:       (-0.336458,-0.757944,0.558853)
+ New Momentum Direction: (-0.675647,-0.607685,0.417398)
+ New Polarization:       (0.336458,-0.757944,-0.558853)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.675647,-0.607685,0.417398)
+ Old Polarization:       (0.336458,-0.757944,-0.558853)
+ New Momentum Direction: (-0.675647,-0.607685,-0.417398)
+ New Polarization:       (-0.336458,0.757944,-0.558853)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.675647,-0.607685,-0.417398)
+Old Polarization: (-0.336458,0.757944,-0.558853)
+New Polarization: (-0.0558546,0.934408,-0.351798)
+Polarization Change: (-0.0558546,0.934408,-0.351798)
+New Momentum Direction: (0.743208,0.274197,0.610294)
+Momentum Change: (0.743208,0.274197,0.610294)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.743208,0.274197,0.610294)
+ Old Polarization:       (-0.0558546,0.934408,-0.351798)
+ New Momentum Direction: (0.743208,0.274197,-0.610294)
+ New Polarization:       (0.0558546,-0.934408,-0.351798)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1051, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98786,-0.1543,0.017954)
- Old Polarization:       (0.0060496,-0.077274,-0.99699)
- New Momentum Direction: (0.9775,-0.20951,0.024377)
- New Polarization:       (-0.011163,-0.1668,-0.98593)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1050, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1049, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6991,0.5981,0.39184)
- Old Polarization:       (-0.31082,0.74772,-0.58678)
- New Momentum Direction: (0.23881,0.81227,0.53215)
- New Polarization:       (-0.58811,0.55705,-0.58636)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1048, parentID 1) is processed with stopping code 2
 ### pop requested out of 180 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.92662,-0.36992,0.067315)
- Old Polarization:       (-0.057654,-0.3167,-0.94677)
- New Momentum Direction: (0.86098,-0.50043,0.091062)
- New Polarization:       (-0.1056,-0.35099,-0.93041)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1047, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96589,0.24369,0.087553)
- Old Polarization:       (-0.0080261,0.36613,-0.93053)
- New Momentum Direction: (0.9374,0.32774,0.11775)
- New Polarization:       (-0.014576,0.37474,-0.92701)
+ Old Momentum Direction: (0.965887,0.243671,0.0876778)
+ Old Polarization:       (-0.00789484,0.366119,-0.930535)
+ New Momentum Direction: (0.937389,0.327715,0.117918)
+ New Polarization:       (-0.0143374,0.374592,-0.927079)
  *** FresnelRefraction *** 
 Track (trackID 1046, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88059,0.43714,0.18295)
- Old Polarization:       (-0.11333,0.56914,-0.81439)
- New Momentum Direction: (0.76441,0.59474,0.24891)
- New Polarization:       (-0.20886,0.59368,-0.77712)
- *** FresnelRefraction *** 
-Track (trackID 1045, parentID 1) is processed with stopping code 2
-### pop requested out of 177 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 1045, parentID 1) is processed with stopping code 2
+### pop requested out of 177 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.999784,0.00505175,0.0201809)
+ Old Polarization:       (0.0195919,0.0975876,-0.995034)
+ New Momentum Direction: (0.999601,0.00685699,0.0273925)
+ New Polarization:       (-0.0273085,0.481548,0.875994)
+ *** FresnelRefraction *** 
 Track (trackID 1044, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.091552,0.045105,0.99478)
- Old Polarization:       (-0.98609,0.14329,0.084255)
- New Momentum Direction: (0.1233,0.060749,0.99051)
- New Polarization:       (0.59249,0.7962,-0.12259)
+ Old Momentum Direction: (0.0914267,0.0451139,0.994789)
+ Old Polarization:       (-0.986095,0.143313,0.0841284)
+ New Momentum Direction: (0.123135,0.0607602,0.990528)
+ New Polarization:       (0.591568,0.796907,-0.122423)
  *** FresnelRefraction *** 
 Track (trackID 1043, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68287,0.605408,0.408865)
+ Old Polarization:       (-0.328763,0.75447,-0.568059)
+ New Momentum Direction: (0.118609,0.822862,0.555724)
+ New Polarization:       (-0.64282,0.490195,-0.588635)
+ *** FresnelRefraction *** 
 Track (trackID 1042, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29343,-0.64218,0.70816)
- Old Polarization:       (-0.75481,-0.61022,-0.2406)
- New Momentum Direction: (0.29343,-0.64218,-0.70816)
- New Polarization:       (0.83478,0.53312,-0.13755)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.29343,-0.64218,-0.70816)
- Old Polarization:       (0.83478,0.53312,-0.13755)
- New Momentum Direction: (0.29343,0.64218,-0.70816)
- New Polarization:       (-0.83478,0.53312,0.13755)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.29343,0.64218,-0.70816)
-Old Polarization: (-0.83478,0.53312,0.13755)
-New Polarization: (0.038412,-0.87421,0.48402)
-Polarization Change: (0.038412,-0.87421,0.48402)
-New Momentum Direction: (-0.90701,0.17277,0.38403)
-Momentum Change: (-0.90701,0.17277,0.38403)
- Photon at Boundary! 
- Old Momentum Direction: (-0.90701,0.17277,0.38403)
- Old Polarization:       (0.038412,-0.87421,0.48402)
- New Momentum Direction: (-0.90701,0.17277,-0.38403)
- New Polarization:       (-0.038412,0.87421,0.48402)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.90701,0.17277,-0.38403)
- Old Polarization:       (-0.038412,0.87421,0.48402)
- New Momentum Direction: (-0.8198,0.23494,-0.52223)
- New Polarization:       (0.071866,0.94696,0.31321)
+ Old Momentum Direction: (0.293328,-0.642181,0.70821)
+ Old Polarization:       (-0.754795,-0.610206,-0.240692)
+ New Momentum Direction: (0.398889,-0.873286,0.279748)
+ New Polarization:       (-0.735594,-0.486879,-0.471009)
  *** FresnelRefraction *** 
 Track (trackID 1041, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37093,-0.67984,0.63264)
- Old Polarization:       (-0.67389,-0.66578,-0.32033)
- New Momentum Direction: (0.49976,-0.15388,0.85238)
- New Polarization:       (-0.16102,0.95043,0.26599)
+ Old Momentum Direction: (0.370831,-0.679837,0.632698)
+ Old Polarization:       (-0.673866,-0.665766,-0.320408)
+ New Momentum Direction: (0.499635,-0.153882,0.852458)
+ New Polarization:       (-0.161082,0.950425,0.265978)
  *** FresnelRefraction *** 
 Track (trackID 1040, parentID 1) is processed with stopping code 2
 ### pop requested out of 172 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89488,0.41266,0.17003)
- Old Polarization:       (-0.094169,0.54696,-0.83185)
- New Momentum Direction: (0.79643,0.55913,0.23038)
- New Polarization:       (-0.17252,0.5752,-0.79961)
+ Old Momentum Direction: (0.894865,0.412637,0.17014)
+ Old Polarization:       (-0.0940469,0.546953,-0.831864)
+ New Momentum Direction: (0.796401,0.559107,0.230533)
+ New Polarization:       (-0.172306,0.575165,-0.799685)
  *** FresnelRefraction *** 
 Track (trackID 1039, parentID 1) is processed with stopping code 2
 ### pop requested out of 171 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18204,0.35267,0.91787)
- Old Polarization:       (-0.87787,0.4788,-0.0098654)
- New Momentum Direction: (0.24718,0.47887,0.84237)
- New Polarization:       (-0.87488,0.48399,-0.018422)
+ Old Momentum Direction: (0.18193,0.352677,0.917889)
+ Old Polarization:       (-0.877853,0.478826,-0.00998214)
+ New Momentum Direction: (0.247032,0.478878,0.842408)
+ New Polarization:       (-0.874828,0.484075,-0.0186402)
  *** FresnelRefraction *** 
 Track (trackID 1038, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.341452,-0.661878,0.667329)
+ Old Polarization:       (-0.707516,-0.648393,-0.281083)
+ New Momentum Direction: (0.341452,-0.661878,-0.667329)
+ New Polarization:       (0.707516,0.648393,-0.281083)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.341452,-0.661878,-0.667329)
+ Old Polarization:       (0.707516,0.648393,-0.281083)
+ New Momentum Direction: (0.341452,0.661878,-0.667329)
+ New Polarization:       (-0.707516,0.648393,0.281083)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1037, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
-
-** Photon absorbed! **
+Scattering Photon!
+Old Momentum Direction: (0.103023,-0.333288,0.93718)
+Old Polarization: (-0.962224,-0.272109,0.00900587)
+New Polarization: (0.930042,-0.225116,-0.29042)
+Polarization Change: (0.930042,-0.225116,-0.29042)
+New Momentum Direction: (-0.336408,-0.839595,-0.426508)
+Momentum Change: (-0.336408,-0.839595,-0.426508)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.336408,-0.839595,-0.426508)
+ Old Polarization:       (0.930042,-0.225116,-0.29042)
+ New Momentum Direction: (-0.457744,-0.673553,-0.580342)
+ New Polarization:       (0.436063,0.398758,-0.806747)
+ *** FresnelRefraction *** 
 Track (trackID 1036, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.55092,-0.71559,0.42945)
-Old Polarization: (-0.4733,-0.69172,-0.54544)
-New Polarization: (-0.53239,-0.47656,-0.6996)
-Polarization Change: (-0.53239,-0.47656,-0.6996)
-New Momentum Direction: (0.14707,-0.86597,0.47798)
-Momentum Change: (0.14707,-0.86597,0.47798)
- Photon at Boundary! 
- Old Momentum Direction: (0.14707,-0.86597,0.47798)
- Old Polarization:       (-0.53239,-0.47656,-0.6996)
- New Momentum Direction: (0.19984,-0.73365,0.64948)
- New Polarization:       (-0.0023591,0.66249,0.74907)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1035, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22423,0.41726,0.88069)
- Old Polarization:       (-0.83279,0.5514,-0.049216)
- New Momentum Direction: (0.30398,0.56568,0.76655)
- New Polarization:       (-0.81986,0.56514,-0.091916)
+ Old Momentum Direction: (0.224124,0.417259,0.880718)
+ Old Polarization:       (-0.832765,0.551424,-0.049328)
+ New Momentum Direction: (0.303846,0.565681,0.766604)
+ New Polarization:       (-0.819803,0.565187,-0.0921223)
  *** FresnelRefraction *** 
 Track (trackID 1034, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71626,-0.6455,0.26514)
- Old Polarization:       (-0.29038,-0.62118,-0.72788)
- New Momentum Direction: (-0.71626,-0.6455,0.26514)
- New Polarization:       (-0.14753,0.51143,0.84657)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.71626,-0.6455,0.26514)
- Old Polarization:       (-0.14753,0.51143,0.84657)
- New Momentum Direction: (-0.71626,0.6455,0.26514)
- New Polarization:       (0.14753,0.51143,-0.84657)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.716212,-0.645513,0.26524)
+ Old Polarization:       (-0.290297,-0.621188,-0.72791)
+ New Momentum Direction: (0.329199,-0.873404,0.358879)
+ New Polarization:       (-0.537164,-0.485794,-0.689536)
+ *** FresnelRefraction *** 
 Track (trackID 1033, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1032, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.72537,-0.64091,0.25113)
-Old Polarization: (-0.28233,-0.60973,-0.74062)
-New Polarization: (0.47392,0.5276,0.70501)
-Polarization Change: (0.47392,0.5276,0.70501)
-New Momentum Direction: (-0.8607,0.44666,0.24432)
-Momentum Change: (-0.8607,0.44666,0.24432)
  Photon at Boundary! 
- Old Momentum Direction: (-0.8607,0.44666,0.24432)
- Old Polarization:       (0.47392,0.5276,0.70501)
- New Momentum Direction: (-0.722,0.60701,0.33204)
- New Polarization:       (0.66607,0.47988,0.57102)
+ Old Momentum Direction: (0.725323,-0.640927,0.251235)
+ Old Polarization:       (-0.282245,-0.609734,-0.74065)
+ New Momentum Direction: (0.353163,-0.871033,0.341433)
+ New Polarization:       (-0.525345,-0.486613,-0.698012)
  *** FresnelRefraction *** 
 Track (trackID 1031, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.46229,0.61143,0.64221)
-Old Polarization: (-0.57015,0.75965,-0.31282)
-New Polarization: (0.53435,0.60706,-0.58817)
-Polarization Change: (0.53435,0.60706,-0.58817)
-New Momentum Direction: (-0.79988,0.5881,-0.11971)
-Momentum Change: (-0.79988,0.5881,-0.11971)
 
 ** Photon absorbed! **
 Track (trackID 1030, parentID 1) is processed with stopping code 2
@@ -9664,91 +9579,111 @@ Track (trackID 1030, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 1029, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44616,-0.70894,0.54621)
- Old Polarization:       (-0.58907,-0.6921,-0.41712)
- New Momentum Direction: (0.60338,-0.30046,0.73869)
- New Polarization:       (0.089914,0.94603,0.31135)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1028, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.0783471,-0.0191055,0.996743)
+Old Polarization: (-0.994287,0.0712114,0.079519)
+New Polarization: (-0.962044,0.239609,-0.130609)
+Polarization Change: (-0.962044,0.239609,-0.130609)
+New Momentum Direction: (-0.251665,-0.593923,0.764147)
+Momentum Change: (-0.251665,-0.593923,0.764147)
  Photon at Boundary! 
- Old Momentum Direction: (0.078474,-0.019115,0.99673)
- Old Polarization:       (-0.99428,0.071187,0.079646)
- New Momentum Direction: (0.10629,-0.025889,0.994)
- New Polarization:       (0.92918,-0.35333,-0.10856)
+ Old Momentum Direction: (-0.251665,-0.593923,0.764147)
+ Old Polarization:       (-0.962044,0.239609,-0.130609)
+ New Momentum Direction: (-0.340858,-0.804414,0.486553)
+ New Polarization:       (-0.936511,0.245266,-0.250582)
  *** FresnelRefraction *** 
 Track (trackID 1027, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.786949,-0.584429,0.197875)
+ Old Polarization:       (-0.210935,-0.556192,-0.803839)
+ New Momentum Direction: (0.55288,-0.78925,0.267222)
+ New Polarization:       (-0.382999,-0.525514,-0.759702)
+ *** FresnelRefraction *** 
 Track (trackID 1026, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71707,0.59038,0.37049)
- Old Polarization:       (-0.29176,0.73698,-0.6097)
- New Momentum Direction: (0.31831,0.80297,0.5039)
- New Polarization:       (-0.54632,0.58978,-0.59472)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.717039,0.590364,0.370574)
+ Old Polarization:       (-0.291658,0.736982,-0.609749)
+ New Momentum Direction: (-0.717039,0.590364,0.370574)
+ New Polarization:       (-0.152509,-0.651641,0.743038)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.717039,0.590364,0.370574)
+ Old Polarization:       (-0.152509,-0.651641,0.743038)
+ New Momentum Direction: (-0.717039,-0.590364,0.370574)
+ New Polarization:       (0.152509,-0.651641,-0.743038)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1025, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91622,-0.39291,0.078458)
- Old Polarization:       (-0.06726,-0.34387,-0.93661)
- New Momentum Direction: (0.84108,-0.53045,0.10592)
- New Polarization:       (-0.12266,-0.37776,-0.91774)
+ Old Momentum Direction: (0.916203,-0.392933,0.0785833)
+ Old Polarization:       (-0.0671446,-0.343876,-0.936611)
+ New Momentum Direction: (0.841038,-0.530472,0.10609)
+ New Polarization:       (-0.12246,-0.377705,-0.917792)
  *** FresnelRefraction *** 
 Track (trackID 1024, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
-
-** Photon absorbed! **
+Scattering Photon!
+Old Momentum Direction: (0.935558,-0.348795,0.0554347)
+Old Polarization: (-0.0516097,-0.290297,-0.955544)
+New Polarization: (0.0966116,-0.578139,0.810198)
+Polarization Change: (0.0966116,-0.578139,0.810198)
+New Momentum Direction: (-0.00941689,0.813439,0.581574)
+Momentum Change: (-0.00941689,0.813439,0.581574)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.00941689,0.813439,0.581574)
+ Old Polarization:       (0.0966116,-0.578139,0.810198)
+ New Momentum Direction: (-0.00941689,0.813439,-0.581574)
+ New Polarization:       (-0.0966116,0.578139,0.810198)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.00941689,0.813439,-0.581574)
+ Old Polarization:       (-0.0966116,0.578139,0.810198)
+ New Momentum Direction: (-0.0127913,0.613008,-0.789973)
+ New Polarization:       (-0.0875151,-0.787693,-0.609821)
+ *** FresnelRefraction *** 
 Track (trackID 1023, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.980323,-0.19569,0.025918)
+ Old Polarization:       (0.00150701,-0.123874,-0.992297)
+ New Momentum Direction: (0.963661,-0.264814,0.0350731)
+ New Polarization:       (-0.00276675,-0.141185,-0.989979)
+ *** FresnelRefraction *** 
 Track (trackID 1022, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18391,0.35574,0.91631)
- Old Polarization:       (-0.87593,0.48231,-0.011439)
- New Momentum Direction: (0.18391,0.35574,-0.91631)
- New Polarization:       (0.89491,-0.44619,0.0063924)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.18391,0.35574,-0.91631)
- Old Polarization:       (0.89491,-0.44619,0.0063924)
- New Momentum Direction: (0.18391,-0.35574,-0.91631)
- New Polarization:       (-0.89491,-0.44619,-0.0063924)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.18391,-0.35574,-0.91631)
- Old Polarization:       (-0.89491,-0.44619,-0.0063924)
- New Momentum Direction: (0.24969,-0.48297,-0.83928)
- New Polarization:       (-0.87963,-0.4755,0.011939)
+ Old Momentum Direction: (0.183805,0.355746,0.91633)
+ Old Polarization:       (-0.875915,0.482326,-0.011555)
+ New Momentum Direction: (0.249543,0.482979,0.839321)
+ New Polarization:       (-0.872433,0.488258,-0.0215758)
  *** FresnelRefraction *** 
 Track (trackID 1021, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.31913,0.52688,0.78775)
- Old Polarization:       (-0.72723,0.66914,-0.15294)
- New Momentum Direction: (0.43355,0.7158,0.54742)
- New Polarization:       (-0.70486,0.64786,-0.28888)
+ Old Momentum Direction: (0.319039,0.526879,0.78779)
+ Old Polarization:       (-0.72719,0.669159,-0.15304)
+ New Momentum Direction: (0.433435,0.715798,0.547511)
+ New Polarization:       (-0.704786,0.647862,-0.289053)
  *** FresnelRefraction *** 
 Track (trackID 1020, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.079072,-0.17938,0.9806)
- Old Polarization:       (-0.99258,-0.10528,0.060779)
- New Momentum Direction: (0.10719,-0.24318,0.96404)
- New Polarization:       (-0.67899,-0.72621,-0.10769)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1019, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39301,0.57353,0.71876)
- Old Polarization:       (-0.64794,0.72736,-0.2261)
- New Momentum Direction: (0.53142,0.77551,0.34085)
- New Polarization:       (-0.64408,0.63126,-0.43206)
+ Old Momentum Direction: (0.392935,0.573523,0.7188)
+ Old Polarization:       (-0.647894,0.727373,-0.22619)
+ New Momentum Direction: (0.531317,0.775503,0.341025)
+ New Polarization:       (-0.643988,0.631265,-0.432186)
  *** FresnelRefraction *** 
 Track (trackID 1018, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
@@ -9757,98 +9692,97 @@ Track (trackID 1018, parentID 1) is processed with stopping code 2
 Track (trackID 1017, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.12508,-0.39933,0.90823)
- Old Polarization:       (-0.93854,-0.34446,-0.022198)
- New Momentum Direction: (0.17015,-0.54322,0.82217)
- New Polarization:       (-0.93374,-0.35551,-0.041652)
+ Old Momentum Direction: (0.124957,-0.399327,0.908253)
+ Old Polarization:       (-0.938543,-0.34444,-0.0223139)
+ New Momentum Direction: (0.169981,-0.54321,0.82221)
+ New Polarization:       (-0.933719,-0.355551,-0.0418684)
  *** FresnelRefraction *** 
 Track (trackID 1016, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40024,-0.69739,0.59452)
- Old Polarization:       (-0.63945,-0.67724,-0.36394)
- New Momentum Direction: (0.40024,0.69739,0.59452)
- New Polarization:       (0.070374,0.62344,-0.7787)
+ Old Momentum Direction: (0.400149,-0.697394,0.594577)
+ Old Polarization:       (-0.639414,-0.677231,-0.364017)
+ New Momentum Direction: (0.400149,0.697394,0.594577)
+ New Polarization:       (0.070544,0.623419,-0.778699)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.40024,0.69739,0.59452)
- Old Polarization:       (0.070374,0.62344,-0.7787)
- New Momentum Direction: (0.40024,0.69739,-0.59452)
- New Polarization:       (-0.070374,-0.62344,-0.7787)
+ Old Momentum Direction: (0.400149,0.697394,0.594577)
+ Old Polarization:       (0.070544,0.623419,-0.778699)
+ New Momentum Direction: (0.400149,0.697394,-0.594577)
+ New Polarization:       (-0.070544,-0.623419,-0.778699)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.400149,0.697394,-0.594577)
+ Old Polarization:       (-0.070544,-0.623419,-0.778699)
+ New Momentum Direction: (-0.400149,0.697394,-0.594577)
+ New Polarization:       (-0.070544,0.623419,0.778699)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.400149,0.697394,-0.594577)
+ Old Polarization:       (-0.070544,0.623419,0.778699)
+ New Momentum Direction: (-0.54186,0.241102,-0.805144)
+ New Polarization:       (-0.408771,-0.912635,0.00181108)
+ *** FresnelRefraction *** 
 Track (trackID 1015, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48476,-0.71838,0.49894)
- Old Polarization:       (-0.54571,-0.69421,-0.46934)
- New Momentum Direction: (0.65893,-0.32535,0.6782)
- New Polarization:       (0.19622,0.94475,0.26258)
+ Old Momentum Direction: (0.484678,-0.718385,0.499009)
+ Old Polarization:       (-0.54566,-0.694203,-0.469401)
+ New Momentum Direction: (0.65882,-0.325369,0.6783)
+ New Polarization:       (0.19617,0.944742,0.262641)
  *** FresnelRefraction *** 
 Track (trackID 1014, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87299,-0.47451,0.11282)
- Old Polarization:       (-0.11839,-0.43055,-0.89477)
- New Momentum Direction: (0.75043,-0.64303,0.15289)
- New Polarization:       (-0.21661,-0.4578,-0.86226)
+ Old Momentum Direction: (0.872962,-0.474533,0.11294)
+ Old Polarization:       (-0.118283,-0.430557,-0.894779)
+ New Momentum Direction: (0.750373,-0.643052,0.153048)
+ New Polarization:       (-0.216426,-0.457781,-0.86232)
  *** FresnelRefraction *** 
 Track (trackID 1013, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.84743,0.47921,0.22853)
-Old Polarization: (-0.14493,0.6229,-0.76876)
-New Polarization: (0.59944,-0.68983,0.40596)
-Polarization Change: (0.59944,-0.68983,0.40596)
-New Momentum Direction: (0.6285,0.091584,-0.7724)
-Momentum Change: (0.6285,0.091584,-0.7724)
-Scattering Photon!
-Old Momentum Direction: (0.6285,0.091584,-0.7724)
-Old Polarization: (0.59944,-0.68983,0.40596)
-New Polarization: (-0.42529,0.44448,-0.7884)
-Polarization Change: (-0.42529,0.44448,-0.7884)
-New Momentum Direction: (0.47565,-0.63133,-0.61251)
-Momentum Change: (0.47565,-0.63133,-0.61251)
  Photon at Boundary! 
- Old Momentum Direction: (0.47565,-0.63133,-0.61251)
- Old Polarization:       (-0.42529,0.44448,-0.7884)
- New Momentum Direction: (0.47565,-0.63133,0.61251)
- New Polarization:       (0.42529,-0.44448,-0.7884)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.847408,0.479191,0.228639)
+ Old Polarization:       (-0.14481,0.622898,-0.768783)
+ New Momentum Direction: (0.696091,0.647974,0.309172)
+ New Polarization:       (-0.263624,0.631231,-0.729417)
+ *** FresnelRefraction *** 
 Track (trackID 1012, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.621445,-0.696509,0.358721)
+ Old Polarization:       (-0.395498,-0.674142,-0.62379)
+ New Momentum Direction: (0.842648,-0.230981,0.486407)
+ New Polarization:       (0.30742,0.948,-0.0823918)
+ *** FresnelRefraction *** 
 Track (trackID 1011, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.792043,0.537952,0.288575)
+Old Polarization: (-0.208421,0.682603,-0.700438)
+New Polarization: (0.616256,0.494171,-0.613207)
+Polarization Change: (0.616256,0.494171,-0.613207)
+New Momentum Direction: (-0.781902,0.476968,-0.40141)
+Momentum Change: (-0.781902,0.476968,-0.40141)
  Photon at Boundary! 
- Old Momentum Direction: (0.79207,0.53797,0.28848)
- Old Polarization:       (-0.20853,0.68261,-0.7004)
- New Momentum Direction: (0.55993,0.73018,0.39155)
- New Polarization:       (-0.38208,0.64689,-0.65996)
+ Old Momentum Direction: (-0.781902,0.476968,-0.40141)
+ Old Polarization:       (0.616256,0.494171,-0.613207)
+ New Momentum Direction: (-0.781902,-0.476968,-0.40141)
+ New Polarization:       (-0.616256,0.494171,0.613207)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.781902,-0.476968,-0.40141)
+ Old Polarization:       (-0.616256,0.494171,0.613207)
+ New Momentum Direction: (-0.532959,-0.647388,-0.544833)
+ New Polarization:       (0.841406,-0.473514,-0.260423)
  *** FresnelRefraction *** 
 Track (trackID 1010, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.15813,-0.44753,0.88018)
- Old Polarization:       (-0.91221,-0.40743,-0.043275)
- New Momentum Direction: (0.15813,-0.44753,-0.88018)
- New Polarization:       (0.95253,0.304,0.01656)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.15813,-0.44753,-0.88018)
- Old Polarization:       (0.95253,0.304,0.01656)
- New Momentum Direction: (0.15813,0.44753,-0.88018)
- New Polarization:       (-0.95253,0.304,-0.01656)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.15813,0.44753,-0.88018)
- Old Polarization:       (-0.95253,0.304,-0.01656)
- New Momentum Direction: (0.21287,0.60244,-0.76926)
- New Polarization:       (-0.92952,0.3675,0.030593)
+ Old Momentum Direction: (0.158009,-0.447521,0.880204)
+ Old Polarization:       (-0.912213,-0.407414,-0.0433862)
+ New Momentum Direction: (0.212702,-0.602427,0.769311)
+ New Polarization:       (-0.903515,-0.421043,-0.0799003)
  *** FresnelRefraction *** 
 Track (trackID 1009, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
@@ -9856,20 +9790,52 @@ Track (trackID 1009, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 1008, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.425922,0.59728,0.679593)
+ Old Polarization:       (-0.609775,0.74441,-0.272082)
+ New Momentum Direction: (0.425922,0.59728,-0.679593)
+ New Polarization:       (0.636164,-0.731802,-0.244462)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.425922,0.59728,-0.679593)
+ Old Polarization:       (0.636164,-0.731802,-0.244462)
+ New Momentum Direction: (0.425922,-0.59728,-0.679593)
+ New Polarization:       (-0.636164,-0.731802,0.244462)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.425922,-0.59728,-0.679593)
+Old Polarization: (-0.636164,-0.731802,0.244462)
+New Polarization: (-0.881967,-0.266135,-0.388981)
+Polarization Change: (-0.881967,-0.266135,-0.388981)
+New Momentum Direction: (-0.0711563,-0.740668,0.668092)
+Momentum Change: (-0.0711563,-0.740668,0.668092)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.0711563,-0.740668,0.668092)
+ Old Polarization:       (-0.881967,-0.266135,-0.388981)
+ New Momentum Direction: (-0.0711563,-0.740668,-0.668092)
+ New Polarization:       (0.881967,0.266135,-0.388981)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.0711563,-0.740668,-0.668092)
+Old Polarization: (0.881967,0.266135,-0.388981)
+New Polarization: (-0.183107,-0.365174,-0.912754)
+Polarization Change: (-0.183107,-0.365174,-0.912754)
+New Momentum Direction: (0.903818,0.302734,-0.302432)
+Momentum Change: (0.903818,0.302734,-0.302432)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.903818,0.302734,-0.302432)
+ Old Polarization:       (-0.183107,-0.365174,-0.912754)
+ New Momentum Direction: (0.813147,0.411782,-0.411372)
+ New Polarization:       (-0.318733,-0.276356,-0.906662)
+ *** FresnelRefraction *** 
 Track (trackID 1007, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1006, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.1223,-0.38522,0.91469)
- Old Polarization:       (-0.94363,-0.33073,-0.01311)
- New Momentum Direction: (0.16603,-0.52293,0.83605)
- New Polarization:       (-0.94088,-0.33786,-0.024478)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1005, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
 
@@ -9877,208 +9843,230 @@ Track (trackID 1005, parentID 1) is processed with stopping code 2
 Track (trackID 1004, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39919,-0.69249,0.60092)
- Old Polarization:       (-0.64215,-0.67897,-0.35586)
- New Momentum Direction: (0.53815,-0.23265,0.8101)
- New Polarization:       (-0.061101,0.94785,0.3128)
+ Old Momentum Direction: (0.399096,-0.692494,0.600978)
+ Old Polarization:       (-0.642121,-0.678963,-0.355936)
+ New Momentum Direction: (0.399096,0.692494,0.600978)
+ New Polarization:       (0.08194,0.62588,-0.775603)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.399096,0.692494,0.600978)
+ Old Polarization:       (0.08194,0.62588,-0.775603)
+ New Momentum Direction: (0.399096,0.692494,-0.600978)
+ New Polarization:       (-0.08194,-0.62588,-0.775603)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.399096,0.692494,-0.600978)
+ Old Polarization:       (-0.08194,-0.62588,-0.775603)
+ New Momentum Direction: (-0.399096,0.692494,-0.600978)
+ New Polarization:       (-0.08194,0.62588,0.775603)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.399096,0.692494,-0.600978)
+ Old Polarization:       (-0.08194,0.62588,0.775603)
+ New Momentum Direction: (-0.538027,0.232654,-0.810185)
+ New Polarization:       (-0.407741,-0.913057,0.00857777)
  *** FresnelRefraction *** 
 Track (trackID 1003, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.08992,0.016954,0.9958)
- Old Polarization:       (-0.98984,0.11212,0.087472)
- New Momentum Direction: (0.1209,0.022795,0.9924)
- New Polarization:       (0.90952,0.39797,-0.11995)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1002, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.337108,-0.659001,0.672366)
+ Old Polarization:       (-0.712464,-0.645417,-0.275376)
+ New Momentum Direction: (0.337108,-0.659001,-0.672366)
+ New Polarization:       (0.746041,0.622607,-0.236184)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.337108,-0.659001,-0.672366)
+ Old Polarization:       (0.746041,0.622607,-0.236184)
+ New Momentum Direction: (0.337108,0.659001,-0.672366)
+ New Polarization:       (-0.746041,0.622607,0.236184)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1001, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.105927,-0.333872,0.936648)
+Old Polarization: (-0.961548,-0.274419,0.0109254)
+New Polarization: (0.918152,0.360385,0.164678)
+Polarization Change: (0.918152,0.360385,0.164678)
+New Momentum Direction: (-0.310182,0.395139,0.864669)
+Momentum Change: (-0.310182,0.395139,0.864669)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.310182,0.395139,0.864669)
+ Old Polarization:       (0.918152,0.360385,0.164678)
+ New Momentum Direction: (-0.310182,0.395139,-0.864669)
+ New Polarization:       (-0.837239,-0.544401,0.0515603)
+ *** FresnelReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.310182,0.395139,-0.864669)
+Old Polarization: (-0.837239,-0.544401,0.0515603)
+New Polarization: (-0.798518,-0.571327,0.189616)
+Polarization Change: (-0.798518,-0.571327,0.189616)
+New Momentum Direction: (-0.324523,0.143268,-0.934965)
+Momentum Change: (-0.324523,0.143268,-0.934965)
 
 ** Photon absorbed! **
 Track (trackID 1000, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6937,-0.66047,0.28733)
- Old Polarization:       (-0.31545,-0.63722,-0.70317)
- New Momentum Direction: (-0.6937,-0.66047,0.28733)
- New Polarization:       (-0.21415,0.57002,0.79323)
+ Old Momentum Direction: (0.693649,-0.660481,0.287429)
+ Old Polarization:       (-0.315368,-0.637225,-0.703198)
+ New Momentum Direction: (-0.693649,-0.660481,0.287429)
+ New Polarization:       (-0.214233,0.570143,0.793121)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6937,-0.66047,0.28733)
- Old Polarization:       (-0.21415,0.57002,0.79323)
- New Momentum Direction: (-0.6937,0.66047,0.28733)
- New Polarization:       (0.21415,0.57002,-0.79323)
+ Old Momentum Direction: (-0.693649,-0.660481,0.287429)
+ Old Polarization:       (-0.214233,0.570143,0.793121)
+ New Momentum Direction: (-0.693649,0.660481,0.287429)
+ New Polarization:       (0.214233,0.570143,-0.793121)
  *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.6937,0.66047,0.28733)
-Old Polarization: (0.21415,0.57002,-0.79323)
-New Polarization: (0.12498,0.96221,-0.24192)
-Polarization Change: (0.12498,0.96221,-0.24192)
-New Momentum Direction: (0.18438,-0.26211,-0.94726)
-Momentum Change: (0.18438,-0.26211,-0.94726)
- Photon at Boundary! 
- Old Momentum Direction: (0.18438,-0.26211,-0.94726)
- Old Polarization:       (0.12498,0.96221,-0.24192)
- New Momentum Direction: (0.24956,-0.35477,-0.90103)
- New Polarization:       (0.87669,-0.3124,0.36582)
- *** FresnelRefraction *** 
-Track (trackID 999, parentID 1) is processed with stopping code 2
-### pop requested out of 131 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.85785,-0.49582,0.13507)
- Old Polarization:       (-0.12914,-0.46239,-0.87722)
- New Momentum Direction: (0.72268,-0.66689,0.18167)
- New Polarization:       (-0.23302,-0.48252,-0.84432)
- *** FresnelRefraction *** 
-Track (trackID 998, parentID 1) is processed with stopping code 2
-### pop requested out of 130 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 999, parentID 1) is processed with stopping code 2
+### pop requested out of 131 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 998, parentID 1) is processed with stopping code 2
+### pop requested out of 130 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.163676,-0.472779,0.865846)
+ Old Polarization:       (-0.900657,-0.429733,-0.0643907)
+ New Momentum Direction: (0.221567,-0.639996,0.73574)
+ New Polarization:       (-0.887376,-0.445157,-0.119996)
+ *** FresnelRefraction *** 
 Track (trackID 997, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.079813,-0.064096,0.99475)
- Old Polarization:       (-0.99646,0.02143,0.081331)
- New Momentum Direction: (0.10775,-0.086532,0.9904)
- New Polarization:       (0.3638,-0.92368,-0.12028)
+ Old Momentum Direction: (0.0796855,-0.0640868,0.994758)
+ Old Polarization:       (-0.996467,0.0214541,0.0812045)
+ New Momentum Direction: (0.107578,-0.0865195,0.990425)
+ New Polarization:       (0.362579,-0.92418,-0.120115)
  *** FresnelRefraction *** 
 Track (trackID 996, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.091342,-0.2814,0.95523)
- Old Polarization:       (-0.97596,-0.21592,0.029717)
- New Momentum Direction: (0.12419,-0.38259,0.91553)
- New Polarization:       (-0.90351,-0.42501,-0.055046)
+ Old Momentum Direction: (0.0912144,-0.28139,0.955249)
+ Old Polarization:       (-0.975967,-0.215899,0.029595)
+ New Momentum Direction: (0.124015,-0.382576,0.915563)
+ New Polarization:       (-0.903905,-0.424205,-0.0548224)
  *** FresnelRefraction *** 
 Track (trackID 995, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.657471,0.614116,0.436571)
+ Old Polarization:       (-0.356559,0.764006,-0.537737)
+ New Momentum Direction: (-0.657471,0.614116,0.436571)
+ New Polarization:       (-0.356559,-0.764006,0.537737)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.657471,0.614116,0.436571)
+ Old Polarization:       (-0.356559,-0.764006,0.537737)
+ New Momentum Direction: (-0.657471,-0.614116,0.436571)
+ New Polarization:       (0.356559,-0.764006,-0.537737)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.657471,-0.614116,0.436571)
+ Old Polarization:       (0.356559,-0.764006,-0.537737)
+ New Momentum Direction: (-0.657471,-0.614116,-0.436571)
+ New Polarization:       (-0.356559,0.764006,-0.537737)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.657471,-0.614116,-0.436571)
+Old Polarization: (-0.356559,0.764006,-0.537737)
+New Polarization: (0.00702181,-0.53927,0.842103)
+Polarization Change: (0.00702181,-0.53927,0.842103)
+New Momentum Direction: (0.704153,-0.595268,-0.387072)
+Momentum Change: (0.704153,-0.595268,-0.387072)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.704153,-0.595268,-0.387072)
+ Old Polarization:       (0.00702181,-0.53927,0.842103)
+ New Momentum Direction: (0.704153,0.595268,-0.387072)
+ New Polarization:       (-0.00702181,-0.53927,-0.842103)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.704153,0.595268,-0.387072)
+Old Polarization: (-0.00702181,-0.53927,-0.842103)
+New Polarization: (0.408698,0.210645,-0.888028)
+Polarization Change: (0.408698,0.210645,-0.888028)
+New Momentum Direction: (-0.341782,-0.866874,-0.362926)
+Momentum Change: (-0.341782,-0.866874,-0.362926)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.341782,-0.866874,-0.362926)
+ Old Polarization:       (0.408698,0.210645,-0.888028)
+ New Momentum Direction: (-0.464544,-0.735439,-0.493283)
+ New Polarization:       (0.335787,0.369148,-0.866589)
+ *** FresnelRefraction *** 
 Track (trackID 994, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.44785,0.59872,0.66405)
- Old Polarization:       (-0.58747,0.75692,-0.28626)
- New Momentum Direction: (0.44785,0.59872,-0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
+ Old Momentum Direction: (0.44778,0.598718,0.664101)
+ Old Polarization:       (-0.587415,0.756936,-0.28634)
+ New Momentum Direction: (0.44778,0.598718,-0.664101)
+ New Polarization:       (0.587415,-0.756936,-0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44785,0.59872,-0.66405)
- Old Polarization:       (0.58747,-0.75692,-0.28626)
- New Momentum Direction: (0.44785,-0.59872,-0.66405)
- New Polarization:       (-0.58747,-0.75692,0.28626)
+ Old Momentum Direction: (0.44778,0.598718,-0.664101)
+ Old Polarization:       (0.587415,-0.756936,-0.28634)
+ New Momentum Direction: (0.44778,-0.598718,-0.664101)
+ New Polarization:       (-0.587415,-0.756936,0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44785,-0.59872,-0.66405)
- Old Polarization:       (-0.58747,-0.75692,0.28626)
- New Momentum Direction: (-0.44785,-0.59872,-0.66405)
- New Polarization:       (-0.58747,0.75692,-0.28626)
+ Old Momentum Direction: (0.44778,-0.598718,-0.664101)
+ Old Polarization:       (-0.587415,-0.756936,0.28634)
+ New Momentum Direction: (-0.44778,-0.598718,-0.664101)
+ New Polarization:       (-0.587415,0.756936,-0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.44785,-0.59872,-0.66405)
- Old Polarization:       (-0.58747,0.75692,-0.28626)
- New Momentum Direction: (-0.44785,-0.59872,0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
+ Old Momentum Direction: (-0.44778,-0.598718,-0.664101)
+ Old Polarization:       (-0.587415,0.756936,-0.28634)
+ New Momentum Direction: (-0.44778,-0.598718,0.664101)
+ New Polarization:       (0.587415,-0.756936,-0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.44785,-0.59872,0.66405)
- Old Polarization:       (0.58747,-0.75692,-0.28626)
- New Momentum Direction: (-0.44785,0.59872,0.66405)
- New Polarization:       (-0.58747,-0.75692,0.28626)
+ Old Momentum Direction: (-0.44778,-0.598718,0.664101)
+ Old Polarization:       (0.587415,-0.756936,-0.28634)
+ New Momentum Direction: (-0.44778,0.598718,0.664101)
+ New Polarization:       (-0.587415,-0.756936,0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.44785,0.59872,0.66405)
- Old Polarization:       (-0.58747,-0.75692,0.28626)
- New Momentum Direction: (0.44785,0.59872,0.66405)
- New Polarization:       (-0.58747,0.75692,-0.28626)
+ Old Momentum Direction: (-0.44778,0.598718,0.664101)
+ Old Polarization:       (-0.587415,-0.756936,0.28634)
+ New Momentum Direction: (0.44778,0.598718,0.664101)
+ New Polarization:       (-0.587415,0.756936,-0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44785,0.59872,0.66405)
- Old Polarization:       (-0.58747,0.75692,-0.28626)
- New Momentum Direction: (0.44785,0.59872,-0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
+ Old Momentum Direction: (0.44778,0.598718,0.664101)
+ Old Polarization:       (-0.587415,0.756936,-0.28634)
+ New Momentum Direction: (0.44778,0.598718,-0.664101)
+ New Polarization:       (0.587415,-0.756936,-0.28634)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.44785,0.59872,-0.66405)
- Old Polarization:       (0.58747,-0.75692,-0.28626)
- New Momentum Direction: (0.44785,-0.59872,-0.66405)
- New Polarization:       (-0.58747,-0.75692,0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44785,-0.59872,-0.66405)
- Old Polarization:       (-0.58747,-0.75692,0.28626)
- New Momentum Direction: (0.44785,0.59872,-0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44785,0.59872,-0.66405)
- Old Polarization:       (0.58747,-0.75692,-0.28626)
- New Momentum Direction: (0.44785,-0.59872,-0.66405)
- New Polarization:       (-0.58747,-0.75692,0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44785,-0.59872,-0.66405)
- Old Polarization:       (-0.58747,-0.75692,0.28626)
- New Momentum Direction: (0.44785,-0.59872,0.66405)
- New Polarization:       (0.58747,0.75692,0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44785,-0.59872,0.66405)
- Old Polarization:       (0.58747,0.75692,0.28626)
- New Momentum Direction: (-0.44785,-0.59872,0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44785,-0.59872,0.66405)
- Old Polarization:       (0.58747,-0.75692,-0.28626)
- New Momentum Direction: (-0.44785,0.59872,0.66405)
- New Polarization:       (-0.58747,-0.75692,0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44785,0.59872,0.66405)
- Old Polarization:       (-0.58747,-0.75692,0.28626)
- New Momentum Direction: (-0.44785,0.59872,-0.66405)
- New Polarization:       (0.58747,0.75692,0.28626)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44785,0.59872,-0.66405)
- Old Polarization:       (0.58747,0.75692,0.28626)
- New Momentum Direction: (0.44785,0.59872,-0.66405)
- New Polarization:       (0.58747,-0.75692,-0.28626)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.44785,0.59872,-0.66405)
-Old Polarization: (0.58747,-0.75692,-0.28626)
-New Polarization: (0.68998,-0.72272,0.040107)
-Polarization Change: (0.68998,-0.72272,0.040107)
-New Momentum Direction: (0.18228,0.22711,0.95666)
-Momentum Change: (0.18228,0.22711,0.95666)
- Photon at Boundary! 
- Old Momentum Direction: (0.18228,0.22711,0.95666)
- Old Polarization:       (0.68998,-0.72272,0.040107)
- New Momentum Direction: (0.18228,-0.22711,0.95666)
- New Polarization:       (-0.68998,-0.72272,-0.040107)
+ Old Momentum Direction: (0.44778,0.598718,-0.664101)
+ Old Polarization:       (0.587415,-0.756936,-0.28634)
+ New Momentum Direction: (0.44778,-0.598718,-0.664101)
+ New Polarization:       (-0.587415,-0.756936,0.28634)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 993, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.077073,-0.18179,0.98031)
- Old Polarization:       (-0.99253,-0.10726,0.058142)
- New Momentum Direction: (0.1047,-0.24694,0.96336)
- New Polarization:       (-0.70343,-0.70314,-0.10379)
+ Old Momentum Direction: (0.0769438,-0.18178,0.980324)
+ Old Polarization:       (-0.992539,-0.107241,0.058017)
+ New Momentum Direction: (0.104521,-0.246932,0.963379)
+ New Polarization:       (-0.704347,-0.702258,-0.103584)
  *** FresnelRefraction *** 
 Track (trackID 992, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89521,-0.43515,0.096158)
- Old Polarization:       (-0.091215,-0.39012,-0.91623)
- New Momentum Direction: (0.79846,-0.58787,0.12991)
- New Polarization:       (-0.16627,-0.4227,-0.89088)
+ Old Momentum Direction: (0.895187,-0.435168,0.0962812)
+ Old Polarization:       (-0.0911033,-0.390129,-0.916242)
+ New Momentum Direction: (0.79841,-0.587897,0.130073)
+ New Polarization:       (-0.16608,-0.42267,-0.890936)
  *** FresnelRefraction *** 
 Track (trackID 991, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
@@ -10091,139 +10079,139 @@ Track (trackID 990, parentID 1) is processed with stopping code 2
 Track (trackID 989, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34112,0.5443,0.7664)
- Old Polarization:       (-0.7033,0.68874,-0.17611)
- New Momentum Direction: (0.46327,0.7392,0.48884)
- New Polarization:       (-0.68357,0.64911,-0.33374)
+ Old Momentum Direction: (0.341037,0.544299,0.766441)
+ Old Polarization:       (-0.703259,0.688752,-0.176204)
+ New Momentum Direction: (0.463154,0.739201,0.488948)
+ New Polarization:       (-0.683495,0.649111,-0.333901)
  *** FresnelRefraction *** 
 Track (trackID 988, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50654,0.62203,0.59707)
- Old Polarization:       (-0.52187,0.77242,-0.36197)
- New Momentum Direction: (0.50654,-0.62203,0.59707)
- New Polarization:       (0.52187,0.77242,0.36197)
+ Old Momentum Direction: (0.506474,0.622027,0.597133)
+ Old Polarization:       (-0.521806,0.772426,-0.362045)
+ New Momentum Direction: (0.506474,-0.622027,0.597133)
+ New Polarization:       (0.521806,0.772426,0.362045)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50654,-0.62203,0.59707)
- Old Polarization:       (0.52187,0.77242,0.36197)
- New Momentum Direction: (0.50654,-0.62203,-0.59707)
- New Polarization:       (-0.52187,-0.77242,0.36197)
+ Old Momentum Direction: (0.506474,-0.622027,0.597133)
+ Old Polarization:       (0.521806,0.772426,0.362045)
+ New Momentum Direction: (0.506474,-0.622027,-0.597133)
+ New Polarization:       (-0.521806,-0.772426,0.362045)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.50654,-0.62203,-0.59707)
- Old Polarization:       (-0.52187,-0.77242,0.36197)
- New Momentum Direction: (-0.50654,-0.62203,-0.59707)
- New Polarization:       (-0.52187,0.77242,-0.36197)
+ Old Momentum Direction: (0.506474,-0.622027,-0.597133)
+ Old Polarization:       (-0.521806,-0.772426,0.362045)
+ New Momentum Direction: (-0.506474,-0.622027,-0.597133)
+ New Polarization:       (-0.521806,0.772426,-0.362045)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.50654,-0.62203,-0.59707)
- Old Polarization:       (-0.52187,0.77242,-0.36197)
- New Momentum Direction: (-0.50654,0.62203,-0.59707)
- New Polarization:       (0.52187,0.77242,0.36197)
+ Old Momentum Direction: (-0.506474,-0.622027,-0.597133)
+ Old Polarization:       (-0.521806,0.772426,-0.362045)
+ New Momentum Direction: (-0.506474,0.622027,-0.597133)
+ New Polarization:       (0.521806,0.772426,0.362045)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.50654,0.62203,-0.59707)
- Old Polarization:       (0.52187,0.77242,0.36197)
- New Momentum Direction: (-0.50654,0.62203,0.59707)
- New Polarization:       (-0.52187,-0.77242,0.36197)
+ Old Momentum Direction: (-0.506474,0.622027,-0.597133)
+ Old Polarization:       (0.521806,0.772426,0.362045)
+ New Momentum Direction: (-0.506474,0.622027,0.597133)
+ New Polarization:       (-0.521806,-0.772426,0.362045)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 987, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.30309,-0.64018,0.70591)
- Old Polarization:       (-0.74839,-0.61849,-0.23957)
- New Momentum Direction: (0.4092,-0.8643,0.29246)
- New Polarization:       (-0.73203,-0.50231,-0.46024)
+ Old Momentum Direction: (0.302984,-0.640175,0.705958)
+ Old Polarization:       (-0.748368,-0.618474,-0.239658)
+ New Momentum Direction: (0.409058,-0.864301,0.292669)
+ New Polarization:       (-0.731957,-0.502307,-0.460354)
  *** FresnelRefraction *** 
 Track (trackID 986, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.07549,-0.018413,0.99698)
-Old Polarization: (-0.99447,0.071777,0.076626)
-New Polarization: (-0.93869,-0.09756,0.33067)
-Polarization Change: (-0.93869,-0.09756,0.33067)
-New Momentum Direction: (0.32939,-0.53697,0.77664)
-Momentum Change: (0.32939,-0.53697,0.77664)
+Old Momentum Direction: (0.0753625,-0.0184039,0.996986)
+Old Polarization: (-0.994481,0.071801,0.0764985)
+New Polarization: (-0.938734,-0.0975347,0.330554)
+Polarization Change: (-0.938734,-0.0975347,0.330554)
+New Momentum Direction: (0.329283,-0.536971,0.776682)
+Momentum Change: (0.329283,-0.536971,0.776682)
  Photon at Boundary! 
- Old Momentum Direction: (0.32939,-0.53697,0.77664)
- Old Polarization:       (-0.93869,-0.09756,0.33067)
- New Momentum Direction: (0.44737,-0.72929,0.51769)
- New Polarization:       (-0.45674,-0.68397,-0.56884)
+ Old Momentum Direction: (0.329283,-0.536971,0.776682)
+ Old Polarization:       (-0.938734,-0.0975347,0.330554)
+ New Momentum Direction: (0.447217,-0.72929,0.517816)
+ New Polarization:       (-0.456948,-0.683976,-0.568661)
  *** FresnelRefraction *** 
 Track (trackID 985, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63625,-0.68923,0.34662)
- Old Polarization:       (-0.37868,-0.67045,-0.63804)
- New Momentum Direction: (0.86037,-0.20018,0.46871)
- New Polarization:       (0.28929,0.94895,-0.12574)
+ Old Momentum Direction: (0.636193,-0.689238,0.346712)
+ Old Polarization:       (-0.378614,-0.670452,-0.63808)
+ New Momentum Direction: (0.860288,-0.200239,0.468839)
+ New Polarization:       (0.289353,0.948939,-0.125655)
  *** FresnelRefraction *** 
 Track (trackID 984, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21334,-0.5587,0.80146)
- Old Polarization:       (-0.84298,-0.51993,-0.13805)
- New Momentum Direction: (0.28989,-0.75916,0.58278)
- New Polarization:       (-0.81835,-0.51236,-0.26037)
+ Old Momentum Direction: (0.213224,-0.558695,0.801495)
+ Old Polarization:       (-0.842976,-0.519909,-0.138151)
+ New Momentum Direction: (0.28973,-0.759157,0.582869)
+ New Polarization:       (-0.8183,-0.512347,-0.260549)
  *** FresnelRefraction *** 
 Track (trackID 983, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26587,0.47624,0.83816)
- Old Polarization:       (-0.78469,0.61196,-0.098807)
- New Momentum Direction: (0.36169,0.64788,0.67039)
- New Polarization:       (-0.7632,0.61875,-0.18621)
+ Old Momentum Direction: (0.265775,0.476242,0.838187)
+ Old Polarization:       (-0.784662,0.611982,-0.0989133)
+ New Momentum Direction: (0.361563,0.647884,0.670462)
+ New Polarization:       (-0.763133,0.618775,-0.186399)
  *** FresnelRefraction *** 
 Track (trackID 982, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21137,-0.55767,0.8027)
- Old Polarization:       (-0.84446,-0.51772,-0.13732)
- New Momentum Direction: (0.28746,-0.75843,0.58494)
- New Polarization:       (-0.81966,-0.51074,-0.25941)
+ Old Momentum Direction: (0.211252,-0.557664,0.802735)
+ Old Polarization:       (-0.844453,-0.517702,-0.13742)
+ New Momentum Direction: (0.287301,-0.75842,0.585027)
+ New Polarization:       (-0.819617,-0.510726,-0.259591)
  *** FresnelRefraction *** 
 Track (trackID 981, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75208,-0.6199,0.22384)
- Old Polarization:       (-0.25352,-0.58559,-0.76995)
- New Momentum Direction: (0.44318,-0.84315,0.30445)
- New Polarization:       (-0.46868,-0.50744,-0.72308)
+ Old Momentum Direction: (0.752036,-0.619913,0.223941)
+ Old Polarization:       (-0.253429,-0.585592,-0.769971)
+ New Momentum Direction: (0.443047,-0.843168,0.304592)
+ New Polarization:       (-0.46856,-0.507444,-0.723154)
  *** FresnelRefraction *** 
 Track (trackID 980, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27537,-0.62332,0.73188)
- Old Polarization:       (-0.77623,-0.59329,-0.21324)
- New Momentum Direction: (0.37348,-0.84539,0.38187)
- New Polarization:       (-0.75288,-0.51673,-0.40763)
+ Old Momentum Direction: (0.275263,-0.623318,0.731919)
+ Old Polarization:       (-0.776215,-0.59328,-0.213328)
+ New Momentum Direction: (0.373332,-0.84539,0.38202)
+ New Polarization:       (-0.752816,-0.516715,-0.407766)
  *** FresnelRefraction *** 
 Track (trackID 979, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.088275,-0.2508,0.964)
- Old Polarization:       (-0.98207,-0.18372,0.04213)
- New Momentum Direction: (0.11971,-0.34012,0.93273)
- New Polarization:       (-0.85533,-0.51233,-0.077044)
+ Old Momentum Direction: (0.0881465,-0.250795,0.964019)
+ Old Polarization:       (-0.982084,-0.1837,0.0420076)
+ New Momentum Direction: (0.119538,-0.340112,0.932756)
+ New Polarization:       (-0.855847,-0.511492,-0.0768238)
  *** FresnelRefraction *** 
 Track (trackID 978, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85654,-0.49873,0.1327)
- Old Polarization:       (-0.13316,-0.462,-0.87683)
- New Momentum Direction: (0.71768,-0.67296,0.17906)
- New Polarization:       (-0.24161,-0.48179,-0.84232)
+ Old Momentum Direction: (0.856511,-0.498747,0.132817)
+ Old Polarization:       (-0.133057,-0.462005,-0.876839)
+ New Momentum Direction: (0.717621,-0.67298,0.179216)
+ New Polarization:       (-0.241438,-0.481779,-0.842375)
  *** FresnelRefraction *** 
 Track (trackID 977, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.3034,0.51261,0.80323)
- Old Polarization:       (-0.74451,0.65363,-0.13593)
- New Momentum Direction: (0.41215,0.69636,0.58755)
- New Polarization:       (-0.72156,0.64321,-0.25618)
+ Old Momentum Direction: (0.303305,0.512614,0.803264)
+ Old Polarization:       (-0.744475,0.653646,-0.136027)
+ New Momentum Direction: (0.412024,0.696359,0.587639)
+ New Polarization:       (-0.721489,0.643223,-0.256354)
  *** FresnelRefraction *** 
 Track (trackID 976, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
@@ -10232,77 +10220,77 @@ Track (trackID 976, parentID 1) is processed with stopping code 2
 Track (trackID 975, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43983,0.59089,0.67631)
- Old Polarization:       (-0.5974,0.75479,-0.27094)
- New Momentum Direction: (0.43983,0.59089,-0.67631)
- New Polarization:       (0.64786,-0.73028,-0.21671)
+ Old Momentum Direction: (0.439762,0.590883,0.676363)
+ Old Polarization:       (-0.597348,0.7548,-0.271021)
+ New Momentum Direction: (0.439762,0.590883,-0.676363)
+ New Polarization:       (0.647994,-0.730198,-0.216597)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43983,0.59089,-0.67631)
- Old Polarization:       (0.64786,-0.73028,-0.21671)
- New Momentum Direction: (0.43983,-0.59089,-0.67631)
- New Polarization:       (-0.64786,-0.73028,0.21671)
+ Old Momentum Direction: (0.439762,0.590883,-0.676363)
+ Old Polarization:       (0.647994,-0.730198,-0.216597)
+ New Momentum Direction: (0.439762,-0.590883,-0.676363)
+ New Polarization:       (-0.647994,-0.730198,0.216597)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43983,-0.59089,-0.67631)
- Old Polarization:       (-0.64786,-0.73028,0.21671)
- New Momentum Direction: (-0.43983,-0.59089,-0.67631)
- New Polarization:       (-0.64786,0.73028,-0.21671)
+ Old Momentum Direction: (0.439762,-0.590883,-0.676363)
+ Old Polarization:       (-0.647994,-0.730198,0.216597)
+ New Momentum Direction: (-0.439762,-0.590883,-0.676363)
+ New Polarization:       (-0.647994,0.730198,-0.216597)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.43983,-0.59089,-0.67631)
- Old Polarization:       (-0.64786,0.73028,-0.21671)
- New Momentum Direction: (-0.43983,-0.59089,0.67631)
- New Polarization:       (0.87417,-0.45429,0.1716)
+ Old Momentum Direction: (-0.439762,-0.590883,-0.676363)
+ Old Polarization:       (-0.647994,0.730198,-0.216597)
+ New Momentum Direction: (-0.439762,-0.590883,0.676363)
+ New Polarization:       (0.874146,-0.454428,0.17136)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.43983,-0.59089,0.67631)
- Old Polarization:       (0.87417,-0.45429,0.1716)
- New Momentum Direction: (-0.43983,0.59089,0.67631)
- New Polarization:       (-0.87417,-0.45429,-0.1716)
+ Old Momentum Direction: (-0.439762,-0.590883,0.676363)
+ Old Polarization:       (0.874146,-0.454428,0.17136)
+ New Momentum Direction: (-0.439762,0.590883,0.676363)
+ New Polarization:       (-0.874146,-0.454428,-0.17136)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 974, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7509,0.56898,0.33528)
- Old Polarization:       (-0.25355,0.71715,-0.64916)
- New Momentum Direction: (0.44388,0.77202,0.45493)
- New Polarization:       (-0.46655,0.63256,-0.61823)
+ Old Momentum Direction: (0.750868,0.568965,0.335376)
+ Old Polarization:       (-0.253449,0.717149,-0.6492)
+ New Momentum Direction: (0.443792,0.771995,0.455052)
+ New Polarization:       (-0.466402,0.632582,-0.618312)
  *** FresnelRefraction *** 
 Track (trackID 973, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13832,-0.42796,0.89315)
- Old Polarization:       (-0.92544,-0.37705,-0.037341)
- New Momentum Direction: (0.18789,-0.58133,0.79168)
- New Polarization:       (-0.91739,-0.39178,-0.069953)
+ Old Momentum Direction: (0.138201,-0.427953,0.893173)
+ Old Polarization:       (-0.925444,-0.377028,-0.0374543)
+ New Momentum Direction: (0.187727,-0.581316,0.791726)
+ New Polarization:       (-0.917367,-0.391809,-0.0701634)
  *** FresnelRefraction *** 
 Track (trackID 972, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.72354,0.58512,0.36622)
-Old Polarization: (-0.2834,0.73557,-0.61532)
-New Polarization: (-0.20101,0.64839,-0.73429)
-Polarization Change: (-0.20101,0.64839,-0.73429)
-New Momentum Direction: (0.50651,-0.57281,-0.64446)
-Momentum Change: (0.50651,-0.57281,-0.64446)
+Old Momentum Direction: (0.723507,0.58511,0.366311)
+Old Polarization: (-0.283305,0.73557,-0.615366)
+New Polarization: (-0.200915,0.648379,-0.734328)
+Polarization Change: (-0.200915,0.648379,-0.734328)
+New Momentum Direction: (0.506458,-0.572908,-0.64442)
+Momentum Change: (0.506458,-0.572908,-0.64442)
  Photon at Boundary! 
- Old Momentum Direction: (0.50651,-0.57281,-0.64446)
- Old Polarization:       (-0.20101,0.64839,-0.73429)
- New Momentum Direction: (-0.50651,-0.57281,-0.64446)
- New Polarization:       (-0.20101,-0.64839,0.73429)
+ Old Momentum Direction: (0.506458,-0.572908,-0.64442)
+ Old Polarization:       (-0.200915,0.648379,-0.734328)
+ New Momentum Direction: (-0.506458,-0.572908,-0.64442)
+ New Polarization:       (-0.200915,-0.648379,0.734328)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 971, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75359,-0.61436,0.23383)
- Old Polarization:       (-0.24646,-0.59382,-0.76592)
- New Momentum Direction: (0.46564,-0.8271,0.3148)
- New Polarization:       (-0.44618,-0.5266,-0.72361)
+ Old Momentum Direction: (0.753543,-0.614369,0.233932)
+ Old Polarization:       (-0.24637,-0.593827,-0.765945)
+ New Momentum Direction: (0.465506,-0.827114,0.314938)
+ New Polarization:       (-0.446058,-0.526601,-0.723687)
  *** FresnelRefraction *** 
 Track (trackID 970, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
@@ -10315,135 +10303,135 @@ Track (trackID 969, parentID 1) is processed with stopping code 2
 Track (trackID 968, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39195,0.57812,0.71565)
- Old Polarization:       (-0.64759,0.7259,-0.23173)
- New Momentum Direction: (0.53227,0.78509,0.31674)
- New Polarization:       (-0.64508,0.61841,-0.44882)
+ Old Momentum Direction: (0.39187,0.578118,0.715693)
+ Old Polarization:       (-0.647544,0.725912,-0.231817)
+ New Momentum Direction: (0.532162,0.785088,0.316924)
+ New Polarization:       (-0.644981,0.618423,-0.448946)
  *** FresnelRefraction *** 
 Track (trackID 967, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99825,-0.055116,0.021651)
- Old Polarization:       (0.023407,0.031415,-0.99923)
- New Momentum Direction: (0.9968,-0.074438,0.029241)
- New Polarization:       (-0.040193,-0.78237,-0.62152)
+ Old Momentum Direction: (0.998241,-0.0551391,0.0217829)
+ Old Polarization:       (0.0235391,0.0314034,-0.99923)
+ New Momentum Direction: (0.996789,-0.0744694,0.0294194)
+ New Polarization:       (-0.0403994,-0.784979,-0.618203)
  *** FresnelRefraction *** 
 Track (trackID 966, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9797,0.19216,0.05708)
- Old Polarization:       (-0.0037632,0.30233,-0.9532)
- New Momentum Direction: (0.96219,0.26111,0.077563)
- New Polarization:       (-0.0069666,0.30825,-0.95128)
+ Old Momentum Direction: (0.979699,0.192137,0.0572071)
+ Old Polarization:       (-0.00363056,0.302319,-0.9532)
+ New Momentum Direction: (0.962181,0.261083,0.0777353)
+ New Polarization:       (-0.00672111,0.308027,-0.951354)
  *** FresnelRefraction *** 
 Track (trackID 965, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98372,0.16902,0.061038)
- Old Polarization:       (0.01107,0.28202,-0.95934)
- New Momentum Direction: (0.97031,0.22749,0.082155)
- New Polarization:       (-0.020063,0.4142,-0.90997)
+ Old Momentum Direction: (0.983718,0.168993,0.0611653)
+ Old Polarization:       (0.0112026,0.282014,-0.959345)
+ New Momentum Direction: (0.970301,0.227459,0.0823265)
+ New Polarization:       (-0.0203038,0.415714,-0.909269)
  *** FresnelRefraction *** 
 Track (trackID 964, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40956,0.57996,0.70421)
- Old Polarization:       (-0.63033,0.73793,-0.24113)
- New Momentum Direction: (0.40956,0.57996,-0.70421)
- New Polarization:       (0.72367,-0.67655,-0.1363)
+ Old Momentum Direction: (0.409486,0.579957,0.704252)
+ Old Polarization:       (-0.630285,0.737939,-0.24122)
+ New Momentum Direction: (0.409486,0.579957,-0.704252)
+ New Polarization:       (0.723736,-0.676487,-0.136277)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.40956,0.57996,-0.70421)
- Old Polarization:       (0.72367,-0.67655,-0.1363)
- New Momentum Direction: (0.40956,-0.57996,-0.70421)
- New Polarization:       (-0.72367,-0.67655,0.1363)
+ Old Momentum Direction: (0.409486,0.579957,-0.704252)
+ Old Polarization:       (0.723736,-0.676487,-0.136277)
+ New Momentum Direction: (0.409486,-0.579957,-0.704252)
+ New Polarization:       (-0.723736,-0.676487,0.136277)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 963, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.087087,0.056024,0.99462)
- Old Polarization:       (-0.985,0.15411,0.077564)
- New Momentum Direction: (0.11793,0.075863,0.99012)
- New Polarization:       (0.40157,0.90827,-0.11742)
+ Old Momentum Direction: (0.0869618,0.0560323,0.994635)
+ Old Polarization:       (-0.98501,0.154137,0.0774371)
+ New Momentum Direction: (0.117758,0.075875,0.990139)
+ New Polarization:       (0.400299,0.908852,-0.117254)
  *** FresnelRefraction *** 
 Track (trackID 962, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99456,-0.1027,0.017565)
- Old Polarization:       (0.015494,-0.020926,-0.99966)
- New Momentum Direction: (0.98998,-0.13918,0.023804)
- New Polarization:       (-0.028215,-0.36017,-0.93246)
+ Old Momentum Direction: (0.994552,-0.102724,0.0176973)
+ Old Polarization:       (0.0156255,-0.0209381,-0.999659)
+ New Momentum Direction: (0.989973,-0.139209,0.023983)
+ New Polarization:       (-0.0284495,-0.362784,-0.931439)
  *** FresnelRefraction *** 
 Track (trackID 961, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91334,-0.39982,0.077209)
- Old Polarization:       (-0.073601,-0.34857,-0.93439)
- New Momentum Direction: (0.8341,-0.5416,0.10459)
- New Polarization:       (-0.13498,-0.38424,-0.91331)
+ Old Momentum Direction: (0.913318,-0.399837,0.0773341)
+ Old Polarization:       (-0.0734863,-0.348584,-0.934392)
+ New Momentum Direction: (0.834064,-0.54163,0.104759)
+ New Polarization:       (-0.134774,-0.384197,-0.913361)
  *** FresnelRefraction *** 
 Track (trackID 960, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.38056,-0.69414,0.61102)
-Old Polarization: (-0.65953,-0.66688,-0.34683)
-New Polarization: (-0.93706,0.11142,0.33091)
-Polarization Change: (-0.93706,0.11142,0.33091)
-New Momentum Direction: (-0.28515,-0.79116,-0.54108)
-Momentum Change: (-0.28515,-0.79116,-0.54108)
+Old Momentum Direction: (0.380468,-0.694141,0.611075)
+Old Polarization: (-0.659499,-0.666872,-0.346904)
+New Polarization: (-0.937081,0.11139,0.330865)
+Polarization Change: (-0.937081,0.11139,0.330865)
+New Momentum Direction: (-0.285106,-0.791129,-0.541137)
+Momentum Change: (-0.285106,-0.791129,-0.541137)
 
 ** Photon absorbed! **
 Track (trackID 959, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43867,-0.70321,0.55952)
- Old Polarization:       (-0.59849,-0.69307,-0.40183)
- New Momentum Direction: (0.43867,0.70321,0.55952)
- New Polarization:       (-0.092256,0.65458,-0.75034)
+ Old Momentum Direction: (0.438582,-0.70321,0.55959)
+ Old Polarization:       (-0.598449,-0.693062,-0.4019)
+ New Momentum Direction: (0.438582,0.70321,0.55959)
+ New Polarization:       (-0.0920807,0.654558,-0.750383)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43867,0.70321,0.55952)
- Old Polarization:       (-0.092256,0.65458,-0.75034)
- New Momentum Direction: (0.43867,0.70321,-0.55952)
- New Polarization:       (0.092256,-0.65458,-0.75034)
+ Old Momentum Direction: (0.438582,0.70321,0.55959)
+ Old Polarization:       (-0.0920807,0.654558,-0.750383)
+ New Momentum Direction: (0.438582,0.70321,-0.55959)
+ New Polarization:       (0.0920807,-0.654558,-0.750383)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.43867,0.70321,-0.55952)
- Old Polarization:       (0.092256,-0.65458,-0.75034)
- New Momentum Direction: (-0.43867,0.70321,-0.55952)
- New Polarization:       (0.092256,0.65458,0.75034)
+ Old Momentum Direction: (0.438582,0.70321,-0.55959)
+ Old Polarization:       (0.0920807,-0.654558,-0.750383)
+ New Momentum Direction: (-0.438582,0.70321,-0.55959)
+ New Polarization:       (0.0920807,0.654558,0.750383)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.43867,0.70321,-0.55952)
- Old Polarization:       (0.092256,0.65458,0.75034)
- New Momentum Direction: (-0.5906,0.28932,-0.75332)
- New Polarization:       (-0.38303,-0.92216,-0.053872)
+ Old Momentum Direction: (-0.438582,0.70321,-0.55959)
+ Old Polarization:       (0.0920807,0.654558,0.750383)
+ New Momentum Direction: (-0.590484,0.289331,-0.753403)
+ New Polarization:       (-0.383064,-0.922148,-0.0539053)
  *** FresnelRefraction *** 
 Track (trackID 958, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.16739,0.32774,0.92982)
- Old Polarization:       (-0.89285,0.45035,0.0019923)
- New Momentum Direction: (0.22756,0.44556,0.86585)
- New Polarization:       (-0.88762,0.46057,-0.0037224)
+ Old Momentum Direction: (0.167276,0.327744,0.92984)
+ Old Polarization:       (-0.892837,0.450376,0.00187393)
+ New Momentum Direction: (0.227413,0.445569,0.865882)
+ New Polarization:       (-0.887919,0.459986,-0.00350126)
  *** FresnelRefraction *** 
 Track (trackID 957, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.080827,-0.10987,0.99065)
- Old Polarization:       (-0.99651,-0.029586,0.078023)
- New Momentum Direction: (0.10901,-0.14818,0.98294)
- New Polarization:       (-0.18714,-0.97421,-0.12611)
+ Old Momentum Direction: (0.0806982,-0.109861,0.990666)
+ Old Polarization:       (-0.996523,-0.0295622,0.077897)
+ New Momentum Direction: (0.108833,-0.148163,0.982956)
+ New Polarization:       (-0.188559,-0.973954,-0.125929)
  *** FresnelRefraction *** 
 Track (trackID 956, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.19474,-0.53216,0.82394)
- Old Polarization:       (-0.86363,-0.49126,-0.11317)
- New Momentum Direction: (0.26452,-0.72286,0.63836)
- New Polarization:       (-0.84182,-0.49603,-0.21285)
+ Old Momentum Direction: (0.194624,-0.532157,0.823972)
+ Old Polarization:       (-0.863625,-0.491244,-0.113277)
+ New Momentum Direction: (0.264366,-0.722852,0.638432)
+ New Polarization:       (-0.841774,-0.496016,-0.213037)
  *** FresnelRefraction *** 
 Track (trackID 955, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
@@ -10452,99 +10440,99 @@ Track (trackID 955, parentID 1) is processed with stopping code 2
 Track (trackID 954, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48359,-0.71525,0.50453)
- Old Polarization:       (-0.54747,-0.69692,-0.46323)
- New Momentum Direction: (0.65487,-0.32304,0.68322)
- New Polarization:       (0.18767,0.94524,0.26704)
+ Old Momentum Direction: (0.483513,-0.715254,0.504605)
+ Old Polarization:       (-0.547424,-0.69691,-0.463296)
+ New Momentum Direction: (0.654758,-0.323054,0.683321)
+ New Polarization:       (0.18762,0.945228,0.267099)
  *** FresnelRefraction *** 
 Track (trackID 953, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96907,-0.24482,0.03121)
- Old Polarization:       (-0.013084,-0.17725,-0.98408)
- New Momentum Direction: (0.94236,-0.33193,0.042315)
- New Polarization:       (-0.024125,-0.19353,-0.9808)
+ Old Momentum Direction: (0.969057,-0.244838,0.0313403)
+ Old Polarization:       (-0.012959,-0.177258,-0.984079)
+ New Momentum Direction: (0.942337,-0.331957,0.0424919)
+ New Polarization:       (-0.0238948,-0.193382,-0.980833)
  *** FresnelRefraction *** 
 Track (trackID 952, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52377,-0.71587,0.46174)
- Old Polarization:       (-0.50314,-0.69736,-0.51044)
- New Momentum Direction: (0.70938,-0.32513,0.62536)
- New Polarization:       (0.26565,0.94515,0.19005)
+ Old Momentum Direction: (0.523692,-0.715874,0.461812)
+ Old Polarization:       (-0.503084,-0.697351,-0.510498)
+ New Momentum Direction: (0.709273,-0.325154,0.625465)
+ New Polarization:       (0.265627,0.945143,0.190123)
  *** FresnelRefraction *** 
 Track (trackID 951, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97098,-0.23674,0.033908)
- Old Polarization:       (-0.0070602,-0.17009,-0.9854)
- New Momentum Direction: (0.94638,-0.3198,0.045804)
- New Polarization:       (-0.012928,-0.17915,-0.98374)
+ Old Momentum Direction: (0.97097,-0.236767,0.0340388)
+ Old Polarization:       (-0.00693442,-0.170104,-0.985402)
+ New Momentum Direction: (0.946358,-0.319832,0.0459807)
+ New Polarization:       (-0.0126976,-0.179003,-0.983767)
  *** FresnelRefraction *** 
 Track (trackID 950, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52071,0.62484,0.58176)
- Old Polarization:       (-0.50635,0.77467,-0.37882)
- New Momentum Direction: (0.52071,-0.62484,0.58176)
- New Polarization:       (0.50635,0.77467,0.37882)
+ Old Momentum Direction: (0.520648,0.624831,0.581817)
+ Old Polarization:       (-0.506279,0.774674,-0.378895)
+ New Momentum Direction: (0.520648,-0.624831,0.581817)
+ New Polarization:       (0.506279,0.774674,0.378895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52071,-0.62484,0.58176)
- Old Polarization:       (0.50635,0.77467,0.37882)
- New Momentum Direction: (0.52071,-0.62484,-0.58176)
- New Polarization:       (-0.50635,-0.77467,0.37882)
+ Old Momentum Direction: (0.520648,-0.624831,0.581817)
+ Old Polarization:       (0.506279,0.774674,0.378895)
+ New Momentum Direction: (0.520648,-0.624831,-0.581817)
+ New Polarization:       (-0.506279,-0.774674,0.378895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52071,-0.62484,-0.58176)
- Old Polarization:       (-0.50635,-0.77467,0.37882)
- New Momentum Direction: (-0.52071,-0.62484,-0.58176)
- New Polarization:       (-0.50635,0.77467,-0.37882)
+ Old Momentum Direction: (0.520648,-0.624831,-0.581817)
+ Old Polarization:       (-0.506279,-0.774674,0.378895)
+ New Momentum Direction: (-0.520648,-0.624831,-0.581817)
+ New Polarization:       (-0.506279,0.774674,-0.378895)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (-0.52071,-0.62484,-0.58176)
-Old Polarization: (-0.50635,0.77467,-0.37882)
-New Polarization: (-0.75541,0.64829,0.095272)
-Polarization Change: (-0.75541,0.64829,0.095272)
-New Momentum Direction: (0.25464,0.42441,-0.86893)
-Momentum Change: (0.25464,0.42441,-0.86893)
+Old Momentum Direction: (-0.520648,-0.624831,-0.581817)
+Old Polarization: (-0.506279,0.774674,-0.378895)
+New Polarization: (-0.75537,0.648347,0.0951973)
+Polarization Change: (-0.75537,0.648347,0.0951973)
+New Momentum Direction: (0.254702,0.424334,-0.868946)
+Momentum Change: (0.254702,0.424334,-0.868946)
  Photon at Boundary! 
- Old Momentum Direction: (0.25464,0.42441,-0.86893)
- Old Polarization:       (-0.75541,0.64829,0.095272)
- New Momentum Direction: (0.34632,0.57723,-0.7395)
- New Polarization:       (-0.72679,0.66351,0.17754)
+ Old Momentum Direction: (0.254702,0.424334,-0.868946)
+ Old Polarization:       (-0.75537,0.648347,0.0951973)
+ New Momentum Direction: (0.346414,0.577127,-0.739542)
+ New Polarization:       (-0.726775,0.66357,0.177405)
  *** FresnelRefraction *** 
 Track (trackID 949, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57816,0.62102,0.52921)
- Old Polarization:       (-0.44276,0.7836,-0.43582)
- New Momentum Direction: (0.57816,-0.62102,0.52921)
- New Polarization:       (0.44276,0.7836,0.43582)
+ Old Momentum Direction: (0.578109,0.621009,0.52928)
+ Old Polarization:       (-0.442688,0.783604,-0.435881)
+ New Momentum Direction: (0.578109,-0.621009,0.52928)
+ New Polarization:       (0.442688,0.783604,0.435881)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.57816,-0.62102,0.52921)
- Old Polarization:       (0.44276,0.7836,0.43582)
- New Momentum Direction: (-0.57816,-0.62102,0.52921)
- New Polarization:       (0.44276,-0.7836,-0.43582)
+ Old Momentum Direction: (0.578109,-0.621009,0.52928)
+ Old Polarization:       (0.442688,0.783604,0.435881)
+ New Momentum Direction: (-0.578109,-0.621009,0.52928)
+ New Polarization:       (0.442688,-0.783604,-0.435881)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 948, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1098,-0.34708,0.93138)
- Old Polarization:       (-0.95735,-0.28888,0.0052078)
- New Momentum Direction: (0.14905,-0.47117,0.86936)
- New Polarization:       (-0.9481,-0.31782,-0.009697)
+ Old Momentum Direction: (0.109671,-0.347076,0.931402)
+ Old Polarization:       (-0.957359,-0.288856,0.0050893)
+ New Momentum Direction: (0.14888,-0.471159,0.869393)
+ New Polarization:       (-0.948329,-0.317146,-0.00947638)
  *** FresnelRefraction *** 
 Track (trackID 947, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.074315,-0.057513,0.99558)
- Old Polarization:       (-0.99668,0.02889,0.076066)
- New Momentum Direction: (0.10085,-0.078047,0.99184)
- New Polarization:       (0.40346,-0.90806,-0.11248)
+ Old Momentum Direction: (0.0741868,-0.0575037,0.995585)
+ Old Polarization:       (-0.996693,0.0289141,0.0759394)
+ New Momentum Direction: (0.100674,-0.0780344,0.991855)
+ New Polarization:       (0.402199,-0.908637,-0.112311)
  *** FresnelRefraction *** 
 Track (trackID 946, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
@@ -10553,10 +10541,10 @@ Track (trackID 946, parentID 1) is processed with stopping code 2
 Track (trackID 945, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.17472,-0.49508,0.8511)
- Old Polarization:       (-0.88767,-0.45323,-0.081416)
- New Momentum Direction: (0.23676,-0.67089,0.70275)
- New Polarization:       (-0.87117,-0.46682,-0.15215)
+ Old Momentum Direction: (0.174598,-0.495076,0.851126)
+ Old Polarization:       (-0.887669,-0.453208,-0.0815241)
+ New Momentum Direction: (0.236598,-0.67088,0.702809)
+ New Polarization:       (-0.871131,-0.46682,-0.152349)
  *** FresnelRefraction *** 
 Track (trackID 944, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
@@ -10565,72 +10553,72 @@ Track (trackID 944, parentID 1) is processed with stopping code 2
 Track (trackID 943, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9689,-0.24566,0.029693)
- Old Polarization:       (-0.014836,-0.17745,-0.98402)
- New Momentum Direction: (0.94186,-0.33358,0.040319)
- New Polarization:       (-0.02743,-0.19593,-0.98023)
+ Old Momentum Direction: (0.968891,-0.245685,0.0298237)
+ Old Polarization:       (-0.0147109,-0.177464,-0.984017)
+ New Momentum Direction: (0.941843,-0.333605,0.0404964)
+ New Polarization:       (-0.0271992,-0.195784,-0.98027)
  *** FresnelRefraction *** 
 Track (trackID 942, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98186,0.1812,0.055813)
- Old Polarization:       (0.00060867,0.29135,-0.95662)
- New Momentum Direction: (0.96637,0.24576,0.075699)
- New Polarization:       (-0.0011224,0.29839,-0.95444)
+ Old Momentum Direction: (0.981858,0.181178,0.0559398)
+ Old Polarization:       (0.000741529,0.291343,-0.956618)
+ New Momentum Direction: (0.966364,0.245734,0.0758716)
+ New Polarization:       (-0.00136737,0.299919,-0.953964)
  *** FresnelRefraction *** 
 Track (trackID 941, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.2022,-0.52368,0.82757)
- Old Polarization:       (-0.86372,-0.49368,-0.10137)
- New Momentum Direction: (0.27194,-0.70431,0.65574)
- New Polarization:       (-0.84538,-0.5004,-0.18689)
+ Old Momentum Direction: (0.202078,-0.523676,0.827603)
+ Old Polarization:       (-0.863714,-0.493661,-0.101475)
+ New Momentum Direction: (0.271779,-0.704303,0.655815)
+ New Polarization:       (-0.845345,-0.500396,-0.18707)
  *** FresnelRefraction *** 
 Track (trackID 940, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5872,-0.70231,0.40245)
- Old Polarization:       (-0.43244,-0.69247,-0.57748)
- New Momentum Direction: (0.79038,-0.28613,0.5417)
- New Polarization:       (0.32053,0.94669,0.03237)
+ Old Momentum Direction: (0.587132,-0.702314,0.402531)
+ Old Polarization:       (-0.432376,-0.692472,-0.577523)
+ New Momentum Direction: (0.790286,-0.28616,0.541812)
+ New Polarization:       (0.320539,0.946679,0.0324541)
  *** FresnelRefraction *** 
 Track (trackID 939, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.16916,0.31459,0.93403)
- Old Polarization:       (-0.89696,0.4419,0.013619)
- New Momentum Direction: (0.22844,0.42481,0.87599)
- New Polarization:       (-0.858,0.51305,-0.025057)
+ Old Momentum Direction: (0.169053,0.314591,0.934052)
+ Old Polarization:       (-0.896954,0.441918,0.0134999)
+ New Momentum Direction: (0.228285,0.424816,0.876024)
+ New Polarization:       (-0.858344,0.512472,-0.0248384)
  *** FresnelRefraction *** 
 Track (trackID 938, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0798,0.035478,0.99618)
- Old Polarization:       (-0.98862,0.13066,0.074542)
- New Momentum Direction: (0.10849,0.048234,0.99293)
- New Polarization:       (0.66144,0.74213,-0.10832)
+ Old Momentum Direction: (0.0796745,0.0354871,0.996189)
+ Old Polarization:       (-0.988628,0.130679,0.0744147)
+ New Momentum Direction: (0.108321,0.0482463,0.992945)
+ New Polarization:       (0.660516,0.74298,-0.108157)
  *** FresnelRefraction *** 
 Track (trackID 937, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85289,-0.50595,0.12882)
- Old Polarization:       (-0.14228,-0.46263,-0.87506)
- New Momentum Direction: (0.7051,-0.68719,0.17496)
- New Polarization:       (-0.26105,-0.48095,-0.83698)
+ Old Momentum Direction: (0.852863,-0.505965,0.128935)
+ Old Polarization:       (-0.142172,-0.462642,-0.875071)
+ New Momentum Direction: (0.705035,-0.687211,0.175122)
+ New Polarization:       (-0.260873,-0.480943,-0.837042)
  *** FresnelRefraction *** 
 Track (trackID 936, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74237,-0.62325,0.24588)
- Old Polarization:       (-0.25855,-0.60505,-0.75304)
- New Momentum Direction: (-0.74237,-0.62325,0.24588)
- New Polarization:       (-0.084723,0.45136,0.88831)
+ Old Momentum Direction: (0.742321,-0.623259,0.245981)
+ Old Polarization:       (-0.258465,-0.605052,-0.753065)
+ New Momentum Direction: (-0.742321,-0.623259,0.245981)
+ New Polarization:       (-0.0847574,0.451507,0.888233)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.74237,-0.62325,0.24588)
- Old Polarization:       (-0.084723,0.45136,0.88831)
- New Momentum Direction: (-0.74237,0.62325,0.24588)
- New Polarization:       (0.084723,0.45136,-0.88831)
+ Old Momentum Direction: (-0.742321,-0.623259,0.245981)
+ Old Polarization:       (-0.0847574,0.451507,0.888233)
+ New Momentum Direction: (-0.742321,0.623259,0.245981)
+ New Polarization:       (0.0847574,0.451507,-0.888233)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -10641,42 +10629,42 @@ Track (trackID 935, parentID 1) is processed with stopping code 2
 Track (trackID 934, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22361,0.41661,0.88115)
- Old Polarization:       (-0.83337,0.55055,-0.048825)
- New Momentum Direction: (0.30318,0.56488,0.76746)
- New Polarization:       (-0.82052,0.5643,-0.091205)
+ Old Momentum Direction: (0.223503,0.416617,0.881179)
+ Old Polarization:       (-0.833351,0.550574,-0.0489364)
+ New Momentum Direction: (0.303044,0.564883,0.76751)
+ New Polarization:       (-0.820457,0.564353,-0.0914114)
  *** FresnelRefraction *** 
 Track (trackID 933, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85615,0.47085,0.21285)
- Old Polarization:       (-0.13935,0.60705,-0.78235)
- New Momentum Direction: (0.71177,0.64005,0.28934)
- New Polarization:       (-0.25607,0.62002,-0.74162)
+ Old Momentum Direction: (0.856133,0.470833,0.212962)
+ Old Polarization:       (-0.139228,0.607041,-0.782379)
+ New Momentum Direction: (0.711733,0.640025,0.289489)
+ New Polarization:       (-0.255874,0.620016,-0.741693)
  *** FresnelRefraction *** 
 Track (trackID 932, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.2333,0.425,0.87461)
- Old Polarization:       (-0.82476,0.56295,-0.053551)
- New Momentum Direction: (0.31545,0.57466,0.75515)
- New Polarization:       (-0.81127,0.57613,-0.09953)
+ Old Momentum Direction: (0.233196,0.424998,0.874641)
+ Old Polarization:       (-0.824737,0.562965,-0.0536615)
+ New Momentum Direction: (0.315318,0.574666,0.755204)
+ New Polarization:       (-0.811216,0.576178,-0.0997333)
  *** FresnelRefraction *** 
 Track (trackID 931, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.081491,-0.21839,0.97245)
- Old Polarization:       (-0.98783,-0.14743,0.049671)
- New Momentum Direction: (0.11068,-0.29663,0.94856)
- New Polarization:       (-0.80353,-0.58839,-0.090237)
+ Old Momentum Direction: (0.0813622,-0.218383,0.972466)
+ Old Polarization:       (-0.987835,-0.147402,0.0495467)
+ New Momentum Direction: (0.110509,-0.296616,0.948581)
+ New Polarization:       (-0.8042,-0.587503,-0.0900198)
  *** FresnelRefraction *** 
 Track (trackID 930, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60386,-0.70298,0.37573)
- Old Polarization:       (-0.41514,-0.67976,-0.60464)
- New Momentum Direction: (0.81958,-0.26124,0.50995)
- New Polarization:       (0.31985,0.94703,-0.028907)
+ Old Momentum Direction: (0.603793,-0.702991,0.375816)
+ Old Polarization:       (-0.415073,-0.679762,-0.604681)
+ New Momentum Direction: (0.819489,-0.261277,0.510071)
+ New Polarization:       (0.319877,0.947021,-0.0288218)
  *** FresnelRefraction *** 
 Track (trackID 929, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
@@ -10685,65 +10673,65 @@ Track (trackID 929, parentID 1) is processed with stopping code 2
 Track (trackID 928, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.14901,-0.43063,0.89014)
- Old Polarization:       (-0.92129,-0.38745,-0.033214)
- New Momentum Direction: (0.20082,-0.58035,0.78922)
- New Polarization:       (-0.91456,-0.39978,-0.061263)
+ Old Momentum Direction: (0.148887,-0.430624,0.890166)
+ Old Polarization:       (-0.921298,-0.387427,-0.0333264)
+ New Momentum Direction: (0.20065,-0.580338,0.78927)
+ New Polarization:       (-0.914539,-0.399799,-0.0614697)
  *** FresnelRefraction *** 
 Track (trackID 927, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23924,-0.57968,0.77894)
- Old Polarization:       (-0.81922,-0.55113,-0.15853)
- New Momentum Direction: (0.32303,-0.78272,0.53198)
- New Polarization:       (-0.79507,-0.52935,-0.29606)
+ Old Momentum Direction: (0.239124,-0.579673,0.778973)
+ Old Polarization:       (-0.819216,-0.551109,-0.158631)
+ New Momentum Direction: (0.32288,-0.78271,0.532085)
+ New Polarization:       (-0.795024,-0.52933,-0.29622)
  *** FresnelRefraction *** 
 Track (trackID 926, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.43009,0.59924,0.67523)
-Old Polarization: (-0.60531,0.74632,-0.27677)
-New Polarization: (-0.74886,0.026036,-0.66222)
-Polarization Change: (-0.74886,0.026036,-0.66222)
-New Momentum Direction: (-0.15112,0.9662,0.20888)
-Momentum Change: (-0.15112,0.9662,0.20888)
+Old Momentum Direction: (0.430022,0.599234,0.675277)
+Old Polarization: (-0.60526,0.746333,-0.276853)
+New Polarization: (-0.748823,0.0260291,-0.662259)
+Polarization Change: (-0.748823,0.0260291,-0.662259)
+New Momentum Direction: (-0.151079,0.966218,0.208802)
+Momentum Change: (-0.151079,0.966218,0.208802)
  Photon at Boundary! 
- Old Momentum Direction: (-0.15112,0.9662,0.20888)
- Old Polarization:       (-0.74886,0.026036,-0.66222)
- New Momentum Direction: (-0.20558,0.93648,0.28416)
- New Polarization:       (-0.87795,-0.048201,-0.47632)
+ Old Momentum Direction: (-0.151079,0.966218,0.208802)
+ Old Polarization:       (-0.748823,0.0260291,-0.662259)
+ New Momentum Direction: (-0.205527,0.936521,0.284054)
+ New Polarization:       (-0.877934,-0.0481889,-0.476351)
  *** FresnelRefraction *** 
 Track (trackID 925, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45676,-0.71486,0.52948)
- Old Polarization:       (-0.57644,-0.69117,-0.43589)
- New Momentum Direction: (0.62056,-0.31215,0.71935)
- New Polarization:       (0.12732,0.94529,0.30036)
+ Old Momentum Direction: (0.456677,-0.71486,0.529549)
+ Old Polarization:       (-0.576397,-0.691166,-0.435954)
+ New Momentum Direction: (0.620442,-0.312168,0.719446)
+ New Polarization:       (0.127264,0.945283,0.300408)
  *** FresnelRefraction *** 
 Track (trackID 924, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82024,-0.54929,0.15964)
- Old Polarization:       (-0.17798,-0.51029,-0.84138)
- New Momentum Direction: (0.62972,-0.74596,0.21679)
- New Polarization:       (-0.32621,-0.50721,-0.7977)
+ Old Momentum Direction: (0.820211,-0.549303,0.159749)
+ Old Polarization:       (-0.177877,-0.510301,-0.8414)
+ New Momentum Direction: (0.629643,-0.745979,0.216947)
+ New Polarization:       (-0.326055,-0.507213,-0.797761)
  *** FresnelRefraction *** 
 Track (trackID 923, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22705,-0.56683,0.79193)
- Old Polarization:       (-0.83199,-0.53557,-0.1448)
- New Momentum Direction: (0.30688,-0.76613,0.56469)
- New Polarization:       (-0.80822,-0.5231,-0.27047)
+ Old Momentum Direction: (0.226936,-0.566822,0.791968)
+ Old Polarization:       (-0.83198,-0.53555,-0.144899)
+ New Momentum Direction: (0.306728,-0.766122,0.564778)
+ New Polarization:       (-0.80817,-0.52308,-0.270645)
  *** FresnelRefraction *** 
 Track (trackID 922, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82556,0.50697,0.24785)
- Old Polarization:       (-0.17327,0.64571,-0.74367)
- New Momentum Direction: (0.64093,0.6896,0.33713)
- New Polarization:       (-0.31849,0.63852,-0.70061)
+ Old Momentum Direction: (0.825541,0.506955,0.247948)
+ Old Polarization:       (-0.173152,0.645703,-0.743697)
+ New Momentum Direction: (0.640887,0.689576,0.337266)
+ New Polarization:       (-0.318308,0.638532,-0.700683)
  *** FresnelRefraction *** 
 Track (trackID 921, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
@@ -10752,18 +10740,18 @@ Track (trackID 921, parentID 1) is processed with stopping code 2
 Track (trackID 920, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9893,-0.14432,0.021372)
- Old Polarization:       (0.011746,-0.06722,-0.99767)
- New Momentum Direction: (0.98033,-0.19522,0.028909)
- New Polarization:       (-0.021464,-0.25109,-0.96773)
+ Old Momentum Direction: (0.989294,-0.144344,0.0215037)
+ Old Polarization:       (0.0118762,-0.0672316,-0.997667)
+ New Momentum Direction: (0.980322,-0.195251,0.0290876)
+ New Polarization:       (-0.0217001,-0.253043,-0.967212)
  *** FresnelRefraction *** 
 Track (trackID 919, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42423,-0.70337,0.57035)
- Old Polarization:       (-0.61344,-0.68653,-0.39035)
- New Momentum Direction: (0.57352,-0.27669,0.77105)
- New Polarization:       (0.024933,0.94669,0.32117)
+ Old Momentum Direction: (0.424146,-0.703369,0.570415)
+ Old Polarization:       (-0.613403,-0.686518,-0.390423)
+ New Momentum Direction: (0.573397,-0.2767,0.771137)
+ New Polarization:       (0.0248691,0.946685,0.321198)
  *** FresnelRefraction *** 
 Track (trackID 918, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
@@ -10784,10 +10772,10 @@ Track (trackID 915, parentID 1) is processed with stopping code 2
 Track (trackID 914, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.08337,0.043862,0.99555)
- Old Polarization:       (-0.98715,0.14031,0.076484)
- New Momentum Direction: (0.11309,0.0595,0.9918)
- New Polarization:       (0.55766,0.82236,-0.11292)
+ Old Momentum Direction: (0.0832444,0.0438709,0.995563)
+ Old Polarization:       (-0.987156,0.140331,0.0763575)
+ New Momentum Direction: (0.112923,0.0595121,0.99182)
+ New Polarization:       (0.556567,0.823115,-0.112757)
  *** FresnelRefraction *** 
 Track (trackID 913, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
@@ -10796,10 +10784,10 @@ Track (trackID 913, parentID 1) is processed with stopping code 2
 Track (trackID 912, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94862,-0.31265,0.048726)
- Old Polarization:       (-0.033749,-0.25308,-0.96686)
- New Momentum Direction: (0.90367,-0.42312,0.065943)
- New Polarization:       (-0.061963,-0.28157,-0.95754)
+ Old Momentum Direction: (0.948605,-0.312669,0.0488542)
+ Old Polarization:       (-0.0336276,-0.253093,-0.966857)
+ New Momentum Direction: (0.903644,-0.423149,0.0661167)
+ New Polarization:       (-0.0617426,-0.281474,-0.95758)
  *** FresnelRefraction *** 
 Track (trackID 911, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
@@ -10808,127 +10796,127 @@ Track (trackID 911, parentID 1) is processed with stopping code 2
 Track (trackID 910, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.23679,0.43143,0.87052)
-Old Polarization: (-0.82022,0.569,-0.05889)
-New Polarization: (0.78473,-0.15638,-0.59978)
-Polarization Change: (0.78473,-0.15638,-0.59978)
-New Momentum Direction: (0.3809,-0.64171,0.66567)
-Momentum Change: (0.3809,-0.64171,0.66567)
+Old Momentum Direction: (0.236686,0.431429,0.870545)
+Old Polarization: (-0.820202,0.569023,-0.0590006)
+New Polarization: (0.784782,-0.156444,-0.599702)
+Polarization Change: (0.784782,-0.156444,-0.599702)
+New Momentum Direction: (0.380824,-0.64168,0.665748)
+Momentum Change: (0.380824,-0.64168,0.665748)
  Photon at Boundary! 
- Old Momentum Direction: (0.3809,-0.64171,0.66567)
- Old Polarization:       (0.78473,-0.15638,-0.59978)
- New Momentum Direction: (0.3809,-0.64171,-0.66567)
- New Polarization:       (-0.78473,0.15638,-0.59978)
+ Old Momentum Direction: (0.380824,-0.64168,0.665748)
+ Old Polarization:       (0.784782,-0.156444,-0.599702)
+ New Momentum Direction: (0.380824,-0.64168,-0.665748)
+ New Polarization:       (-0.784782,0.156444,-0.599702)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.3809,-0.64171,-0.66567)
- Old Polarization:       (-0.78473,0.15638,-0.59978)
- New Momentum Direction: (0.3809,0.64171,-0.66567)
- New Polarization:       (0.78473,0.15638,0.59978)
+ Old Momentum Direction: (0.380824,-0.64168,-0.665748)
+ Old Polarization:       (-0.784782,0.156444,-0.599702)
+ New Momentum Direction: (0.380824,0.64168,-0.665748)
+ New Polarization:       (0.784782,0.156444,0.599702)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.3809,0.64171,-0.66567)
- Old Polarization:       (0.78473,0.15638,0.59978)
- New Momentum Direction: (-0.3809,0.64171,-0.66567)
- New Polarization:       (0.78473,-0.15638,-0.59978)
+ Old Momentum Direction: (0.380824,0.64168,-0.665748)
+ Old Polarization:       (0.784782,0.156444,0.599702)
+ New Momentum Direction: (-0.380824,0.64168,-0.665748)
+ New Polarization:       (0.784782,-0.156444,-0.599702)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 909, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,0.61599,0.61458)
- Old Polarization:       (-0.53725,0.77099,-0.34197)
- New Momentum Direction: (0.49279,-0.61599,0.61458)
- New Polarization:       (0.53725,0.77099,0.34197)
+ Old Momentum Direction: (0.492728,0.615985,0.61464)
+ Old Polarization:       (-0.537189,0.770995,-0.342044)
+ New Momentum Direction: (0.492728,-0.615985,0.61464)
+ New Polarization:       (0.537189,0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,-0.61599,0.61458)
- Old Polarization:       (0.53725,0.77099,0.34197)
- New Momentum Direction: (0.49279,-0.61599,-0.61458)
- New Polarization:       (-0.53725,-0.77099,0.34197)
+ Old Momentum Direction: (0.492728,-0.615985,0.61464)
+ Old Polarization:       (0.537189,0.770995,0.342044)
+ New Momentum Direction: (0.492728,-0.615985,-0.61464)
+ New Polarization:       (-0.537189,-0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,-0.61599,-0.61458)
- Old Polarization:       (-0.53725,-0.77099,0.34197)
- New Momentum Direction: (-0.49279,-0.61599,-0.61458)
- New Polarization:       (-0.53725,0.77099,-0.34197)
+ Old Momentum Direction: (0.492728,-0.615985,-0.61464)
+ Old Polarization:       (-0.537189,-0.770995,0.342044)
+ New Momentum Direction: (-0.492728,-0.615985,-0.61464)
+ New Polarization:       (-0.537189,0.770995,-0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49279,-0.61599,-0.61458)
- Old Polarization:       (-0.53725,0.77099,-0.34197)
- New Momentum Direction: (-0.49279,0.61599,-0.61458)
- New Polarization:       (0.53725,0.77099,0.34197)
+ Old Momentum Direction: (-0.492728,-0.615985,-0.61464)
+ Old Polarization:       (-0.537189,0.770995,-0.342044)
+ New Momentum Direction: (-0.492728,0.615985,-0.61464)
+ New Polarization:       (0.537189,0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49279,0.61599,-0.61458)
- Old Polarization:       (0.53725,0.77099,0.34197)
- New Momentum Direction: (-0.49279,0.61599,0.61458)
- New Polarization:       (-0.53725,-0.77099,0.34197)
+ Old Momentum Direction: (-0.492728,0.615985,-0.61464)
+ Old Polarization:       (0.537189,0.770995,0.342044)
+ New Momentum Direction: (-0.492728,0.615985,0.61464)
+ New Polarization:       (-0.537189,-0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49279,0.61599,0.61458)
- Old Polarization:       (-0.53725,-0.77099,0.34197)
- New Momentum Direction: (0.49279,0.61599,0.61458)
- New Polarization:       (-0.53725,0.77099,-0.34197)
+ Old Momentum Direction: (-0.492728,0.615985,0.61464)
+ Old Polarization:       (-0.537189,-0.770995,0.342044)
+ New Momentum Direction: (0.492728,0.615985,0.61464)
+ New Polarization:       (-0.537189,0.770995,-0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,0.61599,0.61458)
- Old Polarization:       (-0.53725,0.77099,-0.34197)
- New Momentum Direction: (0.49279,-0.61599,0.61458)
- New Polarization:       (0.53725,0.77099,0.34197)
+ Old Momentum Direction: (0.492728,0.615985,0.61464)
+ Old Polarization:       (-0.537189,0.770995,-0.342044)
+ New Momentum Direction: (0.492728,-0.615985,0.61464)
+ New Polarization:       (0.537189,0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,-0.61599,0.61458)
- Old Polarization:       (0.53725,0.77099,0.34197)
- New Momentum Direction: (0.49279,-0.61599,-0.61458)
- New Polarization:       (-0.53725,-0.77099,0.34197)
+ Old Momentum Direction: (0.492728,-0.615985,0.61464)
+ Old Polarization:       (0.537189,0.770995,0.342044)
+ New Momentum Direction: (0.492728,-0.615985,-0.61464)
+ New Polarization:       (-0.537189,-0.770995,0.342044)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49279,-0.61599,-0.61458)
- Old Polarization:       (-0.53725,-0.77099,0.34197)
- New Momentum Direction: (-0.49279,-0.61599,-0.61458)
- New Polarization:       (-0.53725,0.77099,-0.34197)
+ Old Momentum Direction: (0.492728,-0.615985,-0.61464)
+ Old Polarization:       (-0.537189,-0.770995,0.342044)
+ New Momentum Direction: (-0.492728,-0.615985,-0.61464)
+ New Polarization:       (-0.537189,0.770995,-0.342044)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 908, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.083375,-0.186,0.97901)
- Old Polarization:       (-0.99153,-0.1137,0.062839)
- New Momentum Direction: (0.083375,-0.186,-0.97901)
- New Polarization:       (0.98765,0.14619,0.056336)
+ Old Momentum Direction: (0.0832462,-0.185993,0.979018)
+ Old Polarization:       (-0.991536,-0.113677,0.0627142)
+ New Momentum Direction: (0.0832462,-0.185993,-0.979018)
+ New Polarization:       (0.987671,0.146099,0.0562261)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.083375,-0.186,-0.97901)
- Old Polarization:       (0.98765,0.14619,0.056336)
- New Momentum Direction: (0.11266,-0.25133,-0.96132)
- New Polarization:       (0.99301,0.062642,0.099993)
+ Old Momentum Direction: (0.0832462,-0.185993,-0.979018)
+ Old Polarization:       (0.987671,0.146099,0.0562261)
+ New Momentum Direction: (0.112482,-0.251314,-0.961347)
+ New Polarization:       (0.993032,0.0626643,0.0998079)
  *** FresnelRefraction *** 
 Track (trackID 907, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.754,-0.61543,0.22963)
- Old Polarization:       (-0.24779,-0.59024,-0.76826)
- New Momentum Direction: (0.46115,-0.83134,0.31019)
- New Polarization:       (-0.45161,-0.52082,-0.72443)
+ Old Momentum Direction: (0.753957,-0.615443,0.229738)
+ Old Polarization:       (-0.247704,-0.590244,-0.768281)
+ New Momentum Direction: (0.461022,-0.831355,0.310336)
+ New Polarization:       (-0.451489,-0.520819,-0.724503)
  *** FresnelRefraction *** 
 Track (trackID 906, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7393,-0.62987,0.23813)
- Old Polarization:       (-0.26673,-0.59863,-0.75531)
- New Momentum Direction: (0.40461,-0.8554,0.32339)
- New Polarization:       (-0.49315,-0.5019,-0.71056)
+ Old Momentum Direction: (0.739254,-0.62988,0.238232)
+ Old Polarization:       (-0.266648,-0.598633,-0.755339)
+ New Momentum Direction: (0.404462,-0.855416,0.323534)
+ New Polarization:       (-0.493036,-0.501898,-0.710644)
  *** FresnelRefraction *** 
 Track (trackID 905, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.07693,-0.060771,0.99518)
- Old Polarization:       (-0.99659,0.025221,0.078579)
- New Momentum Direction: (0.10414,-0.082265,0.99115)
- New Polarization:       (0.38219,-0.91674,-0.11624)
+ Old Momentum Direction: (0.076802,-0.0607623,0.995193)
+ Old Polarization:       (-0.996598,0.0252456,0.0784518)
+ New Momentum Direction: (0.103965,-0.0822527,0.991174)
+ New Polarization:       (0.38095,-0.91728,-0.116079)
  *** FresnelRefraction *** 
 Track (trackID 904, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
@@ -10937,130 +10925,130 @@ Track (trackID 904, parentID 1) is processed with stopping code 2
 Track (trackID 903, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13601,-0.40927,0.90222)
- Old Polarization:       (-0.93244,-0.3606,-0.023013)
- New Momentum Direction: (0.18391,-0.55341,0.81235)
- New Polarization:       (-0.92767,-0.37095,-0.04269)
+ Old Momentum Direction: (0.135886,-0.409263,0.902241)
+ Old Polarization:       (-0.932441,-0.360582,-0.0231278)
+ New Momentum Direction: (0.183744,-0.553401,0.812395)
+ New Polarization:       (-0.927648,-0.370984,-0.0429015)
  *** FresnelRefraction *** 
 Track (trackID 902, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99835,0.05093,0.026647)
- Old Polarization:       (0.018834,0.14813,-0.98879)
- New Momentum Direction: (0.99696,0.069071,0.036138)
- New Polarization:       (-0.033184,0.79552,-0.60502)
+ Old Momentum Direction: (0.998344,0.0509066,0.0267774)
+ Old Polarization:       (0.0189681,0.148123,-0.988787)
+ New Momentum Direction: (0.996953,0.069039,0.0363152)
+ New Polarization:       (-0.0334021,0.798506,-0.60106)
  *** FresnelRefraction *** 
 Track (trackID 901, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.095102,-0.27088,0.9579)
- Old Polarization:       (-0.97752,-0.20731,0.038425)
- New Momentum Direction: (0.12862,-0.36635,0.92154)
- New Polarization:       (-0.87285,-0.48292,-0.070159)
+ Old Momentum Direction: (0.094974,-0.270875,0.957918)
+ Old Polarization:       (-0.97753,-0.207286,0.0383033)
+ New Momentum Direction: (0.128446,-0.366341,0.921572)
+ New Polarization:       (-0.8733,-0.482137,-0.0699397)
  *** FresnelRefraction *** 
 Track (trackID 900, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92306,-0.37736,0.074577)
- Old Polarization:       (-0.057948,-0.32808,-0.94287)
- New Momentum Direction: (0.85515,-0.50854,0.1005)
- New Polarization:       (-0.10541,-0.36042,-0.92681)
+ Old Momentum Direction: (0.923039,-0.377385,0.0747026)
+ Old Polarization:       (-0.0578317,-0.32809,-0.942875)
+ New Momentum Direction: (0.855118,-0.508565,0.100669)
+ New Polarization:       (-0.105205,-0.360365,-0.92686)
  *** FresnelRefraction *** 
 Track (trackID 899, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54522,-0.71073,0.44452)
- Old Polarization:       (-0.47941,-0.69935,-0.53017)
- New Momentum Direction: (0.73499,-0.31732,0.59925)
- New Polarization:       (0.29063,0.94587,0.14441)
+ Old Momentum Direction: (0.545144,-0.710738,0.444601)
+ Old Polarization:       (-0.479352,-0.699347,-0.530221)
+ New Momentum Direction: (0.734892,-0.317349,0.599353)
+ New Polarization:       (0.290616,0.945868,0.144488)
  *** FresnelRefraction *** 
 Track (trackID 898, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1046,0.11377,0.98799)
- Old Polarization:       (-0.97235,0.22028,0.077577)
- New Momentum Direction: (0.14077,0.15311,0.97813)
- New Polarization:       (-0.17193,0.97674,-0.12815)
+ Old Momentum Direction: (0.104475,0.113775,0.987998)
+ Old Polarization:       (-0.972352,0.220304,0.0774506)
+ New Momentum Direction: (0.140602,0.153118,0.978154)
+ New Polarization:       (-0.17324,0.976531,-0.127962)
  *** FresnelRefraction *** 
 Track (trackID 897, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.28312,-0.63255,0.72092)
- Old Polarization:       (-0.76662,-0.60093,-0.22621)
- New Momentum Direction: (0.38467,-0.85943,0.33676)
- New Polarization:       (-0.74461,-0.50453,-0.43705)
+ Old Momentum Direction: (0.283015,-0.632549,0.720961)
+ Old Polarization:       (-0.766606,-0.600921,-0.226296)
+ New Momentum Direction: (0.384525,-0.859428,0.336933)
+ New Polarization:       (-0.744539,-0.504515,-0.437179)
  *** FresnelRefraction *** 
 Track (trackID 896, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96581,0.2472,0.078096)
- Old Polarization:       (-0.017714,0.36346,-0.93144)
- New Momentum Direction: (0.93606,0.3355,0.10599)
- New Polarization:       (-0.032719,0.38294,-0.92319)
+ Old Momentum Direction: (0.965807,0.247182,0.07822)
+ Old Polarization:       (-0.0175831,0.363456,-0.931446)
+ New Momentum Direction: (0.936049,0.335472,0.106159)
+ New Polarization:       (-0.0324773,0.382785,-0.923267)
  *** FresnelRefraction *** 
 Track (trackID 895, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.096894,0.10913,0.98929)
- Old Polarization:       (-0.97444,0.21281,0.071963)
- New Momentum Direction: (0.13118,0.14775,0.98029)
- New Polarization:       (-0.1964,0.97311,-0.12038)
+ Old Momentum Direction: (0.0967706,0.109141,0.989305)
+ Old Polarization:       (-0.974444,0.212832,0.0718371)
+ New Momentum Direction: (0.131009,0.147757,0.980308)
+ New Polarization:       (-0.197814,0.972843,-0.120195)
  *** FresnelRefraction *** 
 Track (trackID 894, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93594,0.33228,0.11666)
- Old Polarization:       (-0.051228,0.45621,-0.8884)
- New Momentum Direction: (0.87819,0.45131,0.15845)
- New Polarization:       (-0.094542,0.48851,-0.86742)
+ Old Momentum Direction: (0.935929,0.332262,0.116783)
+ Old Polarization:       (-0.0511006,0.456198,-0.88841)
+ New Momentum Direction: (0.878175,0.451276,0.158613)
+ New Polarization:       (-0.0943103,0.48843,-0.867492)
  *** FresnelRefraction *** 
 Track (trackID 893, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76263,0.56034,0.32314)
- Old Polarization:       (-0.24012,0.70912,-0.66294)
- New Momentum Direction: (0.48089,0.75953,0.43802)
- New Polarization:       (-0.44005,0.64118,-0.62869)
+ Old Momentum Direction: (0.762601,0.560319,0.323236)
+ Old Polarization:       (-0.240012,0.709119,-0.662982)
+ New Momentum Direction: (0.48081,0.759508,0.438143)
+ New Polarization:       (-0.439895,0.641202,-0.628771)
  *** FresnelRefraction *** 
 Track (trackID 892, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74235,-0.62408,0.24382)
- Old Polarization:       (-0.2595,-0.60331,-0.75411)
- New Momentum Direction: (0.42987,-0.84098,0.32857)
- New Polarization:       (-0.47166,-0.51947,-0.71252)
+ Old Momentum Direction: (0.742301,-0.624089,0.243929)
+ Old Polarization:       (-0.259418,-0.603313,-0.754133)
+ New Momentum Direction: (0.429729,-0.841001,0.32871)
+ New Polarization:       (-0.471548,-0.519471,-0.712596)
  *** FresnelRefraction *** 
 Track (trackID 891, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.074026,-0.16798,0.98301)
- Old Polarization:       (-0.99403,-0.091646,0.059195)
- New Momentum Direction: (0.10072,-0.22857,0.9683)
- New Polarization:       (-0.66536,-0.73906,-0.10524)
+ Old Momentum Direction: (0.0738969,-0.167971,0.983018)
+ Old Polarization:       (-0.99404,-0.0916225,0.0590697)
+ New Momentum Direction: (0.100549,-0.228552,0.968325)
+ New Polarization:       (-0.666385,-0.738173,-0.105034)
  *** FresnelRefraction *** 
 Track (trackID 890, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9989,-0.039595,0.025119)
- Old Polarization:       (0.027037,0.048684,-0.99845)
- New Momentum Direction: (0.998,-0.05334,0.033838)
- New Polarization:       (-0.043527,-0.96891,-0.24354)
+ Old Momentum Direction: (0.998896,-0.0396178,0.0252506)
+ Old Polarization:       (0.0271697,0.0486725,-0.998445)
+ New Momentum Direction: (0.997995,-0.053371,0.0340163)
+ New Polarization:       (-0.0437133,-0.969951,-0.239343)
  *** FresnelRefraction *** 
 Track (trackID 889, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.15916,0.3129,0.93636)
- Old Polarization:       (-0.90114,0.43345,0.0083258)
- New Momentum Direction: (0.21654,0.42572,0.87856)
- New Polarization:       (-0.87788,0.47864,-0.015559)
+ Old Momentum Direction: (0.159044,0.312906,0.936373)
+ Old Polarization:       (-0.901132,0.433468,0.00820657)
+ New Momentum Direction: (0.216391,0.425732,0.878594)
+ New Polarization:       (-0.878211,0.478027,-0.0153365)
  *** FresnelRefraction *** 
 Track (trackID 888, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18272,0.34427,0.92092)
- Old Polarization:       (-0.88075,0.47358,-0.0022877)
- New Momentum Direction: (0.24706,0.4655,0.84986)
- New Polarization:       (-0.88007,0.47482,-0.0042332)
+ Old Momentum Direction: (0.182609,0.344271,0.92094)
+ Old Polarization:       (-0.880739,0.473597,-0.00240475)
+ New Momentum Direction: (0.246917,0.46551,0.849902)
+ New Polarization:       (-0.880024,0.474909,-0.00444975)
  *** FresnelRefraction *** 
 Track (trackID 887, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
@@ -11073,221 +11061,221 @@ Track (trackID 886, parentID 1) is processed with stopping code 2
 Track (trackID 885, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5736,0.6263,0.52796)
- Old Polarization:       (-0.44837,0.77946,-0.43751)
- New Momentum Direction: (0.5736,-0.6263,0.52796)
- New Polarization:       (0.44837,0.77946,0.43751)
+ Old Momentum Direction: (0.573543,0.626286,0.528028)
+ Old Polarization:       (-0.448294,0.779463,-0.437573)
+ New Momentum Direction: (0.573543,-0.626286,0.528028)
+ New Polarization:       (0.448294,0.779463,0.437573)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.5736,-0.6263,0.52796)
- Old Polarization:       (0.44837,0.77946,0.43751)
- New Momentum Direction: (-0.5736,-0.6263,0.52796)
- New Polarization:       (0.44837,-0.77946,-0.43751)
+ Old Momentum Direction: (0.573543,-0.626286,0.528028)
+ Old Polarization:       (0.448294,0.779463,0.437573)
+ New Momentum Direction: (-0.573543,-0.626286,0.528028)
+ New Polarization:       (0.448294,-0.779463,-0.437573)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.5736,-0.6263,0.52796)
- Old Polarization:       (0.44837,-0.77946,-0.43751)
- New Momentum Direction: (-0.5736,-0.6263,-0.52796)
- New Polarization:       (-0.44837,0.77946,-0.43751)
+ Old Momentum Direction: (-0.573543,-0.626286,0.528028)
+ Old Polarization:       (0.448294,-0.779463,-0.437573)
+ New Momentum Direction: (-0.573543,-0.626286,-0.528028)
+ New Polarization:       (-0.448294,0.779463,-0.437573)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 884, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73011,-0.63721,0.2468)
- Old Polarization:       (-0.27699,-0.60614,-0.74557)
- New Momentum Direction: (0.3717,-0.86569,0.3353)
- New Polarization:       (-0.51411,-0.49268,-0.70211)
+ Old Momentum Direction: (0.730062,-0.637219,0.246903)
+ Old Polarization:       (-0.276902,-0.606144,-0.745597)
+ New Momentum Direction: (0.371528,-0.865708,0.335436)
+ New Polarization:       (-0.514007,-0.49267,-0.702192)
  *** FresnelRefraction *** 
 Track (trackID 883, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.084806,0.074054,0.99364)
- Old Polarization:       (-0.98242,0.17266,0.070981)
- New Momentum Direction: (0.11537,0.10075,0.9882)
- New Polarization:       (0.11095,0.98731,-0.11361)
+ Old Momentum Direction: (0.0846812,0.0740623,0.993652)
+ Old Polarization:       (-0.982426,0.17268,0.0708538)
+ New Momentum Direction: (0.115205,0.100759,0.988218)
+ New Polarization:       (0.109365,0.987508,-0.113436)
  *** FresnelRefraction *** 
 Track (trackID 882, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9988,0.036097,0.033063)
- Old Polarization:       (0.027974,0.13337,-0.99067)
- New Momentum Direction: (0.99783,0.048584,0.044501)
- New Polarization:       (-0.045059,0.99601,-0.077053)
+ Old Momentum Direction: (0.998798,0.0360738,0.0331944)
+ Old Polarization:       (0.0281079,0.133354,-0.99067)
+ New Momentum Direction: (0.997821,0.0485525,0.0446771)
+ New Polarization:       (-0.0452429,0.996354,-0.0723249)
  *** FresnelRefraction *** 
 Track (trackID 881, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41547,0.58692,0.69492)
- Old Polarization:       (-0.62274,0.74039,-0.25301)
- New Momentum Direction: (0.41547,0.58692,-0.69492)
- New Polarization:       (0.70178,-0.69288,-0.16563)
+ Old Momentum Direction: (0.415391,0.586915,0.694968)
+ Old Polarization:       (-0.622686,0.740407,-0.253102)
+ New Momentum Direction: (0.415391,0.586915,-0.694968)
+ New Polarization:       (0.70185,-0.692811,-0.165589)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.41547,0.58692,-0.69492)
- Old Polarization:       (0.70178,-0.69288,-0.16563)
- New Momentum Direction: (0.41547,-0.58692,-0.69492)
- New Polarization:       (-0.70178,-0.69288,0.16563)
+ Old Momentum Direction: (0.415391,0.586915,-0.694968)
+ Old Polarization:       (0.70185,-0.692811,-0.165589)
+ New Momentum Direction: (0.415391,-0.586915,-0.694968)
+ New Polarization:       (-0.70185,-0.692811,0.165589)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.41547,-0.58692,-0.69492)
- Old Polarization:       (-0.70178,-0.69288,0.16563)
- New Momentum Direction: (-0.41547,-0.58692,-0.69492)
- New Polarization:       (-0.70178,0.69288,-0.16563)
+ Old Momentum Direction: (0.415391,-0.586915,-0.694968)
+ Old Polarization:       (-0.70185,-0.692811,0.165589)
+ New Momentum Direction: (-0.415391,-0.586915,-0.694968)
+ New Polarization:       (-0.70185,0.692811,-0.165589)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 880, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.10319,-0.33187,0.93767)
- Old Polarization:       (-0.96257,-0.27083,0.010075)
- New Momentum Direction: (0.14036,-0.45139,0.88122)
- New Polarization:       (-0.94374,-0.33017,-0.01881)
+ Old Momentum Direction: (0.103064,-0.331857,0.937683)
+ Old Polarization:       (-0.96258,-0.270813,0.0099561)
+ New Momentum Direction: (0.140182,-0.451378,0.881253)
+ New Polarization:       (-0.943987,-0.329459,-0.0185875)
  *** FresnelRefraction *** 
 Track (trackID 879, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71306,0.58907,0.38018)
- Old Polarization:       (-0.29394,0.74349,-0.60069)
- New Momentum Direction: (0.31626,0.79709,0.51443)
- New Polarization:       (-0.54487,0.59652,-0.58931)
+ Old Momentum Direction: (0.713026,0.58906,0.380267)
+ Old Polarization:       (-0.293845,0.743487,-0.600735)
+ New Momentum Direction: (0.316116,0.797066,0.514545)
+ New Polarization:       (-0.544744,0.596536,-0.589406)
  *** FresnelRefraction *** 
 Track (trackID 878, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71125,0.59034,0.3816)
- Old Polarization:       (-0.29618,0.74401,-0.59895)
- New Momentum Direction: (0.30707,0.79924,0.51664)
- New Polarization:       (-0.55035,0.59202,-0.58875)
+ Old Momentum Direction: (0.711219,0.590324,0.381687)
+ Old Polarization:       (-0.29608,0.744007,-0.598991)
+ New Momentum Direction: (0.306923,0.799225,0.516757)
+ New Polarization:       (-0.55023,0.592035,-0.588847)
  *** FresnelRefraction *** 
 Track (trackID 877, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99963,-0.0085539,0.025946)
- Old Polarization:       (0.026569,0.083229,-0.99618)
- New Momentum Direction: (0.99932,-0.011536,0.034993)
- New Polarization:       (-0.036278,-0.47408,0.87973)
+ Old Momentum Direction: (0.999623,-0.0085773,0.0260782)
+ Old Polarization:       (0.0267023,0.0832176,-0.996174)
+ New Momentum Direction: (0.999314,-0.0115678,0.0351704)
+ New Polarization:       (-0.0364572,-0.47301,0.880302)
  *** FresnelRefraction *** 
 Track (trackID 876, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34977,-0.676,0.6486)
- Old Polarization:       (-0.69457,-0.65172,-0.3047)
- New Momentum Direction: (0.34977,0.676,0.6486)
- New Polarization:       (0.15719,0.64017,-0.75198)
+ Old Momentum Direction: (0.349672,-0.676002,0.648653)
+ Old Polarization:       (-0.69454,-0.651709,-0.304777)
+ New Momentum Direction: (0.349672,0.676002,0.648653)
+ New Polarization:       (0.15733,0.640158,-0.751961)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.34977,0.676,0.6486)
- Old Polarization:       (0.15719,0.64017,-0.75198)
- New Momentum Direction: (0.34977,0.676,-0.6486)
- New Polarization:       (-0.15719,-0.64017,-0.75198)
+ Old Momentum Direction: (0.349672,0.676002,0.648653)
+ Old Polarization:       (0.15733,0.640158,-0.751961)
+ New Momentum Direction: (0.349672,0.676002,-0.648653)
+ New Polarization:       (-0.15733,-0.640158,-0.751961)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.34977,0.676,-0.6486)
- Old Polarization:       (-0.15719,-0.64017,-0.75198)
- New Momentum Direction: (-0.34977,0.676,-0.6486)
- New Polarization:       (-0.15719,0.64017,0.75198)
+ Old Momentum Direction: (0.349672,0.676002,-0.648653)
+ Old Polarization:       (-0.15733,-0.640158,-0.751961)
+ New Momentum Direction: (-0.349672,0.676002,-0.648653)
+ New Polarization:       (-0.15733,0.640158,0.751961)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.34977,0.676,-0.6486)
- Old Polarization:       (-0.15719,0.64017,0.75198)
- New Momentum Direction: (-0.34977,-0.676,-0.6486)
- New Polarization:       (0.7348,-0.62743,0.25768)
+ Old Momentum Direction: (-0.349672,0.676002,-0.648653)
+ Old Polarization:       (-0.15733,0.640158,0.751961)
+ New Momentum Direction: (-0.349672,-0.676002,-0.648653)
+ New Polarization:       (0.734772,-0.627423,0.25778)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.34977,-0.676,-0.6486)
- Old Polarization:       (0.7348,-0.62743,0.25768)
- New Momentum Direction: (-0.34977,-0.676,0.6486)
- New Polarization:       (-0.7348,0.62743,0.25768)
+ Old Momentum Direction: (-0.349672,-0.676002,-0.648653)
+ Old Polarization:       (0.734772,-0.627423,0.25778)
+ New Momentum Direction: (-0.349672,-0.676002,0.648653)
+ New Polarization:       (-0.734772,0.627423,0.25778)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.34977,-0.676,0.6486)
- Old Polarization:       (-0.7348,0.62743,0.25768)
- New Momentum Direction: (-0.47423,-0.042077,0.87939)
- New Polarization:       (-0.3077,0.94379,-0.12078)
+ Old Momentum Direction: (-0.349672,-0.676002,0.648653)
+ Old Polarization:       (-0.734772,0.627423,0.25778)
+ New Momentum Direction: (-0.474098,-0.0420635,0.879467)
+ New Polarization:       (-0.30772,0.943785,-0.120744)
  *** FresnelRefraction *** 
 Track (trackID 875, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0872,-0.2599,0.96169)
- Old Polarization:       (-0.98061,-0.19246,0.036903)
- New Momentum Direction: (0.11854,-0.35331,0.92796)
- New Polarization:       (-0.87824,-0.47336,-0.068038)
+ Old Momentum Direction: (0.087072,-0.259888,0.961705)
+ Old Polarization:       (-0.980619,-0.19244,0.0367802)
+ New Momentum Direction: (0.118369,-0.353303,0.92799)
+ New Polarization:       (-0.878705,-0.472523,-0.0678153)
  *** FresnelRefraction *** 
 Track (trackID 874, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91505,-0.39456,0.083713)
- Old Polarization:       (-0.064979,-0.34904,-0.93485)
- New Momentum Direction: (-0.91505,-0.39456,0.083713)
- New Polarization:       (0.036513,0.12566,0.9914)
+ Old Momentum Direction: (0.915027,-0.394584,0.0838379)
+ Old Polarization:       (-0.064864,-0.349048,-0.934857)
+ New Momentum Direction: (-0.915027,-0.394584,0.0838379)
+ New Polarization:       (0.036441,0.126127,0.991345)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91505,-0.39456,0.083713)
- Old Polarization:       (0.036513,0.12566,0.9914)
- New Momentum Direction: (-0.91505,0.39456,0.083713)
- New Polarization:       (-0.036513,0.12566,-0.9914)
+ Old Momentum Direction: (-0.915027,-0.394584,0.0838379)
+ Old Polarization:       (0.036441,0.126127,0.991345)
+ New Momentum Direction: (-0.915027,0.394584,0.0838379)
+ New Polarization:       (-0.036441,0.126127,-0.991345)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91505,0.39456,0.083713)
- Old Polarization:       (-0.036513,0.12566,-0.9914)
- New Momentum Direction: (-0.84009,0.53064,0.11258)
- New Polarization:       (0.066644,0.30694,-0.94939)
+ Old Momentum Direction: (-0.915027,0.394584,0.0838379)
+ Old Polarization:       (-0.036441,0.126127,-0.991345)
+ New Momentum Direction: (-0.840047,0.530668,0.112752)
+ New Polarization:       (0.0665128,0.307006,-0.94938)
  *** FresnelRefraction *** 
 Track (trackID 873, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.082542,-0.17137,0.98174)
- Old Polarization:       (-0.993,-0.097632,0.066446)
- New Momentum Direction: (0.11148,-0.23145,0.96644)
- New Polarization:       (-0.61537,-0.77969,-0.11574)
+ Old Momentum Direction: (0.0824135,-0.171365,0.981755)
+ Old Polarization:       (-0.993013,-0.0976088,0.066321)
+ New Momentum Direction: (0.111303,-0.231435,0.966462)
+ New Polarization:       (-0.61638,-0.778926,-0.115541)
  *** FresnelRefraction *** 
 Track (trackID 872, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65538,0.6135,0.44057)
- Old Polarization:       (-0.35849,0.76607,-0.5335)
- New Momentum Direction: (-0.65538,0.6135,0.44057)
- New Polarization:       (-0.35849,-0.76607,0.5335)
+ Old Momentum Direction: (0.655334,0.613487,0.440648)
+ Old Polarization:       (-0.358399,0.766078,-0.533549)
+ New Momentum Direction: (-0.655334,0.613487,0.440648)
+ New Polarization:       (-0.358399,-0.766078,0.533549)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65538,0.6135,0.44057)
- Old Polarization:       (-0.35849,-0.76607,0.5335)
- New Momentum Direction: (-0.65538,-0.6135,0.44057)
- New Polarization:       (0.35849,-0.76607,-0.5335)
+ Old Momentum Direction: (-0.655334,0.613487,0.440648)
+ Old Polarization:       (-0.358399,-0.766078,0.533549)
+ New Momentum Direction: (-0.655334,-0.613487,0.440648)
+ New Polarization:       (0.358399,-0.766078,-0.533549)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65538,-0.6135,0.44057)
- Old Polarization:       (0.35849,-0.76607,-0.5335)
- New Momentum Direction: (-0.65538,-0.6135,-0.44057)
- New Polarization:       (-0.35849,0.76607,-0.5335)
+ Old Momentum Direction: (-0.655334,-0.613487,0.440648)
+ Old Polarization:       (0.358399,-0.766078,-0.533549)
+ New Momentum Direction: (-0.655334,-0.613487,-0.440648)
+ New Polarization:       (-0.358399,0.766078,-0.533549)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 871, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88276,0.4334,0.1814)
- Old Polarization:       (-0.11013,0.56621,-0.81687)
- New Momentum Direction: (0.76955,0.58907,0.24655)
- New Polarization:       (-0.20265,0.59141,-0.7805)
+ Old Momentum Direction: (0.882744,0.433379,0.181508)
+ Old Polarization:       (-0.110008,0.566204,-0.816891)
+ New Momentum Direction: (0.769526,0.58904,0.246701)
+ New Polarization:       (-0.202435,0.591381,-0.780569)
  *** FresnelRefraction *** 
 Track (trackID 870, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.57435,-0.70834,0.41034)
-Old Polarization: (-0.44722,-0.69136,-0.56747)
-New Polarization: (-0.25014,0.78354,0.56877)
-Polarization Change: (-0.25014,0.78354,0.56877)
-New Momentum Direction: (0.96506,0.1544,0.21172)
-Momentum Change: (0.96506,0.1544,0.21172)
+Old Momentum Direction: (0.574277,-0.708348,0.410426)
+Old Polarization: (-0.447162,-0.691354,-0.567517)
+New Polarization: (-0.250207,0.783493,0.568802)
+Polarization Change: (-0.250207,0.783493,0.568802)
+New Momentum Direction: (0.96504,0.15445,0.21176)
+Momentum Change: (0.96504,0.15445,0.21176)
  Photon at Boundary! 
- Old Momentum Direction: (0.96506,0.1544,0.21172)
- Old Polarization:       (-0.25014,0.78354,0.56877)
- New Momentum Direction: (0.93509,0.20882,0.28634)
- New Polarization:       (-0.34541,0.71787,0.60445)
+ Old Momentum Direction: (0.96504,0.15445,0.21176)
+ Old Polarization:       (-0.250207,0.783493,0.568802)
+ New Momentum Direction: (0.935064,0.208886,0.286395)
+ New Polarization:       (-0.345491,0.71783,0.604447)
  *** FresnelRefraction *** 
 Track (trackID 869, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
@@ -11300,80 +11288,80 @@ Track (trackID 1, parentID 0) is processed with stopping code 4
 Track (trackID 1262, parentID 1) is processed with stopping code 2
 ### pop requested out of 197 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.20906,-0.67284,0.70963)
- Old Polarization:       (-0.73075,-0.58972,-0.34385)
- New Momentum Direction: (0.28162,-0.90633,0.31504)
- New Polarization:       (-0.66943,-0.42081,-0.6122)
+ Old Momentum Direction: (0.208884,-0.67283,0.709695)
+ Old Polarization:       (-0.730737,-0.589671,-0.343964)
+ New Momentum Direction: (0.281373,-0.906324,0.315287)
+ New Polarization:       (-0.669336,-0.420804,-0.612302)
  *** FresnelRefraction *** 
 Track (trackID 1261, parentID 1) is processed with stopping code 2
 ### pop requested out of 196 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.20717,-0.68236,0.70104)
-Old Polarization: (-0.72685,-0.58699,-0.35655)
-New Polarization: (0.2654,0.77176,0.57789)
-Polarization Change: (0.2654,0.77176,0.57789)
-New Momentum Direction: (-0.95635,0.13469,0.25934)
-Momentum Change: (-0.95635,0.13469,0.25934)
+Old Momentum Direction: (0.206995,-0.682357,0.701101)
+Old Polarization: (-0.726833,-0.586946,-0.356662)
+New Polarization: (0.265366,0.771708,0.577968)
+Polarization Change: (0.265366,0.771708,0.577968)
+New Momentum Direction: (-0.956369,0.134693,0.259261)
+Momentum Change: (-0.956369,0.134693,0.259261)
 
 ** Photon absorbed! **
 Track (trackID 1260, parentID 1) is processed with stopping code 2
 ### pop requested out of 195 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94216,0.25512,0.21736)
- Old Polarization:       (0.084879,0.44577,-0.89111)
- New Momentum Direction: (0.89116,0.34534,0.29423)
- New Polarization:       (-0.15266,0.83898,-0.52232)
+ Old Momentum Direction: (0.942144,0.255042,0.217528)
+ Old Polarization:       (0.0850821,0.445739,-0.891111)
+ New Momentum Direction: (0.891127,0.345236,0.294456)
+ New Polarization:       (-0.153012,0.839558,-0.521276)
  *** FresnelRefraction *** 
 Track (trackID 1259, parentID 1) is processed with stopping code 2
 ### pop requested out of 194 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.99066,-0.027114,0.13364)
-Old Polarization: (0.13607,0.13277,-0.98176)
-New Polarization: (-0.16051,-0.10129,0.98182)
-Polarization Change: (-0.16051,-0.10129,0.98182)
-New Momentum Direction: (-0.61013,0.7921,-0.018026)
-Momentum Change: (-0.61013,0.7921,-0.018026)
+Old Momentum Direction: (0.990632,-0.0271935,0.133823)
+Old Polarization: (0.136266,0.132726,-0.981741)
+New Polarization: (-0.160673,-0.101228,0.981803)
+Polarization Change: (-0.160673,-0.101228,0.981803)
+New Momentum Direction: (-0.609443,0.792625,-0.0180133)
+Momentum Change: (-0.609443,0.792625,-0.0180133)
  Photon at Boundary! 
- Old Momentum Direction: (-0.61013,0.7921,-0.018026)
- Old Polarization:       (-0.16051,-0.10129,0.98182)
- New Momentum Direction: (-0.82757,0.56084,-0.02445)
- New Polarization:       (-0.15973,-0.19349,0.96801)
+ Old Momentum Direction: (-0.609443,0.792625,-0.0180133)
+ Old Polarization:       (-0.160673,-0.101228,0.981803)
+ New Momentum Direction: (-0.826632,0.562213,-0.0244327)
+ New Polarization:       (-0.160091,-0.193318,0.967987)
  *** FresnelRefraction *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.82757,0.56084,-0.02445)
- Old Polarization:       (-0.15973,-0.19349,0.96801)
- New Momentum Direction: (-0.91033,0.41348,-0.018026)
- New Polarization:       (0.089693,0.23962,0.96672)
+ Old Momentum Direction: (-0.826632,0.562213,-0.0244327)
+ Old Polarization:       (-0.160091,-0.193318,0.967987)
+ New Momentum Direction: (-0.909872,0.414497,-0.0180133)
+ New Polarization:       (0.0899056,0.239367,0.966758)
  *** FresnelRefraction *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91033,0.41348,-0.018026)
- Old Polarization:       (0.089693,0.23962,0.96672)
- New Momentum Direction: (-0.82757,0.56084,-0.02445)
- New Polarization:       (0.164,0.28319,0.94494)
+ Old Momentum Direction: (-0.909872,0.414497,-0.0180133)
+ Old Polarization:       (0.0899056,0.239367,0.966758)
+ New Momentum Direction: (-0.826632,0.562213,-0.0244327)
+ New Polarization:       (0.164404,0.282794,0.944986)
  *** FresnelRefraction *** 
 Track (trackID 1258, parentID 1) is processed with stopping code 2
 ### pop requested out of 193 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.01608,0.15789,0.98733)
- Old Polarization:       (-0.94049,0.33761,-0.038672)
- New Momentum Direction: (0.021783,0.21388,0.97662)
- New Polarization:       (-0.90971,0.4094,-0.069368)
+ Old Momentum Direction: (0.0159202,0.157916,0.987324)
+ Old Polarization:       (-0.940455,0.33769,-0.0388468)
+ New Momentum Direction: (0.0215657,0.213915,0.976614)
+ New Polarization:       (-0.909532,0.409753,-0.0696667)
  *** FresnelRefraction *** 
 Track (trackID 1257, parentID 1) is processed with stopping code 2
 ### pop requested out of 192 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.029395,-0.44098,0.89704)
- Old Polarization:       (-0.93408,-0.3316,-0.1324)
- New Momentum Direction: (0.039526,-0.59295,0.80427)
- New Polarization:       (-0.89586,-0.37753,-0.23431)
+ Old Momentum Direction: (0.0292013,-0.440954,0.897055)
+ Old Polarization:       (-0.934087,-0.331526,-0.132557)
+ New Momentum Direction: (0.0392648,-0.592916,0.804307)
+ New Polarization:       (-0.895806,-0.37751,-0.23456)
  *** FresnelRefraction *** 
 Track (trackID 1256, parentID 1) is processed with stopping code 2
 ### pop requested out of 191 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.82724,0.44676,0.34071)
- Old Polarization:       (-0.043907,0.65596,-0.75352)
- New Momentum Direction: (0.64779,0.60576,0.46197)
- New Polarization:       (-0.083495,0.65921,-0.74731)
+ Old Momentum Direction: (0.827215,0.446695,0.340851)
+ Old Polarization:       (-0.0437114,0.655941,-0.753545)
+ New Momentum Direction: (0.647738,0.605675,0.462162)
+ New Polarization:       (-0.0831266,0.659184,-0.747373)
  *** FresnelRefraction *** 
 Track (trackID 1255, parentID 1) is processed with stopping code 2
 ### pop requested out of 190 stacked tracks.
@@ -11382,10 +11370,10 @@ Track (trackID 1255, parentID 1) is processed with stopping code 2
 Track (trackID 1254, parentID 1) is processed with stopping code 2
 ### pop requested out of 189 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65568,-0.68081,0.32648)
- Old Polarization:       (-0.23203,-0.59316,-0.77093)
- New Momentum Direction: (0.88646,-0.13919,0.44139)
- New Polarization:       (0.2934,0.90658,-0.30335)
+ Old Momentum Direction: (0.655563,-0.680849,0.326621)
+ Old Polarization:       (-0.231932,-0.593164,-0.77095)
+ New Momentum Direction: (0.8863,-0.139564,0.441581)
+ New Polarization:       (0.293783,0.906531,-0.303139)
  *** FresnelRefraction *** 
 Track (trackID 1253, parentID 1) is processed with stopping code 2
 ### pop requested out of 188 stacked tracks.
@@ -11394,66 +11382,66 @@ Track (trackID 1253, parentID 1) is processed with stopping code 2
 Track (trackID 1252, parentID 1) is processed with stopping code 2
 ### pop requested out of 187 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70815,0.54156,0.45304)
- Old Polarization:       (-0.17668,0.75714,-0.62891)
- New Momentum Direction: (-0.70815,0.54156,0.45304)
- New Polarization:       (-0.098531,-0.71116,0.69609)
+ Old Momentum Direction: (0.708113,0.541506,0.453153)
+ Old Polarization:       (-0.176498,0.757138,-0.62896)
+ New Momentum Direction: (-0.708113,0.541506,0.453153)
+ New Polarization:       (-0.0984713,-0.71123,0.696028)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70815,0.54156,0.45304)
- Old Polarization:       (-0.098531,-0.71116,0.69609)
- New Momentum Direction: (-0.70815,-0.54156,0.45304)
- New Polarization:       (0.098531,-0.71116,-0.69609)
+ Old Momentum Direction: (-0.708113,0.541506,0.453153)
+ Old Polarization:       (-0.0984713,-0.71123,0.696028)
+ New Momentum Direction: (-0.708113,-0.541506,0.453153)
+ New Polarization:       (0.0984713,-0.71123,-0.696028)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70815,-0.54156,0.45304)
- Old Polarization:       (0.098531,-0.71116,-0.69609)
- New Momentum Direction: (-0.70815,-0.54156,-0.45304)
- New Polarization:       (-0.098531,0.71116,-0.69609)
+ Old Momentum Direction: (-0.708113,-0.541506,0.453153)
+ Old Polarization:       (0.0984713,-0.71123,-0.696028)
+ New Momentum Direction: (-0.708113,-0.541506,-0.453153)
+ New Polarization:       (-0.0984713,0.71123,-0.696028)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70815,-0.54156,-0.45304)
- Old Polarization:       (-0.098531,0.71116,-0.69609)
- New Momentum Direction: (0.70815,-0.54156,-0.45304)
- New Polarization:       (0.054098,-0.59814,0.79957)
+ Old Momentum Direction: (-0.708113,-0.541506,-0.453153)
+ Old Polarization:       (-0.0984713,0.71123,-0.696028)
+ New Momentum Direction: (0.708113,-0.541506,-0.453153)
+ New Polarization:       (0.0540905,-0.598283,0.799457)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70815,-0.54156,-0.45304)
- Old Polarization:       (0.054098,-0.59814,0.79957)
- New Momentum Direction: (0.70815,0.54156,-0.45304)
- New Polarization:       (-0.054098,-0.59814,-0.79957)
+ Old Momentum Direction: (0.708113,-0.541506,-0.453153)
+ Old Polarization:       (0.0540905,-0.598283,0.799457)
+ New Momentum Direction: (0.708113,0.541506,-0.453153)
+ New Polarization:       (-0.0540905,-0.598283,-0.799457)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70815,0.54156,-0.45304)
- Old Polarization:       (-0.054098,-0.59814,-0.79957)
- New Momentum Direction: (0.70815,0.54156,0.45304)
- New Polarization:       (0.054098,0.59814,-0.79957)
+ Old Momentum Direction: (0.708113,0.541506,-0.453153)
+ Old Polarization:       (-0.0540905,-0.598283,-0.799457)
+ New Momentum Direction: (0.708113,0.541506,0.453153)
+ New Polarization:       (0.0540905,0.598283,-0.799457)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.70815,0.54156,0.45304)
- Old Polarization:       (0.054098,0.59814,-0.79957)
- New Momentum Direction: (-0.70815,0.54156,0.45304)
- New Polarization:       (-0.02956,-0.66382,0.74731)
+ Old Momentum Direction: (0.708113,0.541506,0.453153)
+ Old Polarization:       (0.0540905,0.598283,-0.799457)
+ New Momentum Direction: (-0.708113,0.541506,0.453153)
+ New Polarization:       (-0.0295694,-0.663947,0.747195)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70815,0.54156,0.45304)
- Old Polarization:       (-0.02956,-0.66382,0.74731)
- New Momentum Direction: (-0.70815,-0.54156,0.45304)
- New Polarization:       (0.02956,-0.66382,-0.74731)
+ Old Momentum Direction: (-0.708113,0.541506,0.453153)
+ Old Polarization:       (-0.0295694,-0.663947,0.747195)
+ New Momentum Direction: (-0.708113,-0.541506,0.453153)
+ New Polarization:       (0.0295694,-0.663947,-0.747195)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.70815,-0.54156,0.45304)
- Old Polarization:       (0.02956,-0.66382,-0.74731)
- New Momentum Direction: (-0.28153,-0.73598,0.61569)
- New Polarization:       (0.062184,-0.65428,-0.75369)
+ Old Momentum Direction: (-0.708113,-0.541506,0.453153)
+ Old Polarization:       (0.0295694,-0.663947,-0.747195)
+ New Momentum Direction: (-0.281367,-0.735916,0.615842)
+ New Polarization:       (0.0622087,-0.654407,-0.753579)
  *** FresnelRefraction *** 
 Track (trackID 1251, parentID 1) is processed with stopping code 2
 ### pop requested out of 186 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8354,0.43724,0.33305)
- Old Polarization:       (-0.034333,0.64627,-0.76233)
- New Momentum Direction: (0.6673,0.59248,0.4513)
- New Polarization:       (-0.06508,0.65001,-0.75713)
+ Old Momentum Direction: (0.835377,0.437182,0.333193)
+ Old Polarization:       (-0.0341368,0.646253,-0.762359)
+ New Momentum Direction: (0.66725,0.592398,0.451489)
+ New Polarization:       (-0.0647101,0.649975,-0.757196)
  *** FresnelRefraction *** 
 Track (trackID 1250, parentID 1) is processed with stopping code 2
 ### pop requested out of 185 stacked tracks.
@@ -11462,42 +11450,42 @@ Track (trackID 1250, parentID 1) is processed with stopping code 2
 Track (trackID 1249, parentID 1) is processed with stopping code 2
 ### pop requested out of 184 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.60493,-0.70678,0.36678)
- Old Polarization:       (-0.28808,-0.62367,-0.72667)
- New Momentum Direction: (0.81697,-0.29527,0.49535)
- New Polarization:       (0.40983,0.90158,-0.13852)
+ Old Momentum Direction: (0.604804,-0.706813,0.366915)
+ Old Polarization:       (-0.287997,-0.623671,-0.726699)
+ New Momentum Direction: (0.816806,-0.295428,0.495529)
+ New Polarization:       (0.409974,0.901553,-0.138288)
  *** FresnelRefraction *** 
 Track (trackID 1248, parentID 1) is processed with stopping code 2
 ### pop requested out of 183 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1414,0.38038,0.91396)
- Old Polarization:       (-0.80249,0.58464,-0.11917)
- New Momentum Direction: (0.19139,0.51486,0.83563)
- New Polarization:       (-0.75068,0.62528,-0.21332)
+ Old Momentum Direction: (0.141271,0.38039,0.913973)
+ Old Polarization:       (-0.80242,0.584709,-0.119324)
+ New Momentum Direction: (0.191218,0.51488,0.835664)
+ New Polarization:       (-0.750524,0.625378,-0.21358)
  *** FresnelRefraction *** 
 Track (trackID 1247, parentID 1) is processed with stopping code 2
 ### pop requested out of 182 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.10722,0.3413,0.93382)
- Old Polarization:       (-0.83716,0.53766,-0.10039)
- New Momentum Direction: (0.14564,0.46361,0.87399)
- New Polarization:       (-0.78792,0.5886,-0.18092)
+ Old Momentum Direction: (0.107082,0.341315,0.933829)
+ Old Polarization:       (-0.8371,0.53773,-0.100551)
+ New Momentum Direction: (0.145457,0.463633,0.874006)
+ New Polarization:       (-0.787762,0.588726,-0.181197)
  *** FresnelRefraction *** 
 Track (trackID 1246, parentID 1) is processed with stopping code 2
 ### pop requested out of 181 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76,-0.59953,0.25091)
- Old Polarization:       (-0.1153,-0.50432,-0.85578)
- New Momentum Direction: (0.47926,-0.80962,0.33884)
- New Polarization:       (-0.22122,-0.48504,-0.84605)
+ Old Momentum Direction: (0.759906,-0.599587,0.251075)
+ Old Polarization:       (-0.115188,-0.504343,-0.855786)
+ New Momentum Direction: (0.47899,-0.809697,0.339057)
+ New Polarization:       (-0.221017,-0.485046,-0.846098)
  *** FresnelRefraction *** 
 Track (trackID 1245, parentID 1) is processed with stopping code 2
 ### pop requested out of 180 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70626,0.54083,0.45683)
- Old Polarization:       (-0.17743,0.75991,-0.62535)
- New Momentum Direction: (0.28051,0.73327,0.61938)
- New Polarization:       (-0.35643,0.67872,-0.6421)
+ Old Momentum Direction: (0.706229,0.540783,0.456941)
+ Old Polarization:       (-0.177245,0.759909,-0.625398)
+ New Momentum Direction: (0.280343,0.733205,0.61953)
+ New Polarization:       (-0.356117,0.678795,-0.642198)
  *** FresnelRefraction *** 
 Track (trackID 1244, parentID 1) is processed with stopping code 2
 ### pop requested out of 179 stacked tracks.
@@ -11506,80 +11494,80 @@ Track (trackID 1244, parentID 1) is processed with stopping code 2
 Track (trackID 1243, parentID 1) is processed with stopping code 2
 ### pop requested out of 178 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34833,0.54003,0.76618)
- Old Polarization:       (-0.57467,0.76878,-0.2806)
- New Momentum Direction: (0.4693,0.72757,0.5004)
- New Polarization:       (-0.53487,0.68511,-0.49451)
+ Old Momentum Direction: (0.348242,0.540018,0.76623)
+ Old Polarization:       (-0.574549,0.768823,-0.280721)
+ New Momentum Direction: (0.469181,0.727558,0.500528)
+ New Polarization:       (-0.534702,0.685124,-0.49467)
  *** FresnelRefraction *** 
 Track (trackID 1242, parentID 1) is processed with stopping code 2
 ### pop requested out of 177 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94035,-0.31136,0.13714)
- Old Polarization:       (0.08269,-0.18184,-0.97984)
- New Momentum Direction: (0.8876,-0.42153,0.18567)
- New Polarization:       (-0.14912,-0.64436,-0.75004)
+ Old Momentum Direction: (0.940294,-0.31143,0.137324)
+ Old Polarization:       (0.0828562,-0.181883,-0.979823)
+ New Momentum Direction: (0.887504,-0.42163,0.185916)
+ New Polarization:       (-0.149411,-0.644972,-0.749458)
  *** FresnelRefraction *** 
 Track (trackID 1241, parentID 1) is processed with stopping code 2
 ### pop requested out of 176 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98332,0.095755,0.15465)
- Old Polarization:       (0.12429,0.26703,-0.95564)
- New Momentum Direction: (0.9689,0.13027,0.21039)
- New Polarization:       (-0.19477,0.9259,0.3237)
+ Old Momentum Direction: (0.983298,0.0956759,0.154827)
+ Old Polarization:       (0.124492,0.266989,-0.955625)
+ New Momentum Direction: (0.968862,0.13016,0.210631)
+ New Polarization:       (-0.195031,0.925269,0.325332)
  *** FresnelRefraction *** 
 Track (trackID 1240, parentID 1) is processed with stopping code 2
 ### pop requested out of 175 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13531,0.36373,0.92162)
- Old Polarization:       (-0.81352,0.57175,-0.10621)
- New Momentum Direction: (0.18224,0.48988,0.85253)
- New Polarization:       (-0.76644,0.6139,-0.18893)
+ Old Momentum Direction: (0.135177,0.363749,0.921637)
+ Old Polarization:       (-0.813453,0.57182,-0.106374)
+ New Momentum Direction: (0.182059,0.489902,0.852555)
+ New Polarization:       (-0.766282,0.614017,-0.189196)
  *** FresnelRefraction *** 
 Track (trackID 1239, parentID 1) is processed with stopping code 2
 ### pop requested out of 174 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.15378,-0.6408,0.75215)
- Old Polarization:       (-0.78538,-0.54119,-0.3005)
- New Momentum Direction: (0.20905,-0.8711,0.44439)
- New Polarization:       (-0.71429,-0.44639,-0.53901)
+ Old Momentum Direction: (0.153598,-0.640789,0.752195)
+ Old Polarization:       (-0.785369,-0.541134,-0.300616)
+ New Momentum Direction: (0.208799,-0.871084,0.44454)
+ New Polarization:       (-0.714201,-0.446344,-0.53916)
  *** FresnelRefraction *** 
 Track (trackID 1238, parentID 1) is processed with stopping code 2
 ### pop requested out of 173 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63035,0.56636,0.53094)
- Old Polarization:       (-0.25888,0.79813,-0.54403)
- New Momentum Direction: (-0.63035,0.56636,0.53094)
- New Polarization:       (-0.25888,-0.79813,0.54403)
+ Old Momentum Direction: (0.630306,0.566315,0.531038)
+ Old Polarization:       (-0.258708,0.798142,-0.544095)
+ New Momentum Direction: (-0.630306,0.566315,0.531038)
+ New Polarization:       (-0.258708,-0.798142,0.544095)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63035,0.56636,0.53094)
- Old Polarization:       (-0.25888,-0.79813,0.54403)
- New Momentum Direction: (-0.63035,-0.56636,0.53094)
- New Polarization:       (0.25888,-0.79813,-0.54403)
+ Old Momentum Direction: (-0.630306,0.566315,0.531038)
+ Old Polarization:       (-0.258708,-0.798142,0.544095)
+ New Momentum Direction: (-0.630306,-0.566315,0.531038)
+ New Polarization:       (0.258708,-0.798142,-0.544095)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63035,-0.56636,0.53094)
- Old Polarization:       (0.25888,-0.79813,-0.54403)
- New Momentum Direction: (-0.63035,-0.56636,-0.53094)
- New Polarization:       (-0.25888,0.79813,-0.54403)
+ Old Momentum Direction: (-0.630306,-0.566315,0.531038)
+ Old Polarization:       (0.258708,-0.798142,-0.544095)
+ New Momentum Direction: (-0.630306,-0.566315,-0.531038)
+ New Polarization:       (-0.258708,0.798142,-0.544095)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.63035,-0.56636,-0.53094)
- Old Polarization:       (-0.25888,0.79813,-0.54403)
- New Momentum Direction: (0.63035,-0.56636,-0.53094)
- New Polarization:       (-0.25888,-0.79813,0.54403)
+ Old Momentum Direction: (-0.630306,-0.566315,-0.531038)
+ Old Polarization:       (-0.258708,0.798142,-0.544095)
+ New Momentum Direction: (0.630306,-0.566315,-0.531038)
+ New Polarization:       (-0.258708,-0.798142,0.544095)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63035,-0.56636,-0.53094)
- Old Polarization:       (-0.25888,-0.79813,0.54403)
- New Momentum Direction: (0.63035,0.56636,-0.53094)
- New Polarization:       (0.25888,-0.79813,-0.54403)
+ Old Momentum Direction: (0.630306,-0.566315,-0.531038)
+ Old Polarization:       (-0.258708,-0.798142,0.544095)
+ New Momentum Direction: (0.630306,0.566315,-0.531038)
+ New Polarization:       (0.258708,-0.798142,-0.544095)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63035,0.56636,-0.53094)
- Old Polarization:       (0.25888,-0.79813,-0.54403)
- New Momentum Direction: (0.63035,0.56636,0.53094)
- New Polarization:       (-0.25888,0.79813,-0.54403)
+ Old Momentum Direction: (0.630306,0.566315,-0.531038)
+ Old Polarization:       (0.258708,-0.798142,-0.544095)
+ New Momentum Direction: (0.630306,0.566315,0.531038)
+ New Polarization:       (-0.258708,0.798142,-0.544095)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -11594,54 +11582,54 @@ Track (trackID 1236, parentID 1) is processed with stopping code 2
 Track (trackID 1235, parentID 1) is processed with stopping code 2
 ### pop requested out of 170 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81366,0.45654,0.35991)
- Old Polarization:       (-0.053546,0.67532,-0.73558)
- New Momentum Direction: (0.62176,0.61506,0.48488)
- New Polarization:       (-0.1007,0.67674,-0.7293)
+ Old Momentum Direction: (0.813633,0.456474,0.360044)
+ Old Polarization:       (-0.0533525,0.675306,-0.735605)
+ New Momentum Direction: (0.621696,0.614983,0.485068)
+ New Polarization:       (-0.10034,0.676724,-0.729367)
  *** FresnelRefraction *** 
 Track (trackID 1234, parentID 1) is processed with stopping code 2
 ### pop requested out of 169 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90269,-0.3996,0.15962)
- Old Polarization:       (0.044514,-0.28224,-0.95831)
- New Momentum Direction: (0.81418,-0.53918,0.21538)
- New Polarization:       (-0.081915,-0.47391,-0.87675)
+ Old Momentum Direction: (0.902625,-0.399665,0.159799)
+ Old Polarization:       (0.0446684,-0.282275,-0.958293)
+ New Momentum Direction: (0.814056,-0.539278,0.215621)
+ New Polarization:       (-0.0821966,-0.474496,-0.876411)
  *** FresnelRefraction *** 
 Track (trackID 1233, parentID 1) is processed with stopping code 2
 ### pop requested out of 168 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91096,0.32637,0.25226)
- Old Polarization:       (0.048338,0.52288,-0.85104)
- New Momentum Direction: (-0.91096,0.32637,0.25226)
- New Polarization:       (0.025837,-0.56521,0.82454)
+ Old Momentum Direction: (0.910942,0.326296,0.252422)
+ Old Polarization:       (0.0485401,0.522851,-0.851041)
+ New Momentum Direction: (-0.910942,0.326296,0.252422)
+ New Polarization:       (0.0259417,-0.565359,0.824437)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91096,0.32637,0.25226)
- Old Polarization:       (0.025837,-0.56521,0.82454)
- New Momentum Direction: (-0.91096,-0.32637,0.25226)
- New Polarization:       (-0.025837,-0.56521,-0.82454)
+ Old Momentum Direction: (-0.910942,0.326296,0.252422)
+ Old Polarization:       (0.0259417,-0.565359,0.824437)
+ New Momentum Direction: (-0.910942,-0.326296,0.252422)
+ New Polarization:       (-0.0259417,-0.565359,-0.824437)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.91096,-0.32637,0.25226)
- Old Polarization:       (-0.025837,-0.56521,-0.82454)
- New Momentum Direction: (-0.8289,-0.4426,0.3421)
- New Polarization:       (0.048116,-0.6657,-0.74467)
+ Old Momentum Direction: (-0.910942,-0.326296,0.252422)
+ Old Polarization:       (-0.0259417,-0.565359,-0.824437)
+ New Momentum Direction: (-0.828861,-0.442502,0.342318)
+ New Polarization:       (0.0483098,-0.666204,-0.744203)
  *** FresnelRefraction *** 
 Track (trackID 1232, parentID 1) is processed with stopping code 2
 ### pop requested out of 167 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78125,-0.58089,0.2285)
- Old Polarization:       (-0.09706,-0.47465,-0.87481)
- New Momentum Direction: (0.52824,-0.79016,0.31081)
- New Polarization:       (-0.18806,-0.46584,-0.86465)
+ Old Momentum Direction: (0.781163,-0.580947,0.22866)
+ Old Polarization:       (-0.0969377,-0.47467,-0.87481)
+ New Momentum Direction: (0.527993,-0.79024,0.311037)
+ New Polarization:       (-0.187841,-0.465848,-0.864697)
  *** FresnelRefraction *** 
 Track (trackID 1231, parentID 1) is processed with stopping code 2
 ### pop requested out of 166 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98561,-0.10222,0.13463)
- Old Polarization:       (0.14021,0.049511,-0.98888)
- New Momentum Direction: (0.97377,-0.13759,0.18121)
- New Polarization:       (-0.20355,-0.88267,0.42362)
+ Old Momentum Direction: (0.985576,-0.102301,0.134812)
+ Old Polarization:       (0.140396,0.0494686,-0.988859)
+ New Momentum Direction: (0.973711,-0.137698,0.181457)
+ New Polarization:       (-0.203809,-0.882411,0.424044)
  *** FresnelRefraction *** 
 Track (trackID 1230, parentID 1) is processed with stopping code 2
 ### pop requested out of 165 stacked tracks.
@@ -11650,200 +11638,200 @@ Track (trackID 1230, parentID 1) is processed with stopping code 2
 Track (trackID 1229, parentID 1) is processed with stopping code 2
 ### pop requested out of 164 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.14074,-0.62762,0.76569)
- Old Polarization:       (-0.80019,-0.52752,-0.28532)
- New Momentum Direction: (0.1912,-0.85266,0.48622)
- New Polarization:       (-0.72985,-0.45473,-0.51044)
+ Old Momentum Direction: (0.140549,-0.627606,0.76574)
+ Old Polarization:       (-0.800186,-0.527469,-0.285446)
+ New Momentum Direction: (0.190945,-0.852644,0.486353)
+ New Polarization:       (-0.729766,-0.454676,-0.510599)
  *** FresnelRefraction *** 
 Track (trackID 1228, parentID 1) is processed with stopping code 2
 ### pop requested out of 163 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62118,-0.70172,0.34889)
- Old Polarization:       (-0.27174,-0.61045,-0.74398)
- New Momentum Direction: (0.84309,-0.2549,0.47353)
- New Polarization:       (0.38327,0.90248,-0.19658)
+ Old Momentum Direction: (0.621059,-0.701758,0.34903)
+ Old Polarization:       (-0.271655,-0.610458,-0.744006)
+ New Momentum Direction: (0.842923,-0.255099,0.473715)
+ New Polarization:       (0.38346,0.902444,-0.196351)
  *** FresnelRefraction *** 
 Track (trackID 1227, parentID 1) is processed with stopping code 2
 ### pop requested out of 162 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18531,0.43152,0.88287)
- Old Polarization:       (-0.75291,0.6397,-0.15463)
- New Momentum Direction: (0.25114,0.58483,0.7713)
- New Polarization:       (-0.6954,0.6633,-0.27651)
+ Old Momentum Direction: (0.185186,0.431525,0.882888)
+ Old Polarization:       (-0.752829,0.639758,-0.154786)
+ New Momentum Direction: (0.250982,0.584845,0.771339)
+ New Polarization:       (-0.695239,0.663362,-0.276755)
  *** FresnelRefraction *** 
 Track (trackID 1226, parentID 1) is processed with stopping code 2
 ### pop requested out of 161 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.78737,-0.57397,0.22496)
- Old Polarization:       (-0.089849,-0.46786,-0.87922)
- New Momentum Direction: (0.54565,-0.78023,0.30581)
- New Polarization:       (-0.17351,-0.46219,-0.86964)
+ Old Momentum Direction: (0.78728,-0.574027,0.225129)
+ Old Polarization:       (-0.0897258,-0.467883,-0.879224)
+ New Momentum Direction: (0.54541,-0.780304,0.306029)
+ New Polarization:       (-0.173284,-0.462201,-0.869679)
  *** FresnelRefraction *** 
 Track (trackID 1225, parentID 1) is processed with stopping code 2
 ### pop requested out of 160 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56018,0.58364,0.58784)
- Old Polarization:       (-0.33849,0.80897,-0.48062)
- New Momentum Direction: (0.56018,0.58364,-0.58784)
- New Polarization:       (0.33849,-0.80897,-0.48062)
+ Old Momentum Direction: (0.560129,0.583609,0.587925)
+ Old Polarization:       (-0.338335,0.808982,-0.480704)
+ New Momentum Direction: (0.560129,0.583609,-0.587925)
+ New Polarization:       (0.338335,-0.808982,-0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56018,0.58364,-0.58784)
- Old Polarization:       (0.33849,-0.80897,-0.48062)
- New Momentum Direction: (0.56018,-0.58364,-0.58784)
- New Polarization:       (-0.33849,-0.80897,0.48062)
+ Old Momentum Direction: (0.560129,0.583609,-0.587925)
+ Old Polarization:       (0.338335,-0.808982,-0.480704)
+ New Momentum Direction: (0.560129,-0.583609,-0.587925)
+ New Polarization:       (-0.338335,-0.808982,0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56018,-0.58364,-0.58784)
- Old Polarization:       (-0.33849,-0.80897,0.48062)
- New Momentum Direction: (-0.56018,-0.58364,-0.58784)
- New Polarization:       (-0.33849,0.80897,-0.48062)
+ Old Momentum Direction: (0.560129,-0.583609,-0.587925)
+ Old Polarization:       (-0.338335,-0.808982,0.480704)
+ New Momentum Direction: (-0.560129,-0.583609,-0.587925)
+ New Polarization:       (-0.338335,0.808982,-0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56018,-0.58364,-0.58784)
- Old Polarization:       (-0.33849,0.80897,-0.48062)
- New Momentum Direction: (-0.56018,-0.58364,0.58784)
- New Polarization:       (0.33849,-0.80897,-0.48062)
+ Old Momentum Direction: (-0.560129,-0.583609,-0.587925)
+ Old Polarization:       (-0.338335,0.808982,-0.480704)
+ New Momentum Direction: (-0.560129,-0.583609,0.587925)
+ New Polarization:       (0.338335,-0.808982,-0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56018,-0.58364,0.58784)
- Old Polarization:       (0.33849,-0.80897,-0.48062)
- New Momentum Direction: (-0.56018,0.58364,0.58784)
- New Polarization:       (-0.33849,-0.80897,0.48062)
+ Old Momentum Direction: (-0.560129,-0.583609,0.587925)
+ Old Polarization:       (0.338335,-0.808982,-0.480704)
+ New Momentum Direction: (-0.560129,0.583609,0.587925)
+ New Polarization:       (-0.338335,-0.808982,0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56018,0.58364,0.58784)
- Old Polarization:       (-0.33849,-0.80897,0.48062)
- New Momentum Direction: (0.56018,0.58364,0.58784)
- New Polarization:       (-0.33849,0.80897,-0.48062)
+ Old Momentum Direction: (-0.560129,0.583609,0.587925)
+ Old Polarization:       (-0.338335,-0.808982,0.480704)
+ New Momentum Direction: (0.560129,0.583609,0.587925)
+ New Polarization:       (-0.338335,0.808982,-0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56018,0.58364,0.58784)
- Old Polarization:       (-0.33849,0.80897,-0.48062)
- New Momentum Direction: (0.56018,0.58364,-0.58784)
- New Polarization:       (0.33849,-0.80897,-0.48062)
+ Old Momentum Direction: (0.560129,0.583609,0.587925)
+ Old Polarization:       (-0.338335,0.808982,-0.480704)
+ New Momentum Direction: (0.560129,0.583609,-0.587925)
+ New Polarization:       (0.338335,-0.808982,-0.480704)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56018,0.58364,-0.58784)
- Old Polarization:       (0.33849,-0.80897,-0.48062)
- New Momentum Direction: (0.56018,-0.58364,-0.58784)
- New Polarization:       (-0.33849,-0.80897,0.48062)
+ Old Momentum Direction: (0.560129,0.583609,-0.587925)
+ Old Polarization:       (0.338335,-0.808982,-0.480704)
+ New Momentum Direction: (0.560129,-0.583609,-0.587925)
+ New Polarization:       (-0.338335,-0.808982,0.480704)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1224, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98397,0.090242,0.15385)
- Old Polarization:       (0.12568,0.26122,-0.95706)
- New Momentum Direction: (0.97015,0.1227,0.20918)
- New Polarization:       (-0.19504,0.90739,0.37229)
+ Old Momentum Direction: (0.983945,0.0901632,0.154025)
+ Old Polarization:       (0.125882,0.261177,-0.957048)
+ New Momentum Direction: (0.97011,0.122593,0.209424)
+ New Polarization:       (-0.19529,0.906681,0.373886)
  *** FresnelRefraction *** 
 Track (trackID 1223, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97423,0.14083,0.17621)
- Old Polarization:       (0.12353,0.32053,-0.93915)
- New Momentum Direction: (0.95249,0.19015,0.23792)
- New Polarization:       (-0.20207,0.97901,0.026502)
+ Old Momentum Direction: (0.974206,0.140751,0.176383)
+ Old Polarization:       (0.123731,0.320487,-0.939137)
+ New Momentum Direction: (0.952452,0.190045,0.238157)
+ New Polarization:       (-0.202345,0.978912,0.0280759)
  *** FresnelRefraction *** 
 Track (trackID 1222, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (9.3594e-06,-0.37681,0.92629)
- Old Polarization:       (-0.96114,-0.25571,-0.10401)
- New Momentum Direction: (1.2648e-05,-0.50919,0.86066)
- New Polarization:       (-0.9309,-0.31439,-0.18599)
+ Old Momentum Direction: (-0.000184444,-0.376776,0.926304)
+ Old Polarization:       (-0.961144,-0.255637,-0.104172)
+ New Momentum Direction: (-0.000249244,-0.509146,0.86068)
+ New Polarization:       (-0.93084,-0.314397,-0.186255)
  *** FresnelRefraction *** 
 Track (trackID 1221, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98519,0.070457,0.1563)
- Old Polarization:       (0.13513,0.24192,-0.96084)
- New Momentum Direction: (0.97281,0.095179,0.21114)
- New Polarization:       (-0.20061,0.80185,0.56284)
+ Old Momentum Direction: (0.985171,0.070378,0.156476)
+ Old Polarization:       (0.13533,0.241879,-0.960823)
+ New Momentum Direction: (0.972769,0.0950725,0.211381)
+ New Polarization:       (-0.200857,0.800886,0.564126)
  *** FresnelRefraction *** 
 Track (trackID 1220, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43937,0.57332,0.69156)
- Old Polarization:       (-0.47248,0.80225,-0.3649)
- New Momentum Direction: (0.59334,0.77423,0.22028)
- New Polarization:       (-0.49255,0.56565,-0.66139)
+ Old Momentum Direction: (0.439299,0.573304,0.69162)
+ Old Polarization:       (-0.472348,0.802281,-0.365011)
+ New Momentum Direction: (0.593238,0.7742,0.220642)
+ New Polarization:       (-0.49233,0.565763,-0.661456)
  *** FresnelRefraction *** 
 Track (trackID 1219, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98946,-0.069367,0.1271)
- Old Polarization:       (0.13287,0.086114,-0.98739)
- New Momentum Direction: (0.98046,-0.094229,0.17266)
- New Polarization:       (-0.18743,-0.71387,0.67473)
+ Old Momentum Direction: (0.989432,-0.0694468,0.127287)
+ Old Polarization:       (0.133062,0.0860719,-0.987363)
+ New Momentum Direction: (0.98041,-0.0943373,0.172908)
+ New Polarization:       (-0.187691,-0.713696,0.674841)
  *** FresnelRefraction *** 
 Track (trackID 1218, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84213,-0.50281,0.19494)
- Old Polarization:       (-0.024118,-0.39623,-0.91784)
- New Momentum Direction: (0.68505,-0.67924,0.26333)
- New Polarization:       (-0.045341,-0.40053,-0.91516)
+ Old Momentum Direction: (0.84205,-0.502877,0.195108)
+ Old Polarization:       (-0.0239808,-0.396256,-0.917827)
+ New Momentum Direction: (0.684874,-0.679323,0.263566)
+ New Polarization:       (-0.0450853,-0.400526,-0.915176)
  *** FresnelRefraction *** 
 Track (trackID 1217, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97655,-0.17747,0.12191)
- Old Polarization:       (0.11797,-0.032612,-0.99248)
- New Momentum Direction: (0.95622,-0.24122,0.1657)
- New Polarization:       (-0.19494,-0.94732,-0.25415)
+ Old Momentum Direction: (0.976508,-0.177551,0.122094)
+ Old Polarization:       (0.118151,-0.0326529,-0.992459)
+ New Momentum Direction: (0.95615,-0.241327,0.165949)
+ New Polarization:       (-0.195206,-0.947519,-0.253184)
  *** FresnelRefraction *** 
 Track (trackID 1216, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43263,0.57413,0.69513)
- Old Polarization:       (-0.47974,0.7994,-0.36167)
- New Momentum Direction: (0.58558,0.7771,0.2307)
- New Polarization:       (-0.49501,0.56817,-0.65738)
+ Old Momentum Direction: (0.432555,0.574108,0.695195)
+ Old Polarization:       (-0.479605,0.799435,-0.361778)
+ New Momentum Direction: (0.585474,0.77707,0.231044)
+ New Polarization:       (-0.494795,0.568275,-0.657451)
  *** FresnelRefraction *** 
 Track (trackID 1215, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41014,-0.74955,0.51958)
- Old Polarization:       (-0.50402,-0.66108,-0.55582)
- New Momentum Direction: (0.55736,-0.43679,0.70609)
- New Polarization:       (0.24314,0.89902,0.36421)
+ Old Momentum Direction: (0.409987,-0.74956,0.519683)
+ Old Polarization:       (-0.50397,-0.661063,-0.555887)
+ New Momentum Direction: (0.557152,-0.436841,0.706223)
+ New Polarization:       (0.243,0.898991,0.364372)
  *** FresnelRefraction *** 
 Track (trackID 1214, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51103,-0.73965,0.43791)
- Old Polarization:       (-0.39298,-0.65414,-0.64627)
- New Momentum Direction: (0.51103,0.73965,0.43791)
- New Polarization:       (-0.83501,0.54808,0.048679)
+ Old Momentum Direction: (0.510887,-0.739679,0.438029)
+ Old Polarization:       (-0.392919,-0.654128,-0.646321)
+ New Momentum Direction: (0.510887,0.739679,0.438029)
+ New Polarization:       (-0.835026,0.548076,0.0484068)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51103,0.73965,0.43791)
- Old Polarization:       (-0.83501,0.54808,0.048679)
- New Momentum Direction: (-0.51103,0.73965,0.43791)
- New Polarization:       (-0.83501,-0.54808,-0.048679)
+ Old Momentum Direction: (0.510887,0.739679,0.438029)
+ Old Polarization:       (-0.835026,0.548076,0.0484068)
+ New Momentum Direction: (-0.510887,0.739679,0.438029)
+ New Polarization:       (-0.835026,-0.548076,-0.0484068)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51103,0.73965,0.43791)
- Old Polarization:       (-0.83501,-0.54808,-0.048679)
- New Momentum Direction: (-0.51103,0.73965,-0.43791)
- New Polarization:       (0.83501,0.54808,-0.048679)
+ Old Momentum Direction: (-0.510887,0.739679,0.438029)
+ Old Polarization:       (-0.835026,-0.548076,-0.0484068)
+ New Momentum Direction: (-0.510887,0.739679,-0.438029)
+ New Polarization:       (0.835026,0.548076,-0.0484068)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.51103,0.73965,-0.43791)
- Old Polarization:       (0.83501,0.54808,-0.048679)
- New Momentum Direction: (-0.69277,0.40946,-0.59365)
- New Polarization:       (0.0023931,-0.82187,-0.56967)
+ Old Momentum Direction: (-0.510887,0.739679,-0.438029)
+ Old Polarization:       (0.835026,0.548076,-0.0484068)
+ New Momentum Direction: (-0.692578,0.409545,-0.593809)
+ New Polarization:       (0.00247074,-0.821847,-0.569703)
  *** FresnelRefraction *** 
 Track (trackID 1213, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.043916,-0.50002,0.8649)
- Old Polarization:       (-0.90532,-0.38601,-0.17719)
- New Momentum Direction: (0.059738,-0.68016,0.73062)
- New Polarization:       (-0.85164,-0.41653,-0.31813)
+ Old Momentum Direction: (0.043723,-0.499999,0.864922)
+ Old Polarization:       (-0.905319,-0.385937,-0.17734)
+ New Momentum Direction: (0.0594745,-0.680127,0.730678)
+ New Polarization:       (-0.851577,-0.416489,-0.31836)
  *** FresnelRefraction *** 
 Track (trackID 1212, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
@@ -11860,10 +11848,10 @@ Track (trackID 1210, parentID 1) is processed with stopping code 2
 Track (trackID 1209, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.013694,-0.40744,0.91313)
- Old Polarization:       (-0.9493,-0.29215,-0.11612)
- New Momentum Direction: (0.018451,-0.54899,0.83563)
- New Polarization:       (-0.91558,-0.34508,-0.20649)
+ Old Momentum Direction: (0.0134995,-0.40741,0.913146)
+ Old Polarization:       (-0.949299,-0.29208,-0.116281)
+ New Momentum Direction: (0.0181894,-0.548949,0.835658)
+ New Polarization:       (-0.915519,-0.345075,-0.206754)
  *** FresnelRefraction *** 
 Track (trackID 1208, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
@@ -11872,34 +11860,34 @@ Track (trackID 1208, parentID 1) is processed with stopping code 2
 Track (trackID 1207, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22397,0.47152,0.85294)
- Old Polarization:       (-0.70834,0.67986,-0.18984)
- New Momentum Direction: (0.30446,0.64097,0.7046)
- New Polarization:       (-0.64775,0.68167,-0.34021)
+ Old Momentum Direction: (0.22386,0.471524,0.852966)
+ Old Polarization:       (-0.708248,0.67992,-0.189984)
+ New Momentum Direction: (0.304309,0.640977,0.70466)
+ New Polarization:       (-0.647589,0.681711,-0.340438)
  *** FresnelRefraction *** 
 Track (trackID 1206, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95583,0.21463,0.20083)
- Old Polarization:       (0.10108,0.40156,-0.91024)
- New Momentum Direction: (0.91759,0.29027,0.27161)
- New Polarization:       (-0.17731,0.91036,-0.3739)
+ Old Momentum Direction: (0.955807,0.214549,0.201)
+ Old Polarization:       (0.101285,0.401525,-0.91023)
+ New Momentum Direction: (0.917557,0.290162,0.271838)
+ New Polarization:       (-0.177633,0.910818,-0.372636)
  *** FresnelRefraction *** 
 Track (trackID 1205, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91466,-0.37524,0.15029)
- Old Polarization:       (0.054897,-0.25305,-0.96589)
- New Momentum Direction: (0.83718,-0.50771,0.20335)
- New Polarization:       (-0.10102,-0.50897,-0.85484)
+ Old Momentum Direction: (0.914603,-0.375311,0.150474)
+ Old Polarization:       (0.0550545,-0.253087,-0.965876)
+ New Momentum Direction: (0.837067,-0.507806,0.203596)
+ New Polarization:       (-0.101312,-0.509576,-0.85444)
  *** FresnelRefraction *** 
 Track (trackID 1204, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.18939,0.435,0.88029)
- Old Polarization:       (-0.74867,0.64404,-0.15718)
- New Momentum Direction: (0.25658,0.58933,0.76607)
- New Polarization:       (-0.6911,0.66596,-0.28085)
+ Old Momentum Direction: (0.189269,0.435009,0.880309)
+ Old Polarization:       (-0.748589,0.644097,-0.157335)
+ New Momentum Direction: (0.256417,0.58934,0.766113)
+ New Polarization:       (-0.690944,0.666023,-0.281087)
  *** FresnelRefraction *** 
 Track (trackID 1203, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
@@ -11908,26 +11896,26 @@ Track (trackID 1203, parentID 1) is processed with stopping code 2
 Track (trackID 1202, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63016,-0.69635,0.34351)
- Old Polarization:       (-0.26129,-0.60677,-0.7507)
- New Momentum Direction: (0.63016,0.69635,0.34351)
- New Polarization:       (-0.77016,0.50426,0.39061)
+ Old Momentum Direction: (0.63004,-0.696388,0.343647)
+ Old Polarization:       (-0.261201,-0.606778,-0.750729)
+ New Momentum Direction: (0.63004,0.696388,0.343647)
+ New Polarization:       (-0.770262,0.504156,0.390541)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.63016,0.69635,0.34351)
- Old Polarization:       (-0.77016,0.50426,0.39061)
- New Momentum Direction: (-0.63016,0.69635,0.34351)
- New Polarization:       (-0.77016,-0.50426,-0.39061)
+ Old Momentum Direction: (0.63004,0.696388,0.343647)
+ Old Polarization:       (-0.770262,0.504156,0.390541)
+ New Momentum Direction: (-0.63004,0.696388,0.343647)
+ New Polarization:       (-0.770262,-0.504156,-0.390541)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1201, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86243,0.39931,0.31106)
- Old Polarization:       (0.0017859,0.61213,-0.79076)
- New Momentum Direction: (0.73188,0.53758,0.41876)
- New Polarization:       (-0.003316,0.61734,-0.78669)
+ Old Momentum Direction: (0.862411,0.399247,0.311206)
+ Old Polarization:       (0.00198459,0.612106,-0.790773)
+ New Momentum Direction: (0.731829,0.53749,0.418964)
+ New Polarization:       (-0.00368488,0.61789,-0.786256)
  *** FresnelRefraction *** 
 Track (trackID 1200, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
@@ -11940,72 +11928,72 @@ Track (trackID 1199, parentID 1) is processed with stopping code 2
 Track (trackID 1198, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38788,-0.74789,0.5387)
- Old Polarization:       (-0.52848,-0.65931,-0.53482)
- New Momentum Direction: (0.5271,-0.43158,0.73206)
- New Polarization:       (0.18711,0.89924,0.39542)
+ Old Momentum Direction: (0.387723,-0.747907,0.5388)
+ Old Polarization:       (-0.528432,-0.659283,-0.534888)
+ New Momentum Direction: (0.526885,-0.43162,0.732186)
+ New Polarization:       (0.186948,0.899215,0.395554)
  *** FresnelRefraction *** 
 Track (trackID 1197, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.11619,0.35485,0.92767)
- Old Polarization:       (-0.82685,0.55203,-0.1076)
- New Momentum Direction: (0.15791,0.48227,0.86167)
- New Polarization:       (-0.77572,0.60053,-0.19395)
+ Old Momentum Direction: (0.116058,0.354868,0.927685)
+ Old Polarization:       (-0.826788,0.552096,-0.107758)
+ New Momentum Direction: (0.15773,0.482288,0.861695)
+ New Polarization:       (-0.775561,0.600653,-0.19422)
  *** FresnelRefraction *** 
 Track (trackID 1196, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70273,0.53948,0.46383)
- Old Polarization:       (-0.17894,0.765,-0.61867)
- New Momentum Direction: (0.27832,0.72831,0.62618)
- New Polarization:       (-0.35606,0.68373,-0.63698)
+ Old Momentum Direction: (0.702688,0.539431,0.463945)
+ Old Polarization:       (-0.178762,0.765002,-0.618721)
+ New Momentum Direction: (0.278152,0.728242,0.626334)
+ New Polarization:       (-0.355753,0.6838,-0.63707)
  *** FresnelRefraction *** 
 Track (trackID 1195, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13583,0.37869,0.9155)
- Old Polarization:       (-0.80616,0.57939,-0.12006)
- New Momentum Direction: (0.18441,0.51412,0.83766)
- New Polarization:       (-0.75289,0.62174,-0.21586)
+ Old Momentum Direction: (0.1357,0.378706,0.915515)
+ Old Polarization:       (-0.806087,0.579458,-0.120214)
+ New Momentum Direction: (0.18423,0.514141,0.837687)
+ New Polarization:       (-0.752728,0.621846,-0.216121)
  *** FresnelRefraction *** 
 Track (trackID 1194, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.55694,-0.72308,0.40863)
- Old Polarization:       (-0.34082,-0.64763,-0.68148)
- New Momentum Direction: (0.74947,-0.36869,0.54988)
- New Polarization:       (0.43211,0.90169,0.015622)
+ Old Momentum Direction: (0.55681,-0.723108,0.408752)
+ Old Polarization:       (-0.34075,-0.647628,-0.681519)
+ New Momentum Direction: (0.749289,-0.368797,0.55005)
+ New Polarization:       (0.432154,0.901661,0.0158574)
  *** FresnelRefraction *** 
 Track (trackID 1193, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62263,0.57426,0.53156)
- Old Polarization:       (-0.27012,0.79527,-0.54276)
- New Momentum Direction: (-0.62263,0.57426,0.53156)
- New Polarization:       (-0.27012,-0.79527,0.54276)
+ Old Momentum Direction: (0.622582,0.574224,0.531657)
+ Old Polarization:       (-0.269952,0.795275,-0.542829)
+ New Momentum Direction: (-0.622582,0.574224,0.531657)
+ New Polarization:       (-0.269952,-0.795275,0.542829)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62263,0.57426,0.53156)
- Old Polarization:       (-0.27012,-0.79527,0.54276)
- New Momentum Direction: (-0.62263,-0.57426,0.53156)
- New Polarization:       (0.27012,-0.79527,-0.54276)
+ Old Momentum Direction: (-0.622582,0.574224,0.531657)
+ Old Polarization:       (-0.269952,-0.795275,0.542829)
+ New Momentum Direction: (-0.622582,-0.574224,0.531657)
+ New Polarization:       (0.269952,-0.795275,-0.542829)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62263,-0.57426,0.53156)
- Old Polarization:       (0.27012,-0.79527,-0.54276)
- New Momentum Direction: (-0.62263,-0.57426,-0.53156)
- New Polarization:       (-0.27012,0.79527,-0.54276)
+ Old Momentum Direction: (-0.622582,-0.574224,0.531657)
+ Old Polarization:       (0.269952,-0.795275,-0.542829)
+ New Momentum Direction: (-0.622582,-0.574224,-0.531657)
+ New Polarization:       (-0.269952,0.795275,-0.542829)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1192, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95222,0.22816,0.20303)
- Old Polarization:       (0.093724,0.4144,-0.90526)
- New Momentum Direction: (0.91017,0.30945,0.27537)
- New Polarization:       (-0.16693,0.88241,-0.43987)
+ Old Momentum Direction: (0.952203,0.228079,0.203199)
+ Old Polarization:       (0.0939276,0.414366,-0.90525)
+ New Momentum Direction: (0.910137,0.309346,0.275601)
+ New Polarization:       (-0.167266,0.882942,-0.438675)
  *** FresnelRefraction *** 
 Track (trackID 1191, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
@@ -12022,54 +12010,54 @@ Track (trackID 1189, parentID 1) is processed with stopping code 2
 Track (trackID 1188, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89349,-0.41902,0.16153)
- Old Polarization:       (0.031003,-0.30128,-0.95303)
- New Momentum Direction: (0.79405,-0.56717,0.21864)
- New Polarization:       (-0.057693,-0.42839,-0.90175)
+ Old Momentum Direction: (0.893429,-0.419089,0.161708)
+ Old Polarization:       (0.0311543,-0.301312,-0.953016)
+ New Momentum Direction: (0.793913,-0.567267,0.218884)
+ New Polarization:       (-0.0579749,-0.428971,-0.901456)
  *** FresnelRefraction *** 
 Track (trackID 1187, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24883,0.48293,0.83956)
- Old Polarization:       (-0.6845,0.70095,-0.20032)
- New Momentum Direction: (0.24883,0.48293,-0.83956)
- New Polarization:       (0.91369,-0.40463,0.03805)
+ Old Momentum Direction: (0.248725,0.48293,0.839592)
+ Old Polarization:       (-0.684408,0.701,-0.20046)
+ New Momentum Direction: (0.248725,0.48293,-0.839592)
+ New Polarization:       (0.913799,-0.404374,0.0381145)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.24883,0.48293,-0.83956)
- Old Polarization:       (0.91369,-0.40463,0.03805)
- New Momentum Direction: (0.24883,-0.48293,-0.83956)
- New Polarization:       (-0.91369,-0.40463,-0.03805)
+ Old Momentum Direction: (0.248725,0.48293,-0.839592)
+ Old Polarization:       (0.913799,-0.404374,0.0381145)
+ New Momentum Direction: (0.248725,-0.48293,-0.839592)
+ New Polarization:       (-0.913799,-0.404374,-0.0381145)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.24883,-0.48293,-0.83956)
- Old Polarization:       (-0.91369,-0.40463,-0.03805)
- New Momentum Direction: (0.33617,-0.65243,-0.6792)
- New Polarization:       (-0.8544,-0.51468,0.071508)
+ Old Momentum Direction: (0.248725,-0.48293,-0.839592)
+ Old Polarization:       (-0.913799,-0.404374,-0.0381145)
+ New Momentum Direction: (0.336026,-0.652436,-0.679275)
+ New Polarization:       (-0.854417,-0.514627,0.0716274)
  *** FresnelRefraction *** 
 Track (trackID 1186, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.033582,-0.12826,0.99117)
- Old Polarization:       (-0.9993,0.02068,-0.031181)
- New Momentum Direction: (-0.045352,-0.17322,0.98384)
- New Polarization:       (-0.99692,-0.055187,-0.055671)
+ Old Momentum Direction: (-0.0337662,-0.128229,0.99117)
+ Old Polarization:       (-0.999293,0.0207618,-0.0313569)
+ New Momentum Direction: (-0.0456006,-0.173171,0.983836)
+ New Polarization:       (-0.99689,-0.0554812,-0.0559713)
  *** FresnelRefraction *** 
 Track (trackID 1185, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96477,-0.23206,0.12396)
- Old Polarization:       (0.10496,-0.092524,-0.99016)
- New Momentum Direction: (0.93387,-0.31543,0.16849)
- New Polarization:       (-0.18271,-0.82588,-0.53342)
+ Old Momentum Direction: (0.964729,-0.232132,0.124143)
+ Old Polarization:       (0.10514,-0.0925644,-0.99014)
+ New Momentum Direction: (0.93379,-0.315533,0.168746)
+ New Polarization:       (-0.182997,-0.826372,-0.532562)
  *** FresnelRefraction *** 
 Track (trackID 1184, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26619,-0.70718,0.65501)
- Old Polarization:       (-0.66606,-0.62615,-0.40534)
- New Momentum Direction: (0.35903,-0.30098,0.88346)
- New Polarization:       (-0.19496,0.90151,0.38635)
+ Old Momentum Direction: (0.266019,-0.707176,0.655085)
+ Old Polarization:       (-0.666034,-0.626115,-0.405436)
+ New Momentum Direction: (0.3588,-0.300972,0.88356)
+ New Polarization:       (-0.195147,0.901483,0.386323)
  *** FresnelRefraction *** 
 Track (trackID 1183, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
@@ -12078,10 +12066,10 @@ Track (trackID 1183, parentID 1) is processed with stopping code 2
 Track (trackID 1182, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35603,-0.7379,0.57336)
- Old Polarization:       (-0.56536,-0.65863,-0.49657)
- New Momentum Direction: (0.48075,-0.41169,0.7742)
- New Polarization:       (0.086839,0.90094,0.42516)
+ Old Momentum Direction: (0.355869,-0.737911,0.57345)
+ Old Polarization:       (-0.565319,-0.658597,-0.496653)
+ New Momentum Direction: (0.480527,-0.411721,0.774325)
+ New Polarization:       (0.086658,0.900916,0.425254)
  *** FresnelRefraction *** 
 Track (trackID 1181, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
@@ -12090,32 +12078,32 @@ Track (trackID 1181, parentID 1) is processed with stopping code 2
 Track (trackID 1180, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59093,0.5743,0.56655)
- Old Polarization:       (-0.3027,0.80883,-0.50415)
- New Momentum Direction: (-0.59093,0.5743,0.56655)
- New Polarization:       (-0.3027,-0.80883,0.50415)
+ Old Momentum Direction: (0.590881,0.574259,0.566644)
+ Old Polarization:       (-0.302543,0.808841,-0.504226)
+ New Momentum Direction: (-0.590881,0.574259,0.566644)
+ New Polarization:       (-0.302543,-0.808841,0.504226)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.59093,0.5743,0.56655)
- Old Polarization:       (-0.3027,-0.80883,0.50415)
- New Momentum Direction: (-0.59093,-0.5743,0.56655)
- New Polarization:       (0.3027,-0.80883,-0.50415)
+ Old Momentum Direction: (-0.590881,0.574259,0.566644)
+ Old Polarization:       (-0.302543,-0.808841,0.504226)
+ New Momentum Direction: (-0.590881,-0.574259,0.566644)
+ New Polarization:       (0.302543,-0.808841,-0.504226)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.59093,-0.5743,0.56655)
- Old Polarization:       (0.3027,-0.80883,-0.50415)
- New Momentum Direction: (-0.59093,-0.5743,-0.56655)
- New Polarization:       (-0.3027,0.80883,-0.50415)
+ Old Momentum Direction: (-0.590881,-0.574259,0.566644)
+ Old Polarization:       (0.302543,-0.808841,-0.504226)
+ New Momentum Direction: (-0.590881,-0.574259,-0.566644)
+ New Polarization:       (-0.302543,0.808841,-0.504226)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1179, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98802,-0.076778,0.13384)
- Old Polarization:       (0.13978,0.078038,-0.9871)
- New Momentum Direction: (0.97809,-0.1036,0.18059)
- New Polarization:       (-0.19676,-0.74351,0.63912)
+ Old Momentum Direction: (0.987993,-0.076857,0.134029)
+ Old Polarization:       (0.139972,0.0779954,-0.987079)
+ New Momentum Direction: (0.978029,-0.103703,0.180844)
+ New Polarization:       (-0.19702,-0.743322,0.639261)
  *** FresnelRefraction *** 
 Track (trackID 1178, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
@@ -12124,10 +12112,10 @@ Track (trackID 1178, parentID 1) is processed with stopping code 2
 Track (trackID 1177, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52695,-0.73519,0.42639)
- Old Polarization:       (-0.37522,-0.65141,-0.65945)
- New Momentum Direction: (0.71339,-0.39733,0.57724)
- New Polarization:       (0.42322,0.90082,0.097009)
+ Old Momentum Direction: (0.526817,-0.735223,0.426511)
+ Old Polarization:       (-0.375156,-0.651398,-0.659499)
+ New Momentum Direction: (0.713201,-0.397423,0.577407)
+ New Polarization:       (0.423228,0.90079,0.097241)
  *** FresnelRefraction *** 
 Track (trackID 1176, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
@@ -12140,26 +12128,26 @@ Track (trackID 1175, parentID 1) is processed with stopping code 2
 Track (trackID 1174, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45494,0.5795,0.67617)
- Old Polarization:       (-0.45497,0.80397,-0.38292)
- New Momentum Direction: (0.6163,0.78504,0.06235)
- New Polarization:       (-0.51174,0.4594,-0.726)
+ Old Momentum Direction: (0.454867,0.579482,0.676237)
+ Old Polarization:       (-0.45483,0.804002,-0.383028)
+ New Momentum Direction: (0.616199,0.785013,0.0636558)
+ New Polarization:       (-0.51133,0.460222,-0.725766)
  *** FresnelRefraction *** 
 Track (trackID 1173, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98267,-0.14029,0.12117)
- Old Polarization:       (0.12355,0.0083481,-0.9923)
- New Momentum Direction: (0.96768,-0.19087,0.16484)
- New Polarization:       (-0.19498,-0.98076,0.0090207)
+ Old Momentum Direction: (0.982634,-0.140373,0.121353)
+ Old Polarization:       (0.123731,0.00830653,-0.992281)
+ New Momentum Direction: (0.967612,-0.190973,0.165096)
+ New Polarization:       (-0.195248,-0.980704,0.00991389)
  *** FresnelRefraction *** 
 Track (trackID 1172, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93947,-0.31523,0.13428)
- Old Polarization:       (0.078183,-0.18435,-0.97975)
- New Momentum Direction: (0.88514,-0.42811,0.18237)
- New Polarization:       (-0.14229,-0.62215,-0.76986)
+ Old Momentum Direction: (0.939416,-0.315304,0.134467)
+ Old Polarization:       (0.0783494,-0.184387,-0.979726)
+ New Momentum Direction: (0.885037,-0.428206,0.182616)
+ New Polarization:       (-0.142585,-0.622781,-0.769294)
  *** FresnelRefraction *** 
 Track (trackID 1171, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
@@ -12168,18 +12156,18 @@ Track (trackID 1171, parentID 1) is processed with stopping code 2
 Track (trackID 1170, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6145,-0.70494,0.35419)
- Old Polarization:       (-0.27907,-0.61416,-0.7382)
- New Momentum Direction: (0.83393,-0.27113,0.48067)
- New Polarization:       (0.39426,0.90216,-0.17514)
+ Old Momentum Direction: (0.614377,-0.704979,0.354324)
+ Old Polarization:       (-0.278981,-0.61416,-0.738225)
+ New Momentum Direction: (0.83377,-0.271311,0.480852)
+ New Polarization:       (0.39443,0.902125,-0.174914)
  *** FresnelRefraction *** 
 Track (trackID 1169, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41156,-0.74363,0.52691)
- Old Polarization:       (-0.50372,-0.66741,-0.54847)
- New Momentum Direction: (0.55492,-0.43281,0.71045)
- New Polarization:       (0.23409,0.90074,0.36588)
+ Old Momentum Direction: (0.411407,-0.743645,0.527007)
+ Old Polarization:       (-0.503679,-0.667391,-0.548541)
+ New Momentum Direction: (0.554716,-0.432854,0.710583)
+ New Polarization:       (0.233953,0.900712,0.366038)
  *** FresnelRefraction *** 
 Track (trackID 1168, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
@@ -12196,109 +12184,109 @@ Track (trackID 1166, parentID 1) is processed with stopping code 2
 Track (trackID 1165, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.16184,-0.64714,0.745)
-Old Polarization: (-0.77699,-0.54898,-0.30807)
-New Polarization: (-0.85153,0.14659,0.50339)
-Polarization Change: (-0.85153,0.14659,0.50339)
-New Momentum Direction: (-0.45781,-0.67586,-0.57761)
-Momentum Change: (-0.45781,-0.67586,-0.57761)
+Old Momentum Direction: (0.161658,-0.647124,0.745049)
+Old Polarization: (-0.776983,-0.548923,-0.308189)
+New Polarization: (-0.851581,0.146591,0.503311)
+Polarization Change: (-0.851581,0.146591,0.503311)
+New Momentum Direction: (-0.457773,-0.675797,-0.577705)
+Momentum Change: (-0.457773,-0.675797,-0.577705)
  Photon at Boundary! 
- Old Momentum Direction: (-0.45781,-0.67586,-0.57761)
- Old Polarization:       (-0.85153,0.14659,0.50339)
- New Momentum Direction: (-0.45781,0.67586,-0.57761)
- New Polarization:       (0.85153,0.14659,-0.50339)
+ Old Momentum Direction: (-0.457773,-0.675797,-0.577705)
+ Old Polarization:       (-0.851581,0.146591,0.503311)
+ New Momentum Direction: (-0.457773,0.675797,-0.577705)
+ New Polarization:       (0.851581,0.146591,-0.503311)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.45781,0.67586,-0.57761)
- Old Polarization:       (0.85153,0.14659,-0.50339)
- New Momentum Direction: (-0.45781,0.67586,0.57761)
- New Polarization:       (-0.85153,-0.14659,-0.50339)
+ Old Momentum Direction: (-0.457773,0.675797,-0.577705)
+ Old Polarization:       (0.851581,0.146591,-0.503311)
+ New Momentum Direction: (-0.457773,0.675797,0.577705)
+ New Polarization:       (-0.851581,-0.146591,-0.503311)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.45781,0.67586,0.57761)
- Old Polarization:       (-0.85153,-0.14659,-0.50339)
- New Momentum Direction: (0.45781,0.67586,0.57761)
- New Polarization:       (-0.85153,0.14659,0.50339)
+ Old Momentum Direction: (-0.457773,0.675797,0.577705)
+ Old Polarization:       (-0.851581,-0.146591,-0.503311)
+ New Momentum Direction: (0.457773,0.675797,0.577705)
+ New Polarization:       (-0.851581,0.146591,0.503311)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.45781,0.67586,0.57761)
- Old Polarization:       (-0.85153,0.14659,0.50339)
- New Momentum Direction: (0.45781,-0.67586,0.57761)
- New Polarization:       (0.85153,0.14659,-0.50339)
+ Old Momentum Direction: (0.457773,0.675797,0.577705)
+ Old Polarization:       (-0.851581,0.146591,0.503311)
+ New Momentum Direction: (0.457773,-0.675797,0.577705)
+ New Polarization:       (0.851581,0.146591,-0.503311)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1164, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9897,-0.029406,0.14012)
- Old Polarization:       (0.14279,0.13103,-0.98104)
- New Momentum Direction: (0.9812,-0.039643,0.1889)
- New Polarization:       (-0.19273,-0.25441,0.9477)
+ Old Momentum Direction: (0.989669,-0.0294858,0.140308)
+ Old Polarization:       (0.142984,0.130983,-0.981019)
+ New Momentum Direction: (0.981144,-0.0397496,0.189148)
+ New Polarization:       (-0.192992,-0.254885,0.947517)
  *** FresnelRefraction *** 
 Track (trackID 1163, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96132,-0.24033,0.13456)
- Old Polarization:       (0.11202,-0.10517,-0.98813)
- New Momentum Direction: (0.92863,-0.32373,0.18125)
- New Polarization:       (-0.19152,-0.83668,-0.51311)
+ Old Momentum Direction: (0.961275,-0.240404,0.134743)
+ Old Polarization:       (0.112191,-0.105213,-0.988101)
+ New Momentum Direction: (0.928542,-0.323831,0.181503)
+ New Polarization:       (-0.191801,-0.837107,-0.512312)
  *** FresnelRefraction *** 
 Track (trackID 1162, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.43606,-0.75023,0.497)
- Old Polarization:       (-0.4755,-0.66096,-0.58055)
- New Momentum Direction: (0.5929,-0.43797,0.67576)
- New Polarization:       (0.3018,0.89886,0.31777)
+ Old Momentum Direction: (0.435907,-0.750251,0.4971)
+ Old Polarization:       (-0.475446,-0.660941,-0.580611)
+ New Momentum Direction: (0.592698,-0.438025,0.675902)
+ New Polarization:       (0.301683,0.89883,0.31795)
  *** FresnelRefraction *** 
 Track (trackID 1161, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8938,0.35918,0.26853)
- Old Polarization:       (0.026275,0.55581,-0.8309)
- New Momentum Direction: (0.79236,0.4886,0.36528)
- New Polarization:       (-0.049444,0.64824,-0.75983)
+ Old Momentum Direction: (0.893782,0.359113,0.268684)
+ Old Polarization:       (0.0264762,0.55578,-0.830908)
+ New Momentum Direction: (0.792322,0.488507,0.365495)
+ New Polarization:       (-0.0498217,0.648877,-0.759261)
  *** FresnelRefraction *** 
 Track (trackID 1160, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29004,-0.71913,0.63145)
- Old Polarization:       (-0.63864,-0.63685,-0.43193)
- New Momentum Direction: (0.39185,-0.34448,0.85311)
- New Polarization:       (-0.11569,0.90145,0.41714)
+ Old Momentum Direction: (0.289869,-0.719127,0.631532)
+ Old Polarization:       (-0.638609,-0.636814,-0.432025)
+ New Momentum Direction: (0.391617,-0.344485,0.853209)
+ New Polarization:       (-0.115886,0.901423,0.417142)
  *** FresnelRefraction *** 
 Track (trackID 1159, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.037706,-0.10037,0.99424)
- Old Polarization:       (-0.99812,0.051962,-0.032607)
- New Momentum Direction: (-0.051153,-0.13617,0.98936)
- New Polarization:       (-0.99728,-0.045639,-0.057844)
+ Old Momentum Direction: (-0.0378886,-0.100339,0.994232)
+ Old Polarization:       (-0.998107,0.0520443,-0.0327839)
+ New Momentum Direction: (-0.0514009,-0.136123,0.989358)
+ New Polarization:       (-0.99725,-0.045968,-0.0581356)
  *** FresnelRefraction *** 
 Track (trackID 1158, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.17126,0.42123,0.89064)
- Old Polarization:       (-0.76642,0.62501,-0.14822)
- New Momentum Direction: (0.23274,0.57244,0.78622)
- New Polarization:       (-0.70833,0.65373,-0.26629)
+ Old Momentum Direction: (0.17114,0.421239,0.890656)
+ Old Polarization:       (-0.766336,0.62507,-0.148378)
+ New Momentum Direction: (0.232575,0.572455,0.78626)
+ New Polarization:       (-0.708165,0.653802,-0.266541)
  *** FresnelRefraction *** 
 Track (trackID 1157, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47106,-0.74442,0.47322)
- Old Polarization:       (-0.43715,-0.66297,-0.60776)
- New Momentum Direction: (0.6372,-0.42922,0.64011)
- New Polarization:       (0.35952,0.9002,0.24573)
+ Old Momentum Direction: (0.470915,-0.744446,0.473327)
+ Old Polarization:       (-0.437098,-0.662952,-0.607816)
+ New Momentum Direction: (0.637003,-0.429289,0.640265)
+ New Polarization:       (0.359447,0.900174,0.245938)
  *** FresnelRefraction *** 
 Track (trackID 1156, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37864,-0.74632,0.54739)
- Old Polarization:       (-0.53878,-0.65862,-0.52529)
- New Momentum Direction: (0.51421,-0.42776,0.74338)
- New Polarization:       (0.16124,0.89951,0.40606)
+ Old Momentum Direction: (0.37848,-0.746332,0.547487)
+ Old Polarization:       (-0.538739,-0.658598,-0.525366)
+ New Momentum Direction: (0.513991,-0.427792,0.74351)
+ New Polarization:       (0.161078,0.899484,0.406181)
  *** FresnelRefraction *** 
 Track (trackID 1155, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
@@ -12307,69 +12295,69 @@ Track (trackID 1155, parentID 1) is processed with stopping code 2
 Track (trackID 1154, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62701,0.57428,0.52636)
- Old Polarization:       (-0.26585,0.79286,-0.54835)
- New Momentum Direction: (-0.62701,0.57428,0.52636)
- New Polarization:       (-0.26585,-0.79286,0.54835)
+ Old Momentum Direction: (0.626968,0.574236,0.526463)
+ Old Polarization:       (-0.265678,0.792873,-0.548423)
+ New Momentum Direction: (-0.626968,0.574236,0.526463)
+ New Polarization:       (-0.265678,-0.792873,0.548423)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62701,0.57428,0.52636)
- Old Polarization:       (-0.26585,-0.79286,0.54835)
- New Momentum Direction: (-0.62701,-0.57428,0.52636)
- New Polarization:       (0.26585,-0.79286,-0.54835)
+ Old Momentum Direction: (-0.626968,0.574236,0.526463)
+ Old Polarization:       (-0.265678,-0.792873,0.548423)
+ New Momentum Direction: (-0.626968,-0.574236,0.526463)
+ New Polarization:       (0.265678,-0.792873,-0.548423)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62701,-0.57428,0.52636)
- Old Polarization:       (0.26585,-0.79286,-0.54835)
- New Momentum Direction: (-0.62701,-0.57428,-0.52636)
- New Polarization:       (-0.26585,0.79286,-0.54835)
+ Old Momentum Direction: (-0.626968,-0.574236,0.526463)
+ Old Polarization:       (0.265678,-0.792873,-0.548423)
+ New Momentum Direction: (-0.626968,-0.574236,-0.526463)
+ New Polarization:       (-0.265678,0.792873,-0.548423)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.62701,-0.57428,-0.52636)
- Old Polarization:       (-0.26585,0.79286,-0.54835)
- New Momentum Direction: (0.62701,-0.57428,-0.52636)
- New Polarization:       (-0.26585,-0.79286,0.54835)
+ Old Momentum Direction: (-0.626968,-0.574236,-0.526463)
+ Old Polarization:       (-0.265678,0.792873,-0.548423)
+ New Momentum Direction: (0.626968,-0.574236,-0.526463)
+ New Polarization:       (-0.265678,-0.792873,0.548423)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62701,-0.57428,-0.52636)
- Old Polarization:       (-0.26585,-0.79286,0.54835)
- New Momentum Direction: (0.62701,0.57428,-0.52636)
- New Polarization:       (0.26585,-0.79286,-0.54835)
+ Old Momentum Direction: (0.626968,-0.574236,-0.526463)
+ Old Polarization:       (-0.265678,-0.792873,0.548423)
+ New Momentum Direction: (0.626968,0.574236,-0.526463)
+ New Polarization:       (0.265678,-0.792873,-0.548423)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.62701,0.57428,-0.52636)
-Old Polarization: (0.26585,-0.79286,-0.54835)
-New Polarization: (0.75869,-0.52972,-0.37918)
-Polarization Change: (0.75869,-0.52972,-0.37918)
-New Momentum Direction: (0.65119,0.63295,0.41871)
-Momentum Change: (0.65119,0.63295,0.41871)
+Old Momentum Direction: (0.626968,0.574236,-0.526463)
+Old Polarization: (0.265678,-0.792873,-0.548423)
+New Polarization: (0.75858,-0.529841,-0.379244)
+Polarization Change: (0.75858,-0.529841,-0.379244)
+New Momentum Direction: (0.651328,0.632794,0.41874)
+Momentum Change: (0.651328,0.632794,0.41874)
  Photon at Boundary! 
- Old Momentum Direction: (0.65119,0.63295,0.41871)
- Old Polarization:       (0.75869,-0.52972,-0.37918)
- New Momentum Direction: (-0.65119,0.63295,0.41871)
- New Polarization:       (0.75869,0.52972,0.37918)
+ Old Momentum Direction: (0.651328,0.632794,0.41874)
+ Old Polarization:       (0.75858,-0.529841,-0.379244)
+ New Momentum Direction: (-0.651328,0.632794,0.41874)
+ New Polarization:       (0.75858,0.529841,0.379244)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65119,0.63295,0.41871)
- Old Polarization:       (0.75869,0.52972,0.37918)
- New Momentum Direction: (-0.65119,-0.63295,0.41871)
- New Polarization:       (-0.75869,0.52972,-0.37918)
+ Old Momentum Direction: (-0.651328,0.632794,0.41874)
+ Old Polarization:       (0.75858,0.529841,0.379244)
+ New Momentum Direction: (-0.651328,-0.632794,0.41874)
+ New Polarization:       (-0.75858,0.529841,-0.379244)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65119,-0.63295,0.41871)
- Old Polarization:       (-0.75869,0.52972,-0.37918)
- New Momentum Direction: (-0.65119,-0.63295,-0.41871)
- New Polarization:       (0.75869,-0.52972,-0.37918)
+ Old Momentum Direction: (-0.651328,-0.632794,0.41874)
+ Old Polarization:       (-0.75858,0.529841,-0.379244)
+ New Momentum Direction: (-0.651328,-0.632794,-0.41874)
+ New Polarization:       (0.75858,-0.529841,-0.379244)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1153, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88586,-0.43339,0.16562)
- Old Polarization:       (0.022218,-0.31693,-0.94819)
- New Momentum Direction: (0.77805,-0.58682,0.22425)
- New Polarization:       (-0.041491,-0.40419,-0.91373)
+ Old Momentum Direction: (0.88579,-0.433461,0.165795)
+ Old Polarization:       (0.0223669,-0.316961,-0.948175)
+ New Momentum Direction: (0.777911,-0.586907,0.224487)
+ New Polarization:       (-0.0417695,-0.404758,-0.91347)
  *** FresnelRefraction *** 
 Track (trackID 1152, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
@@ -12378,10 +12366,10 @@ Track (trackID 1152, parentID 1) is processed with stopping code 2
 Track (trackID 1151, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.0098013,0.041648,0.99908)
- Old Polarization:       (-0.9773,0.21107,-0.018386)
- New Momentum Direction: (-0.013188,0.05604,0.99834)
- New Polarization:       (-0.94305,0.3312,-0.031049)
+ Old Momentum Direction: (-0.00997298,0.0416784,0.999081)
+ Old Polarization:       (-0.977277,0.211153,-0.0185639)
+ New Momentum Direction: (-0.0134193,0.0560811,0.998336)
+ New Polarization:       (-0.9428,0.331885,-0.0313163)
  *** FresnelRefraction *** 
 Track (trackID 1150, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
@@ -12390,42 +12378,42 @@ Track (trackID 1150, parentID 1) is processed with stopping code 2
 Track (trackID 1149, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.038471,-0.21921,0.97492)
- Old Polarization:       (-0.99532,-0.078097,-0.056836)
- New Momentum Direction: (-0.052343,-0.29825,0.95305)
- New Polarization:       (-0.98243,-0.15584,-0.10273)
+ Old Momentum Direction: (-0.0386599,-0.219176,0.974919)
+ Old Polarization:       (-0.995321,-0.0780159,-0.057008)
+ New Momentum Direction: (-0.0526005,-0.298209,0.95305)
+ New Polarization:       (-0.982375,-0.155965,-0.103021)
  *** FresnelRefraction *** 
 Track (trackID 1148, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.055542,-0.50892,0.85902)
- Old Polarization:       (-0.8981,-0.40138,-0.17973)
- New Momentum Direction: (0.075146,-0.68855,0.72129)
- New Polarization:       (-0.84558,-0.42739,-0.31989)
+ Old Momentum Direction: (0.0553486,-0.508895,0.859048)
+ Old Polarization:       (-0.898104,-0.401316,-0.179872)
+ New Momentum Direction: (0.0748844,-0.688514,0.721347)
+ New Polarization:       (-0.845517,-0.427346,-0.32012)
  *** FresnelRefraction *** 
 Track (trackID 1147, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9717,-0.19624,0.13148)
- Old Polarization:       (0.12285,-0.05559,-0.99087)
- New Momentum Direction: (0.94796,-0.26451,0.17722)
- New Polarization:       (-0.20244,-0.93035,-0.30573)
+ Old Momentum Direction: (0.97166,-0.196315,0.131669)
+ Old Polarization:       (0.123029,-0.0556322,-0.990843)
+ New Momentum Direction: (0.947883,-0.264612,0.177476)
+ New Polarization:       (-0.202705,-0.930581,-0.304843)
  *** FresnelRefraction *** 
 Track (trackID 1146, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37002,-0.74302,0.55768)
- Old Polarization:       (-0.54893,-0.65915,-0.514)
- New Momentum Direction: (0.50121,-0.42207,0.75541)
- New Polarization:       (0.13282,0.90016,0.41482)
+ Old Momentum Direction: (0.369856,-0.743031,0.557773)
+ Old Polarization:       (-0.548893,-0.659123,-0.514076)
+ New Momentum Direction: (0.500993,-0.422101,0.755538)
+ New Polarization:       (0.132646,0.900134,0.414927)
  *** FresnelRefraction *** 
 Track (trackID 1145, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98076,-0.14355,0.13229)
- Old Polarization:       (0.13413,0.0032076,-0.99096)
- New Momentum Direction: (0.96483,-0.19332,0.17815)
- New Polarization:       (-0.20696,-0.97643,0.061272)
+ Old Momentum Direction: (0.980725,-0.14363,0.132475)
+ Old Polarization:       (0.134317,0.00316512,-0.990933)
+ New Momentum Direction: (0.96476,-0.193423,0.1784)
+ New Polarization:       (-0.207215,-0.976326,0.062048)
  *** FresnelRefraction *** 
 Track (trackID 1144, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
@@ -12434,128 +12422,128 @@ Track (trackID 1144, parentID 1) is processed with stopping code 2
 Track (trackID 1143, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89449,-0.41769,0.15946)
- Old Polarization:       (0.030612,-0.29861,-0.95389)
- New Momentum Direction: (0.79542,-0.5662,0.21616)
- New Polarization:       (-0.057132,-0.42512,-0.90333)
+ Old Momentum Direction: (0.894421,-0.417762,0.159641)
+ Old Polarization:       (0.0307638,-0.298641,-0.95387)
+ New Momentum Direction: (0.79529,-0.566292,0.216399)
+ New Polarization:       (-0.0574152,-0.425713,-0.903035)
  *** FresnelRefraction *** 
 Track (trackID 1142, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.97774,-0.17059,0.12216)
-Old Polarization: (0.11963,-0.025117,-0.9925)
-New Polarization: (-0.26653,-0.5244,-0.80868)
-Polarization Change: (-0.26653,-0.5244,-0.80868)
-New Momentum Direction: (0.52918,0.62164,-0.57752)
-Momentum Change: (0.52918,0.62164,-0.57752)
+Old Momentum Direction: (0.977703,-0.17067,0.12235)
+Old Polarization: (0.119807,-0.0251581,-0.992478)
+New Polarization: (-0.266393,-0.524429,-0.808708)
+Polarization Change: (-0.266393,-0.524429,-0.808708)
+New Momentum Direction: (0.529301,0.621604,-0.577451)
+Momentum Change: (0.529301,0.621604,-0.577451)
  Photon at Boundary! 
- Old Momentum Direction: (0.52918,0.62164,-0.57752)
- Old Polarization:       (-0.26653,-0.5244,-0.80868)
- New Momentum Direction: (-0.52918,0.62164,-0.57752)
- New Polarization:       (-0.26653,0.5244,0.80868)
+ Old Momentum Direction: (0.529301,0.621604,-0.577451)
+ Old Polarization:       (-0.266393,-0.524429,-0.808708)
+ New Momentum Direction: (-0.529301,0.621604,-0.577451)
+ New Polarization:       (-0.266393,0.524429,0.808708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52918,0.62164,-0.57752)
- Old Polarization:       (-0.26653,0.5244,0.80868)
- New Momentum Direction: (-0.52918,-0.62164,-0.57752)
- New Polarization:       (0.26653,0.5244,-0.80868)
+ Old Momentum Direction: (-0.529301,0.621604,-0.577451)
+ Old Polarization:       (-0.266393,0.524429,0.808708)
+ New Momentum Direction: (-0.529301,-0.621604,-0.577451)
+ New Polarization:       (0.266393,0.524429,-0.808708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52918,-0.62164,-0.57752)
- Old Polarization:       (0.26653,0.5244,-0.80868)
- New Momentum Direction: (-0.52918,-0.62164,0.57752)
- New Polarization:       (-0.26653,-0.5244,-0.80868)
+ Old Momentum Direction: (-0.529301,-0.621604,-0.577451)
+ Old Polarization:       (0.266393,0.524429,-0.808708)
+ New Momentum Direction: (-0.529301,-0.621604,0.577451)
+ New Polarization:       (-0.266393,-0.524429,-0.808708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52918,-0.62164,0.57752)
- Old Polarization:       (-0.26653,-0.5244,-0.80868)
- New Momentum Direction: (0.52918,-0.62164,0.57752)
- New Polarization:       (-0.26653,0.5244,0.80868)
+ Old Momentum Direction: (-0.529301,-0.621604,0.577451)
+ Old Polarization:       (-0.266393,-0.524429,-0.808708)
+ New Momentum Direction: (0.529301,-0.621604,0.577451)
+ New Polarization:       (-0.266393,0.524429,0.808708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52918,-0.62164,0.57752)
- Old Polarization:       (-0.26653,0.5244,0.80868)
- New Momentum Direction: (0.52918,0.62164,0.57752)
- New Polarization:       (0.26653,0.5244,-0.80868)
+ Old Momentum Direction: (0.529301,-0.621604,0.577451)
+ Old Polarization:       (-0.266393,0.524429,0.808708)
+ New Momentum Direction: (0.529301,0.621604,0.577451)
+ New Polarization:       (0.266393,0.524429,-0.808708)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52918,0.62164,0.57752)
- Old Polarization:       (0.26653,0.5244,-0.80868)
- New Momentum Direction: (0.52918,0.62164,-0.57752)
- New Polarization:       (-0.26653,-0.5244,-0.80868)
+ Old Momentum Direction: (0.529301,0.621604,0.577451)
+ Old Polarization:       (0.266393,0.524429,-0.808708)
+ New Momentum Direction: (0.529301,0.621604,-0.577451)
+ New Polarization:       (-0.266393,-0.524429,-0.808708)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1141, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68621,0.55069,0.47524)
- Old Polarization:       (-0.19956,0.7708,-0.60502)
- New Momentum Direction: (0.16542,0.74664,0.64434)
- New Polarization:       (-0.41623,0.64516,-0.64072)
+ Old Momentum Direction: (0.686175,0.550643,0.475349)
+ Old Polarization:       (-0.199386,0.770799,-0.605074)
+ New Momentum Direction: (0.165127,0.746572,0.644487)
+ New Polarization:       (-0.415961,0.645214,-0.640839)
  *** FresnelRefraction *** 
 Track (trackID 1140, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.88023,0.37458,0.29136)
-Old Polarization: (0.020656,0.58314,-0.81211)
-New Polarization: (-0.039476,-0.92869,0.36874)
-Polarization Change: (-0.039476,-0.92869,0.36874)
-New Momentum Direction: (-0.023301,-0.36807,-0.9295)
-Momentum Change: (-0.023301,-0.36807,-0.9295)
+Old Momentum Direction: (0.880207,0.37451,0.291508)
+Old Polarization: (0.0208558,0.583115,-0.812122)
+New Polarization: (-0.0397956,-0.928671,0.368762)
+Polarization Change: (-0.0397956,-0.928671,0.368762)
+New Momentum Direction: (-0.0234287,-0.368086,-0.929497)
+Momentum Change: (-0.0234287,-0.368086,-0.929497)
  Photon at Boundary! 
- Old Momentum Direction: (-0.023301,-0.36807,-0.9295)
- Old Polarization:       (-0.039476,-0.92869,0.36874)
- New Momentum Direction: (-0.031403,-0.49606,-0.86772)
- New Polarization:       (-0.040685,-0.8668,0.497)
+ Old Momentum Direction: (-0.0234287,-0.368086,-0.929497)
+ Old Polarization:       (-0.0397956,-0.928671,0.368762)
+ New Momentum Direction: (-0.0315752,-0.496073,-0.867706)
+ New Polarization:       (-0.0409825,-0.866766,0.497027)
  *** FresnelRefraction *** 
 Track (trackID 1139, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.034666,-0.16938,0.98494)
- Old Polarization:       (-0.99891,-0.024845,-0.039431)
- New Momentum Direction: (-0.046875,-0.22903,0.97229)
- New Polarization:       (-0.99277,-0.09701,-0.070713)
+ Old Momentum Direction: (-0.0348531,-0.169345,0.98494)
+ Old Polarization:       (-0.998909,-0.0247633,-0.039605)
+ New Momentum Direction: (-0.0471273,-0.228984,0.972289)
+ New Polarization:       (-0.992727,-0.0972147,-0.071013)
  *** FresnelRefraction *** 
 Track (trackID 1138, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81272,0.46282,0.35396)
- Old Polarization:       (-0.061089,0.67183,-0.73819)
- New Momentum Direction: (0.61164,0.62842,0.4806)
- New Polarization:       (-0.11691,0.67262,-0.7307)
+ Old Momentum Direction: (0.812696,0.462757,0.354092)
+ Old Polarization:       (-0.060895,0.671811,-0.738215)
+ New Momentum Direction: (0.611584,0.628336,0.48079)
+ New Polarization:       (-0.116546,0.672605,-0.730766)
  *** FresnelRefraction *** 
 Track (trackID 1137, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.084381,0.30434,0.94882)
- Old Polarization:       (-0.86322,0.49796,-0.082956)
- New Momentum Direction: (0.11451,0.413,0.9035)
- New Polarization:       (-0.81893,0.55408,-0.14948)
+ Old Momentum Direction: (0.0842398,0.304361,0.948824)
+ Old Polarization:       (-0.863166,0.498032,-0.0831225)
+ New Momentum Direction: (0.114315,0.413024,0.903517)
+ New Polarization:       (-0.818772,0.55424,-0.149767)
  *** FresnelRefraction *** 
 Track (trackID 1136, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95055,-0.28305,0.12784)
- Old Polarization:       (0.088374,-0.14809,-0.98502)
- New Momentum Direction: (0.90635,-0.38507,0.17391)
- New Polarization:       (-0.15919,-0.6925,-0.70364)
+ Old Momentum Direction: (0.950501,-0.283121,0.128022)
+ Old Polarization:       (0.0885444,-0.148132,-0.984996)
+ New Momentum Direction: (0.906263,-0.385168,0.174165)
+ New Polarization:       (-0.159486,-0.693119,-0.702958)
  *** FresnelRefraction *** 
 Track (trackID 1135, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99095,-0.0024176,0.13423)
- Old Polarization:       (0.1329,0.15948,-0.97821)
- New Momentum Direction: (0.98319,-0.0032884,0.18258)
- New Polarization:       (-0.18161,0.087017,0.97951)
+ Old Momentum Direction: (0.990922,-0.00249751,0.134418)
+ Old Polarization:       (0.133093,0.159438,-0.978195)
+ New Momentum Direction: (0.983139,-0.00339701,0.182829)
+ New Polarization:       (-0.181866,0.0860127,0.979554)
  *** FresnelRefraction *** 
 Track (trackID 1134, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84282,0.42703,0.32757)
- Old Polarization:       (-0.024036,0.63789,-0.76975)
- New Momentum Direction: (0.68601,0.5773,0.44284)
- New Polarization:       (-0.045255,0.64131,-0.76594)
+ Old Momentum Direction: (0.842796,0.426969,0.327709)
+ Old Polarization:       (-0.0238387,0.637874,-0.769772)
+ New Momentum Direction: (0.685962,0.577218,0.443029)
+ New Polarization:       (-0.044885,0.641268,-0.766003)
  *** FresnelRefraction *** 
 Track (trackID 1133, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
@@ -12564,79 +12552,79 @@ Track (trackID 1133, parentID 1) is processed with stopping code 2
 Track (trackID 1132, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0063007,0.14309,0.98969)
- Old Polarization:       (-0.94687,0.31912,-0.040111)
- New Momentum Direction: (0.0085683,0.19459,0.98085)
- New Polarization:       (-0.91253,0.40264,-0.071908)
+ Old Momentum Direction: (0.00613899,0.143119,0.989686)
+ Old Polarization:       (-0.946831,0.319199,-0.0402865)
+ New Momentum Direction: (0.00834831,0.194625,0.980842)
+ New Polarization:       (-0.912341,0.403014,-0.0722035)
  *** FresnelRefraction *** 
 Track (trackID 1131, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94916,0.23215,0.21261)
- Old Polarization:       (0.098011,0.4239,-0.90039)
- New Momentum Direction: (0.90558,0.31281,0.28649)
- New Polarization:       (-0.17231,0.88845,-0.42541)
+ Old Momentum Direction: (0.94914,0.232071,0.212782)
+ Old Polarization:       (0.0982143,0.423863,-0.900385)
+ New Momentum Direction: (0.905543,0.312707,0.286715)
+ New Polarization:       (-0.172643,0.888933,-0.424255)
  *** FresnelRefraction *** 
 Track (trackID 1130, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46614,-0.74856,0.47155)
- Old Polarization:       (-0.44248,-0.65881,-0.60842)
- New Momentum Direction: (0.63393,-0.43229,0.64129)
- New Polarization:       (0.35767,0.89907,0.25249)
+ Old Momentum Direction: (0.465996,-0.748586,0.471664)
+ Old Polarization:       (-0.442427,-0.658797,-0.608477)
+ New Momentum Direction: (0.633734,-0.432357,0.641442)
+ New Polarization:       (0.357592,0.899041,0.252693)
  *** FresnelRefraction *** 
 Track (trackID 1129, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68223,0.55308,0.47818)
- Old Polarization:       (-0.20436,0.77221,-0.60161)
- New Momentum Direction: (-0.68223,0.55308,0.47818)
- New Polarization:       (-0.16359,-0.75292,0.63746)
+ Old Momentum Direction: (0.682196,0.553037,0.478288)
+ Old Polarization:       (-0.20418,0.77221,-0.601666)
+ New Momentum Direction: (-0.682196,0.553037,0.478288)
+ New Polarization:       (-0.163562,-0.752991,0.637379)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68223,0.55308,0.47818)
- Old Polarization:       (-0.16359,-0.75292,0.63746)
- New Momentum Direction: (-0.68223,-0.55308,0.47818)
- New Polarization:       (0.16359,-0.75292,-0.63746)
+ Old Momentum Direction: (-0.682196,0.553037,0.478288)
+ Old Polarization:       (-0.163562,-0.752991,0.637379)
+ New Momentum Direction: (-0.682196,-0.553037,0.478288)
+ New Polarization:       (0.163562,-0.752991,-0.637379)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.68223,-0.55308,0.47818)
- Old Polarization:       (0.16359,-0.75292,-0.63746)
- New Momentum Direction: (-0.68223,-0.55308,-0.47818)
- New Polarization:       (-0.16359,0.75292,-0.63746)
+ Old Momentum Direction: (-0.682196,-0.553037,0.478288)
+ Old Polarization:       (0.163562,-0.752991,-0.637379)
+ New Momentum Direction: (-0.682196,-0.553037,-0.478288)
+ New Polarization:       (-0.163562,0.752991,-0.637379)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1128, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13675,0.37655,0.91625)
- Old Polarization:       (-0.8067,0.57914,-0.1176)
- New Momentum Direction: (0.18531,0.51025,0.83982)
- New Polarization:       (-0.75472,0.62122,-0.21091)
+ Old Momentum Direction: (0.136622,0.376562,0.916262)
+ Old Polarization:       (-0.806633,0.579202,-0.117763)
+ New Momentum Direction: (0.185133,0.510271,0.839851)
+ New Polarization:       (-0.75456,0.621327,-0.211169)
  *** FresnelRefraction *** 
 Track (trackID 1127, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (-0.0061102,0.090273,0.9959)
-Old Polarization: (-0.96445,0.2626,-0.02972)
-New Polarization: (0.94886,-0.11858,-0.29256)
-Polarization Change: (0.94886,-0.11858,-0.29256)
-New Momentum Direction: (0.21512,-0.43537,0.87417)
-Momentum Change: (0.21512,-0.43537,0.87417)
+Old Momentum Direction: (-0.00627741,0.0903025,0.995895)
+Old Polarization: (-0.964421,0.262677,-0.0298972)
+New Polarization: (0.948904,-0.118678,-0.292397)
+Polarization Change: (0.948904,-0.118678,-0.292397)
+New Momentum Direction: (0.214938,-0.43535,0.874227)
+Momentum Change: (0.214938,-0.43535,0.874227)
  Photon at Boundary! 
- Old Momentum Direction: (0.21512,-0.43537,0.87417)
- Old Polarization:       (0.94886,-0.11858,-0.29256)
- New Momentum Direction: (0.29156,-0.59006,0.75288)
- New Polarization:       (0.86055,-0.18187,-0.47579)
+ Old Momentum Direction: (0.214938,-0.43535,0.874227)
+ Old Polarization:       (0.948904,-0.118678,-0.292397)
+ New Momentum Direction: (0.291303,-0.590026,0.753002)
+ New Polarization:       (0.860655,-0.181995,-0.475554)
  *** FresnelRefraction *** 
 Track (trackID 1126, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37925,-0.73973,0.55585)
- Old Polarization:       (-0.5401,-0.66475,-0.51614)
- New Momentum Direction: (0.51084,-0.42247,0.74871)
- New Polarization:       (0.14836,0.90117,0.40728)
+ Old Momentum Direction: (0.379095,-0.73974,0.555943)
+ Old Polarization:       (-0.540058,-0.664722,-0.516219)
+ New Momentum Direction: (0.510626,-0.422508,0.748832)
+ New Polarization:       (0.148189,0.901147,0.407398)
  *** FresnelRefraction *** 
 Track (trackID 1125, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
@@ -12645,46 +12633,46 @@ Track (trackID 1125, parentID 1) is processed with stopping code 2
 Track (trackID 1124, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4725,0.57902,0.66444)
- Old Polarization:       (-0.43558,0.80881,-0.39509)
- New Momentum Direction: (0.4725,0.57902,-0.66444)
- New Polarization:       (0.43558,-0.80881,-0.39509)
+ Old Momentum Direction: (0.472434,0.578999,0.664505)
+ Old Polarization:       (-0.435437,0.80884,-0.395186)
+ New Momentum Direction: (0.472434,0.578999,-0.664505)
+ New Polarization:       (0.435437,-0.80884,-0.395186)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.4725,0.57902,-0.66444)
- Old Polarization:       (0.43558,-0.80881,-0.39509)
- New Momentum Direction: (0.4725,-0.57902,-0.66444)
- New Polarization:       (-0.43558,-0.80881,0.39509)
+ Old Momentum Direction: (0.472434,0.578999,-0.664505)
+ Old Polarization:       (0.435437,-0.80884,-0.395186)
+ New Momentum Direction: (0.472434,-0.578999,-0.664505)
+ New Polarization:       (-0.435437,-0.80884,0.395186)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.4725,-0.57902,-0.66444)
- Old Polarization:       (-0.43558,-0.80881,0.39509)
- New Momentum Direction: (-0.4725,-0.57902,-0.66444)
- New Polarization:       (-0.43558,0.80881,-0.39509)
+ Old Momentum Direction: (0.472434,-0.578999,-0.664505)
+ Old Polarization:       (-0.435437,-0.80884,0.395186)
+ New Momentum Direction: (-0.472434,-0.578999,-0.664505)
+ New Polarization:       (-0.435437,0.80884,-0.395186)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.4725,-0.57902,-0.66444)
- Old Polarization:       (-0.43558,0.80881,-0.39509)
- New Momentum Direction: (-0.4725,-0.57902,0.66444)
- New Polarization:       (0.43558,-0.80881,-0.39509)
+ Old Momentum Direction: (-0.472434,-0.578999,-0.664505)
+ Old Polarization:       (-0.435437,0.80884,-0.395186)
+ New Momentum Direction: (-0.472434,-0.578999,0.664505)
+ New Polarization:       (0.435437,-0.80884,-0.395186)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1123, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27689,-0.71968,0.63671)
- Old Polarization:       (-0.65035,-0.62814,-0.42717)
- New Momentum Direction: (0.37631,-0.33106,0.86533)
- New Polarization:       (-0.14507,0.90141,0.40795)
+ Old Momentum Direction: (0.276721,-0.719677,0.636781)
+ Old Polarization:       (-0.650327,-0.628107,-0.427266)
+ New Momentum Direction: (0.376081,-0.331059,0.865426)
+ New Polarization:       (-0.14526,0.90138,0.407938)
  *** FresnelRefraction *** 
 Track (trackID 1122, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9732,-0.19431,0.12295)
- Old Polarization:       (0.11509,-0.051281,-0.99203)
- New Momentum Direction: (0.94997,-0.26393,0.16701)
- New Polarization:       (-0.19334,-0.91688,-0.34921)
+ Old Momentum Direction: (0.973165,-0.194388,0.123141)
+ Old Polarization:       (0.115273,-0.0513222,-0.992007)
+ New Momentum Direction: (0.949899,-0.264038,0.167262)
+ New Polarization:       (-0.193619,-0.917181,-0.348269)
  *** FresnelRefraction *** 
 Track (trackID 1121, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
@@ -12693,18 +12681,18 @@ Track (trackID 1121, parentID 1) is processed with stopping code 2
 Track (trackID 1120, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.016317,0.037072,0.99918)
- Old Polarization:       (-0.97859,0.20449,-0.023568)
- New Momentum Direction: (-0.022063,0.050126,0.9985)
- New Polarization:       (-0.93749,0.34592,-0.03808)
+ Old Momentum Direction: (-0.0164895,0.0371031,0.999175)
+ Old Polarization:       (-0.978564,0.20457,-0.0237458)
+ New Momentum Direction: (-0.0222956,0.0501676,0.998492)
+ New Polarization:       (-0.937385,0.346179,-0.0383243)
  *** FresnelRefraction *** 
 Track (trackID 1119, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.01989,-0.0092412,0.99976)
- Old Polarization:       (-0.98793,0.15382,-0.018233)
- New Momentum Direction: (-0.026779,-0.012442,0.99956)
- New Polarization:       (-0.99931,0.026102,-0.026447)
+ Old Momentum Direction: (-0.0200665,-0.00920967,0.999756)
+ Old Polarization:       (-0.987915,0.1539,-0.0184111)
+ New Momentum Direction: (-0.0270157,-0.0123991,0.999558)
+ New Polarization:       (-0.999284,0.0268198,-0.0266756)
  *** FresnelRefraction *** 
 Track (trackID 1118, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
@@ -12713,98 +12701,98 @@ Track (trackID 1118, parentID 1) is processed with stopping code 2
 Track (trackID 1117, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.13965,-0.622,0.77046)
- Old Polarization:       (-0.80395,-0.52546,-0.27849)
- New Momentum Direction: (0.18913,-0.84241,0.50456)
- New Polarization:       (-0.73579,-0.46185,-0.49529)
+ Old Momentum Direction: (0.139459,-0.621986,0.770509)
+ Old Polarization:       (-0.803942,-0.525404,-0.278617)
+ New Momentum Direction: (0.188876,-0.842386,0.50469)
+ New Polarization:       (-0.735707,-0.461796,-0.495459)
  *** FresnelRefraction *** 
 Track (trackID 1116, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.53432,-0.73432,0.41866)
- Old Polarization:       (-0.3673,-0.64778,-0.66743)
- New Momentum Direction: (0.72455,-0.3908,0.56771)
- New Polarization:       (0.42809,0.90073,0.073672)
+ Old Momentum Direction: (0.534184,-0.73435,0.418781)
+ Old Polarization:       (-0.367229,-0.647777,-0.667478)
+ New Momentum Direction: (0.724371,-0.390895,0.56788)
+ New Polarization:       (0.428109,0.9007,0.0739058)
  *** FresnelRefraction *** 
 Track (trackID 1115, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6473,0.56876,0.50746)
- Old Polarization:       (-0.24396,0.78532,-0.569)
- New Momentum Direction: (-0.6473,0.56876,0.50746)
- New Polarization:       (-0.24396,-0.78532,0.569)
+ Old Momentum Direction: (0.647261,0.568716,0.507558)
+ Old Polarization:       (-0.24379,0.785325,-0.569062)
+ New Momentum Direction: (-0.647261,0.568716,0.507558)
+ New Polarization:       (-0.24379,-0.785325,0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,0.56876,0.50746)
- Old Polarization:       (-0.24396,-0.78532,0.569)
- New Momentum Direction: (-0.6473,-0.56876,0.50746)
- New Polarization:       (0.24396,-0.78532,-0.569)
+ Old Momentum Direction: (-0.647261,0.568716,0.507558)
+ Old Polarization:       (-0.24379,-0.785325,0.569062)
+ New Momentum Direction: (-0.647261,-0.568716,0.507558)
+ New Polarization:       (0.24379,-0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,-0.56876,0.50746)
- Old Polarization:       (0.24396,-0.78532,-0.569)
- New Momentum Direction: (-0.6473,-0.56876,-0.50746)
- New Polarization:       (-0.24396,0.78532,-0.569)
+ Old Momentum Direction: (-0.647261,-0.568716,0.507558)
+ Old Polarization:       (0.24379,-0.785325,-0.569062)
+ New Momentum Direction: (-0.647261,-0.568716,-0.507558)
+ New Polarization:       (-0.24379,0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,-0.56876,-0.50746)
- Old Polarization:       (-0.24396,0.78532,-0.569)
- New Momentum Direction: (0.6473,-0.56876,-0.50746)
- New Polarization:       (-0.24396,-0.78532,0.569)
+ Old Momentum Direction: (-0.647261,-0.568716,-0.507558)
+ Old Polarization:       (-0.24379,0.785325,-0.569062)
+ New Momentum Direction: (0.647261,-0.568716,-0.507558)
+ New Polarization:       (-0.24379,-0.785325,0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6473,-0.56876,-0.50746)
- Old Polarization:       (-0.24396,-0.78532,0.569)
- New Momentum Direction: (0.6473,0.56876,-0.50746)
- New Polarization:       (0.24396,-0.78532,-0.569)
+ Old Momentum Direction: (0.647261,-0.568716,-0.507558)
+ Old Polarization:       (-0.24379,-0.785325,0.569062)
+ New Momentum Direction: (0.647261,0.568716,-0.507558)
+ New Polarization:       (0.24379,-0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6473,0.56876,-0.50746)
- Old Polarization:       (0.24396,-0.78532,-0.569)
- New Momentum Direction: (0.6473,0.56876,0.50746)
- New Polarization:       (-0.24396,0.78532,-0.569)
+ Old Momentum Direction: (0.647261,0.568716,-0.507558)
+ Old Polarization:       (0.24379,-0.785325,-0.569062)
+ New Momentum Direction: (0.647261,0.568716,0.507558)
+ New Polarization:       (-0.24379,0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6473,0.56876,0.50746)
- Old Polarization:       (-0.24396,0.78532,-0.569)
- New Momentum Direction: (-0.6473,0.56876,0.50746)
- New Polarization:       (-0.24396,-0.78532,0.569)
+ Old Momentum Direction: (0.647261,0.568716,0.507558)
+ Old Polarization:       (-0.24379,0.785325,-0.569062)
+ New Momentum Direction: (-0.647261,0.568716,0.507558)
+ New Polarization:       (-0.24379,-0.785325,0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,0.56876,0.50746)
- Old Polarization:       (-0.24396,-0.78532,0.569)
- New Momentum Direction: (-0.6473,-0.56876,0.50746)
- New Polarization:       (0.24396,-0.78532,-0.569)
+ Old Momentum Direction: (-0.647261,0.568716,0.507558)
+ Old Polarization:       (-0.24379,-0.785325,0.569062)
+ New Momentum Direction: (-0.647261,-0.568716,0.507558)
+ New Polarization:       (0.24379,-0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,-0.56876,0.50746)
- Old Polarization:       (0.24396,-0.78532,-0.569)
- New Momentum Direction: (-0.6473,-0.56876,-0.50746)
- New Polarization:       (-0.24396,0.78532,-0.569)
+ Old Momentum Direction: (-0.647261,-0.568716,0.507558)
+ Old Polarization:       (0.24379,-0.785325,-0.569062)
+ New Momentum Direction: (-0.647261,-0.568716,-0.507558)
+ New Polarization:       (-0.24379,0.785325,-0.569062)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6473,-0.56876,-0.50746)
- Old Polarization:       (-0.24396,0.78532,-0.569)
- New Momentum Direction: (0.6473,-0.56876,-0.50746)
- New Polarization:       (-0.24396,-0.78532,0.569)
+ Old Momentum Direction: (-0.647261,-0.568716,-0.507558)
+ Old Polarization:       (-0.24379,0.785325,-0.569062)
+ New Momentum Direction: (0.647261,-0.568716,-0.507558)
+ New Polarization:       (-0.24379,-0.785325,0.569062)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1114, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93906,0.2604,0.22441)
- Old Polarization:       (0.085726,0.4548,-0.88646)
- New Momentum Direction: (0.88605,0.35117,0.30264)
- New Polarization:       (-0.15326,0.83801,-0.52369)
+ Old Momentum Direction: (0.93904,0.260324,0.224577)
+ Old Polarization:       (0.0859287,0.454766,-0.886456)
+ New Momentum Direction: (0.886014,0.351074,0.302864)
+ New Polarization:       (-0.153608,0.838573,-0.522685)
  *** FresnelRefraction *** 
 Track (trackID 1113, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97721,0.12676,0.17026)
- Old Polarization:       (0.1251,0.30411,-0.94439)
- New Momentum Direction: (0.95793,0.17139,0.23022)
- New Polarization:       (-0.20186,0.97254,0.11589)
+ Old Momentum Direction: (0.977191,0.126678,0.170442)
+ Old Polarization:       (0.125299,0.304072,-0.944373)
+ New Momentum Direction: (0.957888,0.171285,0.23046)
+ New Polarization:       (-0.202128,0.972286,0.117495)
  *** FresnelRefraction *** 
 Track (trackID 1112, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
@@ -12813,223 +12801,223 @@ Track (trackID 1112, parentID 1) is processed with stopping code 2
 Track (trackID 1111, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.020848,0.17003,0.98522)
- Old Polarization:       (-0.93543,0.35116,-0.040808)
- New Momentum Direction: (0.028236,0.23028,0.97271)
- New Polarization:       (-0.90438,0.42038,-0.073269)
+ Old Momentum Direction: (0.0206898,0.170055,0.985217)
+ Old Polarization:       (-0.935389,0.351237,-0.0409823)
+ New Momentum Direction: (0.0280214,0.230315,0.972713)
+ New Polarization:       (-0.904205,0.420715,-0.0735676)
  *** FresnelRefraction *** 
 Track (trackID 1110, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97093,0.16331,0.17497)
- Old Polarization:       (0.11084,0.34113,-0.93346)
- New Momentum Direction: (0.94551,0.22216,0.23801)
- New Polarization:       (-0.18913,0.96982,-0.15389)
+ Old Momentum Direction: (0.970915,0.163237,0.175149)
+ Old Polarization:       (0.111044,0.34109,-0.933449)
+ New Momentum Direction: (0.945478,0.22205,0.238253)
+ New Polarization:       (-0.189428,0.970008,-0.152318)
  *** FresnelRefraction *** 
 Track (trackID 1109, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.0071913,-0.41611,0.90929)
- Old Polarization:       (-0.94695,-0.295,-0.12751)
- New Momentum Direction: (0.0097701,-0.56533,0.82481)
- New Polarization:       (-0.90811,-0.35034,-0.22937)
+ Old Momentum Direction: (0.0069971,-0.416078,0.909302)
+ Old Polarization:       (-0.946952,-0.294929,-0.127667)
+ New Momentum Direction: (0.00950633,-0.565288,0.824839)
+ New Polarization:       (-0.908044,-0.350326,-0.229624)
  *** FresnelRefraction *** 
 Track (trackID 1108, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97467,-0.18463,0.12623)
- Old Polarization:       (0.1206,-0.041441,-0.99184)
- New Momentum Direction: (0.95305,-0.24998,0.17091)
- New Polarization:       (-0.19874,-0.94218,-0.26981)
+ Old Momentum Direction: (0.97463,-0.184703,0.126413)
+ Old Polarization:       (0.12078,-0.0414822,-0.991812)
+ New Momentum Direction: (0.952976,-0.250083,0.17116)
+ New Polarization:       (-0.199011,-0.942388,-0.268886)
  *** FresnelRefraction *** 
 Track (trackID 1107, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.317,-0.73121,0.60402)
- Old Polarization:       (-0.60748,-0.64562,-0.46276)
- New Momentum Direction: (0.42952,-0.38171,0.81842)
- New Polarization:       (-0.024751,0.90096,0.4332)
+ Old Momentum Direction: (0.31683,-0.731218,0.604102)
+ Old Polarization:       (-0.607448,-0.645586,-0.462846)
+ New Momentum Direction: (0.429291,-0.381727,0.818531)
+ New Polarization:       (-0.0249455,0.900934,0.433239)
  *** FresnelRefraction *** 
 Track (trackID 1106, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.022109,-0.30373,0.9525)
- Old Polarization:       (-0.98189,-0.17271,-0.077864)
- New Momentum Direction: (-0.02997,-0.41172,0.91082)
- New Polarization:       (-0.96057,-0.24012,-0.14015)
+ Old Momentum Direction: (-0.0223014,-0.303699,0.952507)
+ Old Polarization:       (-0.981891,-0.172631,-0.0780313)
+ New Momentum Direction: (-0.0302308,-0.41168,0.910827)
+ New Polarization:       (-0.960518,-0.240172,-0.140434)
  *** FresnelRefraction *** 
 Track (trackID 1105, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56398,0.58058,0.58724)
- Old Polarization:       (-0.33362,0.8107,-0.4811)
- New Momentum Direction: (0.56398,0.58058,-0.58724)
- New Polarization:       (0.33362,-0.8107,-0.4811)
+ Old Momentum Direction: (0.563926,0.580546,0.587328)
+ Old Polarization:       (-0.333463,0.810719,-0.481183)
+ New Momentum Direction: (0.563926,0.580546,-0.587328)
+ New Polarization:       (0.333463,-0.810719,-0.481183)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56398,0.58058,-0.58724)
- Old Polarization:       (0.33362,-0.8107,-0.4811)
- New Momentum Direction: (0.56398,-0.58058,-0.58724)
- New Polarization:       (-0.33362,-0.8107,0.4811)
+ Old Momentum Direction: (0.563926,0.580546,-0.587328)
+ Old Polarization:       (0.333463,-0.810719,-0.481183)
+ New Momentum Direction: (0.563926,-0.580546,-0.587328)
+ New Polarization:       (-0.333463,-0.810719,0.481183)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56398,-0.58058,-0.58724)
- Old Polarization:       (-0.33362,-0.8107,0.4811)
- New Momentum Direction: (-0.56398,-0.58058,-0.58724)
- New Polarization:       (-0.33362,0.8107,-0.4811)
+ Old Momentum Direction: (0.563926,-0.580546,-0.587328)
+ Old Polarization:       (-0.333463,-0.810719,0.481183)
+ New Momentum Direction: (-0.563926,-0.580546,-0.587328)
+ New Polarization:       (-0.333463,0.810719,-0.481183)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56398,-0.58058,-0.58724)
- Old Polarization:       (-0.33362,0.8107,-0.4811)
- New Momentum Direction: (-0.56398,-0.58058,0.58724)
- New Polarization:       (0.33362,-0.8107,-0.4811)
+ Old Momentum Direction: (-0.563926,-0.580546,-0.587328)
+ Old Polarization:       (-0.333463,0.810719,-0.481183)
+ New Momentum Direction: (-0.563926,-0.580546,0.587328)
+ New Polarization:       (0.333463,-0.810719,-0.481183)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56398,-0.58058,0.58724)
- Old Polarization:       (0.33362,-0.8107,-0.4811)
- New Momentum Direction: (-0.56398,0.58058,0.58724)
- New Polarization:       (-0.33362,-0.8107,0.4811)
+ Old Momentum Direction: (-0.563926,-0.580546,0.587328)
+ Old Polarization:       (0.333463,-0.810719,-0.481183)
+ New Momentum Direction: (-0.563926,0.580546,0.587328)
+ New Polarization:       (-0.333463,-0.810719,0.481183)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56398,0.58058,0.58724)
- Old Polarization:       (-0.33362,-0.8107,0.4811)
- New Momentum Direction: (0.56398,0.58058,0.58724)
- New Polarization:       (-0.33362,0.8107,-0.4811)
+ Old Momentum Direction: (-0.563926,0.580546,0.587328)
+ Old Polarization:       (-0.333463,-0.810719,0.481183)
+ New Momentum Direction: (0.563926,0.580546,0.587328)
+ New Polarization:       (-0.333463,0.810719,-0.481183)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.56398,0.58058,0.58724)
-Old Polarization: (-0.33362,0.8107,-0.4811)
-New Polarization: (0.20931,0.20788,-0.9555)
-Polarization Change: (0.20931,0.20788,-0.9555)
-New Momentum Direction: (-0.54304,0.83732,0.063206)
-Momentum Change: (-0.54304,0.83732,0.063206)
+Old Momentum Direction: (0.563926,0.580546,0.587328)
+Old Polarization: (-0.333463,0.810719,-0.481183)
+New Polarization: (0.209383,0.207756,-0.955508)
+Polarization Change: (0.209383,0.207756,-0.955508)
+New Momentum Direction: (-0.542898,0.837423,0.0631141)
+Momentum Change: (-0.542898,0.837423,0.0631141)
  Photon at Boundary! 
- Old Momentum Direction: (-0.54304,0.83732,0.063206)
- Old Polarization:       (0.20931,0.20788,-0.9555)
- New Momentum Direction: (0.54304,0.83732,0.063206)
- New Polarization:       (0.20931,-0.20788,0.9555)
+ Old Momentum Direction: (-0.542898,0.837423,0.0631141)
+ Old Polarization:       (0.209383,0.207756,-0.955508)
+ New Momentum Direction: (0.542898,0.837423,0.0631141)
+ New Polarization:       (0.209383,-0.207756,0.955508)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54304,0.83732,0.063206)
- Old Polarization:       (0.20931,-0.20788,0.9555)
- New Momentum Direction: (0.54304,-0.83732,0.063206)
- New Polarization:       (0.17219,0.037366,-0.98436)
+ Old Momentum Direction: (0.542898,0.837423,0.0631141)
+ Old Polarization:       (0.209383,-0.207756,0.955508)
+ New Momentum Direction: (0.542898,-0.837423,0.0631141)
+ New Polarization:       (0.172205,0.0374525,-0.984349)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.54304,-0.83732,0.063206)
- Old Polarization:       (0.17219,0.037366,-0.98436)
- New Momentum Direction: (-0.54304,-0.83732,0.063206)
- New Polarization:       (0.17219,-0.037366,0.98436)
+ Old Momentum Direction: (0.542898,-0.837423,0.0631141)
+ Old Polarization:       (0.172205,0.0374525,-0.984349)
+ New Momentum Direction: (-0.542898,-0.837423,0.0631141)
+ New Polarization:       (0.172205,-0.0374525,0.984349)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54304,-0.83732,0.063206)
- Old Polarization:       (0.17219,-0.037366,0.98436)
- New Momentum Direction: (-0.54304,0.83732,0.063206)
- New Polarization:       (-0.1251,-0.0062409,-0.99212)
+ Old Momentum Direction: (-0.542898,-0.837423,0.0631141)
+ Old Polarization:       (0.172205,-0.0374525,0.984349)
+ New Momentum Direction: (-0.542898,0.837423,0.0631141)
+ New Polarization:       (-0.125017,-0.00627387,-0.992135)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.54304,0.83732,0.063206)
- Old Polarization:       (-0.1251,-0.0062409,-0.99212)
- New Momentum Direction: (-0.73317,0.67467,0.085335)
- New Polarization:       (-0.12626,-0.011746,-0.99193)
+ Old Momentum Direction: (-0.542898,0.837423,0.0631141)
+ Old Polarization:       (-0.125017,-0.00627387,-0.992135)
+ New Momentum Direction: (-0.732975,0.674897,0.0852114)
+ New Polarization:       (-0.126188,-0.0118075,-0.991936)
  *** FresnelRefraction *** 
 Track (trackID 1104, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.14769,-0.63542,0.75791)
- Old Polarization:       (-0.79193,-0.53504,-0.29425)
- New Momentum Direction: (0.2008,-0.86394,0.46183)
- New Polarization:       (-0.7208,-0.44955,-0.52758)
+ Old Momentum Direction: (0.147499,-0.635407,0.757959)
+ Old Polarization:       (-0.79192,-0.534983,-0.294375)
+ New Momentum Direction: (0.200545,-0.863923,0.461972)
+ New Polarization:       (-0.720717,-0.449506,-0.527742)
  *** FresnelRefraction *** 
 Track (trackID 1103, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.017005,-0.28291,0.959)
- Old Polarization:       (-0.98611,-0.15373,-0.062836)
- New Momentum Direction: (-0.022868,-0.38046,0.92452)
- New Polarization:       (-0.97043,-0.21382,-0.11199)
+ Old Momentum Direction: (-0.0171962,-0.282879,0.959001)
+ Old Polarization:       (-0.986115,-0.153646,-0.0630038)
+ New Momentum Direction: (-0.0231254,-0.380415,0.924527)
+ New Polarization:       (-0.970384,-0.213889,-0.112281)
  *** FresnelRefraction *** 
 Track (trackID 1102, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.016509,-0.34036,0.94015)
- Old Polarization:       (-0.97284,-0.21166,-0.093708)
- New Momentum Direction: (-0.022432,-0.46247,0.88635)
- New Polarization:       (-0.94556,-0.27811,-0.16904)
+ Old Momentum Direction: (-0.0167018,-0.340325,0.940159)
+ Old Polarization:       (-0.972842,-0.211582,-0.0938722)
+ New Momentum Direction: (-0.0226943,-0.462431,0.886365)
+ New Polarization:       (-0.945501,-0.278135,-0.169316)
  *** FresnelRefraction *** 
 Track (trackID 1101, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37761,0.54989,0.74501)
- Old Polarization:       (-0.54246,0.78342,-0.30329)
- New Momentum Direction: (0.5076,0.7392,0.44264)
- New Polarization:       (-0.5138,0.6721,-0.53318)
+ Old Momentum Direction: (0.377522,0.549875,0.74506)
+ Old Polarization:       (-0.542341,0.783459,-0.303411)
+ New Momentum Direction: (0.507489,0.739178,0.4428)
+ New Polarization:       (-0.513627,0.672122,-0.533329)
  *** FresnelRefraction *** 
 Track (trackID 1100, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.56286,-0.72706,0.39316)
-Old Polarization: (-0.33631,-0.63595,-0.69459)
-New Polarization: (0.067486,-0.75232,-0.65533)
-Polarization Change: (0.067486,-0.75232,-0.65533)
-New Momentum Direction: (0.9642,-0.11964,0.23665)
-Momentum Change: (0.9642,-0.11964,0.23665)
+Old Momentum Direction: (0.562728,-0.727094,0.393283)
+Old Polarization: (-0.336239,-0.635951,-0.694629)
+New Polarization: (0.0675699,-0.752285,-0.655363)
+Polarization Change: (0.0675699,-0.752285,-0.655363)
+New Momentum Direction: (0.964206,-0.119569,0.236664)
+Momentum Change: (0.964206,-0.119569,0.236664)
  Photon at Boundary! 
- Old Momentum Direction: (0.9642,-0.11964,0.23665)
- Old Polarization:       (0.067486,-0.75232,-0.65533)
- New Momentum Direction: (0.93278,-0.16264,0.32168)
- New Polarization:       (-0.12195,-0.98219,-0.14295)
+ Old Momentum Direction: (0.964206,-0.119569,0.236664)
+ Old Polarization:       (0.0675699,-0.752285,-0.655363)
+ New Momentum Direction: (0.932786,-0.162533,0.321704)
+ New Polarization:       (-0.122097,-0.982272,-0.142247)
  *** FresnelRefraction *** 
 Track (trackID 1099, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.053895,-0.51052,0.85817)
- Old Polarization:       (-0.89779,-0.40099,-0.18216)
- New Momentum Direction: (0.073068,-0.69214,0.71806)
- New Polarization:       (-0.84398,-0.42651,-0.32524)
+ Old Momentum Direction: (0.0537021,-0.510499,0.8582)
+ Old Polarization:       (-0.897789,-0.400921,-0.182308)
+ New Momentum Direction: (0.0728063,-0.692106,0.718115)
+ New Polarization:       (-0.843918,-0.42647,-0.325463)
  *** FresnelRefraction *** 
 Track (trackID 1098, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7896,0.48438,0.37672)
- Old Polarization:       (-0.086487,0.69564,-0.71316)
- New Momentum Direction: (0.55307,0.65765,0.51148)
- New Polarization:       (-0.16646,0.68877,-0.70561)
+ Old Momentum Direction: (0.78957,0.484317,0.376851)
+ Old Polarization:       (-0.0862962,0.695631,-0.713197)
+ New Momentum Direction: (0.553003,0.657567,0.511658)
+ New Polarization:       (-0.1661,0.688784,-0.705682)
  *** FresnelRefraction *** 
 Track (trackID 1097, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.0046688,0.081313,0.99668)
- Old Polarization:       (-0.96686,0.25405,-0.025255)
- New Momentum Direction: (-0.0063064,0.10983,0.99393)
- New Polarization:       (-0.93654,0.34774,-0.044369)
+ Old Momentum Direction: (-0.00483685,0.0813424,0.996674)
+ Old Polarization:       (-0.966837,0.254126,-0.0254323)
+ New Momentum Direction: (-0.00653334,0.109873,0.993924)
+ New Polarization:       (-0.936314,0.348312,-0.0446585)
  *** FresnelRefraction *** 
 Track (trackID 1096, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.96399,-0.23541,0.12368)
-Old Polarization: (0.10356,-0.096035,-0.98998)
-New Polarization: (0.51341,0.28045,0.81102)
-Polarization Change: (0.51341,0.28045,0.81102)
-New Momentum Direction: (-0.7974,-0.19332,0.57164)
-Momentum Change: (-0.7974,-0.19332,0.57164)
+Old Momentum Direction: (0.963951,-0.235489,0.123866)
+Old Polarization: (0.103737,-0.0960757,-0.989954)
+New Polarization: (0.513141,0.280865,0.81105)
+Polarization Change: (0.513141,0.280865,0.81105)
+New Momentum Direction: (-0.797346,-0.193767,0.571572)
+Momentum Change: (-0.797346,-0.193767,0.571572)
 
 ** Photon absorbed! **
 Track (trackID 1095, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91144,-0.3815,0.15408)
- Old Polarization:       (0.053477,-0.26148,-0.96373)
- New Momentum Direction: (0.83147,-0.51514,0.20806)
- New Polarization:       (-0.098129,-0.50479,-0.85765)
+ Old Momentum Direction: (0.911378,-0.381566,0.154266)
+ Old Polarization:       (0.0536333,-0.261519,-0.963707)
+ New Momentum Direction: (0.831346,-0.515238,0.208309)
+ New Polarization:       (-0.0984141,-0.505382,-0.857265)
  *** FresnelRefraction *** 
 Track (trackID 1094, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.01237,0.083401,0.99644)
- Old Polarization:       (-0.96678,0.25346,-0.033216)
- New Momentum Direction: (-0.01683,0.11347,0.9934)
- New Polarization:       (-0.92784,0.36846,-0.057807)
+ Old Momentum Direction: (-0.012538,0.0834315,0.996435)
+ Old Polarization:       (-0.966749,0.253538,-0.0333932)
+ New Momentum Direction: (-0.0170585,0.113512,0.99339)
+ New Polarization:       (-0.927649,0.368908,-0.0580837)
  *** FresnelRefraction *** 
 Track (trackID 1093, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
@@ -13038,54 +13026,54 @@ Track (trackID 1093, parentID 1) is processed with stopping code 2
 Track (trackID 1092, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9594,-0.24955,0.13142)
- Old Polarization:       (0.10566,-0.11403,-0.98784)
- New Momentum Direction: (0.92448,-0.33732,0.17765)
- New Polarization:       (-0.18353,-0.8022,-0.56815)
+ Old Momentum Direction: (0.959358,-0.249622,0.131609)
+ Old Polarization:       (0.105834,-0.114067,-0.98782)
+ New Momentum Direction: (0.92439,-0.337424,0.177901)
+ New Polarization:       (-0.183808,-0.802687,-0.567369)
  *** FresnelRefraction *** 
 Track (trackID 1091, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94223,0.25212,0.22055)
- Old Polarization:       (0.089288,0.44556,-0.89079)
- New Momentum Direction: (0.89215,0.34,0.29743)
- New Polarization:       (-0.15898,0.85261,-0.49777)
+ Old Momentum Direction: (0.942209,0.252044,0.220719)
+ Old Polarization:       (0.0894915,0.44553,-0.890783)
+ New Momentum Direction: (0.892115,0.3399,0.297656)
+ New Polarization:       (-0.159327,0.853162,-0.496719)
  *** FresnelRefraction *** 
 Track (trackID 1090, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.36938,0.55698,0.74386)
- Old Polarization:       (-0.54919,0.77657,-0.30875)
- New Momentum Direction: (0.50119,0.75573,0.42152)
- New Polarization:       (-0.51881,0.65229,-0.55259)
+ Old Momentum Direction: (0.369299,0.556966,0.743914)
+ Old Polarization:       (-0.54907,0.776609,-0.308871)
+ New Momentum Direction: (0.501078,0.755711,0.421689)
+ New Polarization:       (-0.518634,0.652308,-0.552732)
  *** FresnelRefraction *** 
 Track (trackID 1089, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23257,-0.69822,0.67705)
- Old Polarization:       (-0.69885,-0.60412,-0.38295)
- New Momentum Direction: (0.31618,-0.22983,0.92044)
- New Polarization:       (-0.28261,0.90335,0.32264)
+ Old Momentum Direction: (0.232394,-0.698217,0.677116)
+ Old Polarization:       (-0.698831,-0.604074,-0.383053)
+ New Momentum Direction: (0.315936,-0.229809,0.920528)
+ New Polarization:       (-0.282784,0.903318,0.322567)
  *** FresnelRefraction *** 
 Track (trackID 1088, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65859,0.5634,0.49883)
- Old Polarization:       (-0.23081,0.78219,-0.57871)
- New Momentum Direction: (-0.65859,0.5634,0.49883)
- New Polarization:       (-0.23081,-0.78219,0.57871)
+ Old Momentum Direction: (0.658552,0.563355,0.498939)
+ Old Polarization:       (-0.230634,0.782198,-0.57877)
+ New Momentum Direction: (-0.658552,0.563355,0.498939)
+ New Polarization:       (-0.230634,-0.782198,0.57877)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65859,0.5634,0.49883)
- Old Polarization:       (-0.23081,-0.78219,0.57871)
- New Momentum Direction: (-0.65859,-0.5634,0.49883)
- New Polarization:       (0.23081,-0.78219,-0.57871)
+ Old Momentum Direction: (-0.658552,0.563355,0.498939)
+ Old Polarization:       (-0.230634,-0.782198,0.57877)
+ New Momentum Direction: (-0.658552,-0.563355,0.498939)
+ New Polarization:       (0.230634,-0.782198,-0.57877)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65859,-0.5634,0.49883)
- Old Polarization:       (0.23081,-0.78219,-0.57871)
- New Momentum Direction: (-0.65859,-0.5634,-0.49883)
- New Polarization:       (-0.23081,0.78219,-0.57871)
+ Old Momentum Direction: (-0.658552,-0.563355,0.498939)
+ Old Polarization:       (0.230634,-0.782198,-0.57877)
+ New Momentum Direction: (-0.658552,-0.563355,-0.498939)
+ New Polarization:       (-0.230634,0.782198,-0.57877)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
@@ -13096,26 +13084,26 @@ Track (trackID 1087, parentID 1) is processed with stopping code 2
 Track (trackID 1086, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67744,0.55151,0.48673)
- Old Polarization:       (-0.20725,0.77801,-0.59309)
- New Momentum Direction: (0.11563,0.74473,0.65727)
- New Polarization:       (-0.43719,0.63232,-0.63956)
+ Old Momentum Direction: (0.677404,0.55146,0.486843)
+ Old Polarization:       (-0.207074,0.778009,-0.593145)
+ New Momentum Direction: (0.115192,0.744672,0.657415)
+ New Polarization:       (-0.436962,0.632336,-0.6397)
  *** FresnelRefraction *** 
 Track (trackID 1085, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74859,-0.61237,0.2542)
- Old Polarization:       (-0.13112,-0.51254,-0.84859)
- New Momentum Direction: (0.43685,-0.8308,0.34487)
- New Polarization:       (-0.25563,-0.48223,-0.83792)
+ Old Momentum Direction: (0.748494,-0.612422,0.254354)
+ Old Polarization:       (-0.131008,-0.51256,-0.848598)
+ New Momentum Direction: (0.436545,-0.830871,0.345081)
+ New Polarization:       (-0.255437,-0.482239,-0.837972)
  *** FresnelRefraction *** 
 Track (trackID 1084, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96395,-0.23442,0.1259)
- Old Polarization:       (0.10599,-0.095726,-0.98975)
- New Momentum Direction: (0.93253,-0.31813,0.17085)
- New Polarization:       (-0.18402,-0.82576,-0.53316)
+ Old Momentum Direction: (0.963906,-0.234497,0.126085)
+ Old Polarization:       (0.106164,-0.0957665,-0.989726)
+ New Momentum Direction: (0.932444,-0.31823,0.171106)
+ New Polarization:       (-0.184303,-0.82624,-0.532315)
  *** FresnelRefraction *** 
 Track (trackID 1083, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
@@ -13128,121 +13116,121 @@ Track (trackID 1082, parentID 1) is processed with stopping code 2
 Track (trackID 1081, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48762,0.58748,0.64583)
- Old Polarization:       (-0.41892,0.80646,-0.41729)
- New Momentum Direction: (0.48762,0.58748,-0.64583)
- New Polarization:       (0.41892,-0.80646,-0.41729)
+ Old Momentum Direction: (0.48756,0.587453,0.645898)
+ Old Polarization:       (-0.418777,0.806481,-0.417389)
+ New Momentum Direction: (0.48756,0.587453,-0.645898)
+ New Polarization:       (0.418777,-0.806481,-0.417389)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48762,0.58748,-0.64583)
- Old Polarization:       (0.41892,-0.80646,-0.41729)
- New Momentum Direction: (0.48762,-0.58748,-0.64583)
- New Polarization:       (-0.41892,-0.80646,0.41729)
+ Old Momentum Direction: (0.48756,0.587453,-0.645898)
+ Old Polarization:       (0.418777,-0.806481,-0.417389)
+ New Momentum Direction: (0.48756,-0.587453,-0.645898)
+ New Polarization:       (-0.418777,-0.806481,0.417389)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48762,-0.58748,-0.64583)
- Old Polarization:       (-0.41892,-0.80646,0.41729)
- New Momentum Direction: (-0.48762,-0.58748,-0.64583)
- New Polarization:       (-0.41892,0.80646,-0.41729)
+ Old Momentum Direction: (0.48756,-0.587453,-0.645898)
+ Old Polarization:       (-0.418777,-0.806481,0.417389)
+ New Momentum Direction: (-0.48756,-0.587453,-0.645898)
+ New Polarization:       (-0.418777,0.806481,-0.417389)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1080, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98097,0.10609,0.16259)
- Old Polarization:       (0.12735,0.28044,-0.95139)
- New Momentum Direction: (0.96482,0.14367,0.22018)
- New Polarization:       (-0.20057,0.94369,0.26311)
+ Old Momentum Direction: (0.980953,0.106012,0.162767)
+ Old Polarization:       (0.127555,0.2804,-0.95137)
+ New Momentum Direction: (0.964782,0.143563,0.220422)
+ New Polarization:       (-0.200829,0.943182,0.264717)
  *** FresnelRefraction *** 
 Track (trackID 1079, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.31034,-0.72678,0.61276)
- Old Polarization:       (-0.61588,-0.64473,-0.45279)
- New Momentum Direction: (0.41944,-0.37174,0.82818)
- New Polarization:       (-0.050672,0.9013,0.43022)
+ Old Momentum Direction: (0.310169,-0.726788,0.612842)
+ Old Polarization:       (-0.61585,-0.644697,-0.452874)
+ New Momentum Direction: (0.419211,-0.371749,0.82829)
+ New Polarization:       (-0.0508666,0.901275,0.430251)
  *** FresnelRefraction *** 
 Track (trackID 1078, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48778,0.58571,0.64731)
- Old Polarization:       (-0.41869,0.80762,-0.41527)
- New Momentum Direction: (0.48778,0.58571,-0.64731)
- New Polarization:       (0.41869,-0.80762,-0.41527)
+ Old Momentum Direction: (0.487719,0.58569,0.647378)
+ Old Polarization:       (-0.418544,0.807646,-0.415365)
+ New Momentum Direction: (0.487719,0.58569,-0.647378)
+ New Polarization:       (0.418544,-0.807646,-0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48778,0.58571,-0.64731)
- Old Polarization:       (0.41869,-0.80762,-0.41527)
- New Momentum Direction: (0.48778,-0.58571,-0.64731)
- New Polarization:       (-0.41869,-0.80762,0.41527)
+ Old Momentum Direction: (0.487719,0.58569,-0.647378)
+ Old Polarization:       (0.418544,-0.807646,-0.415365)
+ New Momentum Direction: (0.487719,-0.58569,-0.647378)
+ New Polarization:       (-0.418544,-0.807646,0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48778,-0.58571,-0.64731)
- Old Polarization:       (-0.41869,-0.80762,0.41527)
- New Momentum Direction: (-0.48778,-0.58571,-0.64731)
- New Polarization:       (-0.41869,0.80762,-0.41527)
+ Old Momentum Direction: (0.487719,-0.58569,-0.647378)
+ Old Polarization:       (-0.418544,-0.807646,0.415365)
+ New Momentum Direction: (-0.487719,-0.58569,-0.647378)
+ New Polarization:       (-0.418544,0.807646,-0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48778,-0.58571,-0.64731)
- Old Polarization:       (-0.41869,0.80762,-0.41527)
- New Momentum Direction: (-0.48778,-0.58571,0.64731)
- New Polarization:       (0.41869,-0.80762,-0.41527)
+ Old Momentum Direction: (-0.487719,-0.58569,-0.647378)
+ Old Polarization:       (-0.418544,0.807646,-0.415365)
+ New Momentum Direction: (-0.487719,-0.58569,0.647378)
+ New Polarization:       (0.418544,-0.807646,-0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48778,-0.58571,0.64731)
- Old Polarization:       (0.41869,-0.80762,-0.41527)
- New Momentum Direction: (-0.48778,0.58571,0.64731)
- New Polarization:       (-0.41869,-0.80762,0.41527)
+ Old Momentum Direction: (-0.487719,-0.58569,0.647378)
+ Old Polarization:       (0.418544,-0.807646,-0.415365)
+ New Momentum Direction: (-0.487719,0.58569,0.647378)
+ New Polarization:       (-0.418544,-0.807646,0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48778,0.58571,0.64731)
- Old Polarization:       (-0.41869,-0.80762,0.41527)
- New Momentum Direction: (0.48778,0.58571,0.64731)
- New Polarization:       (-0.41869,0.80762,-0.41527)
+ Old Momentum Direction: (-0.487719,0.58569,0.647378)
+ Old Polarization:       (-0.418544,-0.807646,0.415365)
+ New Momentum Direction: (0.487719,0.58569,0.647378)
+ New Polarization:       (-0.418544,0.807646,-0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48778,0.58571,0.64731)
- Old Polarization:       (-0.41869,0.80762,-0.41527)
- New Momentum Direction: (0.48778,0.58571,-0.64731)
- New Polarization:       (0.41869,-0.80762,-0.41527)
+ Old Momentum Direction: (0.487719,0.58569,0.647378)
+ Old Polarization:       (-0.418544,0.807646,-0.415365)
+ New Momentum Direction: (0.487719,0.58569,-0.647378)
+ New Polarization:       (0.418544,-0.807646,-0.415365)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48778,0.58571,-0.64731)
- Old Polarization:       (0.41869,-0.80762,-0.41527)
- New Momentum Direction: (0.48778,-0.58571,-0.64731)
- New Polarization:       (-0.41869,-0.80762,0.41527)
+ Old Momentum Direction: (0.487719,0.58569,-0.647378)
+ Old Polarization:       (0.418544,-0.807646,-0.415365)
+ New Momentum Direction: (0.487719,-0.58569,-0.647378)
+ New Polarization:       (-0.418544,-0.807646,0.415365)
  *** TotalInternalReflection *** 
 Scattering Photon!
-Old Momentum Direction: (0.48778,-0.58571,-0.64731)
-Old Polarization: (-0.41869,-0.80762,0.41527)
-New Polarization: (0.88262,0.34448,-0.31987)
-Polarization Change: (0.88262,0.34448,-0.31987)
-New Momentum Direction: (0.4324,-0.86189,0.26491)
-Momentum Change: (0.4324,-0.86189,0.26491)
+Old Momentum Direction: (0.487719,-0.58569,-0.647378)
+Old Polarization: (-0.418544,-0.807646,0.415365)
+New Polarization: (0.882549,0.344588,-0.319947)
+Polarization Change: (0.882549,0.344588,-0.319947)
+New Momentum Direction: (0.432545,-0.861798,0.264969)
+Momentum Change: (0.432545,-0.861798,0.264969)
  Photon at Boundary! 
- Old Momentum Direction: (0.4324,-0.86189,0.26491)
- Old Polarization:       (0.88262,0.34448,-0.31987)
- New Momentum Direction: (-0.4324,-0.86189,0.26491)
- New Polarization:       (0.88262,-0.34448,0.31987)
+ Old Momentum Direction: (0.432545,-0.861798,0.264969)
+ Old Polarization:       (0.882549,0.344588,-0.319947)
+ New Momentum Direction: (-0.432545,-0.861798,0.264969)
+ New Polarization:       (0.882549,-0.344588,0.319947)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1077, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98978,0.0062739,0.14247)
- Old Polarization:       (0.13933,0.17032,-0.97549)
- New Momentum Direction: (0.98124,0.0084813,0.1926)
- New Polarization:       (-0.19033,0.20152,0.96081)
+ Old Momentum Direction: (0.989753,0.00619429,0.142655)
+ Old Polarization:       (0.13953,0.170278,-0.975467)
+ New Momentum Direction: (0.981193,0.00837368,0.192847)
+ New Polarization:       (-0.190586,0.200451,0.960987)
  *** FresnelRefraction *** 
 Track (trackID 1076, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.037826,-0.18757,0.98152)
- Old Polarization:       (-0.99793,-0.044122,-0.04689)
- New Momentum Direction: (-0.05133,-0.25453,0.9657)
- New Polarization:       (-0.98907,-0.12086,-0.084427)
+ Old Momentum Direction: (-0.038014,-0.187537,0.981522)
+ Old Polarization:       (-0.997921,-0.0440402,-0.0470638)
+ New Momentum Direction: (-0.0515844,-0.254485,0.9657)
+ New Polarization:       (-0.989026,-0.121031,-0.0847249)
  *** FresnelRefraction *** 
 Track (trackID 1075, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
@@ -13251,18 +13239,18 @@ Track (trackID 1075, parentID 1) is processed with stopping code 2
 Track (trackID 1074, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97804,-0.16467,0.12778)
- Old Polarization:       (0.12627,-0.019664,-0.9918)
- New Momentum Direction: (0.95948,-0.22261,0.17274)
- New Polarization:       (-0.20238,-0.97101,-0.12722)
+ Old Momentum Direction: (0.977999,-0.164748,0.127967)
+ Old Polarization:       (0.12645,-0.0197055,-0.991777)
+ New Momentum Direction: (0.959412,-0.222716,0.172993)
+ New Polarization:       (-0.202645,-0.971071,-0.126321)
  *** FresnelRefraction *** 
 Track (trackID 1073, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39643,-0.74969,0.52992)
- Old Polarization:       (-0.51883,-0.65915,-0.54437)
- New Momentum Direction: (0.53943,-0.43484,0.72107)
- New Polarization:       (0.21142,0.89885,0.38389)
+ Old Momentum Direction: (0.396274,-0.749701,0.530015)
+ Old Polarization:       (-0.518789,-0.659122,-0.544441)
+ New Momentum Direction: (0.539215,-0.43488,0.721198)
+ New Polarization:       (0.211263,0.898825,0.384034)
  *** FresnelRefraction *** 
 Track (trackID 1072, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
@@ -13271,17 +13259,17 @@ Track (trackID 1072, parentID 1) is processed with stopping code 2
 Track (trackID 1071, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.9615,-0.24504,0.12437)
-Old Polarization: (0.10078,-0.10658,-0.98918)
-New Polarization: (-0.89995,0.1631,-0.40433)
-Polarization Change: (-0.89995,0.1631,-0.40433)
-New Momentum Direction: (-0.38,0.16121,0.91083)
-Momentum Change: (-0.38,0.16121,0.91083)
+Old Momentum Direction: (0.961459,-0.245118,0.124551)
+Old Polarization: (0.100957,-0.106621,-0.989161)
+New Polarization: (-0.900019,0.162449,-0.404444)
+Polarization Change: (-0.900019,0.162449,-0.404444)
+New Momentum Direction: (-0.380208,0.161049,0.910772)
+Momentum Change: (-0.380208,0.161049,0.910772)
  Photon at Boundary! 
- Old Momentum Direction: (-0.38,0.16121,0.91083)
- Old Polarization:       (-0.89995,0.1631,-0.40433)
- New Momentum Direction: (-0.51679,0.21924,0.82756)
- New Polarization:       (-0.81106,0.18406,-0.55525)
+ Old Momentum Direction: (-0.380208,0.161049,0.910772)
+ Old Polarization:       (-0.900019,0.162449,-0.404444)
+ New Momentum Direction: (-0.51707,0.219022,0.827447)
+ New Polarization:       (-0.811085,0.183473,-0.555409)
  *** FresnelRefraction *** 
 Track (trackID 1070, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
@@ -13290,10 +13278,10 @@ Track (trackID 1070, parentID 1) is processed with stopping code 2
 Track (trackID 1069, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91348,0.32313,0.24727)
- Old Polarization:       (0.048509,0.5169,-0.85467)
- New Momentum Direction: (0.83309,0.43928,0.33615)
- New Polarization:       (-0.090341,0.70761,-0.7008)
+ Old Momentum Direction: (0.913462,0.323056,0.24743)
+ Old Polarization:       (0.0487114,0.516867,-0.854679)
+ New Momentum Direction: (0.833051,0.439182,0.336371)
+ New Polarization:       (-0.0907137,0.708269,-0.70009)
  *** FresnelRefraction *** 
 Track (trackID 1068, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
@@ -13302,64 +13290,68 @@ Track (trackID 1068, parentID 1) is processed with stopping code 2
 Track (trackID 1067, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96009,-0.2497,0.12597)
- Old Polarization:       (0.10055,-0.11215,-0.98859)
- New Momentum Direction: (0.92502,-0.3392,0.17113)
- New Polarization:       (-0.17696,-0.78325,-0.59599)
+ Old Momentum Direction: (0.96005,-0.249775,0.126161)
+ Old Polarization:       (0.100722,-0.112185,-0.98857)
+ New Momentum Direction: (0.924932,-0.339307,0.171383)
+ New Polarization:       (-0.177243,-0.783788,-0.595198)
  *** FresnelRefraction *** 
 Track (trackID 1066, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 159
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 158
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 160 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54512,0.67999,0.49037)
- Old Polarization:       (-0.61361,0.72217,-0.3193)
- New Momentum Direction: (0.54512,-0.67999,0.49037)
- New Polarization:       (-0.351,-0.7163,-0.60309)
- *** FresnelReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1421, parentID 1) is processed with stopping code 2
 ### pop requested out of 159 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34822,-0.44997,0.82235)
- Old Polarization:       (-0.83759,-0.54327,0.057412)
- New Momentum Direction: (0.46806,-0.60483,0.64428)
- New Polarization:       (-0.72791,-0.67727,-0.10698)
+ Old Momentum Direction: (0.348144,-0.449973,0.822387)
+ Old Polarization:       (-0.8376,-0.543267,0.0573336)
+ New Momentum Direction: (0.467956,-0.604828,0.644361)
+ New Polarization:       (-0.72807,-0.677126,-0.106835)
  *** FresnelRefraction *** 
 Track (trackID 1420, parentID 1) is processed with stopping code 2
 ### pop requested out of 158 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.37002,-0.49422,0.78666)
- Old Polarization:       (-0.80978,-0.5866,0.012361)
- New Momentum Direction: (0.49993,-0.66775,0.55152)
- New Polarization:       (-0.79076,-0.61167,-0.023777)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1419, parentID 1) is processed with stopping code 2
 ### pop requested out of 157 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.32588,-0.414,0.84994)
- Old Polarization:       (-0.86145,-0.50042,0.086538)
- New Momentum Direction: (0.43888,-0.55756,0.70463)
- New Polarization:       (-0.66779,-0.72709,-0.1594)
+ Old Momentum Direction: (0.3258,-0.414004,0.849974)
+ Old Polarization:       (-0.861456,-0.500419,0.0864573)
+ New Momentum Direction: (0.3258,-0.414004,-0.849974)
+ New Polarization:       (0.805494,0.592258,0.0202742)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.3258,-0.414004,-0.849974)
+ Old Polarization:       (0.805494,0.592258,0.0202742)
+ New Momentum Direction: (0.3258,0.414004,-0.849974)
+ New Polarization:       (-0.805494,0.592258,-0.0202742)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.3258,0.414004,-0.849974)
+ Old Polarization:       (-0.805494,0.592258,-0.0202742)
+ New Momentum Direction: (-0.3258,0.414004,-0.849974)
+ New Polarization:       (-0.805494,-0.592258,0.0202742)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.3258,0.414004,-0.849974)
+ Old Polarization:       (-0.805494,-0.592258,0.0202742)
+ New Momentum Direction: (-0.438775,0.557565,-0.704697)
+ New Polarization:       (-0.807936,-0.588058,0.0377769)
  *** FresnelRefraction *** 
 Track (trackID 1418, parentID 1) is processed with stopping code 2
 ### pop requested out of 156 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96022,-0.27182,-0.063906)
- Old Polarization:       (-0.15611,-0.33283,-0.92997)
- New Momentum Direction: (0.925,-0.36989,-0.086962)
- New Polarization:       (-0.25769,-0.44248,-0.85896)
+ Old Momentum Direction: (0.960228,-0.271829,-0.0638018)
+ Old Polarization:       (-0.156013,-0.332832,-0.929991)
+ New Momentum Direction: (0.925006,-0.3699,-0.0868202)
+ New Polarization:       (-0.257561,-0.442462,-0.859005)
  *** FresnelRefraction *** 
 Track (trackID 1417, parentID 1) is processed with stopping code 2
 ### pop requested out of 155 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96382,-0.25908,-0.062744)
- Old Polarization:       (-0.14753,-0.32238,-0.93504)
- New Momentum Direction: (0.93262,-0.35071,-0.084934)
- New Polarization:       (-0.24197,-0.43321,-0.86821)
+ Old Momentum Direction: (0.96382,-0.259089,-0.0626389)
+ Old Polarization:       (-0.147429,-0.322374,-0.935061)
+ New Momentum Direction: (0.932634,-0.350719,-0.0847921)
+ New Polarization:       (-0.24184,-0.433189,-0.868251)
  *** FresnelRefraction *** 
 Track (trackID 1416, parentID 1) is processed with stopping code 2
 ### pop requested out of 154 stacked tracks.
@@ -13368,100 +13360,253 @@ Track (trackID 1416, parentID 1) is processed with stopping code 2
 Track (trackID 1415, parentID 1) is processed with stopping code 2
 ### pop requested out of 153 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56084,-0.64424,0.52002)
- Old Polarization:       (-0.59613,-0.75009,-0.28635)
- New Momentum Direction: (0.56084,0.64424,0.52002)
- New Polarization:       (0.59613,-0.75009,0.28635)
+ Old Momentum Direction: (0.560783,-0.644236,0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (0.560783,0.644236,0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56084,0.64424,0.52002)
- Old Polarization:       (0.59613,-0.75009,0.28635)
- New Momentum Direction: (-0.56084,0.64424,0.52002)
- New Polarization:       (0.59613,0.75009,-0.28635)
+ Old Momentum Direction: (0.560783,0.644236,0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (-0.560783,0.644236,0.520079)
+ New Polarization:       (0.596099,0.750092,-0.286406)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56084,0.64424,0.52002)
- Old Polarization:       (0.59613,0.75009,-0.28635)
- New Momentum Direction: (-0.56084,0.64424,-0.52002)
- New Polarization:       (-0.59613,-0.75009,-0.28635)
+ Old Momentum Direction: (-0.560783,0.644236,0.520079)
+ Old Polarization:       (0.596099,0.750092,-0.286406)
+ New Momentum Direction: (-0.560783,0.644236,-0.520079)
+ New Polarization:       (-0.596099,-0.750092,-0.286406)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,0.644236,-0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (0.560783,-0.644236,-0.520079)
+ New Polarization:       (0.596099,0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,-0.644236,-0.520079)
+ Old Polarization:       (0.596099,0.750092,-0.286406)
+ New Momentum Direction: (0.560783,-0.644236,0.520079)
+ New Polarization:       (-0.596099,-0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,-0.644236,0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (0.560783,0.644236,0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,0.644236,0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (-0.560783,0.644236,0.520079)
+ New Polarization:       (0.596099,0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,0.644236,0.520079)
+ Old Polarization:       (0.596099,0.750092,-0.286406)
+ New Momentum Direction: (-0.560783,-0.644236,0.520079)
+ New Polarization:       (-0.596099,0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,-0.644236,0.520079)
+ Old Polarization:       (-0.596099,0.750092,0.286406)
+ New Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (-0.560783,0.644236,-0.520079)
+ New Polarization:       (-0.596099,-0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,0.644236,-0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (0.560783,0.644236,-0.520079)
+ New Polarization:       (-0.596099,0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,0.644236,-0.520079)
+ Old Polarization:       (-0.596099,0.750092,0.286406)
+ New Momentum Direction: (0.560783,0.644236,0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,0.644236,0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (0.560783,-0.644236,0.520079)
+ New Polarization:       (-0.596099,-0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.560783,-0.644236,0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (-0.560783,-0.644236,0.520079)
+ New Polarization:       (-0.596099,0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,-0.644236,0.520079)
+ Old Polarization:       (-0.596099,0.750092,0.286406)
+ New Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ New Polarization:       (0.596099,-0.750092,0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,-0.644236,-0.520079)
+ Old Polarization:       (0.596099,-0.750092,0.286406)
+ New Momentum Direction: (-0.560783,0.644236,-0.520079)
+ New Polarization:       (-0.596099,-0.750092,-0.286406)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.560783,0.644236,-0.520079)
+ Old Polarization:       (-0.596099,-0.750092,-0.286406)
+ New Momentum Direction: (0.560783,0.644236,-0.520079)
+ New Polarization:       (-0.596099,0.750092,0.286406)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.560783,0.644236,-0.520079)
+Old Polarization: (-0.596099,0.750092,0.286406)
+New Polarization: (-0.205836,0.978082,0.0314083)
+Polarization Change: (-0.205836,0.978082,0.0314083)
+New Momentum Direction: (-0.833998,-0.192123,0.517238)
+Momentum Change: (-0.833998,-0.192123,0.517238)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.833998,-0.192123,0.517238)
+ Old Polarization:       (-0.205836,0.978082,0.0314083)
+ New Momentum Direction: (-0.664361,-0.260246,0.70064)
+ New Polarization:       (0.366938,0.703103,0.609099)
+ *** FresnelRefraction *** 
 Track (trackID 1414, parentID 1) is processed with stopping code 2
 ### pop requested out of 152 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94106,-0.33673,-0.03191)
- Old Polarization:       (-0.17565,-0.40589,-0.89688)
- New Momentum Direction: (0.88823,-0.45736,-0.043341)
- New Polarization:       (-0.29396,-0.4933,-0.81868)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1413, parentID 1) is processed with stopping code 2
 ### pop requested out of 151 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56703,-0.64864,0.50768)
- Old Polarization:       (-0.58896,-0.75016,-0.30064)
- New Momentum Direction: (0.56703,0.64864,0.50768)
- New Polarization:       (0.58896,-0.75016,0.30064)
+ Old Momentum Direction: (0.566977,-0.648644,0.507738)
+ Old Polarization:       (-0.588934,-0.750159,-0.300696)
+ New Momentum Direction: (0.566977,0.648644,0.507738)
+ New Polarization:       (0.588934,-0.750159,0.300696)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.56703,0.64864,0.50768)
- Old Polarization:       (0.58896,-0.75016,0.30064)
- New Momentum Direction: (-0.56703,0.64864,0.50768)
- New Polarization:       (0.58896,0.75016,-0.30064)
+ Old Momentum Direction: (0.566977,0.648644,0.507738)
+ Old Polarization:       (0.588934,-0.750159,0.300696)
+ New Momentum Direction: (-0.566977,0.648644,0.507738)
+ New Polarization:       (0.588934,0.750159,-0.300696)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.56703,0.64864,0.50768)
- Old Polarization:       (0.58896,0.75016,-0.30064)
- New Momentum Direction: (-0.56703,0.64864,-0.50768)
- New Polarization:       (-0.58896,-0.75016,-0.30064)
+ Old Momentum Direction: (-0.566977,0.648644,0.507738)
+ Old Polarization:       (0.588934,0.750159,-0.300696)
+ New Momentum Direction: (-0.566977,0.648644,-0.507738)
+ New Polarization:       (-0.588934,-0.750159,-0.300696)
  *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.566977,0.648644,-0.507738)
+Old Polarization: (-0.588934,-0.750159,-0.300696)
+New Polarization: (0.172607,0.956374,-0.235701)
+Polarization Change: (0.172607,0.956374,-0.235701)
+New Momentum Direction: (0.693015,0.0521329,0.719036)
+Momentum Change: (0.693015,0.0521329,0.719036)
+Scattering Photon!
+Old Momentum Direction: (0.693015,0.0521329,0.719036)
+Old Polarization: (0.172607,0.956374,-0.235701)
+New Polarization: (-0.750348,0.452919,-0.4815)
+Polarization Change: (-0.750348,0.452919,-0.4815)
+New Momentum Direction: (-0.534308,-0.844419,0.0383466)
+Momentum Change: (-0.534308,-0.844419,0.0383466)
  Photon at Boundary! 
- Old Momentum Direction: (-0.56703,0.64864,-0.50768)
- Old Polarization:       (-0.58896,-0.75016,-0.30064)
- New Momentum Direction: (-0.56703,-0.64864,-0.50768)
- New Polarization:       (0.58896,-0.75016,0.30064)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (-0.534308,-0.844419,0.0383466)
+ Old Polarization:       (-0.750348,0.452919,-0.4815)
+ New Momentum Direction: (-0.725895,-0.68583,0.0520966)
+ New Polarization:       (-0.653114,0.663551,-0.364886)
+ *** FresnelRefraction *** 
 Track (trackID 1412, parentID 1) is processed with stopping code 2
 ### pop requested out of 150 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21808,-0.020274,0.97572)
- Old Polarization:       (-0.97463,-0.056182,0.21667)
- New Momentum Direction: (0.2962,-0.027536,0.95473)
- New Polarization:       (0.93511,-0.19519,-0.29574)
+ Old Momentum Direction: (0.217995,-0.0202782,0.975739)
+ Old Polarization:       (-0.974647,-0.0561736,0.216583)
+ New Momentum Direction: (0.296076,-0.0275414,0.954767)
+ New Polarization:       (0.935133,-0.195279,-0.295621)
  *** FresnelRefraction *** 
 Track (trackID 1411, parentID 1) is processed with stopping code 2
 ### pop requested out of 149 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.460286,0.635028,0.620384)
+ Old Polarization:       (-0.710339,0.6826,-0.171686)
+ New Momentum Direction: (0.460286,-0.635028,0.620384)
+ New Polarization:       (0.710339,0.6826,0.171686)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.460286,-0.635028,0.620384)
+ Old Polarization:       (0.710339,0.6826,0.171686)
+ New Momentum Direction: (0.460286,-0.635028,-0.620384)
+ New Polarization:       (-0.710339,-0.6826,0.171686)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.460286,-0.635028,-0.620384)
+ Old Polarization:       (-0.710339,-0.6826,0.171686)
+ New Momentum Direction: (-0.460286,-0.635028,-0.620384)
+ New Polarization:       (-0.710339,0.6826,-0.171686)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1410, parentID 1) is processed with stopping code 2
 ### pop requested out of 148 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.24438,0.24122,0.9392)
- Old Polarization:       (-0.95321,0.23753,0.18702)
- New Momentum Direction: (0.32914,0.32487,0.88664)
- New Polarization:       (-0.10936,0.94575,-0.30593)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1409, parentID 1) is processed with stopping code 2
 ### pop requested out of 147 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.686968,0.668174,0.285692)
+ Old Polarization:       (-0.456598,0.702728,-0.545611)
+ New Momentum Direction: (-0.686968,0.668174,0.285692)
+ New Polarization:       (-0.374391,-0.662378,0.648912)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.686968,0.668174,0.285692)
+ Old Polarization:       (-0.374391,-0.662378,0.648912)
+ New Momentum Direction: (-0.686968,-0.668174,0.285692)
+ New Polarization:       (0.374391,-0.662378,-0.648912)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1408, parentID 1) is processed with stopping code 2
 ### pop requested out of 146 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89577,-0.44196,0.047585)
- Old Polarization:       (-0.21926,-0.53242,-0.81759)
- New Momentum Direction: (0.8012,-0.59495,0.064057)
- New Polarization:       (-0.36685,-0.57293,-0.73292)
+ Old Momentum Direction: (0.895766,-0.441962,0.0476811)
+ Old Polarization:       (-0.219172,-0.532425,-0.817611)
+ New Momentum Direction: (0.80119,-0.594957,0.0641869)
+ New Polarization:       (-0.366731,-0.572931,-0.732979)
  *** FresnelRefraction *** 
 Track (trackID 1407, parentID 1) is processed with stopping code 2
 ### pop requested out of 145 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73703,-0.61914,0.27103)
- Old Polarization:       (-0.40011,-0.72289,-0.56333)
- New Momentum Direction: (0.40322,-0.8383,0.36696)
- New Polarization:       (-0.67323,-0.54336,-0.50153)
+ Old Momentum Direction: (0.736999,-0.61914,0.271103)
+ Old Polarization:       (-0.400051,-0.722889,-0.563375)
+ New Momentum Direction: (-0.736999,-0.61914,0.271103)
+ New Polarization:       (-0.168724,0.556935,0.813238)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.736999,-0.61914,0.271103)
+ Old Polarization:       (-0.168724,0.556935,0.813238)
+ New Momentum Direction: (-0.736999,0.61914,0.271103)
+ New Polarization:       (0.168724,0.556935,-0.813238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.736999,0.61914,0.271103)
+ Old Polarization:       (0.168724,0.556935,-0.813238)
+ New Momentum Direction: (-0.736999,0.61914,-0.271103)
+ New Polarization:       (-0.168724,-0.556935,-0.813238)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.736999,0.61914,-0.271103)
+ Old Polarization:       (-0.168724,-0.556935,-0.813238)
+ New Momentum Direction: (-0.403118,0.838306,-0.367069)
+ New Polarization:       (0.325977,-0.24326,-0.913544)
  *** FresnelRefraction *** 
 Track (trackID 1406, parentID 1) is processed with stopping code 2
 ### pop requested out of 144 stacked tracks.
@@ -13470,168 +13615,210 @@ Track (trackID 1406, parentID 1) is processed with stopping code 2
 Track (trackID 1405, parentID 1) is processed with stopping code 2
 ### pop requested out of 143 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.87302,0.48656,0.033202)
- Old Polarization:       (-0.25013,0.50516,-0.82598)
- New Momentum Direction: (0.74979,0.66014,0.045047)
- New Polarization:       (-0.42242,0.52997,-0.73532)
+ Old Momentum Direction: (0.873021,0.486545,0.0332991)
+ Old Polarization:       (-0.250033,0.505173,-0.826004)
+ New Momentum Direction: (0.7498,0.66012,0.0451785)
+ New Polarization:       (-0.422291,0.52999,-0.735378)
  *** FresnelRefraction *** 
 Track (trackID 1404, parentID 1) is processed with stopping code 2
 ### pop requested out of 142 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.685264,0.663724,0.299806)
+ Old Polarization:       (-0.45672,0.712286,-0.532969)
+ New Momentum Direction: (0.191314,0.894506,0.404051)
+ New Polarization:       (-0.774068,0.390611,-0.498239)
+ *** FresnelRefraction *** 
 Track (trackID 1403, parentID 1) is processed with stopping code 2
 ### pop requested out of 141 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94923,0.30845,-0.061785)
- Old Polarization:       (-0.16201,0.311,-0.9365)
- New Momentum Direction: (0.90521,0.41668,-0.083465)
- New Polarization:       (-0.26895,0.40968,-0.87168)
+ Old Momentum Direction: (0.949244,0.308435,-0.0616797)
+ Old Polarization:       (-0.161907,0.311008,-0.936515)
+ New Momentum Direction: (0.905234,0.416664,-0.0833232)
+ New Polarization:       (-0.268806,0.409674,-0.871728)
  *** FresnelRefraction *** 
 Track (trackID 1402, parentID 1) is processed with stopping code 2
 ### pop requested out of 140 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23859,0.26443,0.93443)
- Old Polarization:       (-0.95112,0.25788,0.16987)
- New Momentum Direction: (0.32435,0.35948,0.87497)
- New Polarization:       (-0.24511,0.92532,-0.2893)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1401, parentID 1) is processed with stopping code 2
 ### pop requested out of 139 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.80886,-0.56269,0.17065)
- Old Polarization:       (-0.31893,-0.66366,-0.67664)
- New Momentum Direction: (0.60768,-0.76,0.23049)
- New Polarization:       (-0.53443,-0.60601,-0.58919)
+ Old Momentum Direction: (0.808841,-0.562695,0.170739)
+ Old Polarization:       (-0.318857,-0.663661,-0.676671)
+ New Momentum Direction: (-0.808841,-0.562695,0.170739)
+ New Polarization:       (0.00968286,0.277574,0.960656)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.808841,-0.562695,0.170739)
+ Old Polarization:       (0.00968286,0.277574,0.960656)
+ New Momentum Direction: (-0.808841,0.562695,0.170739)
+ New Polarization:       (-0.00968286,0.277574,-0.960656)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.808841,0.562695,0.170739)
+ Old Polarization:       (-0.00968286,0.277574,-0.960656)
+ New Momentum Direction: (-0.607636,0.759999,0.230607)
+ New Polarization:       (0.0184261,0.30377,-0.952567)
  *** FresnelRefraction *** 
 Track (trackID 1400, parentID 1) is processed with stopping code 2
 ### pop requested out of 138 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27758,0.38692,0.87934)
- Old Polarization:       (-0.9111,0.39634,0.11321)
- New Momentum Direction: (0.37597,0.52407,0.7642)
- New Polarization:       (-0.62676,0.75126,-0.20685)
+ Old Momentum Direction: (0.277504,0.386913,0.879369)
+ Old Polarization:       (-0.911102,0.396353,0.113127)
+ New Momentum Direction: (0.375869,0.524058,0.764255)
+ New Polarization:       (-0.626973,0.75112,-0.206699)
  *** FresnelRefraction *** 
 Track (trackID 1399, parentID 1) is processed with stopping code 2
 ### pop requested out of 137 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.743829,0.632527,0.215936)
+ Old Polarization:       (-0.391521,0.674201,-0.626231)
+ New Momentum Direction: (0.430683,0.854104,0.29158)
+ New Polarization:       (-0.655523,0.518109,-0.549411)
+ *** FresnelRefraction *** 
 Track (trackID 1398, parentID 1) is processed with stopping code 2
 ### pop requested out of 136 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6394,-0.64784,0.41408)
- Old Polarization:       (-0.50849,-0.76026,-0.40427)
- New Momentum Direction: (0.6394,0.64784,0.41408)
- New Polarization:       (0.50849,-0.76026,0.40427)
+ Old Momentum Direction: (0.639356,-0.647845,0.414151)
+ Old Polarization:       (-0.508451,-0.760263,-0.404323)
+ New Momentum Direction: (0.639356,0.647845,0.414151)
+ New Polarization:       (0.508451,-0.760263,0.404323)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.6394,0.64784,0.41408)
- Old Polarization:       (0.50849,-0.76026,0.40427)
- New Momentum Direction: (-0.6394,0.64784,0.41408)
- New Polarization:       (0.50849,0.76026,-0.40427)
+ Old Momentum Direction: (0.639356,0.647845,0.414151)
+ Old Polarization:       (0.508451,-0.760263,0.404323)
+ New Momentum Direction: (-0.639356,0.647845,0.414151)
+ New Polarization:       (0.508451,0.760263,-0.404323)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.6394,0.64784,0.41408)
- Old Polarization:       (0.50849,0.76026,-0.40427)
- New Momentum Direction: (-0.6394,0.64784,-0.41408)
- New Polarization:       (-0.50849,-0.76026,-0.40427)
+ Old Momentum Direction: (-0.639356,0.647845,0.414151)
+ Old Polarization:       (0.508451,0.760263,-0.404323)
+ New Momentum Direction: (-0.639356,0.647845,-0.414151)
+ New Polarization:       (-0.508451,-0.760263,-0.404323)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.639356,0.647845,-0.414151)
+ Old Polarization:       (-0.508451,-0.760263,-0.404323)
+ New Momentum Direction: (-0.639356,-0.647845,-0.414151)
+ New Polarization:       (0.508451,-0.760263,0.404323)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.639356,-0.647845,-0.414151)
+ Old Polarization:       (0.508451,-0.760263,0.404323)
+ New Momentum Direction: (0.639356,-0.647845,-0.414151)
+ New Polarization:       (0.508451,0.760263,-0.404323)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.639356,-0.647845,-0.414151)
+ Old Polarization:       (0.508451,0.760263,-0.404323)
+ New Momentum Direction: (0.639356,-0.647845,0.414151)
+ New Polarization:       (-0.508451,-0.760263,-0.404323)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.639356,-0.647845,0.414151)
+ Old Polarization:       (-0.508451,-0.760263,-0.404323)
+ New Momentum Direction: (0.639356,0.647845,0.414151)
+ New Polarization:       (0.508451,-0.760263,0.404323)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.639356,0.647845,0.414151)
+ Old Polarization:       (0.508451,-0.760263,0.404323)
+ New Momentum Direction: (-0.639356,0.647845,0.414151)
+ New Polarization:       (0.508451,0.760263,-0.404323)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1397, parentID 1) is processed with stopping code 2
 ### pop requested out of 135 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72501,-0.62541,0.28846)
- Old Polarization:       (-0.41342,-0.73017,-0.544)
- New Momentum Direction: (0.36154,-0.84664,0.3905)
- New Polarization:       (-0.69646,-0.52369,-0.49061)
+ Old Momentum Direction: (0.724984,-0.625415,0.288539)
+ Old Polarization:       (-0.413367,-0.730172,-0.544038)
+ New Momentum Direction: (0.361422,-0.846642,0.390604)
+ New Polarization:       (-0.696416,-0.523673,-0.490685)
  *** FresnelRefraction *** 
 Track (trackID 1396, parentID 1) is processed with stopping code 2
 ### pop requested out of 134 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88783,0.45994,0.014683)
- Old Polarization:       (-0.233,0.47682,-0.84756)
- New Momentum Direction: (0.78166,0.62338,0.019901)
- New Polarization:       (-0.39293,0.51697,-0.76049)
+ Old Momentum Direction: (0.887831,0.459932,0.0147814)
+ Old Polarization:       (-0.232904,0.476827,-0.84758)
+ New Momentum Direction: (0.781673,0.623367,0.0200339)
+ New Polarization:       (-0.392792,0.516985,-0.760553)
  *** FresnelRefraction *** 
 Track (trackID 1395, parentID 1) is processed with stopping code 2
 ### pop requested out of 133 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35333,-0.46664,0.8108)
- Old Polarization:       (-0.82928,-0.55736,0.040612)
- New Momentum Direction: (0.47677,-0.62966,0.61337)
- New Polarization:       (-0.75742,-0.64839,-0.076874)
+ Old Momentum Direction: (0.353256,-0.466641,0.810837)
+ Old Polarization:       (-0.829286,-0.557353,0.0405339)
+ New Momentum Direction: (0.476663,-0.629658,0.613452)
+ New Polarization:       (-0.75756,-0.64824,-0.076727)
  *** FresnelRefraction *** 
 Track (trackID 1394, parentID 1) is processed with stopping code 2
 ### pop requested out of 132 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.40172,-0.54446,0.73634)
- Old Polarization:       (-0.77135,-0.63457,-0.048386)
- New Momentum Direction: (0.54597,-0.73996,0.39291)
- New Polarization:       (-0.77532,-0.62396,-0.097744)
+ Old Momentum Direction: (0.401647,-0.544456,0.736375)
+ Old Polarization:       (-0.771348,-0.634566,-0.0484584)
+ New Momentum Direction: (0.545872,-0.739961,0.393042)
+ New Polarization:       (-0.775313,-0.623945,-0.0978866)
  *** FresnelRefraction *** 
 Track (trackID 1393, parentID 1) is processed with stopping code 2
 ### pop requested out of 131 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.495432,0.665675,0.558053)
+ Old Polarization:       (-0.668139,0.702575,-0.244903)
+ New Momentum Direction: (0.495432,-0.665675,0.558053)
+ New Polarization:       (0.668139,0.702575,0.244903)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.495432,-0.665675,0.558053)
+ Old Polarization:       (0.668139,0.702575,0.244903)
+ New Momentum Direction: (0.495432,-0.665675,-0.558053)
+ New Polarization:       (-0.668139,-0.702575,0.244903)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.495432,-0.665675,-0.558053)
+ Old Polarization:       (-0.668139,-0.702575,0.244903)
+ New Momentum Direction: (-0.495432,-0.665675,-0.558053)
+ New Polarization:       (-0.668139,0.702575,-0.244903)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1392, parentID 1) is processed with stopping code 2
 ### pop requested out of 130 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39115,0.58215,0.71282)
- Old Polarization:       (-0.78538,0.6149,-0.071211)
- New Momentum Direction: (0.39115,0.58215,-0.71282)
- New Polarization:       (0.80892,-0.58685,-0.035385)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39115,0.58215,-0.71282)
- Old Polarization:       (0.80892,-0.58685,-0.035385)
- New Momentum Direction: (0.39115,-0.58215,-0.71282)
- New Polarization:       (-0.80892,-0.58685,0.035385)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39115,-0.58215,-0.71282)
- Old Polarization:       (-0.80892,-0.58685,0.035385)
- New Momentum Direction: (-0.39115,-0.58215,-0.71282)
- New Polarization:       (-0.80892,0.58685,-0.035385)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.39115,-0.58215,-0.71282)
- Old Polarization:       (-0.80892,0.58685,-0.035385)
- New Momentum Direction: (-0.39115,-0.58215,0.71282)
- New Polarization:       (0.83972,-0.54274,0.017531)
- *** FresnelReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.391087,0.582135,0.71286)
+ Old Polarization:       (-0.785368,0.614911,-0.0712819)
+ New Momentum Direction: (0.529155,0.78765,0.315597)
+ New Polarization:       (-0.793247,0.591243,-0.145572)
+ *** FresnelRefraction *** 
 Track (trackID 1391, parentID 1) is processed with stopping code 2
 ### pop requested out of 129 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.33782,0.51732,0.78629)
- Old Polarization:       (-0.84259,0.5385,0.0077235)
- New Momentum Direction: (0.45862,0.7023,0.54447)
- New Polarization:       (-0.83181,0.55486,-0.01504)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.337757,0.517309,0.786328)
+ Old Polarization:       (-0.842585,0.538509,0.00764722)
+ New Momentum Direction: (0.337757,0.517309,-0.786328)
+ New Polarization:       (0.836821,-0.547476,-0.000726976)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1390, parentID 1) is processed with stopping code 2
 ### pop requested out of 128 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68876,-0.63575,0.34847)
- Old Polarization:       (-0.45246,-0.7525,-0.47857)
- New Momentum Direction: (0.22203,-0.85502,0.46866)
- New Polarization:       (-0.76122,-0.45236,-0.46466)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1389, parentID 1) is processed with stopping code 2
 ### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96857,-0.23847,-0.070705)
- Old Polarization:       (-0.14254,-0.2992,-0.94348)
- New Momentum Direction: (0.94157,-0.32291,-0.095744)
- New Polarization:       (-0.2321,-0.41609,-0.8792)
+ Old Momentum Direction: (0.96858,-0.238472,-0.0705998)
+ Old Polarization:       (-0.142438,-0.299202,-0.943499)
+ New Momentum Direction: (0.941585,-0.322922,-0.0956011)
+ New Polarization:       (-0.231967,-0.416074,-0.879246)
  *** FresnelRefraction *** 
 Track (trackID 1388, parentID 1) is processed with stopping code 2
 ### pop requested out of 126 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88966,-0.45381,0.050661)
- Old Polarization:       (-0.22947,-0.54023,-0.80963)
- New Momentum Direction: (0.78651,-0.61376,0.068517)
- New Polarization:       (-0.38601,-0.57518,-0.72123)
+ Old Momentum Direction: (0.88965,-0.453813,0.0507567)
+ Old Polarization:       (-0.229382,-0.540232,-0.80965)
+ New Momentum Direction: (0.7865,-0.613764,0.0686463)
+ New Polarization:       (-0.385897,-0.575175,-0.721288)
  *** FresnelRefraction *** 
 Track (trackID 1387, parentID 1) is processed with stopping code 2
 ### pop requested out of 125 stacked tracks.
@@ -13640,642 +13827,502 @@ Track (trackID 1387, parentID 1) is processed with stopping code 2
 Track (trackID 1386, parentID 1) is processed with stopping code 2
 ### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95923,-0.27747,-0.053831)
- Old Polarization:       (-0.15146,-0.34383,-0.92674)
- New Momentum Direction: (0.92413,-0.3751,-0.072772)
- New Polarization:       (-0.24961,-0.44846,-0.85824)
+ Old Momentum Direction: (0.95923,-0.277472,-0.053727)
+ Old Polarization:       (-0.151365,-0.343825,-0.926754)
+ New Momentum Direction: (0.924133,-0.375103,-0.0726314)
+ New Polarization:       (-0.249478,-0.448442,-0.858289)
  *** FresnelRefraction *** 
 Track (trackID 1385, parentID 1) is processed with stopping code 2
 ### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21781,0.018101,0.97582)
- Old Polarization:       (-0.97584,-0.013768,0.21807)
- New Momentum Direction: (0.29554,0.024561,0.95501)
- New Polarization:       (0.94649,0.12817,-0.2962)
+ Old Momentum Direction: (0.21772,0.0180965,0.975844)
+ Old Polarization:       (-0.975857,-0.0137598,0.217978)
+ New Momentum Direction: (0.295421,0.024555,0.955051)
+ New Polarization:       (0.946521,0.1282,-0.296079)
  *** FresnelRefraction *** 
 Track (trackID 1384, parentID 1) is processed with stopping code 2
 ### pop requested out of 122 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.524596,0.667489,0.528448)
+ Old Polarization:       (-0.63776,0.7193,-0.275445)
+ New Momentum Direction: (0.524596,-0.667489,0.528448)
+ New Polarization:       (0.63776,0.7193,0.275445)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.524596,-0.667489,0.528448)
+ Old Polarization:       (0.63776,0.7193,0.275445)
+ New Momentum Direction: (0.524596,-0.667489,-0.528448)
+ New Polarization:       (-0.63776,-0.7193,0.275445)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.524596,-0.667489,-0.528448)
+ Old Polarization:       (-0.63776,-0.7193,0.275445)
+ New Momentum Direction: (-0.524596,-0.667489,-0.528448)
+ New Polarization:       (-0.63776,0.7193,-0.275445)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1383, parentID 1) is processed with stopping code 2
 ### pop requested out of 121 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.889027,-0.454473,0.0555487)
+ Old Polarization:       (-0.227943,-0.544551,-0.807159)
+ New Momentum Direction: (0.786675,-0.612807,0.0749013)
+ New Polarization:       (-0.382165,-0.578658,-0.720489)
+ *** FresnelRefraction *** 
 Track (trackID 1382, parentID 1) is processed with stopping code 2
 ### pop requested out of 120 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48821,-0.60543,0.62857)
- Old Polarization:       (-0.67865,-0.71621,-0.16273)
- New Momentum Direction: (0.48821,-0.60543,-0.62857)
- New Polarization:       (0.67865,0.71621,-0.16273)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48821,-0.60543,-0.62857)
- Old Polarization:       (0.67865,0.71621,-0.16273)
- New Momentum Direction: (0.48821,0.60543,-0.62857)
- New Polarization:       (-0.67865,0.71621,0.16273)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48821,0.60543,-0.62857)
- Old Polarization:       (-0.67865,0.71621,0.16273)
- New Momentum Direction: (-0.48821,0.60543,-0.62857)
- New Polarization:       (-0.67865,-0.71621,-0.16273)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1381, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.22634,-0.11345,0.96742)
-Old Polarization: (-0.96528,-0.15908,0.20718)
-New Polarization: (0.67474,0.49584,-0.54669)
-Polarization Change: (0.67474,0.49584,-0.54669)
-New Momentum Direction: (0.73747,-0.48238,0.47269)
-Momentum Change: (0.73747,-0.48238,0.47269)
  Photon at Boundary! 
- Old Momentum Direction: (0.73747,-0.48238,0.47269)
- Old Polarization:       (0.67474,0.49584,-0.54669)
- New Momentum Direction: (0.73747,-0.48238,-0.47269)
- New Polarization:       (-0.67474,-0.49584,-0.54669)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.226249,-0.113457,0.967439)
+ Old Polarization:       (-0.965302,-0.159076,0.207093)
+ New Momentum Direction: (0.30736,-0.154132,0.939028)
+ New Polarization:       (0.541089,-0.783434,-0.305701)
+ *** FresnelRefraction *** 
 Track (trackID 1380, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.26854,0.33867,0.90177)
- Old Polarization:       (-0.92632,0.34758,0.14531)
- New Momentum Direction: (0.36153,0.45596,0.81326)
- New Polarization:       (-0.48262,0.83783,-0.25519)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1379, parentID 1) is processed with stopping code 2
 ### pop requested out of 117 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69343,-0.63873,0.33345)
- Old Polarization:       (-0.44861,-0.74486,-0.4939)
- New Momentum Direction: (0.2201,-0.86473,0.45143)
- New Polarization:       (-0.76387,-0.4406,-0.47156)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.693391,-0.638728,0.333519)
+ Old Polarization:       (-0.448556,-0.744861,-0.493942)
+ New Momentum Direction: (-0.693391,-0.638728,0.333519)
+ New Polarization:       (-0.328315,0.692077,0.642836)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.693391,-0.638728,0.333519)
+ Old Polarization:       (-0.328315,0.692077,0.642836)
+ New Momentum Direction: (-0.693391,0.638728,0.333519)
+ New Polarization:       (0.328315,0.692077,-0.642836)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.693391,0.638728,0.333519)
+ Old Polarization:       (0.328315,0.692077,-0.642836)
+ New Momentum Direction: (-0.693391,0.638728,-0.333519)
+ New Polarization:       (-0.328315,-0.692077,-0.642836)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1378, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8784,0.47714,0.027392)
- Old Polarization:       (-0.24342,0.49599,-0.83351)
- New Momentum Direction: (0.76189,0.64665,0.037123)
- New Polarization:       (-0.41055,0.52645,-0.74451)
+ Old Momentum Direction: (0.878404,0.477127,0.0274891)
+ Old Polarization:       (-0.243327,0.495995,-0.833535)
+ New Momentum Direction: (0.761894,0.64663,0.0372548)
+ New Polarization:       (-0.410416,0.526471,-0.744572)
  *** FresnelRefraction *** 
 Track (trackID 1377, parentID 1) is processed with stopping code 2
 ### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93742,-0.34742,-0.023393)
- Old Polarization:       (-0.17779,-0.41978,-0.89004)
- New Momentum Direction: (0.88167,-0.47079,-0.031699)
- New Polarization:       (-0.29747,-0.50242,-0.81184)
+ Old Momentum Direction: (0.937417,-0.347429,-0.0232912)
+ Old Polarization:       (-0.177694,-0.419778,-0.890062)
+ New Momentum Direction: (0.881676,-0.470798,-0.0315617)
+ New Polarization:       (-0.297341,-0.502411,-0.811894)
  *** FresnelRefraction *** 
 Track (trackID 1376, parentID 1) is processed with stopping code 2
 ### pop requested out of 114 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6759,0.67226,0.30204)
- Old Polarization:       (-0.46876,0.70838,-0.52769)
- New Momentum Direction: (-0.6759,0.67226,0.30204)
- New Polarization:       (-0.46876,-0.70838,0.52769)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6759,0.67226,0.30204)
- Old Polarization:       (-0.46876,-0.70838,0.52769)
- New Momentum Direction: (-0.6759,-0.67226,0.30204)
- New Polarization:       (0.46876,-0.70838,-0.52769)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6759,-0.67226,0.30204)
- Old Polarization:       (0.46876,-0.70838,-0.52769)
- New Momentum Direction: (-0.6759,-0.67226,-0.30204)
- New Polarization:       (-0.46876,0.70838,-0.52769)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6759,-0.67226,-0.30204)
- Old Polarization:       (-0.46876,0.70838,-0.52769)
- New Momentum Direction: (0.6759,-0.67226,-0.30204)
- New Polarization:       (-0.46876,-0.70838,0.52769)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6759,-0.67226,-0.30204)
- Old Polarization:       (-0.46876,-0.70838,0.52769)
- New Momentum Direction: (0.6759,0.67226,-0.30204)
- New Polarization:       (0.46876,-0.70838,-0.52769)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1375, parentID 1) is processed with stopping code 2
 ### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98217,0.15639,-0.10431)
- Old Polarization:       (-0.12664,0.14037,-0.98197)
- New Momentum Direction: (0.96711,0.2116,-0.14114)
- New Polarization:       (-0.19775,0.27655,-0.94043)
+ Old Momentum Direction: (0.982185,0.156379,-0.104204)
+ Old Polarization:       (-0.126532,0.14038,-0.981979)
+ New Momentum Direction: (0.967137,0.211583,-0.140989)
+ New Polarization:       (-0.197606,0.276574,-0.940456)
  *** FresnelRefraction *** 
 Track (trackID 1374, parentID 1) is processed with stopping code 2
 ### pop requested out of 112 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.224252,0.0147774,0.974419)
+ Old Polarization:       (-0.974319,-0.0174668,0.224494)
+ New Momentum Direction: (0.30248,0.0199324,0.952947)
+ New Polarization:       (0.948052,0.0970258,-0.302956)
+ *** FresnelRefraction *** 
 Track (trackID 1373, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72968,0.64482,0.22754)
- Old Polarization:       (-0.40932,0.67845,-0.61005)
- New Momentum Direction: (0.37018,0.87602,0.30912)
- New Polarization:       (-0.69332,0.48201,-0.5357)
+ Old Momentum Direction: (0.729662,0.644811,0.227622)
+ Old Polarization:       (-0.409245,0.678463,-0.610088)
+ New Momentum Direction: (0.370136,0.875999,0.309233)
+ New Polarization:       (-0.693238,0.482046,-0.535773)
  *** FresnelRefraction *** 
 Track (trackID 1372, parentID 1) is processed with stopping code 2
 ### pop requested out of 110 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36004,0.55271,0.75159)
- Old Polarization:       (-0.8171,0.57562,-0.031884)
- New Momentum Direction: (0.48953,0.75149,0.4423)
- New Polarization:       (-0.81864,0.57076,-0.063703)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1371, parentID 1) is processed with stopping code 2
 ### pop requested out of 109 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23132,-0.14929,0.96135)
- Old Polarization:       (-0.95946,-0.19853,0.20004)
- New Momentum Direction: (0.31436,-0.20288,0.92737)
- New Polarization:       (0.33216,-0.89164,-0.30766)
+ Old Momentum Direction: (0.231233,-0.149291,0.961376)
+ Old Polarization:       (-0.959484,-0.198519,0.19995)
+ New Momentum Direction: (0.314239,-0.202882,0.927412)
+ New Polarization:       (0.331864,-0.891789,-0.307536)
  *** FresnelRefraction *** 
 Track (trackID 1370, parentID 1) is processed with stopping code 2
 ### pop requested out of 108 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99127,-0.085865,-0.10001)
- Old Polarization:       (-0.11076,-0.13118,-0.98515)
- New Momentum Direction: (0.98416,-0.11549,-0.13452)
- New Polarization:       (-0.15988,-0.25021,-0.9549)
+ Old Momentum Direction: (0.991285,-0.0858724,-0.0999032)
+ Old Polarization:       (-0.11065,-0.131178,-0.985164)
+ New Momentum Direction: (0.984177,-0.115501,-0.134373)
+ New Polarization:       (-0.159749,-0.250296,-0.954899)
  *** FresnelRefraction *** 
 Track (trackID 1369, parentID 1) is processed with stopping code 2
 ### pop requested out of 107 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.252414,0.279773,0.926291)
+ Old Polarization:       (-0.9441,0.280986,0.172399)
+ New Momentum Direction: (0.339946,0.376793,0.861664)
+ New Polarization:       (-0.277013,0.915699,-0.291134)
+ *** FresnelRefraction *** 
 Track (trackID 1368, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42101,-0.55811,0.71502)
- Old Polarization:       (-0.75197,-0.65558,-0.068952)
- New Momentum Direction: (0.56981,-0.75536,0.32366)
- New Polarization:       (-0.76051,-0.63393,-0.14057)
+ Old Momentum Direction: (0.420944,-0.558114,0.715063)
+ Old Polarization:       (-0.751962,-0.655583,-0.0690231)
+ New Momentum Direction: (0.420944,-0.558114,-0.715063)
+ New Polarization:       (0.776927,0.628707,-0.0333503)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.420944,-0.558114,-0.715063)
+ Old Polarization:       (0.776927,0.628707,-0.0333503)
+ New Momentum Direction: (0.420944,0.558114,-0.715063)
+ New Polarization:       (-0.776927,0.628707,0.0333503)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.420944,0.558114,-0.715063)
+ Old Polarization:       (-0.776927,0.628707,0.0333503)
+ New Momentum Direction: (-0.420944,0.558114,-0.715063)
+ New Polarization:       (-0.776927,-0.628707,-0.0333503)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.420944,0.558114,-0.715063)
+ Old Polarization:       (-0.776927,-0.628707,-0.0333503)
+ New Momentum Direction: (-0.56971,0.755357,-0.32383)
+ New Polarization:       (-0.810373,-0.581918,0.0683112)
  *** FresnelRefraction *** 
 Track (trackID 1367, parentID 1) is processed with stopping code 2
 ### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21891,-0.021442,0.97551)
- Old Polarization:       (-0.97439,-0.057539,0.21739)
- New Momentum Direction: (0.29711,-0.029101,0.9544)
- New Polarization:       (0.93288,-0.20432,-0.29664)
+ Old Momentum Direction: (0.218821,-0.021446,0.975529)
+ Old Polarization:       (-0.974407,-0.0575309,0.217305)
+ New Momentum Direction: (0.296988,-0.0291068,0.954438)
+ New Polarization:       (0.932894,-0.204415,-0.296518)
  *** FresnelRefraction *** 
 Track (trackID 1366, parentID 1) is processed with stopping code 2
 ### pop requested out of 104 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84604,-0.52127,0.11176)
- Old Polarization:       (-0.27955,-0.61228,-0.73957)
- New Momentum Direction: (0.69112,-0.70668,0.15151)
- New Polarization:       (-0.47147,-0.59971,-0.64658)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1365, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27239,-0.29519,0.91579)
- Old Polarization:       (-0.91842,-0.36356,0.15598)
- New Momentum Direction: (0.36825,-0.39908,0.83972)
- New Polarization:       (-0.35185,-0.89583,-0.27145)
+ Old Momentum Direction: (0.272299,-0.29519,0.915815)
+ Old Polarization:       (-0.918436,-0.363555,0.155896)
+ New Momentum Direction: (0.368136,-0.399084,0.839766)
+ New Polarization:       (-0.352154,-0.895755,-0.271314)
  *** FresnelRefraction *** 
 Track (trackID 1364, parentID 1) is processed with stopping code 2
 ### pop requested out of 102 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91729,-0.39815,0.0074959)
- Old Polarization:       (-0.19984,-0.47653,-0.85615)
- New Momentum Direction: (0.84204,-0.53931,0.010154)
- New Polarization:       (-0.33595,-0.53908,-0.77235)
+ Old Momentum Direction: (0.917288,-0.398151,0.00759484)
+ Old Polarization:       (-0.199749,-0.476527,-0.856167)
+ New Momentum Direction: (0.842038,-0.539319,0.0102877)
+ New Polarization:       (-0.335832,-0.539068,-0.772413)
  *** FresnelRefraction *** 
 Track (trackID 1363, parentID 1) is processed with stopping code 2
 ### pop requested out of 101 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91072,-0.41221,0.025793)
- Old Polarization:       (-0.20213,-0.49929,-0.84253)
- New Momentum Direction: (0.83132,-0.55471,0.034709)
- New Polarization:       (-0.33781,-0.55387,-0.76099)
+ Old Momentum Direction: (0.910718,-0.412218,0.0258908)
+ Old Polarization:       (-0.202038,-0.499285,-0.842553)
+ New Momentum Direction: (0.83131,-0.554716,0.034841)
+ New Polarization:       (-0.337687,-0.553866,-0.761052)
  *** FresnelRefraction *** 
 Track (trackID 1362, parentID 1) is processed with stopping code 2
 ### pop requested out of 100 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.488627,-0.615193,0.618693)
+ Old Polarization:       (-0.675859,-0.715335,-0.177512)
+ New Momentum Direction: (0.488627,-0.615193,-0.618693)
+ New Polarization:       (0.675859,0.715335,-0.177512)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.488627,-0.615193,-0.618693)
+ Old Polarization:       (0.675859,0.715335,-0.177512)
+ New Momentum Direction: (0.488627,0.615193,-0.618693)
+ New Polarization:       (-0.675859,0.715335,0.177512)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.488627,0.615193,-0.618693)
+ Old Polarization:       (-0.675859,0.715335,0.177512)
+ New Momentum Direction: (-0.488627,0.615193,-0.618693)
+ New Polarization:       (-0.675859,-0.715335,-0.177512)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1361, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22411,-0.037381,0.97385)
- Old Polarization:       (-0.97236,-0.075712,0.22086)
- New Momentum Direction: (0.30297,-0.050536,0.95166)
- New Polarization:       (0.89535,-0.32696,-0.30241)
+ Old Momentum Direction: (0.224019,-0.0373854,0.973867)
+ Old Polarization:       (-0.972383,-0.0757036,0.220771)
+ New Momentum Direction: (0.302852,-0.0505414,0.951697)
+ New Polarization:       (0.895338,-0.327096,-0.302288)
  *** FresnelRefraction *** 
 Track (trackID 1360, parentID 1) is processed with stopping code 2
 ### pop requested out of 98 stacked tracks.
 Scattering Photon!
-Old Momentum Direction: (0.50559,-0.62569,0.59405)
-Old Polarization: (-0.65693,-0.72553,-0.20507)
-New Polarization: (-0.062525,-0.99713,0.042679)
-Polarization Change: (-0.062525,-0.99713,0.042679)
-New Momentum Direction: (-0.93103,0.042869,-0.36241)
-Momentum Change: (-0.93103,0.042869,-0.36241)
- Photon at Boundary! 
- Old Momentum Direction: (-0.93103,0.042869,-0.36241)
- Old Polarization:       (-0.062525,-0.99713,0.042679)
- New Momentum Direction: (-0.86857,0.058213,-0.49214)
- New Polarization:       (0.11504,-0.94227,-0.31449)
- *** FresnelRefraction *** 
+Old Momentum Direction: (0.505531,-0.625689,0.594097)
+Old Polarization: (-0.656911,-0.725528,-0.205129)
+New Polarization: (-0.766731,-0.552105,-0.327573)
+Polarization Change: (-0.766731,-0.552105,-0.327573)
+New Momentum Direction: (-0.370493,0.797266,-0.476552)
+Momentum Change: (-0.370493,0.797266,-0.476552)
+
+** Photon absorbed! **
 Track (trackID 1359, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (0.44802,0.6317,-0.63264)
- New Polarization:       (0.72262,-0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,-0.63264)
- Old Polarization:       (0.72262,-0.67253,-0.15978)
- New Momentum Direction: (0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (-0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (-0.44802,-0.6317,0.63264)
- New Polarization:       (0.72262,-0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,-0.6317,0.63264)
- Old Polarization:       (0.72262,-0.67253,-0.15978)
- New Momentum Direction: (-0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (0.44802,0.6317,-0.63264)
- New Polarization:       (0.72262,-0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,-0.63264)
- Old Polarization:       (0.72262,-0.67253,-0.15978)
- New Momentum Direction: (0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (0.44802,-0.6317,0.63264)
- New Polarization:       (0.72262,0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,-0.6317,0.63264)
- Old Polarization:       (0.72262,0.67253,0.15978)
- New Momentum Direction: (0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (-0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (-0.44802,0.6317,-0.63264)
- New Polarization:       (0.72262,0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,-0.63264)
- Old Polarization:       (0.72262,0.67253,0.15978)
- New Momentum Direction: (-0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (0.44802,-0.6317,0.63264)
- New Polarization:       (0.72262,0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,-0.6317,0.63264)
- Old Polarization:       (0.72262,0.67253,0.15978)
- New Momentum Direction: (0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (-0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (-0.44802,0.6317,-0.63264)
- New Polarization:       (0.72262,0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,-0.63264)
- Old Polarization:       (0.72262,0.67253,0.15978)
- New Momentum Direction: (-0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,-0.6317,-0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (-0.44802,-0.6317,0.63264)
- New Polarization:       (0.72262,-0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,-0.6317,0.63264)
- Old Polarization:       (0.72262,-0.67253,-0.15978)
- New Momentum Direction: (-0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,-0.67253,0.15978)
- New Momentum Direction: (0.44802,0.6317,0.63264)
- New Polarization:       (-0.72262,0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,0.63264)
- Old Polarization:       (-0.72262,0.67253,-0.15978)
- New Momentum Direction: (0.44802,0.6317,-0.63264)
- New Polarization:       (0.72262,-0.67253,-0.15978)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44802,0.6317,-0.63264)
- Old Polarization:       (0.72262,-0.67253,-0.15978)
- New Momentum Direction: (0.44802,-0.6317,-0.63264)
- New Polarization:       (-0.72262,-0.67253,0.15978)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1358, parentID 1) is processed with stopping code 2
 ### pop requested out of 96 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9923,0.032513,-0.11948)
- Old Polarization:       (-0.11961,0.0021302,-0.99282)
- New Momentum Direction: (0.98574,0.044187,-0.16238)
- New Polarization:       (-0.16512,0.06763,-0.98395)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1357, parentID 1) is processed with stopping code 2
 ### pop requested out of 95 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81125,-0.56048,0.16652)
- Old Polarization:       (-0.31652,-0.66043,-0.68092)
- New Momentum Direction: (0.61294,-0.75741,0.22503)
- New Polarization:       (-0.53083,-0.60569,-0.59276)
+ Old Momentum Direction: (0.811232,-0.560485,0.166608)
+ Old Polarization:       (-0.316447,-0.660433,-0.680948)
+ New Momentum Direction: (0.612895,-0.757409,0.225145)
+ New Polarization:       (-0.530746,-0.605699,-0.592822)
  *** FresnelRefraction *** 
 Track (trackID 1356, parentID 1) is processed with stopping code 2
 ### pop requested out of 94 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.2347,0.22787,0.94498)
- Old Polarization:       (-0.958,0.21904,0.18511)
- New Momentum Direction: (0.31816,0.30891,0.8963)
- New Polarization:       (-0.068213,0.95043,-0.30335)
+ Old Momentum Direction: (0.234611,0.227867,0.945005)
+ Old Polarization:       (-0.95801,0.219053,0.18502)
+ New Momentum Direction: (0.318042,0.3089,0.896343)
+ New Polarization:       (-0.0685387,0.95045,-0.303227)
  *** FresnelRefraction *** 
 Track (trackID 1355, parentID 1) is processed with stopping code 2
 ### pop requested out of 93 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70759,0.65614,0.26228)
- Old Polarization:       (-0.43292,0.69591,-0.57297)
- New Momentum Direction: (0.29022,0.88859,0.35521)
- New Polarization:       (-0.73284,0.44507,-0.51464)
+ Old Momentum Direction: (0.707577,0.656125,0.262363)
+ Old Polarization:       (-0.432847,0.695918,-0.573011)
+ New Momentum Direction: (0.29015,0.888576,0.355312)
+ New Polarization:       (-0.732777,0.445093,-0.514713)
  *** FresnelRefraction *** 
 Track (trackID 1354, parentID 1) is processed with stopping code 2
 ### pop requested out of 92 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97734,-0.19201,-0.089098)
- Old Polarization:       (-0.13579,-0.24583,-0.95975)
- New Momentum Direction: (0.95776,-0.26086,-0.12105)
- New Polarization:       (-0.21616,-0.3754,-0.90131)
+ Old Momentum Direction: (0.977348,-0.192019,-0.0889916)
+ Old Polarization:       (-0.135689,-0.245831,-0.959768)
+ New Momentum Direction: (0.957773,-0.260871,-0.120901)
+ New Polarization:       (-0.216025,-0.375399,-0.901337)
  *** FresnelRefraction *** 
 Track (trackID 1353, parentID 1) is processed with stopping code 2
 ### pop requested out of 91 stacked tracks.
-
-** Photon absorbed! **
+Scattering Photon!
+Old Momentum Direction: (0.522902,-0.634601,0.569083)
+Old Polarization: (-0.63757,-0.734307,-0.233016)
+New Polarization: (-0.980083,-0.102595,0.170036)
+Polarization Change: (-0.980083,-0.102595,0.170036)
+New Momentum Direction: (-0.0131326,0.887825,0.459993)
+Momentum Change: (-0.0131326,0.887825,0.459993)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.0131326,0.887825,0.459993)
+ Old Polarization:       (-0.980083,-0.102595,0.170036)
+ New Momentum Direction: (-0.0178453,0.780367,0.625067)
+ New Polarization:       (-0.959611,-0.188919,0.20846)
+ *** FresnelRefraction *** 
 Track (trackID 1352, parentID 1) is processed with stopping code 2
 ### pop requested out of 90 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.32144,-0.41514,0.85108)
- Old Polarization:       (-0.86353,-0.49732,0.083563)
- New Momentum Direction: (0.43464,-0.56134,0.70426)
- New Polarization:       (-0.67719,-0.71923,-0.15534)
+ Old Momentum Direction: (0.321357,-0.415138,0.851111)
+ Old Polarization:       (-0.863545,-0.497314,0.0834822)
+ New Momentum Direction: (0.43453,-0.561338,0.704332)
+ New Polarization:       (-0.67738,-0.719078,-0.155188)
  *** FresnelRefraction *** 
 Track (trackID 1351, parentID 1) is processed with stopping code 2
 ### pop requested out of 89 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.57327,-0.64601,0.50401)
-Old Polarization: (-0.5824,-0.75395,-0.30394)
-New Polarization: (-0.69795,-0.57996,-0.42015)
-Polarization Change: (-0.69795,-0.57996,-0.42015)
-New Momentum Direction: (-0.40291,0.80301,-0.43913)
-Momentum Change: (-0.40291,0.80301,-0.43913)
  Photon at Boundary! 
- Old Momentum Direction: (-0.40291,0.80301,-0.43913)
- Old Polarization:       (-0.69795,-0.57996,-0.42015)
- New Momentum Direction: (-0.54516,0.59142,-0.59416)
- New Polarization:       (-0.51579,-0.79534,-0.31842)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.57322,-0.646014,0.504068)
+ Old Polarization:       (-0.582368,-0.753946,-0.303996)
+ New Momentum Direction: (0.57322,0.646014,0.504068)
+ New Polarization:       (0.582368,-0.753946,0.303996)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57322,0.646014,0.504068)
+ Old Polarization:       (0.582368,-0.753946,0.303996)
+ New Momentum Direction: (-0.57322,0.646014,0.504068)
+ New Polarization:       (0.582368,0.753946,-0.303996)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57322,0.646014,0.504068)
+ Old Polarization:       (0.582368,0.753946,-0.303996)
+ New Momentum Direction: (-0.57322,0.646014,-0.504068)
+ New Polarization:       (-0.582368,-0.753946,-0.303996)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1350, parentID 1) is processed with stopping code 2
 ### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70269,0.6596,0.26675)
- Old Polarization:       (-0.43881,0.69688,-0.56728)
- New Momentum Direction: (-0.70269,0.6596,0.26675)
- New Polarization:       (-0.29365,-0.61035,0.73569)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70269,0.6596,0.26675)
- Old Polarization:       (-0.29365,-0.61035,0.73569)
- New Momentum Direction: (-0.70269,-0.6596,0.26675)
- New Polarization:       (0.29365,-0.61035,-0.73569)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70269,-0.6596,0.26675)
- Old Polarization:       (0.29365,-0.61035,-0.73569)
- New Momentum Direction: (-0.70269,-0.6596,-0.26675)
- New Polarization:       (-0.29365,0.61035,-0.73569)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70269,-0.6596,-0.26675)
- Old Polarization:       (-0.29365,0.61035,-0.73569)
- New Momentum Direction: (-0.26113,-0.89489,-0.36191)
- New Polarization:       (0.55692,0.16656,-0.81369)
+ Old Momentum Direction: (0.702672,0.659587,0.266827)
+ Old Polarization:       (-0.438735,0.696895,-0.567317)
+ New Momentum Direction: (0.261045,0.894876,0.362011)
+ New Polarization:       (-0.746837,0.424829,-0.51162)
  *** FresnelRefraction *** 
 Track (trackID 1349, parentID 1) is processed with stopping code 2
 ### pop requested out of 87 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.32794,-0.42823,0.84207)
- Old Polarization:       (-0.85608,-0.51162,0.073221)
- New Momentum Direction: (0.44356,-0.57919,0.68395)
- New Polarization:       (-0.70172,-0.69916,-0.13698)
+ Old Momentum Direction: (0.327864,-0.428227,0.842097)
+ Old Polarization:       (-0.856093,-0.511621,0.0731413)
+ New Momentum Direction: (0.443448,-0.579193,0.684024)
+ New Polarization:       (-0.701906,-0.699002,-0.136835)
  *** FresnelRefraction *** 
 Track (trackID 1348, parentID 1) is processed with stopping code 2
 ### pop requested out of 86 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.315602,0.473699,0.822195)
+ Old Polarization:       (-0.868719,0.492823,0.0495254)
+ New Momentum Direction: (0.427482,0.641624,0.63685)
+ New Polarization:       (-0.782917,0.614975,-0.0940575)
+ *** FresnelRefraction *** 
 Track (trackID 1347, parentID 1) is processed with stopping code 2
 ### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9756,-0.20238,-0.085086)
- Old Polarization:       (-0.13689,-0.25777,-0.95646)
- New Momentum Direction: (0.95457,-0.2747,-0.11549)
- New Polarization:       (-0.21923,-0.38486,-0.89656)
+ Old Momentum Direction: (0.975611,-0.20239,-0.0849798)
+ Old Polarization:       (-0.136787,-0.257771,-0.956474)
+ New Momentum Direction: (0.954582,-0.274713,-0.115347)
+ New Polarization:       (-0.219095,-0.384853,-0.896597)
  *** FresnelRefraction *** 
 Track (trackID 1346, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.573371,-0.647652,0.50179)
+ Old Polarization:       (-0.582063,-0.753032,-0.306831)
+ New Momentum Direction: (0.573371,0.647652,0.50179)
+ New Polarization:       (0.582063,-0.753032,0.306831)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.573371,0.647652,0.50179)
+ Old Polarization:       (0.582063,-0.753032,0.306831)
+ New Momentum Direction: (-0.573371,0.647652,0.50179)
+ New Polarization:       (0.582063,0.753032,-0.306831)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.573371,0.647652,0.50179)
+ Old Polarization:       (0.582063,0.753032,-0.306831)
+ New Momentum Direction: (-0.573371,0.647652,-0.50179)
+ New Polarization:       (-0.582063,-0.753032,-0.306831)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.573371,0.647652,-0.50179)
+ Old Polarization:       (-0.582063,-0.753032,-0.306831)
+ New Momentum Direction: (-0.573371,-0.647652,-0.50179)
+ New Polarization:       (0.582063,-0.753032,0.306831)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.573371,-0.647652,-0.50179)
+ Old Polarization:       (0.582063,-0.753032,0.306831)
+ New Momentum Direction: (0.573371,-0.647652,-0.50179)
+ New Polarization:       (0.582063,0.753032,-0.306831)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.573371,-0.647652,-0.50179)
+Old Polarization: (0.582063,0.753032,-0.306831)
+New Polarization: (0.0674396,0.97213,0.224533)
+Polarization Change: (0.0674396,0.97213,0.224533)
+New Momentum Direction: (-0.751209,-0.0986301,0.652654)
+Momentum Change: (-0.751209,-0.0986301,0.652654)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.751209,-0.0986301,0.652654)
+ Old Polarization:       (0.0674396,0.97213,0.224533)
+ New Momentum Direction: (0.751209,-0.0986301,0.652654)
+ New Polarization:       (0.018639,-0.985209,-0.17034)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.751209,-0.0986301,0.652654)
+ Old Polarization:       (0.018639,-0.985209,-0.17034)
+ New Momentum Direction: (0.751209,-0.0986301,-0.652654)
+ New Polarization:       (-0.018639,0.985209,-0.17034)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.751209,-0.0986301,-0.652654)
+ Old Polarization:       (-0.018639,0.985209,-0.17034)
+ New Momentum Direction: (0.446919,-0.133672,-0.884531)
+ New Polarization:       (-0.0369468,0.985171,-0.167548)
+ *** FresnelRefraction *** 
 Track (trackID 1345, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99009,0.083346,-0.11299)
- Old Polarization:       (-0.11808,0.058914,-0.99125)
- New Momentum Direction: (0.98178,0.1128,-0.15292)
- New Polarization:       (-0.17166,0.18138,-0.96832)
+ Old Momentum Direction: (0.990108,0.0833362,-0.11288)
+ Old Polarization:       (-0.117972,0.0589191,-0.991267)
+ New Momentum Direction: (0.981804,0.112787,-0.152772)
+ New Polarization:       (-0.171519,0.181446,-0.968328)
  *** FresnelRefraction *** 
 Track (trackID 1344, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.693146,-0.641056,0.329538)
+Old Polarization: (-0.449572,-0.741858,-0.497525)
+New Polarization: (0.147777,0.971176,-0.187028)
+Polarization Change: (0.147777,0.971176,-0.187028)
+New Momentum Direction: (-0.481921,-0.0944275,-0.871112)
+Momentum Change: (-0.481921,-0.0944275,-0.871112)
 
 ** Photon absorbed! **
 Track (trackID 1343, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.47084,-0.5955,0.65091)
- Old Polarization:       (-0.69773,-0.70288,-0.13834)
- New Momentum Direction: (0.47084,-0.5955,-0.65091)
- New Polarization:       (0.69773,0.70288,-0.13834)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.47084,-0.5955,-0.65091)
- Old Polarization:       (0.69773,0.70288,-0.13834)
- New Momentum Direction: (0.47084,0.5955,-0.65091)
- New Polarization:       (-0.69773,0.70288,0.13834)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.47084,0.5955,-0.65091)
- Old Polarization:       (-0.69773,0.70288,0.13834)
- New Momentum Direction: (-0.47084,0.5955,-0.65091)
- New Polarization:       (-0.69773,-0.70288,-0.13834)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.47084,0.5955,-0.65091)
- Old Polarization:       (-0.69773,-0.70288,-0.13834)
- New Momentum Direction: (-0.47084,0.5955,0.65091)
- New Polarization:       (0.69773,0.70288,-0.13834)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1342, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.60018,-0.65285,0.46215)
- Old Polarization:       (-0.55236,-0.75617,-0.35086)
- New Momentum Direction: (0.60018,0.65285,0.46215)
- New Polarization:       (0.55236,-0.75617,0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60018,0.65285,0.46215)
- Old Polarization:       (0.55236,-0.75617,0.35086)
- New Momentum Direction: (-0.60018,0.65285,0.46215)
- New Polarization:       (0.55236,0.75617,-0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60018,0.65285,0.46215)
- Old Polarization:       (0.55236,0.75617,-0.35086)
- New Momentum Direction: (-0.60018,0.65285,-0.46215)
- New Polarization:       (-0.55236,-0.75617,-0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60018,0.65285,-0.46215)
- Old Polarization:       (-0.55236,-0.75617,-0.35086)
- New Momentum Direction: (-0.60018,-0.65285,-0.46215)
- New Polarization:       (0.55236,-0.75617,0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60018,-0.65285,-0.46215)
- Old Polarization:       (0.55236,-0.75617,0.35086)
- New Momentum Direction: (0.60018,-0.65285,-0.46215)
- New Polarization:       (0.55236,0.75617,-0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60018,-0.65285,-0.46215)
- Old Polarization:       (0.55236,0.75617,-0.35086)
- New Momentum Direction: (0.60018,-0.65285,0.46215)
- New Polarization:       (-0.55236,-0.75617,-0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60018,-0.65285,0.46215)
- Old Polarization:       (-0.55236,-0.75617,-0.35086)
- New Momentum Direction: (0.60018,0.65285,0.46215)
- New Polarization:       (0.55236,-0.75617,0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.60018,0.65285,0.46215)
- Old Polarization:       (0.55236,-0.75617,0.35086)
- New Momentum Direction: (-0.60018,0.65285,0.46215)
- New Polarization:       (0.55236,0.75617,-0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60018,0.65285,0.46215)
- Old Polarization:       (0.55236,0.75617,-0.35086)
- New Momentum Direction: (-0.60018,-0.65285,0.46215)
- New Polarization:       (-0.55236,0.75617,0.35086)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.60018,-0.65285,0.46215)
- Old Polarization:       (-0.55236,0.75617,0.35086)
- New Momentum Direction: (-0.60018,-0.65285,-0.46215)
- New Polarization:       (0.55236,-0.75617,0.35086)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1341, parentID 1) is processed with stopping code 2
 ### pop requested out of 79 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.91066,-0.41229,0.026741)
- Old Polarization:       (-0.20168,-0.5001,-0.84215)
- New Momentum Direction: (0.83144,-0.55444,0.035961)
- New Polarization:       (-0.33683,-0.55448,-0.76099)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1340, parentID 1) is processed with stopping code 2
 ### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75334,0.62505,0.20441)
- Old Polarization:       (-0.38048,0.6678,-0.63975)
- New Momentum Direction: (0.46206,0.84292,0.27566)
- New Polarization:       (-0.63545,0.5315,-0.56011)
+ Old Momentum Direction: (0.753332,0.625038,0.204494)
+ Old Polarization:       (-0.380407,0.667807,-0.639785)
+ New Momentum Direction: (0.462024,0.842902,0.275772)
+ New Polarization:       (-0.635356,0.531533,-0.560174)
  *** FresnelRefraction *** 
 Track (trackID 1339, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.623655,0.686066,0.374656)
+ Old Polarization:       (-0.526366,0.72291,-0.447594)
+ New Momentum Direction: (0.623655,-0.686066,0.374656)
+ New Polarization:       (-0.658168,-0.719443,-0.221846)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.623655,-0.686066,0.374656)
+ Old Polarization:       (-0.658168,-0.719443,-0.221846)
+ New Momentum Direction: (-0.623655,-0.686066,0.374656)
+ New Polarization:       (-0.658168,0.719443,0.221846)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.623655,-0.686066,0.374656)
+ Old Polarization:       (-0.658168,0.719443,0.221846)
+ New Momentum Direction: (-0.623655,-0.686066,-0.374656)
+ New Polarization:       (0.658168,-0.719443,0.221846)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.623655,-0.686066,-0.374656)
+Old Polarization: (0.658168,-0.719443,0.221846)
+New Polarization: (-0.567232,0.480814,-0.66863)
+Polarization Change: (-0.567232,0.480814,-0.66863)
+New Momentum Direction: (-0.333903,0.607889,0.720402)
+Momentum Change: (-0.333903,0.607889,0.720402)
 
 ** Photon absorbed! **
 Track (trackID 1338, parentID 1) is processed with stopping code 2
@@ -14285,430 +14332,463 @@ Track (trackID 1338, parentID 1) is processed with stopping code 2
 Track (trackID 1337, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98996,-0.090899,-0.10828)
- Old Polarization:       (-0.11995,-0.13469,-0.9836)
- New Momentum Direction: (0.98146,-0.12324,-0.14681)
- New Polarization:       (-0.17418,-0.25363,-0.95149)
+ Old Momentum Direction: (0.989967,-0.0909068,-0.108174)
+ Old Polarization:       (-0.119848,-0.134688,-0.983614)
+ New Momentum Direction: (0.981477,-0.123255,-0.146667)
+ New Polarization:       (-0.174048,-0.253715,-0.951491)
  *** FresnelRefraction *** 
 Track (trackID 1336, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.46943,-0.6062,0.642)
- Old Polarization:       (-0.69632,-0.70124,-0.15299)
- New Momentum Direction: (0.46943,-0.6062,-0.642)
- New Polarization:       (0.69632,0.70124,-0.15299)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46943,-0.6062,-0.642)
- Old Polarization:       (0.69632,0.70124,-0.15299)
- New Momentum Direction: (0.46943,0.6062,-0.642)
- New Polarization:       (-0.69632,0.70124,0.15299)
- *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.469363,-0.606198,0.642046)
+Old Polarization: (-0.696304,-0.701238,-0.153057)
+New Polarization: (-0.404521,0.914356,0.0177724)
+Polarization Change: (-0.404521,0.914356,0.0177724)
+New Momentum Direction: (0.904243,0.39699,0.157302)
+Momentum Change: (0.904243,0.39699,0.157302)
 
 ** Photon absorbed! **
 Track (trackID 1335, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39988,0.58589,0.70486)
- Old Polarization:       (-0.77749,0.62408,-0.07767)
- New Momentum Direction: (0.53916,0.78997,0.29198)
- New Polarization:       (-0.78729,0.59589,-0.15843)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.399817,0.585881,0.704904)
+ Old Polarization:       (-0.777471,0.624095,-0.0777399)
+ New Momentum Direction: (0.399817,0.585881,-0.704904)
+ New Polarization:       (0.801202,-0.596939,-0.0417086)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.399817,0.585881,-0.704904)
+ Old Polarization:       (0.801202,-0.596939,-0.0417086)
+ New Momentum Direction: (0.399817,-0.585881,-0.704904)
+ New Polarization:       (-0.801202,-0.596939,0.0417086)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1334, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.90431,-0.426,0.027533)
-Old Polarization: (-0.21391,-0.50802,-0.83436)
-New Polarization: (0.29484,0.90693,0.30091)
-Polarization Change: (0.29484,0.90693,0.30091)
-New Momentum Direction: (-0.023019,-0.30808,0.95108)
-Momentum Change: (-0.023019,-0.30808,0.95108)
  Photon at Boundary! 
- Old Momentum Direction: (-0.023019,-0.30808,0.95108)
- Old Polarization:       (0.29484,0.90693,0.30091)
- New Momentum Direction: (-0.031165,-0.41711,0.90832)
- New Polarization:       (0.10092,-0.90543,-0.41232)
+ Old Momentum Direction: (0.904301,-0.425999,0.0276307)
+ Old Polarization:       (-0.213826,-0.508024,-0.83438)
+ New Momentum Direction: (0.816057,-0.57676,0.0374092)
+ New Polarization:       (-0.359871,-0.557695,-0.747977)
  *** FresnelRefraction *** 
 Track (trackID 1333, parentID 1) is processed with stopping code 2
 ### pop requested out of 71 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.57264,-0.64995,0.49965)
- Old Polarization:       (-0.58276,-0.75139,-0.30953)
- New Momentum Direction: (0.57264,0.64995,0.49965)
- New Polarization:       (0.58276,-0.75139,0.30953)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57264,0.64995,0.49965)
- Old Polarization:       (0.58276,-0.75139,0.30953)
- New Momentum Direction: (-0.57264,0.64995,0.49965)
- New Polarization:       (0.58276,0.75139,-0.30953)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57264,0.64995,0.49965)
- Old Polarization:       (0.58276,0.75139,-0.30953)
- New Momentum Direction: (-0.57264,0.64995,-0.49965)
- New Polarization:       (-0.58276,-0.75139,-0.30953)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1332, parentID 1) is processed with stopping code 2
 ### pop requested out of 70 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.25205,0.3095,0.91689)
- Old Polarization:       (-0.93846,0.3094,0.15354)
- New Momentum Direction: (0.34179,0.4197,0.84085)
- New Polarization:       (-0.4091,0.87196,-0.26894)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1331, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1330, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.35749,-0.48861,0.7959)
- Old Polarization:       (-0.81985,-0.57232,0.0169)
- New Momentum Direction: (0.48611,-0.66439,0.5677)
- New Polarization:       (-0.79302,-0.60831,-0.03287)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1329, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44561,0.63462,0.63143)
- Old Polarization:       (-0.72391,0.67039,-0.1629)
- New Momentum Direction: (0.44561,-0.63462,0.63143)
- New Polarization:       (0.72391,0.67039,0.1629)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44561,-0.63462,0.63143)
- Old Polarization:       (0.72391,0.67039,0.1629)
- New Momentum Direction: (0.44561,-0.63462,-0.63143)
- New Polarization:       (-0.72391,-0.67039,0.1629)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.44561,-0.63462,-0.63143)
- Old Polarization:       (-0.72391,-0.67039,0.1629)
- New Momentum Direction: (-0.44561,-0.63462,-0.63143)
- New Polarization:       (-0.72391,0.67039,-0.1629)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44561,-0.63462,-0.63143)
- Old Polarization:       (-0.72391,0.67039,-0.1629)
- New Momentum Direction: (-0.44561,0.63462,-0.63143)
- New Polarization:       (0.72391,0.67039,0.1629)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44561,0.63462,-0.63143)
- Old Polarization:       (0.72391,0.67039,0.1629)
- New Momentum Direction: (-0.44561,0.63462,0.63143)
- New Polarization:       (-0.72391,-0.67039,0.1629)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.44561,0.63462,0.63143)
- Old Polarization:       (-0.72391,-0.67039,0.1629)
- New Momentum Direction: (0.44561,0.63462,0.63143)
- New Polarization:       (-0.72391,0.67039,-0.1629)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1328, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23382,0.15747,0.95944)
- Old Polarization:       (-0.96664,0.14378,0.21198)
- New Momentum Direction: (0.31441,0.21174,0.92537)
- New Polarization:       (0.34005,0.88499,-0.31804)
- *** FresnelRefraction *** 
-Track (trackID 1327, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.69201,-0.64226,0.32958)
-Old Polarization: (-0.45118,-0.74119,-0.49706)
-New Polarization: (-0.30386,-0.78575,0.53876)
-Polarization Change: (-0.30386,-0.78575,0.53876)
-New Momentum Direction: (-0.35188,-0.43296,-0.8299)
-Momentum Change: (-0.35188,-0.43296,-0.8299)
 
 ** Photon absorbed! **
+Track (trackID 1327, parentID 1) is processed with stopping code 2
+### pop requested out of 65 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.691974,-0.642265,0.32965)
+ Old Polarization:       (-0.451134,-0.741194,-0.497102)
+ New Momentum Direction: (0.189131,-0.873601,0.448386)
+ New Polarization:       (-0.777537,-0.412117,-0.474969)
+ *** FresnelRefraction *** 
 Track (trackID 1326, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29638,-0.3721,0.8796)
- Old Polarization:       (-0.88843,-0.44541,0.11093)
- New Momentum Direction: (0.40236,-0.50516,0.76349)
- New Polarization:       (-0.5921,-0.77966,-0.20382)
+ Old Momentum Direction: (0.296293,-0.372099,0.879632)
+ Old Polarization:       (-0.88844,-0.445408,0.110845)
+ New Momentum Direction: (0.402246,-0.50516,0.763552)
+ New Polarization:       (-0.59234,-0.779519,-0.203673)
  *** FresnelRefraction *** 
 Track (trackID 1325, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52171,-0.63025,0.57499)
- Old Polarization:       (-0.63968,-0.73493,-0.22515)
- New Momentum Direction: (0.52171,0.63025,0.57499)
- New Polarization:       (0.63968,-0.73493,0.22515)
+ Old Momentum Direction: (0.521648,-0.630245,0.575043)
+ Old Polarization:       (-0.639658,-0.734926,-0.225213)
+ New Momentum Direction: (0.521648,0.630245,0.575043)
+ New Polarization:       (0.639658,-0.734926,0.225213)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52171,0.63025,0.57499)
- Old Polarization:       (0.63968,-0.73493,0.22515)
- New Momentum Direction: (0.52171,0.63025,-0.57499)
- New Polarization:       (-0.63968,0.73493,0.22515)
+ Old Momentum Direction: (0.521648,0.630245,0.575043)
+ Old Polarization:       (0.639658,-0.734926,0.225213)
+ New Momentum Direction: (0.521648,0.630245,-0.575043)
+ New Polarization:       (-0.639658,0.734926,0.225213)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52171,0.63025,-0.57499)
- Old Polarization:       (-0.63968,0.73493,0.22515)
- New Momentum Direction: (-0.52171,0.63025,-0.57499)
- New Polarization:       (-0.63968,-0.73493,-0.22515)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.52171,0.63025,-0.57499)
- Old Polarization:       (-0.63968,-0.73493,-0.22515)
- New Momentum Direction: (-0.52171,-0.63025,-0.57499)
- New Polarization:       (0.63968,-0.73493,0.22515)
+ Old Momentum Direction: (0.521648,0.630245,-0.575043)
+ Old Polarization:       (-0.639658,0.734926,0.225213)
+ New Momentum Direction: (-0.521648,0.630245,-0.575043)
+ New Polarization:       (-0.639658,-0.734926,-0.225213)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1324, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93673,0.34657,-0.049215)
- Old Polarization:       (-0.17828,0.35135,-0.91911)
- New Momentum Direction: (0.88043,0.46948,-0.066669)
- New Polarization:       (-0.29829,0.43904,-0.84751)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1323, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.30679,0.46662,0.82955)
- Old Polarization:       (-0.87549,0.48024,0.053645)
- New Momentum Direction: (0.4173,0.63471,0.65038)
- New Polarization:       (-0.77971,0.61769,-0.10252)
+ Old Momentum Direction: (0.306716,0.466608,0.82958)
+ Old Polarization:       (-0.875492,0.480255,0.0535653)
+ New Momentum Direction: (0.417207,0.634698,0.650459)
+ New Polarization:       (-0.779852,0.617536,-0.102373)
  *** FresnelRefraction *** 
 Track (trackID 1322, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.28417,0.40555,0.86878)
- Old Polarization:       (-0.90344,0.41665,0.10101)
- New Momentum Direction: (0.38506,0.54953,0.74145)
- New Polarization:       (-0.66854,0.71994,-0.18639)
+ Old Momentum Direction: (0.284096,0.405539,0.868808)
+ Old Polarization:       (-0.903441,0.416663,0.100932)
+ New Momentum Direction: (0.384956,0.549514,0.741515)
+ New Polarization:       (-0.668739,0.719793,-0.186242)
  *** FresnelRefraction *** 
 Track (trackID 1321, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.814415,0.569003,0.113857)
+ Old Polarization:       (-0.314503,0.597712,-0.737447)
+ New Momentum Direction: (0.617451,0.771319,0.154341)
+ New Polarization:       (-0.529834,0.552834,-0.643156)
+ *** FresnelRefraction *** 
 Track (trackID 1320, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.26188,-0.28167,0.92308)
- Old Polarization:       (-0.92551,-0.34444,0.15747)
- New Momentum Direction: (0.35598,-0.38288,0.85245)
- New Polarization:       (-0.31819,-0.90737,-0.27467)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1319, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85651,-0.50777,0.092513)
- Old Polarization:       (-0.26984,-0.59334,-0.75838)
- New Momentum Direction: (0.7123,-0.69051,0.12581)
- New Polarization:       (-0.45696,-0.59228,-0.66362)
+ Old Momentum Direction: (0.856498,-0.507775,0.0926044)
+ Old Polarization:       (-0.269761,-0.593336,-0.758407)
+ New Momentum Direction: (0.712273,-0.690513,0.125931)
+ New Polarization:       (-0.456857,-0.592291,-0.663681)
  *** FresnelRefraction *** 
 Track (trackID 1318, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27349,-0.29908,0.9142)
- Old Polarization:       (-0.91707,-0.36778,0.15403)
- New Momentum Direction: (0.3698,-0.4044,0.83649)
- New Polarization:       (-0.36611,-0.89089,-0.26885)
+ Old Momentum Direction: (0.273399,-0.299077,0.914224)
+ Old Polarization:       (-0.917083,-0.367778,0.153941)
+ New Momentum Direction: (0.369679,-0.404399,0.83654)
+ New Polarization:       (-0.366414,-0.890807,-0.268709)
  *** FresnelRefraction *** 
 Track (trackID 1317, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26332,-0.28697,0.92104)
- Old Polarization:       (-0.92378,-0.35016,0.155)
- New Momentum Direction: (0.358,-0.39016,0.8483)
- New Polarization:       (-0.33852,-0.90094,-0.27151)
+ Old Momentum Direction: (0.263232,-0.286975,0.921061)
+ Old Polarization:       (-0.923792,-0.350156,0.154915)
+ New Momentum Direction: (0.357885,-0.390165,0.848346)
+ New Polarization:       (-0.33884,-0.900858,-0.271372)
  *** FresnelRefraction *** 
 Track (trackID 1316, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72192,-0.62744,0.29181)
- Old Polarization:       (-0.41711,-0.73106,-0.53997)
- New Momentum Direction: (0.34786,-0.8501,0.39537)
- New Polarization:       (-0.70412,-0.51533,-0.48852)
+ Old Momentum Direction: (0.721888,-0.627438,0.29189)
+ Old Polarization:       (-0.417058,-0.731059,-0.540014)
+ New Momentum Direction: (-0.721888,-0.627438,0.29189)
+ New Polarization:       (-0.219151,0.607371,0.763592)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.721888,-0.627438,0.29189)
+ Old Polarization:       (-0.219151,0.607371,0.763592)
+ New Momentum Direction: (-0.721888,0.627438,0.29189)
+ New Polarization:       (0.219151,0.607371,-0.763592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.721888,0.627438,0.29189)
+ Old Polarization:       (0.219151,0.607371,-0.763592)
+ New Momentum Direction: (-0.721888,0.627438,-0.29189)
+ New Polarization:       (-0.219151,-0.607371,-0.763592)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.721888,0.627438,-0.29189)
+ Old Polarization:       (-0.219151,-0.607371,-0.763592)
+ New Momentum Direction: (0.721888,0.627438,-0.29189)
+ New Polarization:       (0.101042,0.321711,0.941431)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.721888,0.627438,-0.29189)
+ Old Polarization:       (0.101042,0.321711,0.941431)
+ New Momentum Direction: (0.721888,-0.627438,-0.29189)
+ New Polarization:       (-0.101042,0.321711,-0.941431)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.721888,-0.627438,-0.29189)
+ Old Polarization:       (-0.101042,0.321711,-0.941431)
+ New Momentum Direction: (0.347737,-0.850104,-0.395477)
+ New Polarization:       (-0.203399,0.343358,-0.916916)
  *** FresnelRefraction *** 
 Track (trackID 1315, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.712743,-0.627979,0.312473)
+ Old Polarization:       (-0.425652,-0.741313,-0.518918)
+ New Momentum Direction: (0.327889,-0.845795,0.420855)
+ New Polarization:       (-0.712144,-0.514007,-0.478171)
+ *** FresnelRefraction *** 
 Track (trackID 1314, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58076,0.68552,0.43907)
- Old Polarization:       (-0.57394,0.72729,-0.37636)
- New Momentum Direction: (0.58076,-0.68552,0.43907)
- New Polarization:       (-0.50797,-0.72662,-0.46258)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.58076,-0.68552,0.43907)
- Old Polarization:       (-0.50797,-0.72662,-0.46258)
- New Momentum Direction: (-0.58076,-0.68552,0.43907)
- New Polarization:       (-0.50797,0.72662,0.46258)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.58076,-0.68552,0.43907)
- Old Polarization:       (-0.50797,0.72662,0.46258)
- New Momentum Direction: (-0.58076,-0.68552,-0.43907)
- New Polarization:       (0.50797,-0.72662,0.46258)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.58076,-0.68552,-0.43907)
- Old Polarization:       (0.50797,-0.72662,0.46258)
- New Momentum Direction: (-0.78713,-0.1622,-0.59508)
- New Polarization:       (-0.15244,0.98603,-0.067111)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1313, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49438,-0.61828,0.61099)
- Old Polarization:       (-0.66962,-0.71908,-0.18583)
- New Momentum Direction: (0.49438,0.61828,0.61099)
- New Polarization:       (0.66962,-0.71908,0.18583)
+ Old Momentum Direction: (0.494322,-0.618281,0.611044)
+ Old Polarization:       (-0.669607,-0.719076,-0.185895)
+ New Momentum Direction: (0.494322,0.618281,0.611044)
+ New Polarization:       (0.669607,-0.719076,0.185895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49438,0.61828,0.61099)
- Old Polarization:       (0.66962,-0.71908,0.18583)
- New Momentum Direction: (0.49438,0.61828,-0.61099)
- New Polarization:       (-0.66962,0.71908,0.18583)
+ Old Momentum Direction: (0.494322,0.618281,0.611044)
+ Old Polarization:       (0.669607,-0.719076,0.185895)
+ New Momentum Direction: (0.494322,0.618281,-0.611044)
+ New Polarization:       (-0.669607,0.719076,0.185895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.49438,0.61828,-0.61099)
- Old Polarization:       (-0.66962,0.71908,0.18583)
- New Momentum Direction: (-0.49438,0.61828,-0.61099)
- New Polarization:       (-0.66962,-0.71908,-0.18583)
+ Old Momentum Direction: (0.494322,0.618281,-0.611044)
+ Old Polarization:       (-0.669607,0.719076,0.185895)
+ New Momentum Direction: (-0.494322,0.618281,-0.611044)
+ New Polarization:       (-0.669607,-0.719076,-0.185895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49438,0.61828,-0.61099)
- Old Polarization:       (-0.66962,-0.71908,-0.18583)
- New Momentum Direction: (-0.49438,-0.61828,-0.61099)
- New Polarization:       (0.66962,-0.71908,0.18583)
+ Old Momentum Direction: (-0.494322,0.618281,-0.611044)
+ Old Polarization:       (-0.669607,-0.719076,-0.185895)
+ New Momentum Direction: (-0.494322,-0.618281,-0.611044)
+ New Polarization:       (0.669607,-0.719076,0.185895)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.49438,-0.61828,-0.61099)
- Old Polarization:       (0.66962,-0.71908,0.18583)
- New Momentum Direction: (-0.49438,-0.61828,0.61099)
- New Polarization:       (-0.66962,0.71908,0.18583)
+ Old Momentum Direction: (-0.494322,-0.618281,-0.611044)
+ Old Polarization:       (0.669607,-0.719076,0.185895)
+ New Momentum Direction: (-0.494322,-0.618281,0.611044)
+ New Polarization:       (-0.669607,0.719076,0.185895)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.494322,-0.618281,0.611044)
+ Old Polarization:       (-0.669607,0.719076,0.185895)
+ New Momentum Direction: (0.494322,-0.618281,0.611044)
+ New Polarization:       (-0.669607,-0.719076,-0.185895)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.494322,-0.618281,0.611044)
+ Old Polarization:       (-0.669607,-0.719076,-0.185895)
+ New Momentum Direction: (0.494322,0.618281,0.611044)
+ New Polarization:       (0.669607,-0.719076,0.185895)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.494322,0.618281,0.611044)
+ Old Polarization:       (0.669607,-0.719076,0.185895)
+ New Momentum Direction: (0.494322,0.618281,-0.611044)
+ New Polarization:       (-0.669607,0.719076,0.185895)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.494322,0.618281,-0.611044)
+ Old Polarization:       (-0.669607,0.719076,0.185895)
+ New Momentum Direction: (-0.494322,0.618281,-0.611044)
+ New Polarization:       (-0.669607,-0.719076,-0.185895)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.494322,0.618281,-0.611044)
+ Old Polarization:       (-0.669607,-0.719076,-0.185895)
+ New Momentum Direction: (-0.494322,-0.618281,-0.611044)
+ New Polarization:       (0.669607,-0.719076,0.185895)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.494322,-0.618281,-0.611044)
+Old Polarization: (0.669607,-0.719076,0.185895)
+New Polarization: (-0.807086,0.584446,-0.0838774)
+Polarization Change: (-0.807086,0.584446,-0.0838774)
+New Momentum Direction: (-0.546603,-0.685881,0.480408)
+Momentum Change: (-0.546603,-0.685881,0.480408)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.546603,-0.685881,0.480408)
+ Old Polarization:       (-0.807086,0.584446,-0.0838774)
+ New Momentum Direction: (0.546603,-0.685881,0.480408)
+ New Polarization:       (-0.807086,-0.584446,0.0838774)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.546603,-0.685881,0.480408)
+ Old Polarization:       (-0.807086,-0.584446,0.0838774)
+ New Momentum Direction: (0.741435,-0.160103,0.651645)
+ New Polarization:       (-0.162823,0.899171,0.406176)
+ *** FresnelRefraction *** 
 Track (trackID 1312, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65424,-0.64589,0.39344)
- Old Polarization:       (-0.49182,-0.75855,-0.42744)
- New Momentum Direction: (-0.65424,-0.64589,0.39344)
- New Polarization:       (-0.49182,0.75855,0.42744)
+ Old Momentum Direction: (0.654201,-0.64589,0.393507)
+ Old Polarization:       (-0.491777,-0.758555,-0.427493)
+ New Momentum Direction: (-0.654201,-0.64589,0.393507)
+ New Polarization:       (-0.491777,0.758555,0.427493)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65424,-0.64589,0.39344)
- Old Polarization:       (-0.49182,0.75855,0.42744)
- New Momentum Direction: (-0.65424,0.64589,0.39344)
- New Polarization:       (0.49182,0.75855,-0.42744)
+ Old Momentum Direction: (-0.654201,-0.64589,0.393507)
+ Old Polarization:       (-0.491777,0.758555,0.427493)
+ New Momentum Direction: (-0.654201,0.64589,0.393507)
+ New Polarization:       (0.491777,0.758555,-0.427493)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65424,0.64589,0.39344)
- Old Polarization:       (0.49182,0.75855,-0.42744)
- New Momentum Direction: (-0.65424,0.64589,-0.39344)
- New Polarization:       (-0.49182,-0.75855,-0.42744)
+ Old Momentum Direction: (-0.654201,0.64589,0.393507)
+ Old Polarization:       (0.491777,0.758555,-0.427493)
+ New Momentum Direction: (-0.654201,0.64589,-0.393507)
+ New Polarization:       (-0.491777,-0.758555,-0.427493)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65424,0.64589,-0.39344)
- Old Polarization:       (-0.49182,-0.75855,-0.42744)
- New Momentum Direction: (0.65424,0.64589,-0.39344)
- New Polarization:       (-0.49182,0.75855,0.42744)
+ Old Momentum Direction: (-0.654201,0.64589,-0.393507)
+ Old Polarization:       (-0.491777,-0.758555,-0.427493)
+ New Momentum Direction: (0.654201,0.64589,-0.393507)
+ New Polarization:       (-0.491777,0.758555,0.427493)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.65424,0.64589,-0.39344)
- Old Polarization:       (-0.49182,0.75855,0.42744)
- New Momentum Direction: (0.65424,-0.64589,-0.39344)
- New Polarization:       (0.49182,0.75855,-0.42744)
+ Old Momentum Direction: (0.654201,0.64589,-0.393507)
+ Old Polarization:       (-0.491777,0.758555,0.427493)
+ New Momentum Direction: (0.654201,-0.64589,-0.393507)
+ New Polarization:       (0.491777,0.758555,-0.427493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.654201,-0.64589,-0.393507)
+ Old Polarization:       (0.491777,0.758555,-0.427493)
+ New Momentum Direction: (0.654201,-0.64589,0.393507)
+ New Polarization:       (-0.491777,-0.758555,-0.427493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.654201,-0.64589,0.393507)
+ Old Polarization:       (-0.491777,-0.758555,-0.427493)
+ New Momentum Direction: (-0.654201,-0.64589,0.393507)
+ New Polarization:       (-0.491777,0.758555,0.427493)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.654201,-0.64589,0.393507)
+ Old Polarization:       (-0.491777,0.758555,0.427493)
+ New Momentum Direction: (-0.654201,0.64589,0.393507)
+ New Polarization:       (0.491777,0.758555,-0.427493)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1311, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52133,-0.62225,0.58397)
- Old Polarization:       (-0.6416,-0.73701,-0.21254)
- New Momentum Direction: (0.52133,0.62225,0.58397)
- New Polarization:       (0.6416,-0.73701,0.21254)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.52133,0.62225,0.58397)
- Old Polarization:       (0.6416,-0.73701,0.21254)
- New Momentum Direction: (0.52133,0.62225,-0.58397)
- New Polarization:       (-0.6416,0.73701,0.21254)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.52133,0.62225,-0.58397)
- Old Polarization:       (-0.6416,0.73701,0.21254)
- New Momentum Direction: (-0.52133,0.62225,-0.58397)
- New Polarization:       (-0.6416,-0.73701,-0.21254)
+ Old Momentum Direction: (0.521272,-0.622246,0.584025)
+ Old Polarization:       (-0.641576,-0.737008,-0.212602)
+ New Momentum Direction: (0.521272,0.622246,0.584025)
+ New Polarization:       (0.641576,-0.737008,0.212602)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1310, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.450764,-0.58754,0.672019)
+ Old Polarization:       (-0.718104,-0.685865,-0.117969)
+ New Momentum Direction: (0.450764,-0.58754,-0.672019)
+ New Polarization:       (0.718104,0.685865,-0.117969)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.450764,-0.58754,-0.672019)
+ Old Polarization:       (0.718104,0.685865,-0.117969)
+ New Momentum Direction: (0.450764,0.58754,-0.672019)
+ New Polarization:       (-0.718104,0.685865,0.117969)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.450764,0.58754,-0.672019)
+Old Polarization: (-0.718104,0.685865,0.117969)
+New Polarization: (0.363184,-0.499169,-0.786719)
+Polarization Change: (0.363184,-0.499169,-0.786719)
+New Momentum Direction: (0.648042,-0.471343,0.598229)
+Momentum Change: (0.648042,-0.471343,0.598229)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.648042,-0.471343,0.598229)
+ Old Polarization:       (0.363184,-0.499169,-0.786719)
+ New Momentum Direction: (-0.648042,-0.471343,0.598229)
+ New Polarization:       (0.363184,0.499169,0.786719)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.648042,-0.471343,0.598229)
+ Old Polarization:       (0.363184,0.499169,0.786719)
+ New Momentum Direction: (-0.648042,0.471343,0.598229)
+ New Polarization:       (-0.363184,0.499169,-0.786719)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.648042,0.471343,0.598229)
+ Old Polarization:       (-0.363184,0.499169,-0.786719)
+ New Momentum Direction: (-0.648042,0.471343,-0.598229)
+ New Polarization:       (0.363184,-0.499169,-0.786719)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1309, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.8709,0.48986,0.039587)
- Old Polarization:       (-0.25066,0.51204,-0.82157)
- New Momentum Direction: (0.74689,0.66279,0.053563)
- New Polarization:       (-0.42193,0.53464,-0.73221)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1308, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88064,-0.47013,0.058727)
- Old Polarization:       (-0.24233,-0.55347,-0.79684)
- New Momentum Direction: (0.76551,-0.63846,0.079754)
- New Polarization:       (-0.40967,-0.57923,-0.70475)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1307, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21873,0.017561,0.97563)
- Old Polarization:       (-0.97562,-0.014366,0.21899)
- New Momentum Direction: (0.29654,0.023808,0.95472)
- New Polarization:       (0.94686,0.12309,-0.29717)
+ Old Momentum Direction: (0.21864,0.0175559,0.975648)
+ Old Polarization:       (-0.975642,-0.014357,0.218897)
+ New Momentum Direction: (0.29642,0.0238014,0.954761)
+ New Polarization:       (0.946893,0.123116,-0.297047)
  *** FresnelRefraction *** 
 Track (trackID 1306, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62498,-0.65495,0.42478)
- Old Polarization:       (-0.52501,-0.75535,-0.39219)
- New Momentum Direction: (0.62498,0.65495,0.42478)
- New Polarization:       (0.52501,-0.75535,0.39219)
+ Old Momentum Direction: (0.624934,-0.654953,0.424845)
+ Old Polarization:       (-0.524976,-0.755347,-0.392239)
+ New Momentum Direction: (0.624934,0.654953,0.424845)
+ New Polarization:       (0.524976,-0.755347,0.392239)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.62498,0.65495,0.42478)
- Old Polarization:       (0.52501,-0.75535,0.39219)
- New Momentum Direction: (-0.62498,0.65495,0.42478)
- New Polarization:       (0.52501,0.75535,-0.39219)
+ Old Momentum Direction: (0.624934,0.654953,0.424845)
+ Old Polarization:       (0.524976,-0.755347,0.392239)
+ New Momentum Direction: (-0.624934,0.654953,0.424845)
+ New Polarization:       (0.524976,0.755347,-0.392239)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.624934,0.654953,0.424845)
+ Old Polarization:       (0.524976,0.755347,-0.392239)
+ New Momentum Direction: (-0.624934,0.654953,-0.424845)
+ New Polarization:       (-0.524976,-0.755347,-0.392239)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1305, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.772122,0.610065,0.177898)
+ Old Polarization:       (-0.359525,0.650203,-0.669312)
+ New Momentum Direction: (-0.772122,0.610065,0.177898)
+ New Polarization:       (-0.0678806,-0.357523,0.931434)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.772122,0.610065,0.177898)
+ Old Polarization:       (-0.0678806,-0.357523,0.931434)
+ New Momentum Direction: (-0.772122,-0.610065,0.177898)
+ New Polarization:       (0.0678806,-0.357523,-0.931434)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.772122,-0.610065,0.177898)
+ Old Polarization:       (0.0678806,-0.357523,-0.931434)
+ New Momentum Direction: (-0.514608,-0.823142,0.240032)
+ New Polarization:       (0.130379,-0.351811,-0.926947)
+ *** FresnelRefraction *** 
 Track (trackID 1304, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81672,0.56484,0.118)
- Old Polarization:       (-0.30906,0.60088,-0.73718)
- New Momentum Direction: (0.62854,0.76134,0.15905)
- New Polarization:       (-0.51661,0.56153,-0.64638)
+ Old Momentum Direction: (0.816715,0.564828,0.118092)
+ Old Polarization:       (-0.30897,0.600888,-0.737205)
+ New Momentum Direction: (0.628528,0.761325,0.159175)
+ New Polarization:       (-0.516494,0.561558,-0.646442)
  *** FresnelRefraction *** 
 Track (trackID 1303, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
@@ -14716,143 +14796,190 @@ Track (trackID 1303, parentID 1) is processed with stopping code 2
 ** Photon absorbed! **
 Track (trackID 1302, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73858,0.63928,0.21406)
- Old Polarization:       (-0.39977,0.67098,-0.62448)
- New Momentum Direction: (0.39961,0.86925,0.29106)
- New Polarization:       (-0.67735,0.49394,-0.54518)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1301, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27492,0.39132,0.87823)
- Old Polarization:       (-0.91108,0.39785,0.10793)
- New Momentum Direction: (0.27492,0.39132,-0.87823)
- New Polarization:       (0.85781,-0.51239,0.040218)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.27492,0.39132,-0.87823)
- Old Polarization:       (0.85781,-0.51239,0.040218)
- New Momentum Direction: (0.27492,-0.39132,-0.87823)
- New Polarization:       (-0.85781,-0.51239,-0.040218)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.27492,-0.39132,-0.87823)
- Old Polarization:       (-0.85781,-0.51239,-0.040218)
- New Momentum Direction: (0.37373,-0.53197,-0.75983)
- New Polarization:       (-0.7618,-0.64337,0.07573)
+ Old Momentum Direction: (0.274841,0.391311,0.878259)
+ Old Polarization:       (-0.911083,0.397866,0.107843)
+ New Momentum Direction: (0.373625,0.531957,0.759886)
+ New Polarization:       (-0.645256,0.737573,-0.199073)
  *** FresnelRefraction *** 
 Track (trackID 1300, parentID 1) is processed with stopping code 2
 ### pop requested out of 38 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.50729,-0.62798,0.59017)
-Old Polarization: (-0.65476,-0.72612,-0.20984)
-New Polarization: (-0.22522,-0.44006,-0.86927)
-Polarization Change: (-0.22522,-0.44006,-0.86927)
-New Momentum Direction: (-0.66869,-0.57907,0.4664)
-Momentum Change: (-0.66869,-0.57907,0.4664)
  Photon at Boundary! 
- Old Momentum Direction: (-0.66869,-0.57907,0.4664)
- Old Polarization:       (-0.22522,-0.44006,-0.86927)
- New Momentum Direction: (-0.66869,0.57907,0.4664)
- New Polarization:       (0.22522,-0.44006,0.86927)
+ Old Momentum Direction: (0.507227,-0.62798,0.590222)
+ Old Polarization:       (-0.654743,-0.726123,-0.209899)
+ New Momentum Direction: (0.507227,0.62798,0.590222)
+ New Polarization:       (0.654743,-0.726123,0.209899)
  *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.507227,0.62798,0.590222)
+ Old Polarization:       (0.654743,-0.726123,0.209899)
+ New Momentum Direction: (0.507227,0.62798,-0.590222)
+ New Polarization:       (-0.654743,0.726123,0.209899)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.507227,0.62798,-0.590222)
+ Old Polarization:       (-0.654743,0.726123,0.209899)
+ New Momentum Direction: (-0.507227,0.62798,-0.590222)
+ New Polarization:       (-0.654743,-0.726123,-0.209899)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.507227,0.62798,-0.590222)
+ Old Polarization:       (-0.654743,-0.726123,-0.209899)
+ New Momentum Direction: (-0.507227,-0.62798,-0.590222)
+ New Polarization:       (0.654743,-0.726123,0.209899)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.507227,-0.62798,-0.590222)
+Old Polarization: (0.654743,-0.726123,0.209899)
+New Polarization: (0.79308,-0.608722,0.021919)
+Polarization Change: (0.79308,-0.608722,0.021919)
+New Momentum Direction: (0.429583,0.533451,-0.728621)
+Momentum Change: (0.429583,0.533451,-0.728621)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.429583,0.533451,-0.728621)
+ Old Polarization:       (0.79308,-0.608722,0.021919)
+ New Momentum Direction: (0.429583,-0.533451,-0.728621)
+ New Polarization:       (-0.79308,-0.608722,-0.021919)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.429583,-0.533451,-0.728621)
+ Old Polarization:       (-0.79308,-0.608722,-0.021919)
+ New Momentum Direction: (0.584068,-0.725288,-0.364447)
+ New Polarization:       (-0.766949,-0.640141,0.0448241)
+ *** FresnelRefraction *** 
 Track (trackID 1299, parentID 1) is processed with stopping code 2
 ### pop requested out of 37 stacked tracks.
-
-** Photon absorbed! **
+Scattering Photon!
+Old Momentum Direction: (0.386274,0.579307,0.717772)
+Old Polarization: (-0.789885,0.609594,-0.0669149)
+New Polarization: (-0.943856,0.291643,-0.155177)
+Polarization Change: (-0.943856,0.291643,-0.155177)
+New Momentum Direction: (0.255272,0.942023,0.217781)
+Momentum Change: (0.255272,0.942023,0.217781)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.255272,0.942023,0.217781)
+ Old Polarization:       (-0.943856,0.291643,-0.155177)
+ New Momentum Direction: (0.345927,0.890639,0.295122)
+ New Polarization:       (0.376054,-0.419782,0.826055)
+ *** FresnelRefraction *** 
 Track (trackID 1298, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29158,0.42755,0.85568)
- Old Polarization:       (-0.89413,0.43968,0.084989)
- New Momentum Direction: (0.39564,0.58015,0.71197)
- New Polarization:       (-0.71399,0.68189,-0.15887)
+ Old Momentum Direction: (0.291503,0.42754,0.855708)
+ Old Polarization:       (-0.894128,0.439688,0.0849083)
+ New Momentum Direction: (0.395544,0.580134,0.712032)
+ New Polarization:       (-0.714167,0.681742,-0.158725)
  *** FresnelRefraction *** 
 Track (trackID 1297, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52817,0.67234,0.51865)
- Old Polarization:       (-0.63308,0.71885,-0.28716)
- New Momentum Direction: (0.71315,0.031823,0.70029)
- New Polarization:       (-0.073679,-0.99003,0.12002)
+ Old Momentum Direction: (0.528127,0.672329,0.518706)
+ Old Polarization:       (-0.633043,0.718861,-0.287222)
+ New Momentum Direction: (0.713091,0.0313213,0.700371)
+ New Polarization:       (-0.0740024,-0.990058,0.119623)
  *** FresnelRefraction *** 
 Track (trackID 1296, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97757,-0.19189,-0.086787)
- Old Polarization:       (-0.13365,-0.24676,-0.95982)
- New Momentum Direction: (0.95837,-0.26016,-0.11766)
- New Polarization:       (-0.2127,-0.37555,-0.90206)
+ Old Momentum Direction: (0.97758,-0.191895,-0.0866803)
+ Old Polarization:       (-0.133543,-0.246753,-0.959833)
+ New Momentum Direction: (0.958386,-0.260165,-0.117519)
+ New Polarization:       (-0.212565,-0.375552,-0.902096)
  *** FresnelRefraction *** 
 Track (trackID 1295, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.542839,-0.631516,0.553636)
+ Old Polarization:       (-0.617171,-0.747053,-0.247005)
+ New Momentum Direction: (0.542839,0.631516,0.553636)
+ New Polarization:       (0.617171,-0.747053,0.247005)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.542839,0.631516,0.553636)
+ Old Polarization:       (0.617171,-0.747053,0.247005)
+ New Momentum Direction: (0.542839,0.631516,-0.553636)
+ New Polarization:       (-0.617171,0.747053,0.247005)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.542839,0.631516,-0.553636)
+ Old Polarization:       (-0.617171,0.747053,0.247005)
+ New Momentum Direction: (-0.542839,0.631516,-0.553636)
+ New Polarization:       (-0.617171,-0.747053,-0.247005)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1294, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93032,0.36502,-0.035729)
- Old Polarization:       (-0.18218,0.37535,-0.9088)
- New Momentum Direction: (0.86898,0.4925,-0.048207)
- New Polarization:       (-0.30436,0.45512,-0.8368)
+ Old Momentum Direction: (0.930324,0.365005,-0.0356257)
+ Old Polarization:       (-0.182072,0.375362,-0.908819)
+ New Momentum Direction: (0.868995,0.49248,-0.0480677)
+ New Polarization:       (-0.304215,0.455116,-0.836853)
  *** FresnelRefraction *** 
 Track (trackID 1293, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73832,0.63459,0.22843)
- Old Polarization:       (-0.39654,0.68241,-0.61407)
- New Momentum Direction: (0.42052,0.85366,0.30729)
- New Polarization:       (-0.65996,0.52022,-0.54205)
- *** FresnelRefraction *** 
-Track (trackID 1292, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 1292, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.215782,0.0528453,0.975011)
+ Old Polarization:       (-0.97636,0.0245727,0.214748)
+ New Momentum Direction: (0.293296,0.0718286,0.95332)
+ New Polarization:       (0.863602,0.407831,-0.296422)
+ *** FresnelRefraction *** 
 Track (trackID 1291, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.25492,0.33187,0.90823)
- Old Polarization:       (-0.93277,0.33196,0.14051)
- New Momentum Direction: (0.34669,0.45135,0.82225)
- New Polarization:       (-0.49035,0.8345,-0.25132)
+ Old Momentum Direction: (0.254837,0.331864,0.908253)
+ Old Polarization:       (-0.93278,0.331969,0.140422)
+ New Momentum Direction: (0.34658,0.451337,0.8223)
+ New Polarization:       (-0.490627,0.834382,-0.251181)
  *** FresnelRefraction *** 
 Track (trackID 1290, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.26421,0.34712,0.89983)
- Old Polarization:       (-0.92601,0.35213,0.13605)
- New Momentum Direction: (0.35784,0.47014,0.8068)
- New Polarization:       (-0.52387,0.8163,-0.24333)
+ Old Momentum Direction: (0.264127,0.347114,0.89986)
+ Old Polarization:       (-0.926019,0.352138,0.13597)
+ New Momentum Direction: (0.357732,0.470129,0.80685)
+ New Polarization:       (-0.524125,0.816182,-0.243186)
  *** FresnelRefraction *** 
 Track (trackID 1289, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.374966,-0.491524,0.786006)
+ Old Polarization:       (-0.807174,-0.590095,0.0160517)
+ New Momentum Direction: (0.504076,-0.660768,0.556142)
+ New Polarization:       (-0.782151,-0.622342,-0.0304957)
+ *** FresnelRefraction *** 
 Track (trackID 1288, parentID 1) is processed with stopping code 2
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29531,0.41695,0.85962)
- Old Polarization:       (-0.89533,0.43478,0.096687)
- New Momentum Direction: (0.39798,0.56192,0.72516)
- New Polarization:       (-0.6807,0.7108,-0.17721)
+ Old Momentum Direction: (0.295235,0.416946,0.859647)
+ Old Polarization:       (-0.895332,0.434796,0.0966062)
+ New Momentum Direction: (0.397884,0.561912,0.72522)
+ New Polarization:       (-0.680889,0.71066,-0.177068)
  *** FresnelRefraction *** 
 Track (trackID 1287, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.91928,-0.39353,0.0081526)
- Old Polarization:       (-0.19543,-0.4743,-0.8584)
- New Momentum Direction: (0.84695,-0.53156,0.011012)
- New Polarization:       (-0.32754,-0.53797,-0.77673)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1286, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1285, parentID 1) is processed with stopping code 2
 ### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.642235,0.675378,0.36249)
+ Old Polarization:       (-0.504951,0.728577,-0.462818)
+ New Momentum Direction: (0.642235,-0.675378,0.36249)
+ New Polarization:       (-0.672441,-0.723423,-0.156468)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1284, parentID 1) is processed with stopping code 2
@@ -14862,5647 +14989,4653 @@ Track (trackID 1284, parentID 1) is processed with stopping code 2
 Track (trackID 1283, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4876,-0.6161,0.6186)
- Old Polarization:       (-0.67672,-0.71438,-0.17808)
- New Momentum Direction: (0.4876,-0.6161,-0.6186)
- New Polarization:       (0.67672,0.71438,-0.17808)
+ Old Momentum Direction: (0.487536,-0.616099,0.618652)
+ Old Polarization:       (-0.676704,-0.714378,-0.178146)
+ New Momentum Direction: (0.487536,-0.616099,-0.618652)
+ New Polarization:       (0.676704,0.714378,-0.178146)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.4876,-0.6161,-0.6186)
- Old Polarization:       (0.67672,0.71438,-0.17808)
- New Momentum Direction: (0.4876,0.6161,-0.6186)
- New Polarization:       (-0.67672,0.71438,0.17808)
+ Old Momentum Direction: (0.487536,-0.616099,-0.618652)
+ Old Polarization:       (0.676704,0.714378,-0.178146)
+ New Momentum Direction: (0.487536,0.616099,-0.618652)
+ New Polarization:       (-0.676704,0.714378,0.178146)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.4876,0.6161,-0.6186)
- Old Polarization:       (-0.67672,0.71438,0.17808)
- New Momentum Direction: (-0.4876,0.6161,-0.6186)
- New Polarization:       (-0.67672,-0.71438,-0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4876,0.6161,-0.6186)
- Old Polarization:       (-0.67672,-0.71438,-0.17808)
- New Momentum Direction: (-0.4876,0.6161,0.6186)
- New Polarization:       (0.67672,0.71438,-0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4876,0.6161,0.6186)
- Old Polarization:       (0.67672,0.71438,-0.17808)
- New Momentum Direction: (-0.4876,-0.6161,0.6186)
- New Polarization:       (-0.67672,0.71438,0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4876,-0.6161,0.6186)
- Old Polarization:       (-0.67672,0.71438,0.17808)
- New Momentum Direction: (0.4876,-0.6161,0.6186)
- New Polarization:       (-0.67672,-0.71438,-0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4876,-0.6161,0.6186)
- Old Polarization:       (-0.67672,-0.71438,-0.17808)
- New Momentum Direction: (0.4876,-0.6161,-0.6186)
- New Polarization:       (0.67672,0.71438,-0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4876,-0.6161,-0.6186)
- Old Polarization:       (0.67672,0.71438,-0.17808)
- New Momentum Direction: (0.4876,0.6161,-0.6186)
- New Polarization:       (-0.67672,0.71438,0.17808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4876,0.6161,-0.6186)
- Old Polarization:       (-0.67672,0.71438,0.17808)
- New Momentum Direction: (-0.4876,0.6161,-0.6186)
- New Polarization:       (-0.67672,-0.71438,-0.17808)
+ Old Momentum Direction: (0.487536,0.616099,-0.618652)
+ Old Polarization:       (-0.676704,0.714378,0.178146)
+ New Momentum Direction: (-0.487536,0.616099,-0.618652)
+ New Polarization:       (-0.676704,-0.714378,-0.178146)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1282, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.79046,0.59387,0.14998)
- Old Polarization:       (-0.33998,0.62907,-0.69906)
- New Momentum Direction: (0.56054,0.80292,0.20277)
- New Polarization:       (-0.57016,0.55176,-0.60867)
+ Old Momentum Direction: (0.790451,0.593858,0.150063)
+ Old Polarization:       (-0.339899,0.629076,-0.699094)
+ New Momentum Direction: (0.560523,0.802901,0.202887)
+ New Polarization:       (-0.57006,0.551793,-0.608733)
  *** FresnelRefraction *** 
 Track (trackID 1281, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.34555,-0.47141,0.8114)
- Old Polarization:       (-0.83268,-0.55273,0.033492)
- New Momentum Direction: (0.47012,-0.64134,0.60636)
- New Polarization:       (-0.77469,-0.62902,-0.064681)
- *** FresnelRefraction *** 
-Track (trackID 1280, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 1280, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.306698,0.467282,0.829207)
+ Old Polarization:       (-0.875302,0.480679,0.0528709)
+ New Momentum Direction: (0.417304,0.635799,0.64932)
+ New Polarization:       (-0.781203,0.616029,-0.10114)
+ *** FresnelRefraction *** 
 Track (trackID 1279, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.529147,0.673144,0.516606)
+ Old Polarization:       (-0.631804,0.718965,-0.289679)
+ New Momentum Direction: (0.529147,-0.673144,0.516606)
+ New Polarization:       (-0.289431,-0.715496,-0.635842)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1278, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70293,-0.63717,0.31608)
- Old Polarization:       (-0.43876,-0.73821,-0.51238)
- New Momentum Direction: (-0.70293,-0.63717,0.31608)
- New Polarization:       (-0.29473,0.66538,0.68586)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.70293,-0.63717,0.31608)
- Old Polarization:       (-0.29473,0.66538,0.68586)
- New Momentum Direction: (-0.70293,0.63717,0.31608)
- New Polarization:       (0.29473,0.66538,-0.68586)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.702895,-0.637171,0.316152)
+ Old Polarization:       (-0.438707,-0.738214,-0.512423)
+ New Momentum Direction: (0.258899,-0.865249,0.42932)
+ New Polarization:       (-0.748106,-0.46078,-0.477514)
+ *** FresnelRefraction *** 
 Track (trackID 1277, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88862,0.45844,0.013756)
- Old Polarization:       (-0.23205,0.47526,-0.84869)
- New Momentum Direction: (0.78337,0.62128,0.018642)
- New Polarization:       (-0.39127,0.5162,-0.76187)
+ Old Momentum Direction: (0.888624,0.458427,0.0138539)
+ Old Polarization:       (-0.231952,0.475269,-0.848715)
+ New Momentum Direction: (0.783377,0.621263,0.0187749)
+ New Polarization:       (-0.39113,0.516218,-0.761929)
  *** FresnelRefraction *** 
 Track (trackID 1276, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24269,-0.21204,0.94665)
- Old Polarization:       (-0.94614,-0.26729,0.18269)
- New Momentum Direction: (0.3301,-0.28841,0.89881)
- New Polarization:       (-0.014096,-0.95358,-0.3008)
+ Old Momentum Direction: (0.242604,-0.21204,0.946669)
+ Old Polarization:       (-0.946157,-0.267286,0.182605)
+ New Momentum Direction: (0.329981,-0.288409,0.898851)
+ New Polarization:       (-0.0144465,-0.953616,-0.300678)
  *** FresnelRefraction *** 
 Track (trackID 1275, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.37142,-0.49976,0.78249)
- Old Polarization:       (-0.80711,-0.59037,0.0060451)
- New Momentum Direction: (0.50276,-0.6765,0.53812)
- New Polarization:       (-0.79808,-0.60244,-0.01171)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (0.37134,-0.499763,0.782524)
+ Old Polarization:       (-0.807114,-0.590365,0.00596926)
+ New Momentum Direction: (0.37134,-0.499763,-0.782524)
+ New Polarization:       (0.802186,0.597073,-0.000653682)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.37134,-0.499763,-0.782524)
+ Old Polarization:       (0.802186,0.597073,-0.000653682)
+ New Momentum Direction: (0.37134,0.499763,-0.782524)
+ New Polarization:       (-0.802186,0.597073,0.000653682)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.37134,0.499763,-0.782524)
+ Old Polarization:       (-0.802186,0.597073,0.000653682)
+ New Momentum Direction: (-0.37134,0.499763,-0.782524)
+ New Polarization:       (-0.802186,-0.597073,-0.000653682)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1274, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.4391,-0.5823,0.68419)
- Old Polarization:       (-0.72982,-0.67531,-0.10637)
- New Momentum Direction: (0.4391,-0.5823,-0.68419)
- New Polarization:       (0.74577,0.6609,-0.083862)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4391,-0.5823,-0.68419)
- Old Polarization:       (0.74577,0.6609,-0.083862)
- New Momentum Direction: (0.4391,0.5823,-0.68419)
- New Polarization:       (-0.74577,0.6609,0.083862)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4391,0.5823,-0.68419)
- Old Polarization:       (-0.74577,0.6609,0.083862)
- New Momentum Direction: (-0.4391,0.5823,-0.68419)
- New Polarization:       (-0.74577,-0.6609,-0.083862)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4391,0.5823,-0.68419)
- Old Polarization:       (-0.74577,-0.6609,-0.083862)
- New Momentum Direction: (-0.59719,0.79195,-0.12721)
- New Polarization:       (-0.79839,-0.57166,0.18915)
+ Old Momentum Direction: (0.439031,-0.582303,0.684233)
+ Old Polarization:       (-0.729812,-0.675312,-0.106434)
+ New Momentum Direction: (0.597096,-0.79195,0.127639)
+ New Polarization:       (-0.756629,-0.608873,-0.238297)
  *** FresnelRefraction *** 
 Track (trackID 1273, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.94429,0.3241,-0.057239)
-Old Polarization: (-0.16873,0.32742,-0.92969)
-New Polarization: (0.11452,-0.20847,-0.9713)
-Polarization Change: (0.11452,-0.20847,-0.9713)
-New Momentum Direction: (0.45281,-0.8593,0.23782)
-Momentum Change: (0.45281,-0.8593,0.23782)
  Photon at Boundary! 
- Old Momentum Direction: (0.45281,-0.8593,0.23782)
- Old Polarization:       (0.11452,-0.20847,-0.9713)
- New Momentum Direction: (-0.45281,-0.8593,0.23782)
- New Polarization:       (0.11452,0.20847,0.9713)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.45281,-0.8593,0.23782)
- Old Polarization:       (0.11452,0.20847,0.9713)
- New Momentum Direction: (-0.61256,-0.72198,0.32172)
- New Polarization:       (0.058509,0.3645,0.92937)
+ Old Momentum Direction: (0.944301,0.324084,-0.0571346)
+ Old Polarization:       (-0.168625,0.327428,-0.929708)
+ New Momentum Direction: (0.89544,0.438422,-0.0772918)
+ New Polarization:       (-0.280973,0.421894,-0.862009)
  *** FresnelRefraction *** 
 Track (trackID 1272, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.21734,0.10681,0.97024)
-Old Polarization: (-0.9743,0.083993,0.209)
-New Polarization: (0.91615,0.19221,-0.35174)
-Polarization Change: (0.91615,0.19221,-0.35174)
-New Momentum Direction: (-0.33292,0.85358,-0.4007)
-Momentum Change: (-0.33292,0.85358,-0.4007)
  Photon at Boundary! 
- Old Momentum Direction: (-0.33292,0.85358,-0.4007)
- Old Polarization:       (0.91615,0.19221,-0.35174)
- New Momentum Direction: (-0.45272,0.7058,-0.54488)
- New Polarization:       (0.45327,-0.34407,-0.82229)
+ Old Momentum Direction: (0.217247,0.1068,0.970256)
+ Old Polarization:       (-0.97432,0.0840022,0.208911)
+ New Momentum Direction: (0.29542,0.14523,0.944264)
+ New Polarization:       (0.604985,0.736516,-0.302552)
  *** FresnelRefraction *** 
 Track (trackID 1271, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27492,0.35949,0.89173)
- Old Polarization:       (-0.91898,0.3709,0.1338)
- New Momentum Direction: (0.37019,0.48406,0.79287)
- New Polarization:       (-0.54329,0.80514,-0.23789)
+ Old Momentum Direction: (0.274842,0.359479,0.891761)
+ Old Polarization:       (-0.918991,0.370912,0.133716)
+ New Momentum Direction: (0.370086,0.484053,0.792924)
+ New Polarization:       (-0.543528,0.805017,-0.237751)
  *** FresnelRefraction *** 
 Track (trackID 1270, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23376,-0.10367,0.96675)
- Old Polarization:       (-0.96446,-0.15066,0.21705)
- New Momentum Direction: (0.31506,-0.13972,0.93873)
- New Polarization:       (0.61009,-0.72784,-0.3131)
+ Old Momentum Direction: (0.233673,-0.103672,0.966773)
+ Old Polarization:       (-0.964485,-0.150651,0.216965)
+ New Momentum Direction: (0.314943,-0.139728,0.938769)
+ New Polarization:       (0.609919,-0.728039,-0.312982)
  *** FresnelRefraction *** 
 Track (trackID 1269, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.33644,0.50905,0.79226)
- Old Polarization:       (-0.84604,0.53285,0.016904)
- New Momentum Direction: (0.45543,0.68909,0.56368)
- New Polarization:       (-0.82135,0.56949,-0.032572)
+ Old Momentum Direction: (0.336375,0.509042,0.792293)
+ Old Polarization:       (-0.846032,0.532867,0.0168274)
+ New Momentum Direction: (0.455342,0.689076,0.563771)
+ New Polarization:       (-0.821457,0.569347,-0.0324246)
  *** FresnelRefraction *** 
 Track (trackID 1268, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
+ Photon at Boundary! 
+ Old Momentum Direction: (0.986552,-0.134438,-0.0929599)
+ Old Polarization:       (-0.117215,-0.185549,-0.975619)
+ New Momentum Direction: (-0.986552,-0.134438,-0.0929599)
+ New Polarization:       (0.112874,-0.971722,0.207403)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.986552,-0.134438,-0.0929599)
+ Old Polarization:       (0.112874,-0.971722,0.207403)
+ New Momentum Direction: (-0.975473,-0.181052,-0.125192)
+ New Polarization:       (0.17387,-0.982542,0.0661791)
+ *** FresnelRefraction *** 
 Track (trackID 1267, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.48727,0.65853,0.5735)
- Old Polarization:       (-0.67809,0.69915,-0.22669)
- New Momentum Direction: (0.48727,-0.65853,0.5735)
- New Polarization:       (0.67809,0.69915,0.22669)
+ Old Momentum Direction: (0.487224,0.65852,0.573553)
+ Old Polarization:       (-0.678052,0.699165,-0.226746)
+ New Momentum Direction: (0.487224,-0.65852,0.573553)
+ New Polarization:       (0.678052,0.699165,0.226746)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48727,-0.65853,0.5735)
- Old Polarization:       (0.67809,0.69915,0.22669)
- New Momentum Direction: (0.48727,-0.65853,-0.5735)
- New Polarization:       (-0.67809,-0.69915,0.22669)
+ Old Momentum Direction: (0.487224,-0.65852,0.573553)
+ Old Polarization:       (0.678052,0.699165,0.226746)
+ New Momentum Direction: (0.487224,-0.65852,-0.573553)
+ New Polarization:       (-0.678052,-0.699165,0.226746)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.48727,-0.65853,-0.5735)
- Old Polarization:       (-0.67809,-0.69915,0.22669)
- New Momentum Direction: (-0.48727,-0.65853,-0.5735)
- New Polarization:       (-0.67809,0.69915,-0.22669)
+ Old Momentum Direction: (0.487224,-0.65852,-0.573553)
+ Old Polarization:       (-0.678052,-0.699165,0.226746)
+ New Momentum Direction: (-0.487224,-0.65852,-0.573553)
+ New Polarization:       (-0.678052,0.699165,-0.226746)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48727,-0.65853,-0.5735)
- Old Polarization:       (-0.67809,0.69915,-0.22669)
- New Momentum Direction: (-0.48727,0.65853,-0.5735)
- New Polarization:       (0.67809,0.69915,0.22669)
+ Old Momentum Direction: (-0.487224,-0.65852,-0.573553)
+ Old Polarization:       (-0.678052,0.699165,-0.226746)
+ New Momentum Direction: (-0.487224,0.65852,-0.573553)
+ New Polarization:       (0.678052,0.699165,0.226746)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48727,0.65853,-0.5735)
- Old Polarization:       (0.67809,0.69915,0.22669)
- New Momentum Direction: (-0.48727,0.65853,0.5735)
- New Polarization:       (-0.67809,-0.69915,0.22669)
+ Old Momentum Direction: (-0.487224,0.65852,-0.573553)
+ Old Polarization:       (0.678052,0.699165,0.226746)
+ New Momentum Direction: (-0.487224,0.65852,0.573553)
+ New Polarization:       (-0.678052,-0.699165,0.226746)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.48727,0.65853,0.5735)
- Old Polarization:       (-0.67809,-0.69915,0.22669)
- New Momentum Direction: (0.48727,0.65853,0.5735)
- New Polarization:       (-0.67809,0.69915,-0.22669)
+ Old Momentum Direction: (-0.487224,0.65852,0.573553)
+ Old Polarization:       (-0.678052,-0.699165,0.226746)
+ New Momentum Direction: (0.487224,0.65852,0.573553)
+ New Polarization:       (-0.678052,0.699165,-0.226746)
  *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48727,0.65853,0.5735)
- Old Polarization:       (-0.67809,0.69915,-0.22669)
- New Momentum Direction: (0.48727,-0.65853,0.5735)
- New Polarization:       (0.67809,0.69915,0.22669)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48727,-0.65853,0.5735)
- Old Polarization:       (0.67809,0.69915,0.22669)
- New Momentum Direction: (0.48727,-0.65853,-0.5735)
- New Polarization:       (-0.67809,-0.69915,0.22669)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48727,-0.65853,-0.5735)
- Old Polarization:       (-0.67809,-0.69915,0.22669)
- New Momentum Direction: (-0.48727,-0.65853,-0.5735)
- New Polarization:       (-0.67809,0.69915,-0.22669)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.48727,-0.65853,-0.5735)
- Old Polarization:       (-0.67809,0.69915,-0.22669)
- New Momentum Direction: (-0.48727,0.65853,-0.5735)
- New Polarization:       (0.67809,0.69915,0.22669)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.48727,0.65853,-0.5735)
-Old Polarization: (0.67809,0.69915,0.22669)
-New Polarization: (0.099118,0.84075,0.53228)
-Polarization Change: (0.099118,0.84075,0.53228)
-New Momentum Direction: (0.95259,0.074471,-0.29502)
-Momentum Change: (0.95259,0.074471,-0.29502)
- Photon at Boundary! 
- Old Momentum Direction: (0.95259,0.074471,-0.29502)
- Old Polarization:       (0.099118,0.84075,0.53228)
- New Momentum Direction: (0.91122,0.10082,-0.39939)
- New Polarization:       (-0.17508,0.97244,-0.15399)
- *** FresnelRefraction *** 
+
+** Photon absorbed! **
 Track (trackID 1266, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.27021,-0.29099,0.91777)
- Old Polarization:       (-0.92025,-0.35832,0.15733)
- New Momentum Direction: (0.36557,-0.39369,0.84343)
- New Polarization:       (-0.33871,-0.90029,-0.27342)
+ Old Momentum Direction: (0.270123,-0.290993,0.9178)
+ Old Polarization:       (-0.920262,-0.358319,0.157242)
+ New Momentum Direction: (0.365456,-0.393691,0.843475)
+ New Polarization:       (-0.339017,-0.900212,-0.273285)
  *** FresnelRefraction *** 
 Track (trackID 1265, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.442995,0.637331,0.630527)
+ Old Polarization:       (-0.725342,0.668138,-0.165739)
+ New Momentum Direction: (0.442995,-0.637331,0.630527)
+ New Polarization:       (0.725342,0.668138,0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.442995,-0.637331,0.630527)
+ Old Polarization:       (0.725342,0.668138,0.165739)
+ New Momentum Direction: (0.442995,-0.637331,-0.630527)
+ New Polarization:       (-0.725342,-0.668138,0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.442995,-0.637331,-0.630527)
+ Old Polarization:       (-0.725342,-0.668138,0.165739)
+ New Momentum Direction: (-0.442995,-0.637331,-0.630527)
+ New Polarization:       (-0.725342,0.668138,-0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.442995,-0.637331,-0.630527)
+ Old Polarization:       (-0.725342,0.668138,-0.165739)
+ New Momentum Direction: (-0.442995,0.637331,-0.630527)
+ New Polarization:       (0.725342,0.668138,0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.442995,0.637331,-0.630527)
+ Old Polarization:       (0.725342,0.668138,0.165739)
+ New Momentum Direction: (-0.442995,0.637331,0.630527)
+ New Polarization:       (-0.725342,-0.668138,0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.442995,0.637331,0.630527)
+ Old Polarization:       (-0.725342,-0.668138,0.165739)
+ New Momentum Direction: (0.442995,0.637331,0.630527)
+ New Polarization:       (-0.725342,0.668138,-0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.442995,0.637331,0.630527)
+ Old Polarization:       (-0.725342,0.668138,-0.165739)
+ New Momentum Direction: (0.442995,-0.637331,0.630527)
+ New Polarization:       (0.725342,0.668138,0.165739)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.442995,-0.637331,0.630527)
+ Old Polarization:       (0.725342,0.668138,0.165739)
+ New Momentum Direction: (0.442995,-0.637331,-0.630527)
+ New Polarization:       (-0.725342,-0.668138,0.165739)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1264, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.649431,-0.652136,0.391098)
+ Old Polarization:       (-0.497906,-0.753412,-0.429487)
+ New Momentum Direction: (-0.649431,-0.652136,0.391098)
+ New Polarization:       (-0.497906,0.753412,0.429487)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.649431,-0.652136,0.391098)
+ Old Polarization:       (-0.497906,0.753412,0.429487)
+ New Momentum Direction: (-0.649431,0.652136,0.391098)
+ New Polarization:       (0.497906,0.753412,-0.429487)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1263, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 123
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 126
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 124 stacked tracks.
+### pop requested out of 127 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22666,0.66208,0.71434)
- Old Polarization:       (-0.97352,0.1315,0.18702)
- New Momentum Direction: (0.30668,0.89581,0.32168)
- New Polarization:       (-0.83174,0.41654,-0.36701)
+ Old Momentum Direction: (0.545156,0.833636,-0.0886347)
+ Old Polarization:       (-0.365528,0.141217,-0.920026)
+ New Momentum Direction: (0.733914,0.66868,-0.119324)
+ New Polarization:       (0.0772019,-0.256652,-0.963415)
+ *** FresnelRefraction *** 
+Track (trackID 1546, parentID 1) is processed with stopping code 2
+### pop requested out of 126 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.81616,-0.161567,0.554779)
+ Old Polarization:       (-0.0632381,-0.979321,-0.192174)
+ New Momentum Direction: (0.622279,-0.218879,0.751572)
+ New Polarization:       (-0.12016,-0.975443,-0.184588)
+ *** FresnelRefraction *** 
+Track (trackID 1545, parentID 1) is processed with stopping code 2
+### pop requested out of 125 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.568103,-0.123357,0.813659)
+ Old Polarization:       (-0.341025,-0.935105,0.0963367)
+ New Momentum Direction: (0.770485,-0.167302,0.615111)
+ New Polarization:       (-0.0674438,-0.980924,-0.182319)
  *** FresnelRefraction *** 
 Track (trackID 1544, parentID 1) is processed with stopping code 2
-### pop requested out of 123 stacked tracks.
+### pop requested out of 124 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92128,-0.28324,0.26649)
- Old Polarization:       (-0.19431,-0.92883,-0.31546)
- New Momentum Direction: (0.85029,-0.38332,0.36066)
- New Polarization:       (-0.32628,-0.92159,-0.21027)
+ Old Momentum Direction: (0.790571,-0.158935,0.591386)
+ Old Polarization:       (-0.0871093,-0.985099,-0.148297)
+ New Momentum Direction: (0.565823,-0.213999,0.796272)
+ New Polarization:       (-0.164192,-0.975634,-0.145529)
  *** FresnelRefraction *** 
 Track (trackID 1543, parentID 1) is processed with stopping code 2
-### pop requested out of 122 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.68355,0.69306,-0.22898)
-Old Polarization: (-0.46082,0.16649,-0.87174)
-New Polarization: (-0.48826,-0.16836,-0.8563)
-Polarization Change: (-0.48826,-0.16836,-0.8563)
-New Momentum Direction: (-0.00052803,0.98127,-0.19263)
-Momentum Change: (-0.00052803,0.98127,-0.19263)
+### pop requested out of 123 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.00052803,0.98127,-0.19263)
- Old Polarization:       (-0.48826,-0.16836,-0.8563)
- New Momentum Direction: (-0.00071427,0.96545,-0.26057)
- New Polarization:       (-0.3818,-0.24109,-0.89225)
+ Old Momentum Direction: (0.85067,-0.144033,0.505585)
+ Old Polarization:       (-0.0182259,-0.969237,-0.245454)
+ New Momentum Direction: (0.706906,-0.19379,0.680242)
+ New Polarization:       (-0.0338844,-0.969909,-0.241099)
  *** FresnelRefraction *** 
 Track (trackID 1542, parentID 1) is processed with stopping code 2
-### pop requested out of 121 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1541, parentID 1) is processed with stopping code 2
-### pop requested out of 120 stacked tracks.
+### pop requested out of 122 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24872,0.80352,0.54082)
- Old Polarization:       (-0.95452,0.29812,-0.0039515)
- New Momentum Direction: (0.33446,0.59937,0.72725)
- New Polarization:       (-0.54739,-0.50461,0.66763)
+ Old Momentum Direction: (0.447513,0.893201,-0.043868)
+ Old Polarization:       (-0.475364,0.196045,-0.857668)
+ New Momentum Direction: (0.608617,0.791218,-0.0596604)
+ New Polarization:       (0.357813,-0.34079,-0.869386)
+ *** FresnelRefraction *** 
+Track (trackID 1541, parentID 1) is processed with stopping code 2
+### pop requested out of 121 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.36374,0.931204,0.0234998)
+ Old Polarization:       (-0.569175,0.242156,-0.785748)
+ New Momentum Direction: (0.49322,0.869321,0.0318651)
+ New Polarization:       (0.711366,-0.381978,-0.589958)
  *** FresnelRefraction *** 
 Track (trackID 1540, parentID 1) is processed with stopping code 2
+### pop requested out of 120 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.488445,0.870077,-0.0662394)
+ Old Polarization:       (-0.429929,0.173906,-0.885956)
+ New Momentum Direction: (0.662314,0.743823,-0.0898183)
+ New Polarization:       (0.222798,-0.309991,-0.924265)
+ *** FresnelRefraction *** 
+Track (trackID 1539, parentID 1) is processed with stopping code 2
 ### pop requested out of 119 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1539, parentID 1) is processed with stopping code 2
+Track (trackID 1538, parentID 1) is processed with stopping code 2
 ### pop requested out of 118 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62517,0.7603,-0.17635)
- Old Polarization:       (-0.5263,0.24382,-0.81459)
- New Momentum Direction: (0.84434,0.47995,-0.23818)
- New Polarization:       (-0.0010499,-0.44304,-0.8965)
- *** FresnelRefraction *** 
-Track (trackID 1538, parentID 1) is processed with stopping code 2
-### pop requested out of 117 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36653,0.18722,0.91137)
- Old Polarization:       (-0.81796,-0.40198,0.41154)
- New Momentum Direction: (0.49483,0.25275,0.83142)
- New Polarization:       (0.73571,0.38734,-0.55561)
+ Old Momentum Direction: (0.743398,0.651686,-0.15055)
+ Old Polarization:       (-0.141737,-0.0664845,-0.987669)
+ New Momentum Direction: (0.431564,0.878934,-0.203048)
+ New Polarization:       (-0.272154,-0.0877404,-0.958245)
  *** FresnelRefraction *** 
 Track (trackID 1537, parentID 1) is processed with stopping code 2
+### pop requested out of 117 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1536, parentID 1) is processed with stopping code 2
 ### pop requested out of 116 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51294,0.85683,-0.052276)
- Old Polarization:       (-0.65218,0.34939,-0.67274)
- New Momentum Direction: (0.69434,0.71616,-0.070763)
- New Polarization:       (0.49927,-0.5502,-0.66933)
- *** FresnelRefraction *** 
-Track (trackID 1536, parentID 1) is processed with stopping code 2
-### pop requested out of 115 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99232,-0.025639,-0.12105)
- Old Polarization:       (-0.10894,-0.6449,-0.75647)
- New Momentum Direction: (0.98604,-0.034497,-0.16287)
- New Polarization:       (-0.15458,-0.55295,-0.81875)
+ Old Momentum Direction: (0.674558,-0.160984,0.720455)
+ Old Polarization:       (-0.223005,-0.974776,-0.00901312)
+ New Momentum Direction: (0.916395,-0.218699,0.335248)
+ New Polarization:       (-0.225655,-0.97403,-0.0185857)
  *** FresnelRefraction *** 
 Track (trackID 1535, parentID 1) is processed with stopping code 2
-### pop requested out of 114 stacked tracks.
+### pop requested out of 115 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73719,-0.27335,0.61793)
- Old Polarization:       (-0.40192,-0.91253,0.075818)
- New Momentum Direction: (0.39717,-0.37128,0.83929)
- New Polarization:       (-0.67935,-0.73381,-0.0031351)
+ Old Momentum Direction: (0.123624,0.28508,0.950498)
+ Old Polarization:       (-0.839866,-0.480103,0.25323)
+ New Momentum Direction: (0.167158,0.385471,0.907453)
+ New Polarization:       (-0.104717,0.922138,-0.372419)
  *** FresnelRefraction *** 
 Track (trackID 1534, parentID 1) is processed with stopping code 2
-### pop requested out of 113 stacked tracks.
+### pop requested out of 114 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1533, parentID 1) is processed with stopping code 2
-### pop requested out of 112 stacked tracks.
+### pop requested out of 113 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.46437,0.0021545,0.88564)
- Old Polarization:       (-0.70476,-0.60471,0.371)
- New Momentum Direction: (0.63187,0.0029316,0.77507)
- New Polarization:       (0.68359,-0.47341,-0.5555)
+ Old Momentum Direction: (0.971886,-0.0226522,0.23436)
+ Old Polarization:       (0.113769,-0.826274,-0.55166)
+ New Momentum Direction: (0.948004,-0.0306187,0.316782)
+ New Polarization:       (-0.190754,-0.851425,0.488558)
  *** FresnelRefraction *** 
 Track (trackID 1532, parentID 1) is processed with stopping code 2
+### pop requested out of 112 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1531, parentID 1) is processed with stopping code 2
 ### pop requested out of 111 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50597,-0.046767,0.86128)
- Old Polarization:       (-0.66009,-0.66375,0.35173)
- New Momentum Direction: (0.68467,-0.063285,0.7261)
- New Polarization:       (0.52287,-0.6514,-0.5498)
- *** FresnelRefraction *** 
-Track (trackID 1531, parentID 1) is processed with stopping code 2
-### pop requested out of 110 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68548,0.69146,-0.22804)
- Old Polarization:       (-0.45833,0.16643,-0.87306)
- New Momentum Direction: (0.68548,-0.69146,-0.22804)
- New Polarization:       (0.21301,-0.10904,0.97095)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.68548,-0.69146,-0.22804)
- Old Polarization:       (0.21301,-0.10904,0.97095)
- New Momentum Direction: (0.18265,-0.93371,-0.30793)
- New Polarization:       (-0.43348,-0.35759,0.82718)
+ Old Momentum Direction: (0.906679,-0.115851,0.4056)
+ Old Polarization:       (0.0414991,-0.932383,-0.359083)
+ New Momentum Direction: (0.821917,-0.15644,0.547703)
+ New Polarization:       (-0.0764618,-0.983145,-0.166071)
  *** FresnelRefraction *** 
 Track (trackID 1530, parentID 1) is processed with stopping code 2
-### pop requested out of 109 stacked tracks.
+### pop requested out of 110 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.62772,0.75518,-0.18884)
- Old Polarization:       (-0.52375,0.23027,-0.82016)
- New Momentum Direction: (0.85361,0.45322,-0.25679)
- New Polarization:       (-0.043009,-0.42996,-0.90182)
+ Old Momentum Direction: (0.409449,0.912313,-0.00607941)
+ Old Polarization:       (-0.519088,0.227479,-0.823894)
+ New Momentum Direction: (0.552482,0.833484,-0.00820313)
+ New Polarization:       (0.551171,-0.372695,-0.746531)
  *** FresnelRefraction *** 
 Track (trackID 1529, parentID 1) is processed with stopping code 2
-### pop requested out of 108 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.91543,-0.28414,0.28506)
- Old Polarization:       (-0.19833,-0.93475,-0.29481)
- New Momentum Direction: (0.83979,-0.38328,0.38452)
- New Polarization:       (-0.33224,-0.92295,-0.19437)
- *** FresnelRefraction *** 
+### pop requested out of 109 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1528, parentID 1) is processed with stopping code 2
-### pop requested out of 107 stacked tracks.
+### pop requested out of 108 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1527, parentID 1) is processed with stopping code 2
+### pop requested out of 107 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1526, parentID 1) is processed with stopping code 2
 ### pop requested out of 106 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.73043,0.63344,-0.25539)
- Old Polarization:       (-0.40687,0.10323,-0.90764)
- New Momentum Direction: (0.3922,0.85315,-0.34397)
- New Polarization:       (-0.67842,0.015734,-0.73451)
- *** FresnelRefraction *** 
-Track (trackID 1526, parentID 1) is processed with stopping code 2
-### pop requested out of 105 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.85681,0.41717,-0.30305)
- Old Polarization:       (-0.26712,-0.1436,-0.9529)
- New Momentum Direction: (0.71571,0.56504,-0.41047)
- New Polarization:       (-0.45008,-0.076238,-0.88973)
+ Old Momentum Direction: (0.569158,-0.123112,0.812959)
+ Old Polarization:       (-0.339723,-0.935597,0.0961585)
+ New Momentum Direction: (0.771463,-0.166872,0.614003)
+ New Polarization:       (-0.0675051,-0.981016,-0.181801)
  *** FresnelRefraction *** 
 Track (trackID 1525, parentID 1) is processed with stopping code 2
-### pop requested out of 104 stacked tracks.
+### pop requested out of 105 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75461,-0.27891,0.59395)
- Old Polarization:       (-0.38148,-0.92295,0.051266)
- New Momentum Direction: (0.45859,-0.37772,0.80438)
- New Polarization:       (-0.64099,-0.76753,0.0050239)
+ Old Momentum Direction: (0.947725,-0.0769716,0.309666)
+ Old Polarization:       (0.0806121,-0.881235,-0.465754)
+ New Momentum Direction: (0.901138,-0.104578,0.42073)
+ New Polarization:       (-0.145933,-0.987007,0.0672329)
  *** FresnelRefraction *** 
 Track (trackID 1524, parentID 1) is processed with stopping code 2
+### pop requested out of 104 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.0443521,0.431232,0.90115)
+Old Polarization: (-0.928134,-0.31593,0.196864)
+New Polarization: (0.695159,0.301046,-0.652783)
+Polarization Change: (0.695159,0.301046,-0.652783)
+New Momentum Direction: (-0.654711,-0.10982,-0.747859)
+Momentum Change: (-0.654711,-0.10982,-0.747859)
+
+** Photon absorbed! **
+Track (trackID 1523, parentID 1) is processed with stopping code 2
 ### pop requested out of 103 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22268,0.73322,0.64249)
- Old Polarization:       (-0.9732,0.20599,0.10221)
- New Momentum Direction: (0.30278,0.38092,0.87363)
- New Polarization:       (-0.79953,-0.39739,0.45037)
- *** FresnelRefraction *** 
-Track (trackID 1523, parentID 1) is processed with stopping code 2
-### pop requested out of 102 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.38392,0.91219,0.14321)
- Old Polarization:       (-0.79457,0.40538,-0.45202)
- New Momentum Direction: (0.52176,0.8306,0.19462)
- New Polarization:       (0.81097,-0.55372,0.18903)
+ Old Momentum Direction: (-0.018005,0.748503,0.662887)
+ Old Polarization:       (-0.996701,0.0390407,-0.0711548)
+ New Momentum Direction: (-0.0243897,0.439416,0.897953)
+ New Polarization:       (-0.996948,-0.0773281,0.0107622)
  *** FresnelRefraction *** 
 Track (trackID 1522, parentID 1) is processed with stopping code 2
-### pop requested out of 101 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9862,0.023569,-0.16385)
- Old Polarization:       (-0.11908,-0.58657,-0.80109)
- New Momentum Direction: (0.97471,0.031817,-0.22119)
- New Polarization:       (-0.18185,-0.46229,-0.86788)
- *** FresnelRefraction *** 
+### pop requested out of 102 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1521, parentID 1) is processed with stopping code 2
-### pop requested out of 100 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58962,-0.15351,0.79296)
- Old Polarization:       (-0.56606,-0.77885,0.27013)
- New Momentum Direction: (0.8011,-0.20857,0.56102)
- New Polarization:       (0.10809,-0.8715,-0.47834)
- *** FresnelRefraction *** 
+### pop requested out of 101 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1520, parentID 1) is processed with stopping code 2
+### pop requested out of 100 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1519, parentID 1) is processed with stopping code 2
 ### pop requested out of 99 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.96667,-0.22924,0.11399)
- Old Polarization:       (-0.14739,-0.86236,-0.48437)
- New Momentum Direction: (0.93749,-0.31163,0.15495)
- New Polarization:       (-0.24123,-0.90277,-0.35612)
- *** FresnelRefraction *** 
-Track (trackID 1519, parentID 1) is processed with stopping code 2
-### pop requested out of 98 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23926,0.80008,0.55012)
- Old Polarization:       (-0.95848,0.28514,0.0021622)
- New Momentum Direction: (0.32403,0.58303,0.74504)
- New Polarization:       (-0.58609,-0.49448,0.64186)
+ Old Momentum Direction: (0.0913371,0.93305,0.347959)
+ Old Polarization:       (-0.872676,0.243311,-0.423364)
+ New Momentum Direction: (0.123934,0.872768,0.47214)
+ New Polarization:       (-0.428221,-0.382181,0.81888)
  *** FresnelRefraction *** 
 Track (trackID 1518, parentID 1) is processed with stopping code 2
+### pop requested out of 98 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.937247,0.339202,-0.0806847)
+ Old Polarization:       (0.0738176,-0.419207,-0.904885)
+ New Momentum Direction: (0.88176,0.458894,-0.109155)
+ New Polarization:       (-0.13378,0.0213832,-0.99078)
+ *** FresnelRefraction *** 
+Track (trackID 1517, parentID 1) is processed with stopping code 2
 ### pop requested out of 97 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.75055,-0.26922,0.60349)
- Old Polarization:       (-0.38387,-0.92099,0.066557)
- New Momentum Direction: (-0.75055,-0.26922,0.60349)
- New Polarization:       (-0.12197,0.954,0.27388)
+ Old Momentum Direction: (0.706295,0.691498,-0.151588)
+ Old Polarization:       (-0.186311,-0.0250106,-0.982172)
+ New Momentum Direction: (-0.706295,0.691498,-0.151588)
+ New Polarization:       (-0.10427,0.110179,0.988427)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.75055,-0.26922,0.60349)
- Old Polarization:       (-0.12197,0.954,0.27388)
- New Momentum Direction: (-0.75055,-0.26922,-0.60349)
- New Polarization:       (0.12197,-0.954,0.27388)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1517, parentID 1) is processed with stopping code 2
-### pop requested out of 96 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.4651,0.88516,0.013211)
- Old Polarization:       (-0.70543,0.3796,-0.59856)
- New Momentum Direction: (0.63024,0.77619,0.017901)
- New Polarization:       (0.70334,-0.56102,-0.43655)
+ Old Momentum Direction: (-0.706295,0.691498,-0.151588)
+ Old Polarization:       (-0.10427,0.110179,0.988427)
+ New Momentum Direction: (-0.957082,0.204449,-0.205413)
+ New Polarization:       (-0.251585,-0.234251,0.939059)
  *** FresnelRefraction *** 
 Track (trackID 1516, parentID 1) is processed with stopping code 2
-### pop requested out of 95 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7377,0.62052,-0.26599)
- Old Polarization:       (-0.40021,0.084629,-0.91251)
- New Momentum Direction: (0.40628,0.83984,-0.36)
- New Polarization:       (-0.67242,0.0080318,-0.74013)
- *** FresnelRefraction *** 
-Track (trackID 1515, parentID 1) is processed with stopping code 2
-### pop requested out of 94 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94778,0.18893,-0.25694)
- Old Polarization:       (-0.16492,-0.39921,-0.90191)
- New Momentum Direction: (0.90198,0.25579,-0.34786)
- New Polarization:       (-0.27459,-0.28191,-0.91931)
- *** FresnelRefraction *** 
-Track (trackID 1514, parentID 1) is processed with stopping code 2
-### pop requested out of 93 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30948,0.30211,0.90164)
- Old Polarization:       (-0.87837,-0.27239,0.39277)
- New Momentum Direction: (0.41997,0.40997,0.80966)
- New Polarization:       (0.32806,0.76325,-0.55663)
- *** FresnelRefraction *** 
-Track (trackID 1513, parentID 1) is processed with stopping code 2
-### pop requested out of 92 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74351,0.60951,-0.27511)
- Old Polarization:       (-0.39526,0.06872,-0.91599)
- New Momentum Direction: (0.41617,0.82878,-0.37407)
- New Polarization:       (-0.6689,0.0003705,-0.74335)
- *** FresnelRefraction *** 
-Track (trackID 1512, parentID 1) is processed with stopping code 2
-### pop requested out of 91 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.62835,-0.19415,0.75331)
- Old Polarization:       (-0.52309,-0.82221,0.22441)
- New Momentum Direction: (0.62835,-0.19415,-0.75331)
- New Polarization:       (0.22284,0.9727,-0.064822)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.62835,-0.19415,-0.75331)
- Old Polarization:       (0.22284,0.9727,-0.064822)
- New Momentum Direction: (-0.62835,-0.19415,-0.75331)
- New Polarization:       (0.22284,-0.9727,0.064822)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.62835,-0.19415,-0.75331)
-Old Polarization: (0.22284,-0.9727,0.064822)
-New Polarization: (-0.40951,-0.87626,0.25391)
-Polarization Change: (-0.40951,-0.87626,0.25391)
-New Momentum Direction: (-0.86072,0.46335,0.21087)
-Momentum Change: (-0.86072,0.46335,0.21087)
- Photon at Boundary! 
- Old Momentum Direction: (-0.86072,0.46335,0.21087)
- Old Polarization:       (-0.40951,-0.87626,0.25391)
- New Momentum Direction: (0.86072,0.46335,0.21087)
- New Polarization:       (-0.17792,0.66188,-0.72819)
- *** FresnelReflection *** 
+### pop requested out of 96 stacked tracks.
 
 ** Photon absorbed! **
+Track (trackID 1515, parentID 1) is processed with stopping code 2
+### pop requested out of 95 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1514, parentID 1) is processed with stopping code 2
+### pop requested out of 94 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.919403,0.379587,-0.103014)
+ Old Polarization:       (0.0505377,-0.373751,-0.926151)
+ New Momentum Direction: (0.845681,0.515058,-0.139779)
+ New Polarization:       (-0.0935487,-0.114793,-0.988975)
+ *** FresnelRefraction *** 
+Track (trackID 1513, parentID 1) is processed with stopping code 2
+### pop requested out of 93 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1512, parentID 1) is processed with stopping code 2
+### pop requested out of 92 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.567402,-0.126304,0.813697)
+ Old Polarization:       (-0.342368,-0.93489,0.0936217)
+ New Momentum Direction: (0.77161,-0.171761,0.612467)
+ New Polarization:       (-0.0767426,-0.980958,-0.178418)
+ *** FresnelRefraction *** 
 Track (trackID 1511, parentID 1) is processed with stopping code 2
-### pop requested out of 90 stacked tracks.
+### pop requested out of 91 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1510, parentID 1) is processed with stopping code 2
-### pop requested out of 89 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.76613,-0.28816,0.57447)
- Old Polarization:       (-0.36981,-0.9287,0.027338)
- New Momentum Direction: (0.48755,-0.39147,0.78042)
- New Polarization:       (-0.62424,-0.78123,-0.001904)
- *** FresnelRefraction *** 
+### pop requested out of 90 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1509, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
+### pop requested out of 89 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1508, parentID 1) is processed with stopping code 2
-### pop requested out of 87 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1507, parentID 1) is processed with stopping code 2
-### pop requested out of 86 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1506, parentID 1) is processed with stopping code 2
-### pop requested out of 85 stacked tracks.
+### pop requested out of 88 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.81923,-0.29393,0.4924)
- Old Polarization:       (-0.30543,-0.95038,-0.059136)
- New Momentum Direction: (0.6365,-0.39532,0.66226)
- New Polarization:       (-0.50895,-0.86045,-0.024468)
+ Old Momentum Direction: (0.869568,-0.140905,0.473284)
+ Old Polarization:       (-0.00139486,-0.959123,-0.282985)
+ New Momentum Direction: (0.744566,-0.190478,0.639796)
+ New Polarization:       (-0.00260875,-0.959249,-0.282549)
+ *** FresnelRefraction *** 
+Track (trackID 1507, parentID 1) is processed with stopping code 2
+### pop requested out of 87 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0116568,0.852278,0.522959)
+ Old Polarization:       (-0.961468,0.153214,-0.228266)
+ New Momentum Direction: (0.0158175,0.704406,0.709621)
+ New Polarization:       (-0.912994,-0.279186,0.297485)
+ *** FresnelRefraction *** 
+Track (trackID 1506, parentID 1) is processed with stopping code 2
+### pop requested out of 86 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.988575,0.0475527,0.143033)
+ Old Polarization:       (0.130392,-0.74583,-0.65325)
+ New Momentum Direction: (-0.988575,0.0475527,0.143033)
+ New Polarization:       (0.128222,0.764154,0.632161)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.988575,0.0475527,0.143033)
+ Old Polarization:       (0.128222,0.764154,0.632161)
+ New Momentum Direction: (-0.978953,0.0643846,0.193661)
+ New Polarization:       (0.185707,0.674563,0.714477)
  *** FresnelRefraction *** 
 Track (trackID 1505, parentID 1) is processed with stopping code 2
+### pop requested out of 85 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1504, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.24359,0.5015,0.83016)
- Old Polarization:       (-0.94945,-0.051435,0.30967)
- New Momentum Direction: (0.33142,0.68232,0.65161)
- New Polarization:       (-0.45916,0.71999,-0.52037)
- *** FresnelRefraction *** 
-Track (trackID 1504, parentID 1) is processed with stopping code 2
-### pop requested out of 83 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.25453,0.82882,0.49827)
- Old Polarization:       (-0.94499,0.32263,-0.053933)
- New Momentum Direction: (0.34335,0.656,0.67214)
- New Polarization:       (-0.42479,-0.5298,0.73408)
+ Old Momentum Direction: (0.147132,0.953176,0.26421)
+ Old Polarization:       (-0.812346,0.268842,-0.517512)
+ New Momentum Direction: (0.1992,0.912339,0.357711)
+ New Polarization:       (0.106302,-0.38299,0.917616)
  *** FresnelRefraction *** 
 Track (trackID 1503, parentID 1) is processed with stopping code 2
-### pop requested out of 82 stacked tracks.
+### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49802,0.8668,-0.025162)
- Old Polarization:       (-0.67005,0.36623,-0.64568)
- New Momentum Direction: (0.67148,0.74024,-0.033926)
- New Polarization:       (0.58625,-0.55868,-0.58667)
+ Old Momentum Direction: (0.432027,-0.0464248,0.900665)
+ Old Polarization:       (-0.492816,-0.848538,0.192654)
+ New Momentum Direction: (0.586305,-0.0630033,0.807637)
+ New Polarization:       (0.364412,-0.869892,-0.332404)
  *** FresnelRefraction *** 
 Track (trackID 1502, parentID 1) is processed with stopping code 2
-### pop requested out of 81 stacked tracks.
+### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98709,0.019387,-0.15899)
- Old Polarization:       (-0.11678,-0.59228,-0.79723)
- New Momentum Direction: (0.97641,0.026135,-0.21434)
- New Polarization:       (-0.17729,-0.46959,-0.8649)
+ Old Momentum Direction: (0.187044,0.956697,0.223035)
+ Old Polarization:       (-0.773338,0.283409,-0.567122)
+ New Momentum Direction: (0.251371,0.920309,0.299739)
+ New Polarization:       (0.451801,-0.385443,0.804555)
  *** FresnelRefraction *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.251371,0.920309,0.299739)
+ Old Polarization:       (0.451801,-0.385443,0.804555)
+ New Momentum Direction: (0.187044,0.684799,0.704319)
+ New Polarization:       (0.731772,0.381203,-0.564973)
+ *** FresnelRefraction *** 
+Scattering Photon!
+Old Momentum Direction: (0.187044,0.684799,0.704319)
+Old Polarization: (0.731772,0.381203,-0.564973)
+New Polarization: (-0.396656,0.713742,0.577266)
+Polarization Change: (-0.396656,0.713742,0.577266)
+New Momentum Direction: (-0.63396,-0.667793,0.390059)
+Momentum Change: (-0.63396,-0.667793,0.390059)
+
+** Photon absorbed! **
 Track (trackID 1501, parentID 1) is processed with stopping code 2
+### pop requested out of 81 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1500, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7845,0.55186,-0.28285)
- Old Polarization:       (-0.3457,0.010527,-0.93828)
- New Momentum Direction: (0.54952,0.74351,-0.38108)
- New Polarization:       (-0.57643,0.0072221,-0.81712)
- *** FresnelRefraction *** 
-Track (trackID 1500, parentID 1) is processed with stopping code 2
-### pop requested out of 79 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30625,0.30323,0.90236)
- Old Polarization:       (-0.88008,-0.27114,0.38981)
- New Momentum Direction: (0.41664,0.41253,0.81008)
- New Polarization:       (0.31776,0.7688,-0.55495)
+ Old Momentum Direction: (0.963021,0.267503,-0.0321404)
+ Old Polarization:       (0.110786,-0.501897,-0.857803)
+ New Momentum Direction: (0.932134,0.359529,-0.0431973)
+ New Polarization:       (-0.188389,0.3796,-0.905767)
  *** FresnelRefraction *** 
 Track (trackID 1499, parentID 1) is processed with stopping code 2
-### pop requested out of 78 stacked tracks.
+### pop requested out of 79 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57534,-0.13685,0.80639)
- Old Polarization:       (-0.582,-0.76121,0.28607)
- New Momentum Direction: (0.57534,-0.13685,-0.80639)
- New Polarization:       (0.2341,0.97221,0.0020354)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57534,-0.13685,-0.80639)
- Old Polarization:       (0.2341,0.97221,0.0020354)
- New Momentum Direction: (-0.57534,-0.13685,-0.80639)
- New Polarization:       (0.2341,-0.97221,-0.0020354)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.57534,-0.13685,-0.80639)
-Old Polarization: (0.2341,-0.97221,-0.0020354)
-New Polarization: (-0.4181,0.8998,-0.12472)
-Polarization Change: (-0.4181,0.8998,-0.12472)
-New Momentum Direction: (-0.73941,-0.41685,-0.52869)
-Momentum Change: (-0.73941,-0.41685,-0.52869)
- Photon at Boundary! 
- Old Momentum Direction: (-0.73941,-0.41685,-0.52869)
- Old Polarization:       (-0.4181,0.8998,-0.12472)
- New Momentum Direction: (-0.73941,0.41685,-0.52869)
- New Polarization:       (0.4181,0.8998,0.12472)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73941,0.41685,-0.52869)
- Old Polarization:       (0.4181,0.8998,0.12472)
- New Momentum Direction: (-0.4057,0.56591,-0.71774)
- New Polarization:       (0.69607,0.70023,0.15865)
+ Old Momentum Direction: (0.799225,0.580948,-0.154073)
+ Old Polarization:       (-0.082078,-0.14845,-0.985508)
+ New Momentum Direction: (0.580695,0.786917,-0.208698)
+ New Polarization:       (-0.156473,-0.143689,-0.977174)
  *** FresnelRefraction *** 
 Track (trackID 1498, parentID 1) is processed with stopping code 2
-### pop requested out of 77 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1497, parentID 1) is processed with stopping code 2
-### pop requested out of 76 stacked tracks.
+### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.25144,0.82211,0.5108)
- Old Polarization:       (-0.94831,0.31482,-0.039875)
- New Momentum Direction: (0.33924,0.64029,0.68916)
- New Polarization:       (-0.46479,-0.52284,0.71456)
+ Old Momentum Direction: (0.031543,0.882373,0.469491)
+ Old Polarization:       (-0.939283,0.186749,-0.287875)
+ New Momentum Direction: (0.0428024,0.76961,0.637078)
+ New Polarization:       (-0.829438,-0.328103,0.452085)
+ *** FresnelRefraction *** 
+Track (trackID 1497, parentID 1) is processed with stopping code 2
+### pop requested out of 77 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.319362,0.0517796,0.946217)
+ Old Polarization:       (-0.620422,-0.743329,0.250079)
+ New Momentum Direction: (0.431307,0.0699297,0.899491)
+ New Polarization:       (0.842955,-0.38658,-0.374144)
  *** FresnelRefraction *** 
 Track (trackID 1496, parentID 1) is processed with stopping code 2
-### pop requested out of 75 stacked tracks.
+### pop requested out of 76 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94632,0.19138,-0.26049)
- Old Polarization:       (-0.16844,-0.39584,-0.90274)
- New Momentum Direction: (0.89869,0.25968,-0.35344)
- New Polarization:       (-0.28109,-0.27758,-0.91866)
+ Old Momentum Direction: (0.523548,-0.104844,0.845521)
+ Old Polarization:       (-0.391002,-0.911289,0.129109)
+ New Momentum Direction: (0.711855,-0.142554,0.687707)
+ New Polarization:       (0.0371953,-0.970158,-0.239605)
  *** FresnelRefraction *** 
 Track (trackID 1495, parentID 1) is processed with stopping code 2
-### pop requested out of 74 stacked tracks.
+### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47309,0.88101,-0.00057731)
- Old Polarization:       (-0.69613,0.37341,-0.61317)
- New Momentum Direction: (0.64176,0.76691,-0.00078312)
- New Polarization:       (0.66808,-0.55956,-0.49047)
+ Old Momentum Direction: (0.711922,0.686367,-0.148551)
+ Old Polarization:       (-0.178039,-0.0282183,-0.983619)
+ New Momentum Direction: (0.317271,0.926875,-0.200605)
+ New Polarization:       (-0.349802,-0.0822376,-0.933207)
  *** FresnelRefraction *** 
 Track (trackID 1494, parentID 1) is processed with stopping code 2
-### pop requested out of 73 stacked tracks.
+### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.61704,0.76649,-0.17821)
- Old Polarization:       (-0.5356,0.24314,-0.80872)
- New Momentum Direction: (0.83884,0.48749,-0.24227)
- New Polarization:       (0.0010448,-0.44649,-0.89479)
+ Old Momentum Direction: (0.77761,0.609869,-0.152917)
+ Old Polarization:       (-0.104337,-0.114672,-0.987909)
+ New Momentum Direction: (0.527684,0.823935,-0.206592)
+ New Polarization:       (-0.198802,-0.116664,-0.973071)
  *** FresnelRefraction *** 
 Track (trackID 1493, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1492, parentID 1) is processed with stopping code 2
-### pop requested out of 71 stacked tracks.
+### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.61692,-0.17514,0.76729)
- Old Polarization:       (-0.53563,-0.80774,0.24629)
- New Momentum Direction: (0.83481,-0.237,0.4969)
- New Polarization:       (0.011823,-0.89466,-0.44658)
+ Old Momentum Direction: (0.987815,0.146257,0.0532007)
+ Old Polarization:       (0.135304,-0.638141,-0.757937)
+ New Momentum Direction: (0.97775,0.197138,0.0717082)
+ New Polarization:       (-0.193336,0.979497,-0.0566365)
+ *** FresnelRefraction *** 
+Track (trackID 1492, parentID 1) is processed with stopping code 2
+### pop requested out of 72 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.98993,0.123968,0.0683453)
+ Old Polarization:       (0.133768,-0.661227,-0.738163)
+ New Momentum Direction: (0.981514,0.167604,0.0924027)
+ New Polarization:       (-0.185419,0.95237,0.242098)
  *** FresnelRefraction *** 
 Track (trackID 1491, parentID 1) is processed with stopping code 2
-### pop requested out of 70 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.97524,0.075598,-0.20781)
- Old Polarization:       (-0.13857,-0.52346,-0.84071)
- New Momentum Direction: (0.95368,0.10284,-0.28271)
- New Polarization:       (-0.22238,-0.39191,-0.89272)
- *** FresnelRefraction *** 
+### pop requested out of 71 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1490, parentID 1) is processed with stopping code 2
-### pop requested out of 69 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30967,0.30641,0.90012)
- Old Polarization:       (-0.87945,-0.26758,0.39365)
- New Momentum Direction: (0.41951,0.41508,0.80729)
- New Polarization:       (0.31366,0.76827,-0.55801)
- *** FresnelRefraction *** 
+### pop requested out of 70 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1489, parentID 1) is processed with stopping code 2
+### pop requested out of 69 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1488, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.31097,0.89223,0.32745)
- Old Polarization:       (-0.88337,0.39844,-0.24677)
- New Momentum Direction: (0.41833,0.79433,0.4405)
- New Polarization:       (0.24631,-0.56601,0.78674)
- *** FresnelRefraction *** 
-Track (trackID 1488, parentID 1) is processed with stopping code 2
-### pop requested out of 67 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44693,0.89381,0.036768)
- Old Polarization:       (-0.72483,0.38591,-0.5707)
- New Momentum Direction: (0.60699,0.79314,0.049937)
- New Polarization:       (0.75897,-0.55992,-0.33234)
+ Old Momentum Direction: (-0.0114528,0.637045,0.770741)
+ Old Polarization:       (-0.995104,-0.0829363,0.0537632)
+ New Momentum Direction: (-0.015444,0.859054,0.511652)
+ New Polarization:       (-0.993676,0.0437342,-0.103423)
  *** FresnelRefraction *** 
 Track (trackID 1487, parentID 1) is processed with stopping code 2
-### pop requested out of 66 stacked tracks.
+### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5177,0.85302,-0.065966)
- Old Polarization:       (-0.64586,0.33908,-0.68402)
- New Momentum Direction: (0.70385,0.70466,-0.089686)
- New Polarization:       (0.45524,-0.54439,-0.70456)
+ Old Momentum Direction: (0.0469555,0.430397,0.901418)
+ Old Polarization:       (-0.9273,-0.316711,0.199523)
+ New Momentum Direction: (0.0634184,0.581297,0.811216)
+ New Polarization:       (-0.758591,0.556255,-0.339294)
  *** FresnelRefraction *** 
 Track (trackID 1486, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
+### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91907,-0.28584,0.2713)
- Old Polarization:       (-0.19773,-0.92996,-0.30997)
- New Momentum Direction: (0.8455,-0.38731,0.3676)
- New Polarization:       (-0.33252,-0.92053,-0.20507)
+ Old Momentum Direction: (0.303626,0.0714219,0.950111)
+ Old Polarization:       (-0.639622,-0.723809,0.258813)
+ New Momentum Direction: (0.408785,0.0961585,0.907551)
+ New Polarization:       (0.893146,-0.246544,-0.376174)
  *** FresnelRefraction *** 
 Track (trackID 1485, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
+### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23052,0.75018,0.61975)
- Old Polarization:       (-0.9696,0.23084,0.081229)
- New Momentum Direction: (0.31176,0.44749,0.83818)
- New Polarization:       (-0.749,-0.42704,0.50658)
+ Old Momentum Direction: (0.892059,-0.130677,0.432614)
+ Old Polarization:       (0.021199,-0.944127,-0.3289)
+ New Momentum Direction: (0.790457,-0.177116,0.586351)
+ New Polarization:       (-0.0396198,-0.970061,-0.239609)
  *** FresnelRefraction *** 
 Track (trackID 1484, parentID 1) is processed with stopping code 2
-### pop requested out of 63 stacked tracks.
+### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5014,0.86449,-0.035422)
- Old Polarization:       (-0.66534,0.35907,-0.65452)
- New Momentum Direction: (0.67819,0.73333,-0.047911)
- New Polarization:       (0.55674,-0.55524,-0.61785)
+ Old Momentum Direction: (0.928561,0.361485,-0.0842814)
+ Old Polarization:       (0.0705205,-0.394737,-0.916084)
+ New Momentum Direction: (0.866424,0.486267,-0.113375)
+ New Polarization:       (-0.126991,-0.00499202,-0.991891)
  *** FresnelRefraction *** 
 Track (trackID 1483, parentID 1) is processed with stopping code 2
-### pop requested out of 62 stacked tracks.
+### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85634,-0.30976,0.41319)
- Old Polarization:       (-0.27035,-0.95063,-0.15235)
- New Momentum Direction: (0.71167,-0.42139,0.5621)
- New Polarization:       (-0.458,-0.88501,-0.083598)
- *** FresnelRefraction *** 
-Track (trackID 1482, parentID 1) is processed with stopping code 2
-### pop requested out of 61 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9798,0.052214,-0.19303)
- Old Polarization:       (-0.1332,-0.54959,-0.82475)
- New Momentum Direction: (0.96231,0.071008,-0.26251)
- New Polarization:       (-0.21017,-0.41841,-0.88361)
- *** FresnelRefraction *** 
-Track (trackID 1481, parentID 1) is processed with stopping code 2
-### pop requested out of 60 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.87098,0.38773,-0.30174)
- Old Polarization:       (-0.25114,-0.17651,-0.95172)
- New Momentum Direction: (0.74654,0.52507,-0.40862)
- New Polarization:       (-0.42318,-0.099196,-0.9006)
- *** FresnelRefraction *** 
-Track (trackID 1480, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1479, parentID 1) is processed with stopping code 2
-### pop requested out of 58 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.29464,0.33777,0.89392)
- Old Polarization:       (-0.8941,-0.23273,0.38264)
- New Momentum Direction: (0.40025,0.45883,0.79327)
- New Polarization:       (0.17305,0.81222,-0.5571)
- *** FresnelRefraction *** 
-Track (trackID 1478, parentID 1) is processed with stopping code 2
-### pop requested out of 57 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.28025,0.39556,0.87464)
- Old Polarization:       (-0.9144,-0.16725,0.36864)
- New Momentum Direction: (0.37873,0.53456,0.75552)
- New Polarization:       (-0.057635,0.82837,-0.55721)
- *** FresnelRefraction *** 
-Track (trackID 1477, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84241,0.44657,-0.30154)
- Old Polarization:       (-0.28261,-0.11029,-0.95287)
- New Momentum Direction: (0.68446,0.60421,-0.40797)
- New Polarization:       (-0.47527,-0.054539,-0.87815)
- *** FresnelRefraction *** 
-Track (trackID 1476, parentID 1) is processed with stopping code 2
-### pop requested out of 55 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1475, parentID 1) is processed with stopping code 2
-### pop requested out of 54 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98624,-0.16444,0.017332)
- Old Polarization:       (-0.12208,-0.79484,-0.59441)
- New Momentum Direction: (0.97461,-0.22268,0.023471)
- New Polarization:       (-0.18573,-0.86251,-0.47072)
- *** FresnelRefraction *** 
-Track (trackID 1474, parentID 1) is processed with stopping code 2
-### pop requested out of 53 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1473, parentID 1) is processed with stopping code 2
-### pop requested out of 52 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.29397,0.89049,0.34729)
- Old Polarization:       (-0.89568,0.38349,-0.22513)
- New Momentum Direction: (0.39891,0.78663,0.47126)
- New Polarization:       (0.14138,-0.56054,0.81597)
- *** FresnelRefraction *** 
-Track (trackID 1472, parentID 1) is processed with stopping code 2
-### pop requested out of 51 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9784,0.075243,-0.19253)
- Old Polarization:       (-0.12419,-0.53061,-0.83847)
- New Momentum Direction: (0.96059,0.10118,-0.25889)
- New Polarization:       (-0.19784,-0.40536,-0.89249)
- *** FresnelRefraction *** 
-Track (trackID 1471, parentID 1) is processed with stopping code 2
-### pop requested out of 50 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.39049,0.9092,0.14446)
- Old Polarization:       (-0.79072,0.4116,-0.45316)
- New Momentum Direction: (0.52738,0.82693,0.1951)
- New Polarization:       (0.80917,-0.55886,0.18144)
- *** FresnelRefraction *** 
-Track (trackID 1470, parentID 1) is processed with stopping code 2
-### pop requested out of 49 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98114,0.050795,-0.18653)
- Old Polarization:       (-0.12775,-0.55385,-0.82276)
- New Momentum Direction: (0.96513,0.068784,-0.25259)
- New Polarization:       (-0.20078,-0.42469,-0.8828)
- *** FresnelRefraction *** 
-Track (trackID 1469, parentID 1) is processed with stopping code 2
-### pop requested out of 48 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.3323,0.90706,0.25849)
- Old Polarization:       (-0.85459,0.40552,-0.32439)
- New Momentum Direction: (0.44986,0.82168,0.34995)
- New Polarization:       (0.51344,-0.55855,0.65146)
- *** FresnelRefraction *** 
-Track (trackID 1468, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.50967,0.85916,-0.045496)
- Old Polarization:       (-0.65621,0.35399,-0.6664)
- New Momentum Direction: (0.68894,0.7222,-0.061499)
- New Polarization:       (0.52134,-0.55269,-0.65018)
- *** FresnelRefraction *** 
-Track (trackID 1467, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99309,-0.070172,-0.09402)
- Old Polarization:       (-0.11644,-0.6873,-0.71698)
- New Momentum Direction: (0.98724,-0.09523,-0.12759)
- New Polarization:       (-0.15857,-0.6603,-0.73407)
- *** FresnelRefraction *** 
-Track (trackID 1466, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.2489,0.83105,0.49739)
- Old Polarization:       (-0.94638,0.31789,-0.057571)
- New Momentum Direction: (0.33758,0.65646,0.67461)
- New Polarization:       (-0.43359,-0.52768,0.73045)
- *** FresnelRefraction *** 
-Track (trackID 1465, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.29683,0.35035,0.88834)
- Old Polarization:       (-0.89656,-0.21801,0.38556)
- New Momentum Direction: (0.40073,0.47297,0.78467)
- New Polarization:       (0.13426,0.81689,-0.56096)
- *** FresnelRefraction *** 
-Track (trackID 1464, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84647,0.437,-0.30415)
- Old Polarization:       (-0.27936,-0.12177,-0.95243)
- New Momentum Direction: (0.69194,0.59256,-0.41242)
- New Polarization:       (-0.47122,-0.062118,-0.87983)
- *** FresnelRefraction *** 
-Track (trackID 1463, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.89884,-0.29439,0.32468)
- Old Polarization:       (-0.21857,-0.94322,-0.25014)
- New Momentum Direction: (0.80564,-0.39792,0.43886)
- New Polarization:       (-0.36738,-0.91676,-0.15682)
- *** FresnelRefraction *** 
-Track (trackID 1462, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1461, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.80696,-0.29945,0.50906)
- Old Polarization:       (-0.32305,-0.94536,-0.043998)
- New Momentum Direction: (0.59979,-0.40571,0.68968)
- New Polarization:       (-0.54348,-0.83916,-0.020997)
- *** FresnelRefraction *** 
-Track (trackID 1460, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.97381,0.082206,-0.21197)
- Old Polarization:       (-0.14037,-0.51601,-0.845)
- New Momentum Direction: (0.95094,0.11186,-0.28843)
- New Polarization:       (-0.22621,-0.38458,-0.89495)
- *** FresnelRefraction *** 
-Track (trackID 1459, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95233,-0.24892,0.17639)
- Old Polarization:       (-0.15659,-0.89504,-0.4176)
- New Momentum Direction: (0.91141,-0.33575,0.23793)
- New Polarization:       (-0.2594,-0.9176,-0.30121)
- *** FresnelRefraction *** 
-Track (trackID 1458, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.98086,0.045411,-0.18934)
-Old Polarization: (-0.13251,-0.55681,-0.82001)
-New Polarization: (0.94421,0.32895,0.016159)
-Polarization Change: (0.94421,0.32895,0.016159)
-New Momentum Direction: (0.18067,-0.47633,-0.8605)
-Momentum Change: (0.18067,-0.47633,-0.8605)
- Photon at Boundary! 
- Old Momentum Direction: (0.18067,-0.47633,-0.8605)
- Old Polarization:       (0.94421,0.32895,0.016159)
- New Momentum Direction: (0.24584,-0.64812,-0.72077)
- New Polarization:       (0.94541,0.32444,0.03072)
- *** FresnelRefraction *** 
-Track (trackID 1457, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.83317,0.46352,-0.30161)
- Old Polarization:       (-0.29349,-0.091644,-0.95156)
- New Momentum Direction: (0.66268,0.62772,-0.40845)
- New Polarization:       (-0.49397,-0.043576,-0.86839)
- *** FresnelRefraction *** 
-Track (trackID 1456, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65978,0.72039,-0.21383)
- Old Polarization:       (-0.48787,0.19421,-0.85104)
- New Momentum Direction: (0.89501,0.33884,-0.29007)
- New Polarization:       (-0.15192,-0.37986,-0.91249)
- *** FresnelRefraction *** 
-Track (trackID 1455, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23679,0.544,0.80498)
- Old Polarization:       (-0.95877,-0.003182,0.28417)
- New Momentum Direction: (0.32154,0.73871,0.59238)
- New Polarization:       (-0.57945,0.64829,-0.49391)
- *** FresnelRefraction *** 
-Track (trackID 1454, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36884,0.16466,0.91479)
- Old Polarization:       (-0.81058,-0.42466,0.40326)
- New Momentum Direction: (0.5019,0.22405,0.8354)
- New Polarization:       (0.77914,0.30226,-0.54916)
- *** FresnelRefraction *** 
-Track (trackID 1453, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1452, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.88902,-0.29394,0.35107)
- Old Polarization:       (-0.22681,-0.94876,-0.22002)
- New Momentum Direction: (0.78738,-0.39575,0.47266)
- New Polarization:       (-0.37964,-0.91538,-0.13402)
- *** FresnelRefraction *** 
-Track (trackID 1451, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1450, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36674,0.19052,0.91061)
- Old Polarization:       (-0.81873,-0.39872,0.41316)
- New Momentum Direction: (0.49431,0.25679,0.83049)
- New Polarization:       (0.7289,0.39814,-0.55695)
- *** FresnelRefraction *** 
-Track (trackID 1449, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1448, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1447, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.32219,0.9045,0.2794)
- Old Polarization:       (-0.86519,0.40113,-0.3009)
- New Momentum Direction: (0.43662,0.81609,0.37863)
- New Polarization:       (0.43019,-0.55902,0.70882)
- *** FresnelRefraction *** 
-Track (trackID 1446, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98304,0.041474,-0.17863)
- Old Polarization:       (-0.12435,-0.56518,-0.81554)
- New Momentum Direction: (0.96876,0.056087,-0.24157)
- New Polarization:       (-0.19367,-0.43728,-0.87822)
- *** FresnelRefraction *** 
-Track (trackID 1445, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.33482,0.2368,0.91204)
- Old Polarization:       (-0.84866,-0.34484,0.40108)
- New Momentum Direction: (0.45534,0.32203,0.83004)
- New Polarization:       (0.58155,0.59834,-0.55117)
- *** FresnelRefraction *** 
-Track (trackID 1444, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.40875,0.096434,0.90754)
- Old Polarization:       (-0.76762,-0.50154,0.39903)
- New Momentum Direction: (0.55479,0.13089,0.82163)
- New Polarization:       (0.83112,-0.042025,-0.55451)
- *** FresnelRefraction *** 
-Track (trackID 1443, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84505,0.43924,-0.30489)
- Old Polarization:       (-0.2814,-0.11953,-0.95212)
- New Momentum Direction: (0.68815,0.59605,-0.41373)
- New Polarization:       (-0.47508,-0.060835,-0.87784)
- *** FresnelRefraction *** 
-Track (trackID 1442, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23843,0.59841,0.76489)
- Old Polarization:       (-0.96593,0.064489,0.25065)
- New Momentum Direction: (0.32072,0.80494,0.49921)
- New Polarization:       (-0.69945,0.55666,-0.44822)
- *** FresnelRefraction *** 
-Track (trackID 1441, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.93433,-0.2767,0.22465)
-Old Polarization: (-0.18383,-0.91412,-0.36137)
-New Polarization: (-0.16354,-0.29686,-0.94081)
-Polarization Change: (-0.16354,-0.29686,-0.94081)
-New Momentum Direction: (0.10288,0.94332,-0.31553)
-Momentum Change: (0.10288,0.94332,-0.31553)
-Scattering Photon!
-Old Momentum Direction: (0.10288,0.94332,-0.31553)
-Old Polarization: (-0.16354,-0.29686,-0.94081)
-New Polarization: (0.74445,0.014196,-0.66752)
-Polarization Change: (0.74445,0.014196,-0.66752)
-New Momentum Direction: (-0.62127,-0.35149,-0.70034)
-Momentum Change: (-0.62127,-0.35149,-0.70034)
- Photon at Boundary! 
- Old Momentum Direction: (-0.62127,-0.35149,-0.70034)
- Old Polarization:       (0.74445,0.014196,-0.66752)
- New Momentum Direction: (-0.84508,-0.47812,-0.23927)
- New Polarization:       (-0.087747,-0.31743,0.94421)
- *** FresnelRefraction *** 
-Track (trackID 1440, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.77709,-0.29129,0.55793)
- Old Polarization:       (-0.3571,-0.93401,0.0097317)
- New Momentum Direction: (0.52031,-0.39523,0.75701)
- New Polarization:       (-0.60162,-0.79878,-0.0035337)
- *** FresnelRefraction *** 
-Track (trackID 1439, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.38603,0.14353,0.91125)
- Old Polarization:       (-0.79452,-0.4502,0.4075)
- New Momentum Direction: (0.52247,0.19426,0.83023)
- New Polarization:       (0.8108,0.18813,-0.55426)
- *** FresnelRefraction *** 
-Track (trackID 1438, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.86005,0.41351,-0.29888)
- Old Polarization:       (-0.26107,-0.14663,-0.95412)
- New Momentum Direction: (-0.86005,0.41351,-0.29888)
- New Polarization:       (0.083786,0.6923,0.71673)
+ Old Momentum Direction: (0.766594,0.623635,-0.153011)
+ Old Polarization:       (-0.116637,-0.0990896,-0.988219)
+ New Momentum Direction: (-0.766594,0.623635,-0.153011)
+ New Polarization:       (-0.02217,0.21244,0.976923)
  *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.86005,0.41351,-0.29888)
- Old Polarization:       (0.083786,0.6923,0.71673)
- New Momentum Direction: (-0.86005,-0.41351,-0.29888)
- New Polarization:       (-0.083786,0.6923,-0.71673)
+ Old Momentum Direction: (-0.766594,0.623635,-0.153011)
+ Old Polarization:       (-0.02217,0.21244,0.976923)
+ New Momentum Direction: (-0.766594,-0.623635,-0.153011)
+ New Polarization:       (0.02217,0.21244,-0.976923)
  *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.766594,-0.623635,-0.153011)
+ Old Polarization:       (0.02217,0.21244,-0.976923)
+ New Momentum Direction: (-0.497614,-0.842413,-0.206689)
+ New Polarization:       (0.0430789,0.213991,-0.975885)
+ *** FresnelRefraction *** 
+Track (trackID 1482, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0974369,0.315616,0.943871)
+ Old Polarization:       (-0.863583,-0.444599,0.237815)
+ New Momentum Direction: (0.132526,0.429276,0.893397)
+ New Polarization:       (-0.333798,0.868027,-0.367571)
+ *** FresnelRefraction *** 
+Track (trackID 1481, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1480, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.977839,0.209345,-0.00221454)
+ Old Polarization:       (0.119077,-0.564841,-0.816563)
+ New Momentum Direction: (0.959032,0.283283,-0.00299669)
+ New Polarization:       (-0.19387,0.648544,-0.736074)
+ *** FresnelRefraction *** 
+Track (trackID 1479, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.662085,0.736616,-0.137984)
+ Old Polarization:       (-0.234185,0.0284552,-0.971776)
+ New Momentum Direction: (0.662085,-0.736616,-0.137984)
+ New Polarization:       (0.193497,-0.00985351,0.981051)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.662085,-0.736616,-0.137984)
+ Old Polarization:       (0.193497,-0.00985351,0.981051)
+ New Momentum Direction: (-0.662085,-0.736616,-0.137984)
+ New Polarization:       (0.193497,0.00985351,-0.981051)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.662085,-0.736616,-0.137984)
+ Old Polarization:       (0.193497,0.00985351,-0.981051)
+ New Momentum Direction: (-0.662085,0.736616,-0.137984)
+ New Polarization:       (-0.200387,0.00340975,0.979711)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.662085,0.736616,-0.137984)
+ Old Polarization:       (-0.200387,0.00340975,0.979711)
+ New Momentum Direction: (0.662085,0.736616,-0.137984)
+ New Polarization:       (-0.200387,-0.00340975,-0.979711)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.662085,0.736616,-0.137984)
+ Old Polarization:       (-0.200387,-0.00340975,-0.979711)
+ New Momentum Direction: (0.894042,0.407396,-0.186326)
+ New Polarization:       (-0.201061,-0.00677465,-0.979555)
+ *** FresnelRefraction *** 
+Track (trackID 1478, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1477, parentID 1) is processed with stopping code 2
+### pop requested out of 57 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.17459,0.20364,0.963353)
+ Old Polarization:       (-0.77923,-0.569527,0.261611)
+ New Momentum Direction: (0.23709,0.27654,0.931297)
+ New Polarization:       (0.473723,0.804025,-0.359348)
+ *** FresnelRefraction *** 
+Track (trackID 1476, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.00125049,0.57543,0.81785)
+ Old Polarization:       (-0.982513,-0.152984,0.106136)
+ New Momentum Direction: (-0.0016877,0.776619,0.629969)
+ New Polarization:       (-0.967398,0.158275,-0.197712)
+ *** FresnelRefraction *** 
+Track (trackID 1475, parentID 1) is processed with stopping code 2
+### pop requested out of 55 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.604505,-0.136793,0.784769)
+ Old Polarization:       (-0.30004,-0.951694,0.0652302)
+ New Momentum Direction: (0.818881,-0.185304,0.543228)
+ New Polarization:       (-0.138887,-0.982296,-0.125714)
+ *** FresnelRefraction *** 
+Track (trackID 1474, parentID 1) is processed with stopping code 2
+### pop requested out of 54 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.0130453,0.618012,0.78606)
+Old Polarization: (-0.992017,-0.106611,0.0673555)
+New Polarization: (0.380019,-0.806404,-0.453098)
+Polarization Change: (0.380019,-0.806404,-0.453098)
+New Momentum Direction: (-0.918608,-0.386415,-0.0827229)
+Momentum Change: (-0.918608,-0.386415,-0.0827229)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.918608,-0.386415,-0.0827229)
+ Old Polarization:       (0.380019,-0.806404,-0.453098)
+ New Momentum Direction: (-0.844894,-0.523081,-0.11198)
+ New Polarization:       (0.523719,-0.766218,-0.372329)
+ *** FresnelRefraction *** 
+Track (trackID 1473, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.7297,-0.168511,0.662677)
+ Old Polarization:       (-0.161218,-0.984233,-0.072756)
+ New Momentum Direction: (0.372117,-0.228747,0.899558)
+ New Polarization:       (-0.317047,-0.94219,-0.108436)
+ *** FresnelRefraction *** 
+Track (trackID 1472, parentID 1) is processed with stopping code 2
+### pop requested out of 52 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.873396,-0.132425,0.468661)
+ Old Polarization:       (0.00888998,-0.957826,-0.287211)
+ New Momentum Direction: (0.756138,-0.177944,0.629755)
+ New Polarization:       (-0.0163919,-0.96717,-0.253602)
+ *** FresnelRefraction *** 
+Track (trackID 1471, parentID 1) is processed with stopping code 2
+### pop requested out of 51 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.649469,-0.150944,0.745255)
+ Old Polarization:       (-0.249542,-0.968128,0.0213839)
+ New Momentum Direction: (0.879411,-0.204385,0.429958)
+ New Polarization:       (-0.206424,-0.97754,-0.0424779)
+ *** FresnelRefraction *** 
+Track (trackID 1470, parentID 1) is processed with stopping code 2
+### pop requested out of 50 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.973571,-0.023288,0.227192)
+ Old Polarization:       (0.110505,-0.82255,-0.557853)
+ New Momentum Direction: (0.950737,-0.0316103,0.308383)
+ New Polarization:       (-0.186502,-0.852942,0.487551)
+ *** FresnelRefraction *** 
+Track (trackID 1469, parentID 1) is processed with stopping code 2
+### pop requested out of 49 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1468, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.21729,0.961904,0.165907)
+ Old Polarization:       (-0.73108,0.272997,-0.625296)
+ New Momentum Direction: (0.295357,0.92839,0.225514)
+ New Polarization:       (0.761026,-0.371324,0.531938)
+ *** FresnelRefraction *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.295357,0.92839,0.225514)
+ Old Polarization:       (0.761026,-0.371324,0.531938)
+ New Momentum Direction: (-0.562946,0.812484,-0.15153)
+ New Polarization:       (0.798664,0.581945,0.153218)
+ *** LambertianReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.562946,0.812484,-0.15153)
+ Old Polarization:       (0.798664,0.581945,0.153218)
+ New Momentum Direction: (-0.414151,0.903356,-0.111478)
+ New Polarization:       (-0.848831,-0.427529,-0.310973)
+ *** FresnelRefraction *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.414151,0.903356,-0.111478)
+ Old Polarization:       (-0.848831,-0.427529,-0.310973)
+ New Momentum Direction: (-0.562946,0.812484,-0.15153)
+ New Polarization:       (-0.768239,-0.58201,-0.266596)
+ *** FresnelRefraction *** 
+Track (trackID 1467, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.154656,0.957169,0.244762)
+ Old Polarization:       (-0.800025,0.266695,-0.537432)
+ New Momentum Direction: (0.210379,0.919177,0.332949)
+ New Polarization:       (0.219758,-0.376319,0.90005)
+ *** FresnelRefraction *** 
+Track (trackID 1466, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1465, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.383542,0.923499,0.00667438)
+ Old Polarization:       (-0.546952,0.232968,-0.804096)
+ New Momentum Direction: (0.520302,0.853934,0.00905427)
+ New Polarization:       (0.630102,-0.376721,-0.679008)
+ *** FresnelRefraction *** 
+Track (trackID 1464, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0176701,0.851488,0.524076)
+ Old Polarization:       (-0.961272,0.158651,-0.225356)
+ New Momentum Direction: (0.0238459,0.706567,0.707244)
+ New Polarization:       (-0.905065,-0.285211,0.315454)
+ *** FresnelRefraction *** 
+Track (trackID 1463, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.457339,0.888338,-0.0411825)
+ Old Polarization:       (-0.464956,0.199382,-0.86259)
+ New Momentum Direction: (0.617606,0.784519,-0.0556143)
+ New Polarization:       (0.357058,-0.34269,-0.868949)
+ *** FresnelRefraction *** 
+Track (trackID 1462, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.242115,0.128085,0.961756)
+ Old Polarization:       (-0.70643,-0.656208,0.265232)
+ New Momentum Direction: (0.327526,0.17327,0.928819)
+ New Polarization:       (0.893756,0.262049,-0.364047)
+ *** FresnelRefraction *** 
+Track (trackID 1461, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.830441,0.53705,-0.148137)
+Old Polarization: (-0.0469426,-0.197503,-0.979178)
+New Polarization: (-0.188499,-0.438217,0.878882)
+Polarization Change: (-0.188499,-0.438217,0.878882)
+New Momentum Direction: (0.296948,0.827602,0.476337)
+Momentum Change: (0.296948,0.827602,0.476337)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.296948,0.827602,0.476337)
+ Old Polarization:       (-0.188499,-0.438217,0.878882)
+ New Momentum Direction: (0.402137,0.649746,0.645071)
+ New Polarization:       (-0.121636,-0.660391,0.741005)
+ *** FresnelRefraction *** 
+Track (trackID 1460, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.271344,0.956046,0.111125)
+ Old Polarization:       (-0.672752,0.270963,-0.688465)
+ New Momentum Direction: (0.367654,0.917693,0.150568)
+ New Polarization:       (0.922679,-0.380187,0.0642068)
+ *** FresnelRefraction *** 
+Track (trackID 1459, parentID 1) is processed with stopping code 2
+### pop requested out of 39 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.898998,-0.12833,0.418728)
+ Old Polarization:       (0.0265086,-0.938408,-0.344511)
+ New Momentum Direction: (0.803734,-0.174345,0.568873)
+ New Polarization:       (-0.0496841,-0.972433,-0.227829)
+ *** FresnelRefraction *** 
+Track (trackID 1458, parentID 1) is processed with stopping code 2
+### pop requested out of 38 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1457, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.533745,0.840966,-0.0888388)
+ Old Polarization:       (-0.379061,0.144019,-0.914096)
+ New Momentum Direction: (0.72205,0.681322,-0.120181)
+ New Polarization:       (0.0885351,-0.26328,-0.960648)
+ *** FresnelRefraction *** 
+Track (trackID 1456, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.596332,0.794415,-0.115297)
+ Old Polarization:       (-0.308199,0.0939568,-0.946671)
+ New Momentum Direction: (0.804971,0.572537,-0.155636)
+ New Polarization:       (-0.0635867,-0.177556,-0.982054)
+ *** FresnelRefraction *** 
+Track (trackID 1455, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.655089,0.742497,-0.139846)
+ Old Polarization:       (-0.243469,0.0322306,-0.969373)
+ New Momentum Direction: (0.88748,0.420103,-0.189455)
+ New Polarization:       (-0.179171,-0.0642251,-0.981719)
+ *** FresnelRefraction *** 
+Track (trackID 1454, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1453, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0239865,0.870993,0.49071)
+ Old Polarization:       (-0.948515,0.174895,-0.264068)
+ New Momentum Direction: (0.0325258,0.745774,0.665404)
+ New Polarization:       (-0.865939,-0.311421,0.391364)
+ *** FresnelRefraction *** 
+Track (trackID 1452, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.986556,0.16037,0.0314368)
+ Old Polarization:       (0.125199,-0.618058,-0.776099)
+ New Momentum Direction: (0.975096,0.217641,0.0426634)
+ New Polarization:       (-0.18874,0.915342,-0.355705)
+ *** FresnelRefraction *** 
+Track (trackID 1451, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.946416,-0.0740145,0.314353)
+ Old Polarization:       (0.0842314,-0.88312,-0.461524)
+ New Momentum Direction: (0.899529,-0.100121,0.425232)
+ New Polarization:       (-0.150967,-0.984657,0.0875148)
+ *** FresnelRefraction *** 
+Track (trackID 1450, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.226008,0.149791,0.96254)
+ Old Polarization:       (-0.725839,-0.633105,0.268954)
+ New Momentum Direction: (0.305126,0.202228,0.930592)
+ New Polarization:       (0.824065,0.4337,-0.364446)
+ *** FresnelRefraction *** 
+Track (trackID 1449, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.218567,0.149851,0.964247)
+ Old Polarization:       (-0.730712,-0.629782,0.263504)
+ New Momentum Direction: (0.296621,0.203365,0.933091)
+ New Polarization:       (0.811395,0.461612,-0.358542)
+ *** FresnelRefraction *** 
+Track (trackID 1448, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.00946826,0.847137,0.53129)
+ Old Polarization:       (-0.964472,0.148019,-0.218826)
+ New Momentum Direction: (0.0128417,0.693248,0.720585)
+ New Polarization:       (-0.921939,-0.270792,0.276949)
+ *** FresnelRefraction *** 
+Track (trackID 1447, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.869248,-0.142282,0.47346)
+ Old Polarization:       (-0.00285694,-0.95912,-0.282986)
+ New Momentum Direction: (0.743202,-0.192558,0.640759)
+ New Polarization:       (-0.0053569,-0.959372,-0.282093)
+ *** FresnelRefraction *** 
+Track (trackID 1446, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.236123,0.957947,0.163042)
+ Old Polarization:       (-0.717502,0.28503,-0.635569)
+ New Momentum Direction: (0.317286,0.922676,0.219085)
+ New Polarization:       (0.805114,-0.38416,0.451899)
+ *** FresnelRefraction *** 
+Track (trackID 1445, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1444, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.981477,0.191379,0.00878133)
+ Old Polarization:       (0.121082,-0.584135,-0.802574)
+ New Momentum Direction: (0.965696,0.259402,0.0119025)
+ New Polarization:       (-0.192782,0.746888,-0.636391)
+ *** FresnelRefraction *** 
+Track (trackID 1443, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0648764,0.392518,0.917453)
+ Old Polarization:       (-0.907385,-0.359391,0.217924)
+ New Momentum Direction: (0.0876,0.530002,0.843459)
+ New Polarization:       (-0.643362,0.676541,-0.358298)
+ *** FresnelRefraction *** 
+Track (trackID 1442, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.300376,0.950756,0.0764075)
+ Old Polarization:       (-0.638595,0.259963,-0.724304)
+ New Momentum Direction: (0.408488,0.90683,0.103908)
+ New Polarization:       (0.899742,-0.380883,-0.213056)
+ *** FresnelRefraction *** 
+Track (trackID 1441, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1440, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1439, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.438727,0.898067,-0.0315292)
+ Old Polarization:       (-0.485656,0.207442,-0.84918)
+ New Momentum Direction: (0.593825,0.803462,-0.0426753)
+ New Polarization:       (0.417342,-0.352929,-0.837417)
+ *** FresnelRefraction *** 
+Track (trackID 1438, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1437, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+### pop requested out of 17 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89878,0.3218,-0.29774)
- Old Polarization:       (-0.22243,-0.25051,-0.94222)
- New Momentum Direction: (0.80323,0.43723,-0.40454)
- New Polarization:       (-0.37598,-0.15462,-0.91364)
+ Old Momentum Direction: (0.158591,0.240086,0.95771)
+ Old Polarization:       (-0.80363,-0.532137,0.266476)
+ New Momentum Direction: (0.213662,0.323455,0.921805)
+ New Polarization:       (0.246318,0.895271,-0.371238)
  *** FresnelRefraction *** 
 Track (trackID 1436, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1435, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1434, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
+### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91338,0.28492,-0.29079)
- Old Polarization:       (-0.20644,-0.29148,-0.93404)
- New Momentum Direction: (0.83297,0.38725,-0.39522)
- New Polarization:       (-0.34852,-0.1876,-0.91834)
+ Old Momentum Direction: (-0.0183153,0.757863,0.652157)
+ Old Polarization:       (-0.995294,0.0482561,-0.0840299)
+ New Momentum Direction: (-0.0248445,0.465605,0.884644)
+ New Polarization:       (-0.995216,-0.0951597,0.0221346)
+ *** FresnelRefraction *** 
+Track (trackID 1435, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.904009,0.413687,-0.107845)
+ Old Polarization:       (0.0412202,-0.335431,-0.941163)
+ New Momentum Direction: (0.817572,0.557203,-0.145259)
+ New Polarization:       (-0.0755949,-0.146218,-0.98636)
+ *** FresnelRefraction *** 
+Track (trackID 1434, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.00679877,0.562357,0.826867)
+ Old Polarization:       (-0.979328,-0.170917,0.108189)
+ New Momentum Direction: (-0.00924604,0.764781,0.644224)
+ New Polarization:       (-0.965747,0.160246,-0.204095)
  *** FresnelRefraction *** 
 Track (trackID 1433, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+### pop requested out of 13 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1432, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51909,-0.072757,0.85161)
- Old Polarization:       (-0.64423,-0.6881,0.3339)
- New Momentum Direction: (0.70603,-0.098958,0.70124)
- New Polarization:       (0.43479,-0.72103,-0.53951)
+ Old Momentum Direction: (0.121984,0.948097,0.293654)
+ Old Polarization:       (-0.836727,0.25737,-0.483372)
+ New Momentum Direction: (0.165846,0.901721,0.399243)
+ New Polarization:       (-0.126538,-0.382044,0.91544)
  *** FresnelRefraction *** 
 Track (trackID 1431, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.23261,0.56059,0.79475)
- Old Polarization:       (-0.96236,0.014549,0.2714)
- New Momentum Direction: (0.31623,0.76211,0.56497)
- New Polarization:       (-0.62514,0.61535,-0.48016)
+ Old Momentum Direction: (0.487592,0.87046,-0.0674737)
+ Old Polarization:       (-0.430893,0.17271,-0.885722)
+ New Momentum Direction: (0.662064,0.743827,-0.0916173)
+ New Polarization:       (0.218885,-0.30883,-0.925588)
  *** FresnelRefraction *** 
 Track (trackID 1430, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1429, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84809,0.43276,-0.30572)
- Old Polarization:       (-0.2784,-0.12697,-0.95204)
- New Momentum Direction: (0.69452,0.58764,-0.41513)
- New Polarization:       (-0.47046,-0.065615,-0.87998)
+ Old Momentum Direction: (0.820465,-0.155495,0.550144)
+ Old Polarization:       (-0.0544074,-0.97917,-0.195615)
+ New Momentum Direction: (-0.820465,-0.155495,0.550144)
+ New Polarization:       (0.00464974,0.960454,0.2784)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.820465,-0.155495,0.550144)
+ Old Polarization:       (0.00464974,0.960454,0.2784)
+ New Momentum Direction: (-0.820465,-0.155495,-0.550144)
+ New Polarization:       (-0.00464974,-0.960454,0.2784)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.820465,-0.155495,-0.550144)
+ Old Polarization:       (-0.00464974,-0.960454,0.2784)
+ New Momentum Direction: (-0.637017,-0.209662,-0.741789)
+ New Polarization:       (0.00877491,-0.964211,0.264992)
+ *** FresnelRefraction *** 
+Track (trackID 1429, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.984455,0.172442,0.0333528)
+ Old Polarization:       (0.133208,-0.609284,-0.781683)
+ New Momentum Direction: (0.97165,0.232123,0.044896)
+ New Polarization:       (-0.199389,0.906574,-0.371978)
  *** FresnelRefraction *** 
 Track (trackID 1428, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92143,-0.28729,0.26161)
- Old Polarization:       (-0.19786,-0.92638,-0.32043)
- New Momentum Direction: (0.84903,-0.39065,0.35573)
- New Polarization:       (-0.33369,-0.91849,-0.2122)
+ Old Momentum Direction: (0.99116,0.0740885,0.110055)
+ Old Polarization:       (0.129771,-0.713862,-0.688158)
+ New Momentum Direction: (0.983643,0.100591,0.149423)
+ New Polarization:       (-0.177965,0.414577,0.892443)
  *** FresnelRefraction *** 
 Track (trackID 1427, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57634,0.809724,-0.110362)
+ Old Polarization:       (-0.331423,0.108153,-0.937263)
+ New Momentum Direction: (0.57634,-0.809724,-0.110362)
+ New Polarization:       (0.192052,0.00293931,0.98138)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57634,-0.809724,-0.110362)
+ Old Polarization:       (0.192052,0.00293931,0.98138)
+ New Momentum Direction: (-0.57634,-0.809724,-0.110362)
+ New Polarization:       (0.192052,-0.00293931,-0.98138)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.57634,-0.809724,-0.110362)
+ Old Polarization:       (0.192052,-0.00293931,-0.98138)
+ New Momentum Direction: (-0.780266,-0.607339,-0.149411)
+ New Polarization:       (0.183843,0.00562366,-0.982939)
+ *** FresnelRefraction *** 
 Track (trackID 1426, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
+### pop requested out of 6 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1425, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
+### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.29788,0.88959,0.34627)
- Old Polarization:       (-0.89386,0.38726,-0.22593)
- New Momentum Direction: (0.40291,0.78632,0.46836)
- New Polarization:       (0.15358,-0.56257,0.81236)
+ Old Momentum Direction: (0.516127,-0.0962822,0.851083)
+ Old Polarization:       (-0.398945,-0.906316,0.139404)
+ New Momentum Direction: (0.699185,-0.130431,0.702942)
+ New Polarization:       (0.0764886,-0.963928,-0.254937)
  *** FresnelRefraction *** 
 Track (trackID 1424, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0153782,0.526847,0.849821)
+ Old Polarization:       (-0.967472,-0.2068,0.145713)
+ New Momentum Direction: (0.0206916,0.708884,0.705022)
+ New Polarization:       (-0.92117,0.287614,-0.262154)
+ *** FresnelRefraction *** 
+Track (trackID 1423, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1423, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.78803,0.54205,-0.29188)
- Old Polarization:       (-0.34461,-0.0044832,-0.93874)
- New Momentum Direction: (0.55059,0.73499,-0.39577)
- New Polarization:       (-0.58011,-0.0040327,-0.81453)
- *** FresnelRefraction *** 
 Track (trackID 1422, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1421, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 104
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 84
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 105 stacked tracks.
+### pop requested out of 85 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63546,0.54394,0.54801)
- Old Polarization:       (-0.65617,0.0063409,0.75458)
- New Momentum Direction: (-0.63546,0.54394,0.54801)
- New Polarization:       (-0.65617,-0.0063409,-0.75458)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.63546,0.54394,0.54801)
- Old Polarization:       (-0.65617,-0.0063409,-0.75458)
- New Momentum Direction: (-0.63546,0.54394,-0.54801)
- New Polarization:       (0.65617,0.0063409,-0.75458)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.63546,0.54394,-0.54801)
- Old Polarization:       (0.65617,0.0063409,-0.75458)
- New Momentum Direction: (-0.63546,-0.54394,-0.54801)
- New Polarization:       (-0.65617,0.0063409,0.75458)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1648, parentID 1) is processed with stopping code 2
-### pop requested out of 104 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1647, parentID 1) is processed with stopping code 2
-### pop requested out of 103 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94507,-0.30551,-0.11622)
- Old Polarization:       (-0.30677,-0.95176,0.0073682)
- New Momentum Direction: (0.8964,-0.41429,-0.15759)
- New Polarization:       (-0.42802,-0.90144,-0.064841)
- *** FresnelRefraction *** 
-Track (trackID 1646, parentID 1) is processed with stopping code 2
-### pop requested out of 102 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.63609,0.54438,0.54685)
-Old Polarization: (-0.6556,0.0075434,0.75507)
-New Polarization: (-0.18674,-0.30826,0.93279)
-Polarization Change: (-0.18674,-0.30826,0.93279)
-New Momentum Direction: (-0.88635,0.46236,-0.024639)
-Momentum Change: (-0.88635,0.46236,-0.024639)
- Photon at Boundary! 
- Old Momentum Direction: (-0.88635,0.46236,-0.024639)
- Old Polarization:       (-0.18674,-0.30826,0.93279)
- New Momentum Direction: (-0.88635,-0.46236,-0.024639)
- New Polarization:       (0.18674,-0.30826,-0.93279)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1645, parentID 1) is processed with stopping code 2
-### pop requested out of 101 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48728,0.61429,-0.62065)
- Old Polarization:       (-0.82329,0.086216,-0.56104)
- New Momentum Direction: (0.48728,0.61429,0.62065)
- New Polarization:       (0.82329,-0.086216,-0.56104)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48728,0.61429,0.62065)
- Old Polarization:       (0.82329,-0.086216,-0.56104)
- New Momentum Direction: (0.48728,-0.61429,0.62065)
- New Polarization:       (-0.82329,-0.086216,0.56104)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.48728,-0.61429,0.62065)
- Old Polarization:       (-0.82329,-0.086216,0.56104)
- New Momentum Direction: (-0.48728,-0.61429,0.62065)
- New Polarization:       (-0.82329,0.086216,-0.56104)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.48728,-0.61429,0.62065)
- Old Polarization:       (-0.82329,0.086216,-0.56104)
- New Momentum Direction: (-0.48728,-0.61429,-0.62065)
- New Polarization:       (0.82329,-0.086216,-0.56104)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.48728,-0.61429,-0.62065)
- Old Polarization:       (0.82329,-0.086216,-0.56104)
- New Momentum Direction: (-0.48728,0.61429,-0.62065)
- New Polarization:       (-0.82329,-0.086216,0.56104)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1644, parentID 1) is processed with stopping code 2
-### pop requested out of 100 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1643, parentID 1) is processed with stopping code 2
-### pop requested out of 99 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95292,-0.26823,0.14138)
- Old Polarization:       (-0.29931,-0.9067,0.29716)
- New Momentum Direction: (0.91118,-0.36447,0.19212)
- New Polarization:       (-0.40915,-0.8553,0.31791)
- *** FresnelRefraction *** 
-Track (trackID 1642, parentID 1) is processed with stopping code 2
-### pop requested out of 98 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.69977,0.40869,0.58591)
- Old Polarization:       (-0.5838,-0.14551,0.79875)
- New Momentum Direction: (0.24482,0.55469,0.79523)
- New Polarization:       (-0.88454,-0.20811,0.41747)
- *** FresnelRefraction *** 
-Track (trackID 1641, parentID 1) is processed with stopping code 2
-### pop requested out of 97 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.46968,0.66397,-0.58185)
- Old Polarization:       (-0.8434,0.14269,-0.51799)
- New Momentum Direction: (0.46968,-0.66397,-0.58185)
- New Polarization:       (0.8434,0.14269,0.51799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46968,-0.66397,-0.58185)
- Old Polarization:       (0.8434,0.14269,0.51799)
- New Momentum Direction: (0.46968,-0.66397,0.58185)
- New Polarization:       (-0.8434,-0.14269,0.51799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.46968,-0.66397,0.58185)
- Old Polarization:       (-0.8434,-0.14269,0.51799)
- New Momentum Direction: (-0.46968,-0.66397,0.58185)
- New Polarization:       (-0.8434,0.14269,-0.51799)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1640, parentID 1) is processed with stopping code 2
-### pop requested out of 96 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73051,0.055633,-0.68063)
- Old Polarization:       (-0.54877,-0.54538,-0.63356)
- New Momentum Direction: (0.38249,0.075271,-0.92089)
- New Polarization:       (-0.82696,-0.41667,-0.37753)
- *** FresnelRefraction *** 
-Track (trackID 1639, parentID 1) is processed with stopping code 2
-### pop requested out of 95 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.4233,0.8005,-0.42428)
- Old Polarization:       (-0.89415,0.29367,-0.33801)
- New Momentum Direction: (0.5756,0.57951,-0.57693)
- New Polarization:       (-0.2959,-0.51011,-0.80761)
- *** FresnelRefraction *** 
-Track (trackID 1638, parentID 1) is processed with stopping code 2
-### pop requested out of 94 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84118,0.094133,0.5325)
- Old Polarization:       (-0.42052,-0.50521,0.7536)
- New Momentum Direction: (0.68668,0.12655,0.71586)
- New Polarization:       (-0.62782,-0.39321,0.67174)
- *** FresnelRefraction *** 
-Track (trackID 1637, parentID 1) is processed with stopping code 2
-### pop requested out of 93 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1636, parentID 1) is processed with stopping code 2
-### pop requested out of 92 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1635, parentID 1) is processed with stopping code 2
-### pop requested out of 91 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.83592,-0.15222,-0.52732)
- Old Polarization:       (-0.43002,-0.77868,-0.45689)
- New Momentum Direction: (0.66788,-0.20642,-0.71507)
- New Polarization:       (-0.64786,-0.63416,-0.42205)
- *** FresnelRefraction *** 
-Track (trackID 1634, parentID 1) is processed with stopping code 2
-### pop requested out of 90 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.41765,0.90103,-0.1171)
- Old Polarization:       (-0.90699,0.42112,0.0055288)
- New Momentum Direction: (0.56259,0.81155,-0.15774)
- New Polarization:       (0.72109,-0.57501,-0.38652)
- *** FresnelRefraction *** 
-Track (trackID 1633, parentID 1) is processed with stopping code 2
-### pop requested out of 89 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74896,0.02495,-0.66214)
- Old Polarization:       (-0.5272,-0.58289,-0.6183)
- New Momentum Direction: (0.44964,0.033633,-0.89257)
- New Polarization:       (-0.79102,-0.44914,-0.41541)
- *** FresnelRefraction *** 
-Track (trackID 1632, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94486,-0.30415,-0.12137)
- Old Polarization:       (-0.30625,-0.95195,0.001398)
- New Momentum Direction: (0.89624,-0.41198,-0.1644)
- New Polarization:       (-0.42744,-0.90118,-0.071881)
- *** FresnelRefraction *** 
-Track (trackID 1631, parentID 1) is processed with stopping code 2
-### pop requested out of 87 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79849,0.17995,0.57448)
- Old Polarization:       (-0.47297,-0.40287,0.78358)
- New Momentum Direction: (0.57491,0.24457,0.78081)
- New Polarization:       (-0.71652,-0.31027,0.62476)
+ Old Momentum Direction: (0.116798,-0.121156,0.985738)
+ Old Polarization:       (-0.712594,-0.701574,-0.00179635)
+ New Momentum Direction: (0.157788,-0.163676,0.973814)
+ New Polarization:       (-0.710099,-0.704094,-0.00328425)
  *** FresnelRefraction *** 
 Track (trackID 1630, parentID 1) is processed with stopping code 2
-### pop requested out of 86 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.86444,-0.18881,-0.46593)
- Old Polarization:       (-0.39428,-0.82961,-0.39533)
- New Momentum Direction: (0.73631,-0.25413,-0.62711)
- New Polarization:       (-0.58683,-0.70122,-0.40486)
- *** FresnelRefraction *** 
-Track (trackID 1629, parentID 1) is processed with stopping code 2
-### pop requested out of 85 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1628, parentID 1) is processed with stopping code 2
 ### pop requested out of 84 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88712,-0.24154,-0.3933)
- Old Polarization:       (-0.37333,-0.87656,-0.30375)
- New Momentum Direction: (0.77884,-0.32824,-0.53448)
- New Polarization:       (-0.55547,-0.75673,-0.3447)
+ Old Momentum Direction: (0.213901,-0.214689,0.952972)
+ Old Polarization:       (-0.598391,-0.799889,-0.0458895)
+ New Momentum Direction: (0.290872,-0.291944,0.911133)
+ New Polarization:       (-0.561312,-0.823269,-0.0845964)
  *** FresnelRefraction *** 
-Track (trackID 1627, parentID 1) is processed with stopping code 2
+Track (trackID 1629, parentID 1) is processed with stopping code 2
 ### pop requested out of 83 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76481,-0.014362,-0.6441)
- Old Polarization:       (-0.50992,-0.62454,-0.59156)
- New Momentum Direction: (0.48952,-0.019438,-0.87177)
- New Polarization:       (-0.76915,-0.48064,-0.42118)
+ Old Momentum Direction: (-0.125694,0.352677,0.927265)
+ Old Polarization:       (-0.984196,-0.161847,-0.0718547)
+ New Momentum Direction: (-0.170402,0.478118,0.861607)
+ New Polarization:       (-0.984735,-0.114129,-0.131421)
  *** FresnelRefraction *** 
-Track (trackID 1626, parentID 1) is processed with stopping code 2
+Track (trackID 1628, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59999,0.61529,0.51129)
- Old Polarization:       (-0.696,0.086339,0.71284)
- New Momentum Direction: (0.59999,-0.61529,0.51129)
- New Polarization:       (0.696,0.086339,-0.71284)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.90367,0.408204,0.129421)
+ Old Polarization:       (0.184321,-0.0979793,-0.97797)
+ New Momentum Direction: (0.815509,0.55168,0.17491)
+ New Polarization:       (-0.316912,0.678565,-0.662659)
+ *** FresnelRefraction *** 
+Track (trackID 1627, parentID 1) is processed with stopping code 2
+### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.59999,-0.61529,0.51129)
- Old Polarization:       (0.696,0.086339,-0.71284)
- New Momentum Direction: (-0.59999,-0.61529,0.51129)
- New Polarization:       (0.696,-0.086339,0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.59999,-0.61529,0.51129)
- Old Polarization:       (0.696,-0.086339,0.71284)
- New Momentum Direction: (-0.59999,-0.61529,-0.51129)
- New Polarization:       (-0.696,0.086339,0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.59999,-0.61529,-0.51129)
- Old Polarization:       (-0.696,0.086339,0.71284)
- New Momentum Direction: (-0.59999,0.61529,-0.51129)
- New Polarization:       (0.696,0.086339,-0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.59999,0.61529,-0.51129)
- Old Polarization:       (0.696,0.086339,-0.71284)
- New Momentum Direction: (0.59999,0.61529,-0.51129)
- New Polarization:       (0.696,-0.086339,0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.59999,0.61529,-0.51129)
- Old Polarization:       (0.696,-0.086339,0.71284)
- New Momentum Direction: (0.59999,0.61529,0.51129)
- New Polarization:       (-0.696,0.086339,0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.59999,0.61529,0.51129)
- Old Polarization:       (-0.696,0.086339,0.71284)
- New Momentum Direction: (0.59999,-0.61529,0.51129)
- New Polarization:       (0.696,0.086339,-0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.59999,-0.61529,0.51129)
- Old Polarization:       (0.696,0.086339,-0.71284)
- New Momentum Direction: (-0.59999,-0.61529,0.51129)
- New Polarization:       (0.696,-0.086339,0.71284)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.59999,-0.61529,0.51129)
- Old Polarization:       (0.696,-0.086339,0.71284)
- New Momentum Direction: (-0.59999,-0.61529,-0.51129)
- New Polarization:       (-0.696,0.086339,0.71284)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (-0.131017,0.459853,0.878277)
+ Old Polarization:       (-0.991116,-0.0402943,-0.126753)
+ New Momentum Direction: (-0.177506,0.62302,0.761799)
+ New Polarization:       (-0.973087,0.00447396,-0.230397)
+ *** FresnelRefraction *** 
+Track (trackID 1626, parentID 1) is processed with stopping code 2
+### pop requested out of 80 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1625, parentID 1) is processed with stopping code 2
-### pop requested out of 81 stacked tracks.
+### pop requested out of 79 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1624, parentID 1) is processed with stopping code 2
-### pop requested out of 80 stacked tracks.
+### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64087,0.53725,0.54831)
- Old Polarization:       (-0.65039,0.00060195,0.7596)
- New Momentum Direction: (-0.64087,0.53725,0.54831)
- New Polarization:       (-0.65039,-0.00060195,-0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64087,0.53725,0.54831)
- Old Polarization:       (-0.65039,-0.00060195,-0.7596)
- New Momentum Direction: (-0.64087,0.53725,-0.54831)
- New Polarization:       (0.65039,0.00060195,-0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64087,0.53725,-0.54831)
- Old Polarization:       (0.65039,0.00060195,-0.7596)
- New Momentum Direction: (-0.64087,-0.53725,-0.54831)
- New Polarization:       (-0.65039,0.00060195,0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64087,-0.53725,-0.54831)
- Old Polarization:       (-0.65039,0.00060195,0.7596)
- New Momentum Direction: (0.64087,-0.53725,-0.54831)
- New Polarization:       (-0.65039,-0.00060195,-0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.64087,-0.53725,-0.54831)
- Old Polarization:       (-0.65039,-0.00060195,-0.7596)
- New Momentum Direction: (0.64087,-0.53725,0.54831)
- New Polarization:       (0.65039,0.00060195,-0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.64087,-0.53725,0.54831)
- Old Polarization:       (0.65039,0.00060195,-0.7596)
- New Momentum Direction: (0.64087,0.53725,0.54831)
- New Polarization:       (-0.65039,0.00060195,0.7596)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.64087,0.53725,0.54831)
- Old Polarization:       (-0.65039,0.00060195,0.7596)
- New Momentum Direction: (-0.64087,0.53725,0.54831)
- New Polarization:       (-0.65039,-0.00060195,-0.7596)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.334496,0.889775,0.310503)
+ Old Polarization:       (-0.46305,0.442144,-0.768175)
+ New Momentum Direction: (0.334496,-0.889775,0.310503)
+ New Polarization:       (0.205671,0.390465,0.89735)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1623, parentID 1) is processed with stopping code 2
-### pop requested out of 79 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.43974,0.77591,-0.45232)
- Old Polarization:       (-0.88217,0.27865,-0.37965)
- New Momentum Direction: (0.59188,0.52822,-0.60882)
- New Polarization:       (-0.37583,-0.48733,-0.7882)
- *** FresnelRefraction *** 
-Track (trackID 1622, parentID 1) is processed with stopping code 2
-### pop requested out of 78 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93511,-0.3009,-0.18714)
- Old Polarization:       (-0.31861,-0.94511,-0.072443)
- New Momentum Direction: (0.87674,-0.40841,-0.25401)
- New Polarization:       (-0.45323,-0.87831,-0.15219)
- *** FresnelRefraction *** 
-Track (trackID 1621, parentID 1) is processed with stopping code 2
 ### pop requested out of 77 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.89106,-0.24954,-0.37914)
- Old Polarization:       (-0.36957,-0.88382,-0.28686)
- New Momentum Direction: (0.7865,-0.33954,-0.51588)
- New Polarization:       (-0.54925,-0.7665,-0.33289)
- *** FresnelRefraction *** 
-Track (trackID 1620, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1622, parentID 1) is processed with stopping code 2
 ### pop requested out of 76 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.42946,0.90273,0.025264)
- Old Polarization:       (-0.89197,0.41963,0.16823)
- New Momentum Direction: (0.57976,0.81407,0.034105)
- New Polarization:       (0.79231,-0.57304,0.20946)
- *** FresnelRefraction *** 
-Track (trackID 1619, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1621, parentID 1) is processed with stopping code 2
 ### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65963,0.4937,0.56671)
- Old Polarization:       (-0.629,-0.050108,0.77579)
- New Momentum Direction: (-0.65963,0.4937,0.56671)
- New Polarization:       (-0.629,0.050108,-0.77579)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65963,0.4937,0.56671)
- Old Polarization:       (-0.629,0.050108,-0.77579)
- New Momentum Direction: (-0.65963,0.4937,-0.56671)
- New Polarization:       (0.629,-0.050108,-0.77579)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65963,0.4937,-0.56671)
- Old Polarization:       (0.629,-0.050108,-0.77579)
- New Momentum Direction: (-0.65963,-0.4937,-0.56671)
- New Polarization:       (-0.629,-0.050108,0.77579)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.65963,-0.4937,-0.56671)
-Old Polarization: (-0.629,-0.050108,0.77579)
-New Polarization: (-0.44834,0.43452,0.78115)
-Polarization Change: (-0.44834,0.43452,0.78115)
-New Momentum Direction: (0.48162,0.85362,-0.19841)
-Momentum Change: (0.48162,0.85362,-0.19841)
- Photon at Boundary! 
- Old Momentum Direction: (0.48162,0.85362,-0.19841)
- Old Polarization:       (-0.44834,0.43452,0.78115)
- New Momentum Direction: (0.65421,0.70666,-0.26951)
- New Polarization:       (0.75351,-0.63962,0.152)
+ Old Momentum Direction: (-0.0738289,0.688435,0.72153)
+ Old Polarization:       (-0.927053,0.219303,-0.304103)
+ New Momentum Direction: (-0.0999679,0.932175,0.347933)
+ New Polarization:       (-0.822997,0.119054,-0.55543)
  *** FresnelRefraction *** 
-Track (trackID 1618, parentID 1) is processed with stopping code 2
+Track (trackID 1620, parentID 1) is processed with stopping code 2
 ### pop requested out of 74 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.92962,-0.29236,-0.22436)
- Old Polarization:       (-0.32323,-0.93926,-0.11537)
- New Momentum Direction: (0.86662,-0.39584,-0.30378)
- New Polarization:       (-0.46325,-0.86449,-0.19508)
- *** FresnelRefraction *** 
-Track (trackID 1617, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1619, parentID 1) is processed with stopping code 2
 ### pop requested out of 73 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41999,0.90681,-0.036199)
- Old Polarization:       (-0.90154,0.42146,0.097953)
- New Momentum Direction: (0.56798,0.82158,-0.048955)
- New Polarization:       (0.81972,-0.57003,-0.055897)
+ Old Momentum Direction: (0.954909,-0.013208,0.296604)
+ Old Polarization:       (0.235582,-0.574288,-0.784024)
+ New Momentum Direction: (0.915061,-0.0179422,0.402916)
+ New Polarization:       (-0.351749,-0.524271,0.775508)
  *** FresnelRefraction *** 
-Track (trackID 1616, parentID 1) is processed with stopping code 2
+Track (trackID 1618, parentID 1) is processed with stopping code 2
 ### pop requested out of 72 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.84045,-0.15369,-0.51963)
- Old Polarization:       (-0.42335,-0.7848,-0.45262)
- New Momentum Direction: (0.68126,-0.20762,-0.70198)
- New Polarization:       (-0.63509,-0.64453,-0.42572)
+ Old Momentum Direction: (0.265037,-0.243108,0.933088)
+ Old Polarization:       (-0.542609,-0.837537,-0.0640889)
+ New Momentum Direction: (0.358873,-0.32918,0.873413)
+ New Polarization:       (-0.501406,-0.857255,-0.11707)
+ *** FresnelRefraction *** 
+Track (trackID 1617, parentID 1) is processed with stopping code 2
+### pop requested out of 71 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1616, parentID 1) is processed with stopping code 2
+### pop requested out of 70 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.550158,-0.340198,0.762622)
+ Old Polarization:       (-0.220788,-0.940013,-0.260053)
+ New Momentum Direction: (0.748552,-0.462878,0.474778)
+ New Polarization:       (-0.224665,-0.850721,-0.475183)
  *** FresnelRefraction *** 
 Track (trackID 1615, parentID 1) is processed with stopping code 2
-### pop requested out of 71 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48724,0.83079,0.26903)
- Old Polarization:       (-0.82694,0.33995,0.44788)
- New Momentum Direction: (0.65664,0.66135,0.36256)
- New Polarization:       (0.094724,-0.54923,0.83029)
- *** FresnelRefraction *** 
-Track (trackID 1614, parentID 1) is processed with stopping code 2
-### pop requested out of 70 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.71059,0.38288,0.5903)
-Old Polarization: (-0.5717,-0.17486,0.80161)
-New Polarization: (-0.27901,0.37166,-0.88545)
-Polarization Change: (-0.27901,0.37166,-0.88545)
-New Momentum Direction: (-0.94298,0.068265,0.32579)
-Momentum Change: (-0.94298,0.068265,0.32579)
-
-** Photon absorbed! **
-Track (trackID 1613, parentID 1) is processed with stopping code 2
 ### pop requested out of 69 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93331,-0.29485,-0.20494)
- Old Polarization:       (-0.31856,-0.94327,-0.093628)
- New Momentum Direction: (0.87406,-0.39892,-0.27727)
- New Polarization:       (-0.45402,-0.87383,-0.17405)
+ Old Momentum Direction: (0.827943,0.549742,0.110879)
+ Old Polarization:       (0.0931945,0.0600929,-0.993833)
+ New Momentum Direction: (0.648294,0.746361,0.150536)
+ New Polarization:       (-0.175866,0.339152,-0.924147)
  *** FresnelRefraction *** 
-Track (trackID 1612, parentID 1) is processed with stopping code 2
+Track (trackID 1614, parentID 1) is processed with stopping code 2
 ### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.9388,-0.29601,-0.17617)
- Old Polarization:       (-0.31065,-0.94852,-0.061677)
- New Momentum Direction: (0.88538,-0.39948,-0.23775)
- New Polarization:       (-0.43851,-0.88747,-0.14183)
+ Old Momentum Direction: (0.895965,-0.15673,0.41555)
+ Old Polarization:       (0.172689,-0.739091,-0.651093)
+ New Momentum Direction: (0.798795,-0.212304,0.562897)
+ New Polarization:       (-0.302478,-0.950528,0.0707349)
  *** FresnelRefraction *** 
-Track (trackID 1611, parentID 1) is processed with stopping code 2
+Track (trackID 1613, parentID 1) is processed with stopping code 2
 ### pop requested out of 67 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91203,-0.1016,0.39734)
- Old Polarization:       (-0.34032,-0.72815,0.59496)
- New Momentum Direction: (0.83341,-0.13691,0.53543)
- New Polarization:       (-0.4958,-0.61325,0.61491)
+ Old Momentum Direction: (0.559148,-0.329257,0.760883)
+ Old Polarization:       (-0.206905,-0.944137,-0.256508)
+ New Momentum Direction: (0.752932,-0.443367,0.486332)
+ New Polarization:       (-0.211126,-0.862669,-0.459596)
  *** FresnelRefraction *** 
-Track (trackID 1610, parentID 1) is processed with stopping code 2
+Track (trackID 1612, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95472,-0.27326,0.11763)
- Old Polarization:       (-0.29561,-0.91589,0.2716)
- New Momentum Direction: (0.91508,-0.37042,0.15945)
- New Polarization:       (-0.40189,-0.87037,0.28449)
+ Old Momentum Direction: (0.343054,-0.289923,0.893453)
+ Old Polarization:       (-0.453255,-0.884204,-0.112888)
+ New Momentum Direction: (0.466569,-0.394308,0.791729)
+ New Polarization:       (-0.402695,-0.891673,-0.206775)
  *** FresnelRefraction *** 
-Track (trackID 1609, parentID 1) is processed with stopping code 2
+Track (trackID 1611, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.12427,0.48085,0.867952)
+ Old Polarization:       (-0.990853,-0.0137651,-0.134241)
+ New Momentum Direction: (-0.167494,0.648099,0.742909)
+ New Polarization:       (-0.969992,0.0263751,-0.2417)
+ *** FresnelRefraction *** 
+Track (trackID 1610, parentID 1) is processed with stopping code 2
+### pop requested out of 64 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1608, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.474,0.85,0.22985)
- Old Polarization:       (-0.84157,0.36053,0.40222)
- New Momentum Direction: (0.63941,0.70357,0.31006)
- New Polarization:       (0.23635,-0.56361,0.7915)
- *** FresnelRefraction *** 
-Track (trackID 1607, parentID 1) is processed with stopping code 2
+Track (trackID 1609, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94296,-0.30811,-0.12605)
- Old Polarization:       (-0.31099,-0.95041,-0.0033287)
- New Momentum Direction: (0.89168,-0.41897,-0.1714)
- New Polarization:       (-0.43608,-0.89661,-0.076952)
+ Old Momentum Direction: (0.757351,0.641767,0.120643)
+ Old Polarization:       (0.016007,0.166449,-0.98592)
+ New Momentum Direction: (0.467262,0.868899,0.16334)
+ New Polarization:       (-0.031499,0.200993,-0.979086)
  *** FresnelRefraction *** 
-Track (trackID 1606, parentID 1) is processed with stopping code 2
+Track (trackID 1608, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6427,0.5378,0.54563)
- Old Polarization:       (-0.64863,0.0029717,0.7611)
- New Momentum Direction: (-0.6427,0.5378,0.54563)
- New Polarization:       (-0.64863,-0.0029717,-0.7611)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6427,0.5378,0.54563)
- Old Polarization:       (-0.64863,-0.0029717,-0.7611)
- New Momentum Direction: (-0.6427,0.5378,-0.54563)
- New Polarization:       (0.64863,0.0029717,-0.7611)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6427,0.5378,-0.54563)
- Old Polarization:       (0.64863,0.0029717,-0.7611)
- New Momentum Direction: (-0.6427,-0.5378,-0.54563)
- New Polarization:       (-0.64863,0.0029717,0.7611)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1605, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.739082,0.661695,0.126167)
+ Old Polarization:       (-0.00326074,0.19081,-0.981622)
+ New Momentum Direction: (0.413678,0.894312,0.17052)
+ New Polarization:       (-0.00648111,0.190186,-0.981727)
+ *** FresnelRefraction *** 
+Track (trackID 1607, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.57839,0.66222,0.47637)
- Old Polarization:       (-0.72113,0.14206,0.67808)
- New Momentum Direction: (0.57839,-0.66222,0.47637)
- New Polarization:       (0.72113,0.14206,-0.67808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57839,-0.66222,0.47637)
- Old Polarization:       (0.72113,0.14206,-0.67808)
- New Momentum Direction: (-0.57839,-0.66222,0.47637)
- New Polarization:       (0.72113,-0.14206,0.67808)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57839,-0.66222,0.47637)
- Old Polarization:       (0.72113,-0.14206,0.67808)
- New Momentum Direction: (-0.57839,-0.66222,-0.47637)
- New Polarization:       (-0.72113,0.14206,0.67808)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.57839,-0.66222,-0.47637)
-Old Polarization: (-0.72113,0.14206,0.67808)
-New Polarization: (0.55512,-0.69079,-0.4633)
-Polarization Change: (0.55512,-0.69079,-0.4633)
-New Momentum Direction: (-0.46332,-0.7194,0.51749)
-Momentum Change: (-0.46332,-0.7194,0.51749)
- Photon at Boundary! 
- Old Momentum Direction: (-0.46332,-0.7194,0.51749)
- Old Polarization:       (0.55512,-0.69079,-0.4633)
- New Momentum Direction: (-0.6276,-0.33877,0.70097)
- New Polarization:       (-0.17368,0.9386,0.29811)
+ Old Momentum Direction: (0.957386,0.232839,0.170873)
+ Old Polarization:       (0.237329,-0.297108,-0.924879)
+ New Momentum Direction: (0.919698,0.316535,0.232295)
+ New Polarization:       (-0.35019,0.928861,0.12076)
  *** FresnelRefraction *** 
-Track (trackID 1604, parentID 1) is processed with stopping code 2
+Track (trackID 1606, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.45978,0.68423,-0.56607)
- Old Polarization:       (-0.85283,0.16252,-0.49626)
- New Momentum Direction: (0.45978,-0.68423,-0.56607)
- New Polarization:       (0.6871,-0.12972,0.71489)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.45978,-0.68423,-0.56607)
- Old Polarization:       (0.6871,-0.12972,0.71489)
- New Momentum Direction: (0.45978,-0.68423,0.56607)
- New Polarization:       (-0.6871,0.12972,0.71489)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.45978,-0.68423,0.56607)
- Old Polarization:       (-0.6871,0.12972,0.71489)
- New Momentum Direction: (-0.45978,-0.68423,0.56607)
- New Polarization:       (-0.6871,-0.12972,-0.71489)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.45978,-0.68423,0.56607)
- Old Polarization:       (-0.6871,-0.12972,-0.71489)
- New Momentum Direction: (-0.62564,-0.12361,0.77026)
- New Polarization:       (-0.76528,0.2889,-0.57523)
+ Old Momentum Direction: (0.262899,-0.237818,0.935054)
+ Old Polarization:       (-0.546247,-0.835549,-0.0589276)
+ New Momentum Direction: (0.354921,-0.321061,0.878038)
+ New Polarization:       (-0.508034,-0.854646,-0.10715)
  *** FresnelRefraction *** 
-Track (trackID 1603, parentID 1) is processed with stopping code 2
+Track (trackID 1605, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.90829,-0.088289,0.40892)
- Old Polarization:       (-0.34392,-0.71412,0.60972)
- New Momentum Direction: (0.82641,-0.11883,0.55038)
- New Polarization:       (-0.50212,-0.59786,0.62486)
+ Old Momentum Direction: (0.437876,0.865195,0.244341)
+ Old Polarization:       (-0.346751,0.413282,-0.841999)
+ New Momentum Direction: (0.595489,0.73142,0.332292)
+ New Polarization:       (0.788278,-0.611761,-0.0660756)
  *** FresnelRefraction *** 
-Track (trackID 1602, parentID 1) is processed with stopping code 2
+Track (trackID 1604, parentID 1) is processed with stopping code 2
 ### pop requested out of 58 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6797,0.17151,-0.71315)
- Old Polarization:       (-0.6065,-0.41537,-0.67795)
- New Momentum Direction: (0.91557,0.23103,-0.32916)
- New Polarization:       (0.35657,-0.087884,0.93012)
+ Old Momentum Direction: (0.298488,0.893273,0.336108)
+ Old Polarization:       (-0.503665,0.44656,-0.739531)
+ New Momentum Direction: (0.405479,0.791908,0.456583)
+ New Polarization:       (0.586089,-0.608534,0.534964)
  *** FresnelRefraction *** 
-Track (trackID 1601, parentID 1) is processed with stopping code 2
+Track (trackID 1603, parentID 1) is processed with stopping code 2
 ### pop requested out of 57 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.49892,0.60329,-0.62219)
- Old Polarization:       (-0.81424,0.080439,-0.57493)
- New Momentum Direction: (0.49892,0.60329,0.62219)
- New Polarization:       (0.81424,-0.080439,-0.57493)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49892,0.60329,0.62219)
- Old Polarization:       (0.81424,-0.080439,-0.57493)
- New Momentum Direction: (0.49892,-0.60329,0.62219)
- New Polarization:       (-0.81424,-0.080439,0.57493)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49892,-0.60329,0.62219)
- Old Polarization:       (-0.81424,-0.080439,0.57493)
- New Momentum Direction: (-0.49892,-0.60329,0.62219)
- New Polarization:       (-0.81424,0.080439,-0.57493)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49892,-0.60329,0.62219)
- Old Polarization:       (-0.81424,0.080439,-0.57493)
- New Momentum Direction: (-0.49892,-0.60329,-0.62219)
- New Polarization:       (0.81424,-0.080439,-0.57493)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49892,-0.60329,-0.62219)
- Old Polarization:       (0.81424,-0.080439,-0.57493)
- New Momentum Direction: (-0.49892,0.60329,-0.62219)
- New Polarization:       (-0.81424,-0.080439,0.57493)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49892,0.60329,-0.62219)
- Old Polarization:       (-0.81424,-0.080439,0.57493)
- New Momentum Direction: (0.49892,0.60329,-0.62219)
- New Polarization:       (-0.81424,0.080439,-0.57493)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1600, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.0422529,0.0928971,0.994779)
+ Old Polarization:       (-0.890041,-0.455856,0.00476576)
+ New Momentum Direction: (-0.0572697,0.125913,0.990387)
+ New Polarization:       (-0.93439,-0.356146,-0.00875307)
+ *** FresnelRefraction *** 
+Track (trackID 1602, parentID 1) is processed with stopping code 2
 ### pop requested out of 56 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94639,-0.29591,-0.12957)
- Old Polarization:       (-0.29954,-0.95404,-0.0090346)
- New Momentum Direction: (0.90072,-0.39793,-0.17423)
- New Polarization:       (-0.4163,-0.90529,-0.08456)
+ Old Momentum Direction: (0.94524,-0.0513482,0.322311)
+ Old Polarization:       (0.223838,-0.616708,-0.754697)
+ New Momentum Direction: (0.896205,-0.0697973,0.438115)
+ New Polarization:       (-0.35077,-0.71611,0.603446)
  *** FresnelRefraction *** 
-Track (trackID 1599, parentID 1) is processed with stopping code 2
+Track (trackID 1601, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89242,-0.25153,-0.37459)
- Old Polarization:       (-0.36803,-0.88609,-0.28179)
- New Momentum Direction: (0.78937,-0.34224,-0.50968)
- New Polarization:       (-0.54654,-0.76989,-0.32949)
+ Old Momentum Direction: (0.586149,0.792397,0.168929)
+ Old Polarization:       (-0.180389,0.330904,-0.926262)
+ New Momentum Direction: (0.797499,0.557826,0.22984)
+ New Polarization:       (0.567428,-0.564053,-0.599891)
  *** FresnelRefraction *** 
-Track (trackID 1598, parentID 1) is processed with stopping code 2
+Track (trackID 1600, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52864,0.75364,0.3906)
- Old Polarization:       (-0.7771,0.24452,0.57994)
- New Momentum Direction: (0.7167,0.45377,0.52955)
- New Polarization:       (-0.32832,-0.45037,0.83028)
- *** FresnelRefraction *** 
-Track (trackID 1597, parentID 1) is processed with stopping code 2
-### pop requested out of 53 stacked tracks.
+ Old Momentum Direction: (0.829225,0.548043,0.1097)
+ Old Polarization:       (0.0935257,0.0574465,-0.993958)
+ New Momentum Direction: (-0.829225,0.548043,0.1097)
+ New Polarization:       (0.0112906,-0.179808,0.983637)
+ *** FresnelReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.829225,0.548043,0.1097)
+Old Polarization: (0.0112906,-0.179808,0.983637)
+New Polarization: (-0.570383,-0.484595,0.663198)
+Polarization Change: (-0.570383,-0.484595,0.663198)
+New Momentum Direction: (-0.631304,-0.2579,-0.731398)
+Momentum Change: (-0.631304,-0.2579,-0.731398)
  Photon at Boundary! 
- Old Momentum Direction: (0.95688,-0.28643,0.048417)
- Old Polarization:       (-0.29031,-0.93693,0.19461)
- New Momentum Direction: (0.91988,-0.38671,0.065368)
- New Polarization:       (-0.39206,-0.90231,0.17921)
+ Old Momentum Direction: (-0.631304,-0.2579,-0.731398)
+ Old Polarization:       (-0.570383,-0.484595,0.663198)
+ New Momentum Direction: (-0.858001,-0.35051,-0.375469)
+ New Polarization:       (-0.283568,-0.286262,0.915228)
  *** FresnelRefraction *** 
-Track (trackID 1596, parentID 1) is processed with stopping code 2
+Track (trackID 1599, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1598, parentID 1) is processed with stopping code 2
 ### pop requested out of 52 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95451,-0.28369,0.091824)
- Old Polarization:       (-0.29773,-0.92364,0.24134)
- New Momentum Direction: (0.91419,-0.38559,0.12481)
- New Polarization:       (-0.40496,-0.88141,0.24315)
+ Old Momentum Direction: (-0.126047,0.368767,0.920936)
+ Old Polarization:       (-0.986627,-0.143306,-0.0776549)
+ New Momentum Direction: (-0.170634,0.499211,0.849513)
+ New Polarization:       (-0.985276,-0.0958133,-0.141599)
  *** FresnelRefraction *** 
-Track (trackID 1595, parentID 1) is processed with stopping code 2
+Track (trackID 1597, parentID 1) is processed with stopping code 2
 ### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.68772,0.43526,0.58102)
- Old Polarization:       (-0.59738,-0.11549,0.7936)
- New Momentum Direction: (0.17188,0.59063,0.78842)
- New Polarization:       (-0.90693,-0.21761,0.36073)
+ Old Momentum Direction: (0.913363,-0.123435,0.387984)
+ Old Polarization:       (0.195163,-0.703591,-0.68328)
+ New Momentum Direction: (0.834943,-0.166846,0.524435)
+ New Polarization:       (-0.329705,-0.914643,0.233928)
  *** FresnelRefraction *** 
-Track (trackID 1594, parentID 1) is processed with stopping code 2
+Track (trackID 1596, parentID 1) is processed with stopping code 2
 ### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94631,-0.30649,-0.10278)
- Old Polarization:       (-0.30582,-0.95182,0.022598)
- New Momentum Direction: (0.89866,-0.41589,-0.13947)
- New Polarization:       (-0.42551,-0.90374,-0.046812)
+ Old Momentum Direction: (0.402029,0.874632,0.27091)
+ Old Polarization:       (-0.387191,0.430512,-0.815318)
+ New Momentum Direction: (0.544377,0.754379,0.366832)
+ New Polarization:       (0.7817,-0.614855,0.104391)
  *** FresnelRefraction *** 
-Track (trackID 1593, parentID 1) is processed with stopping code 2
+Track (trackID 1595, parentID 1) is processed with stopping code 2
 ### pop requested out of 49 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41958,0.85082,-0.31632)
- Old Polarization:       (-0.90464,0.36329,-0.22279)
- New Momentum Direction: (0.56529,0.70627,-0.42618)
- New Polarization:       (0.087552,-0.5651,-0.82036)
+ Old Momentum Direction: (-0.043941,0.110956,0.992853)
+ Old Polarization:       (-0.898949,-0.437957,0.00915877)
+ New Momentum Direction: (-0.059215,0.149525,0.986983)
+ New Polarization:       (-0.962303,-0.271472,-0.0166072)
  *** FresnelRefraction *** 
-Track (trackID 1592, parentID 1) is processed with stopping code 2
+Track (trackID 1594, parentID 1) is processed with stopping code 2
 ### pop requested out of 48 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.63287,0.55477,0.54009)
- Old Polarization:       (-0.65954,0.020897,0.75138)
- New Momentum Direction: (-0.63287,0.55477,0.54009)
- New Polarization:       (-0.65954,-0.020897,-0.75138)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.63287,0.55477,0.54009)
- Old Polarization:       (-0.65954,-0.020897,-0.75138)
- New Momentum Direction: (-0.63287,-0.55477,0.54009)
- New Polarization:       (0.65954,-0.020897,0.75138)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.63287,-0.55477,0.54009)
- Old Polarization:       (0.65954,-0.020897,0.75138)
- New Momentum Direction: (-0.63287,-0.55477,-0.54009)
- New Polarization:       (-0.65954,0.020897,0.75138)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1591, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.579859,0.796077,0.173274)
+ Old Polarization:       (-0.186843,0.336952,-0.922796)
+ New Momentum Direction: (0.787796,0.569175,0.23541)
+ New Polarization:       (0.583991,-0.56874,-0.579215)
+ *** FresnelRefraction *** 
+Track (trackID 1593, parentID 1) is processed with stopping code 2
 ### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41584,0.85922,-0.29803)
- Old Polarization:       (-0.90732,0.36959,-0.20046)
- New Momentum Direction: (0.56153,0.723,-0.40245)
- New Polarization:       (0.15236,-0.56839,-0.80853)
+ Old Momentum Direction: (0.570369,-0.339186,0.748085)
+ Old Polarization:       (-0.19766,-0.940672,-0.275802)
+ New Momentum Direction: (0.775165,-0.460974,0.431998)
+ New Polarization:       (-0.2164,-0.836178,-0.503961)
  *** FresnelRefraction *** 
-Track (trackID 1590, parentID 1) is processed with stopping code 2
+Track (trackID 1592, parentID 1) is processed with stopping code 2
 ### pop requested out of 46 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1589, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.853206,0.508064,0.117942)
+ Old Polarization:       (0.127471,0.0161492,-0.991711)
+ New Momentum Direction: (0.70971,0.686246,0.159305)
+ New Polarization:       (-0.232663,0.441754,-0.866442)
+ *** FresnelRefraction *** 
+Track (trackID 1591, parentID 1) is processed with stopping code 2
 ### pop requested out of 45 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47844,0.64522,-0.59564)
- Old Polarization:       (-0.83472,0.12355,-0.53664)
- New Momentum Direction: (0.47844,-0.64522,-0.59564)
- New Polarization:       (0.83472,0.12355,0.53664)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.47844,-0.64522,-0.59564)
- Old Polarization:       (0.83472,0.12355,0.53664)
- New Momentum Direction: (0.47844,-0.64522,0.59564)
- New Polarization:       (-0.83472,-0.12355,0.53664)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.47844,-0.64522,0.59564)
- Old Polarization:       (-0.83472,-0.12355,0.53664)
- New Momentum Direction: (-0.47844,-0.64522,0.59564)
- New Polarization:       (-0.83472,0.12355,-0.53664)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.47844,-0.64522,0.59564)
- Old Polarization:       (-0.83472,0.12355,-0.53664)
- New Momentum Direction: (-0.47844,0.64522,0.59564)
- New Polarization:       (0.83472,0.12355,0.53664)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.47844,0.64522,0.59564)
- Old Polarization:       (0.83472,0.12355,0.53664)
- New Momentum Direction: (-0.47844,0.64522,-0.59564)
- New Polarization:       (-0.83472,-0.12355,0.53664)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1588, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.088788,0.850751,0.518014)
+ Old Polarization:       (-0.742434,0.403226,-0.534977)
+ New Momentum Direction: (0.120241,0.70243,0.701523)
+ New Polarization:       (-0.405222,-0.610373,0.680617)
+ *** FresnelRefraction *** 
+Track (trackID 1590, parentID 1) is processed with stopping code 2
 ### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.77928,-0.051058,-0.6246)
- Old Polarization:       (-0.49464,-0.66208,-0.56301)
- New Momentum Direction: (0.52349,-0.069418,-0.8492)
- New Polarization:       (-0.75005,-0.51038,-0.42064)
+ Old Momentum Direction: (0.794583,-0.268482,0.544568)
+ Old Polarization:       (0.0548453,-0.861512,-0.504767)
+ New Momentum Direction: (0.565231,-0.364783,0.739897)
+ New Polarization:       (-0.106125,-0.921619,-0.373304)
  *** FresnelRefraction *** 
-Track (trackID 1587, parentID 1) is processed with stopping code 2
+Track (trackID 1589, parentID 1) is processed with stopping code 2
 ### pop requested out of 43 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6354,0.54231,0.5497)
- Old Polarization:       (-0.6561,0.0037929,0.75466)
- New Momentum Direction: (-0.6354,0.54231,0.5497)
- New Polarization:       (-0.6561,-0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6354,0.54231,0.5497)
- Old Polarization:       (-0.6561,-0.0037929,-0.75466)
- New Momentum Direction: (-0.6354,0.54231,-0.5497)
- New Polarization:       (0.6561,0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6354,0.54231,-0.5497)
- Old Polarization:       (0.6561,0.0037929,-0.75466)
- New Momentum Direction: (-0.6354,-0.54231,-0.5497)
- New Polarization:       (-0.6561,0.0037929,0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6354,-0.54231,-0.5497)
- Old Polarization:       (-0.6561,0.0037929,0.75466)
- New Momentum Direction: (0.6354,-0.54231,-0.5497)
- New Polarization:       (-0.6561,-0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6354,-0.54231,-0.5497)
- Old Polarization:       (-0.6561,-0.0037929,-0.75466)
- New Momentum Direction: (0.6354,-0.54231,0.5497)
- New Polarization:       (0.6561,0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6354,-0.54231,0.5497)
- Old Polarization:       (0.6561,0.0037929,-0.75466)
- New Momentum Direction: (0.6354,0.54231,0.5497)
- New Polarization:       (-0.6561,0.0037929,0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6354,0.54231,0.5497)
- Old Polarization:       (-0.6561,0.0037929,0.75466)
- New Momentum Direction: (-0.6354,0.54231,0.5497)
- New Polarization:       (-0.6561,-0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6354,0.54231,0.5497)
- Old Polarization:       (-0.6561,-0.0037929,-0.75466)
- New Momentum Direction: (-0.6354,0.54231,-0.5497)
- New Polarization:       (0.6561,0.0037929,-0.75466)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6354,0.54231,-0.5497)
- Old Polarization:       (0.6561,0.0037929,-0.75466)
- New Momentum Direction: (-0.6354,-0.54231,-0.5497)
- New Polarization:       (-0.6561,0.0037929,0.75466)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1586, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.0984652,0.245462,0.964392)
+ Old Polarization:       (-0.958631,-0.283486,-0.0257227)
+ New Momentum Direction: (-0.132969,0.331476,0.934046)
+ New Polarization:       (-0.965768,-0.255123,-0.0469463)
+ *** FresnelRefraction *** 
+Track (trackID 1588, parentID 1) is processed with stopping code 2
 ### pop requested out of 42 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1585, parentID 1) is processed with stopping code 2
+Track (trackID 1587, parentID 1) is processed with stopping code 2
 ### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.64271,0.54434,0.53909)
- Old Polarization:       (-0.64911,0.013167,0.76058)
- New Momentum Direction: (-0.64271,0.54434,0.53909)
- New Polarization:       (-0.64911,-0.013167,-0.76058)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64271,0.54434,0.53909)
- Old Polarization:       (-0.64911,-0.013167,-0.76058)
- New Momentum Direction: (-0.64271,-0.54434,0.53909)
- New Polarization:       (0.64911,-0.013167,0.76058)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64271,-0.54434,0.53909)
- Old Polarization:       (0.64911,-0.013167,0.76058)
- New Momentum Direction: (-0.64271,-0.54434,-0.53909)
- New Polarization:       (-0.64911,0.013167,0.76058)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1584, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.0249472,0.758467,0.651234)
+ Old Polarization:       (-0.873265,0.300558,-0.383502)
+ New Momentum Direction: (-0.033731,0.472791,0.880529)
+ New Polarization:       (-0.809024,-0.530205,0.253696)
+ *** FresnelRefraction *** 
+Track (trackID 1586, parentID 1) is processed with stopping code 2
 ### pop requested out of 40 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.55391,0.44385,-0.70441)
- Old Polarization:       (-0.74812,-0.10597,-0.65505)
- New Momentum Direction: (0.75195,0.60254,-0.26743)
- New Polarization:       (0.039614,0.36364,0.9307)
+ Old Momentum Direction: (0.352825,0.885644,0.301909)
+ Old Polarization:       (-0.442935,0.442304,-0.779856)
+ New Momentum Direction: (0.477964,0.777353,0.40899)
+ New Polarization:       (0.722025,-0.612864,0.321058)
  *** FresnelRefraction *** 
-Track (trackID 1583, parentID 1) is processed with stopping code 2
+Track (trackID 1585, parentID 1) is processed with stopping code 2
 ### pop requested out of 39 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88659,-0.23187,-0.40024)
- Old Polarization:       (-0.37108,-0.87312,-0.31617)
- New Momentum Direction: (0.78046,-0.3134,-0.54098)
- New Polarization:       (-0.55007,-0.75547,-0.35592)
+ Old Momentum Direction: (0.916217,-0.12408,0.380987)
+ Old Polarization:       (0.191811,-0.698992,-0.688926)
+ New Momentum Direction: (0.838836,-0.16858,0.517624)
+ New Polarization:       (-0.326851,-0.916349,0.231241)
+ *** FresnelRefraction *** 
+Track (trackID 1584, parentID 1) is processed with stopping code 2
+### pop requested out of 38 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.132748,0.48773,0.862843)
+ Old Polarization:       (-0.98917,-0.0101972,-0.146419)
+ New Momentum Direction: (-0.180348,0.662617,0.726921)
+ New Polarization:       (-0.963208,0.0307413,-0.266992)
+ *** FresnelRefraction *** 
+Track (trackID 1583, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.124648,0.868046,0.480582)
+ Old Polarization:       (-0.700383,0.42006,-0.577073)
+ New Momentum Direction: (0.169113,0.739102,0.652019)
+ New Polarization:       (-0.230591,-0.613517,0.755265)
  *** FresnelRefraction *** 
 Track (trackID 1582, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1581, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1580, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42327,0.80473,-0.41623)
- Old Polarization:       (-0.89501,0.30002,-0.33008)
- New Momentum Direction: (0.42327,-0.80473,-0.41623)
- New Polarization:       (0.70028,-0.00091132,0.71387)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.42327,-0.80473,-0.41623)
- Old Polarization:       (0.70028,-0.00091132,0.71387)
- New Momentum Direction: (-0.42327,-0.80473,-0.41623)
- New Polarization:       (0.70028,0.00091132,-0.71387)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.42327,-0.80473,-0.41623)
- Old Polarization:       (0.70028,0.00091132,-0.71387)
- New Momentum Direction: (-0.42327,-0.80473,0.41623)
- New Polarization:       (-0.70028,-0.00091132,-0.71387)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.42327,-0.80473,0.41623)
- Old Polarization:       (-0.70028,-0.00091132,-0.71387)
- New Momentum Direction: (-0.57484,-0.59162,0.56529)
- New Polarization:       (-0.70208,0.0017606,-0.7121)
+ Old Momentum Direction: (0.370169,0.883264,0.287784)
+ Old Polarization:       (-0.423002,0.436074,-0.794298)
+ New Momentum Direction: (0.502598,0.771179,0.39074)
+ New Polarization:       (0.753771,-0.612228,0.23876)
  *** FresnelRefraction *** 
-Track (trackID 1579, parentID 1) is processed with stopping code 2
+Track (trackID 1581, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.142325,-0.150775,0.978269)
+ Old Polarization:       (-0.681265,-0.731909,-0.0136897)
+ New Momentum Direction: (0.192866,-0.204316,0.959717)
+ New Polarization:       (-0.665262,-0.746186,-0.025165)
+ *** FresnelRefraction *** 
+Track (trackID 1580, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1578, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54619,0.7274,0.4154)
- Old Polarization:       (-0.75877,0.21953,0.61325)
- New Momentum Direction: (0.73739,0.37648,0.56082)
- New Polarization:       (-0.40692,-0.41509,0.8137)
- *** FresnelRefraction *** 
-Track (trackID 1577, parentID 1) is processed with stopping code 2
+Track (trackID 1579, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.94007,-0.20937,0.26915)
- Old Polarization:       (-0.31356,-0.84093,0.44104)
- New Momentum Direction: (0.88625,-0.2844,0.36562)
- New Polarization:       (-0.44221,-0.75443,0.48506)
+ Old Momentum Direction: (0.176745,0.88439,0.431991)
+ Old Polarization:       (-0.640762,0.436543,-0.631549)
+ New Momentum Direction: (0.2401,0.773286,0.58684)
+ New Polarization:       (0.0388051,-0.611686,0.790149)
  *** FresnelRefraction *** 
-Track (trackID 1576, parentID 1) is processed with stopping code 2
+Track (trackID 1578, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1575, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (0.958132,0.223476,0.179001)
+ Old Polarization:       (0.243682,-0.308191,-0.919585)
+ New Momentum Direction: (0.921783,0.302603,0.24238)
+ New Polarization:       (-0.353163,0.9133,0.202875)
+ *** FresnelRefraction *** 
+Track (trackID 1577, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95482,-0.297,-0.010724)
- Old Polarization:       (-0.29331,-0.94754,0.12702)
- New Momentum Direction: (0.91581,-0.40135,-0.014491)
- New Polarization:       (-0.39875,-0.91299,0.086317)
+ Old Momentum Direction: (0.00337322,0.789958,0.613151)
+ Old Polarization:       (-0.839902,0.335016,-0.427)
+ New Momentum Direction: (0.00456565,0.557891,0.829902)
+ New Polarization:       (-0.730225,-0.565134,0.383921)
  *** FresnelRefraction *** 
-Track (trackID 1574, parentID 1) is processed with stopping code 2
+Track (trackID 1576, parentID 1) is processed with stopping code 2
 ### pop requested out of 30 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.95026,-0.22898,0.21112)
- Old Polarization:       (-0.29588,-0.87539,0.3823)
- New Momentum Direction: (0.90784,-0.30828,0.28423)
- New Polarization:       (-0.40749,-0.80842,0.42474)
+ Old Momentum Direction: (-0.035522,0.0958013,0.994766)
+ Old Polarization:       (-0.890074,-0.455656,0.0120986)
+ New Momentum Direction: (-0.0478387,0.129019,0.990488)
+ New Polarization:       (-0.98038,-0.195904,-0.0218325)
  *** FresnelRefraction *** 
-Track (trackID 1573, parentID 1) is processed with stopping code 2
+Track (trackID 1575, parentID 1) is processed with stopping code 2
 ### pop requested out of 29 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94169,-0.3009,-0.15058)
- Old Polarization:       (-0.30885,-0.95057,-0.031981)
- New Momentum Direction: (0.89044,-0.40698,-0.20367)
- New Polarization:       (-0.43383,-0.89429,-0.10968)
- *** FresnelRefraction *** 
-Track (trackID 1572, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1574, parentID 1) is processed with stopping code 2
 ### pop requested out of 28 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.91676,-0.26843,-0.29579)
- Old Polarization:       (-0.33418,-0.92108,-0.19986)
- New Momentum Direction: (0.84319,-0.36129,-0.39811)
- New Polarization:       (-0.48458,-0.83146,-0.27175)
+ Old Momentum Direction: (0.58404,0.793736,0.169941)
+ Old Polarization:       (-0.182714,0.332536,-0.925222)
+ New Momentum Direction: (0.794551,0.56146,0.231195)
+ New Polarization:       (0.572375,-0.565477,-0.59382)
  *** FresnelRefraction *** 
-Track (trackID 1571, parentID 1) is processed with stopping code 2
+Track (trackID 1573, parentID 1) is processed with stopping code 2
 ### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.445371,0.859116,0.25212)
+ Old Polarization:       (-0.337619,0.421948,-0.841412)
+ New Momentum Direction: (0.599505,0.724858,0.339374)
+ New Polarization:       (0.784174,-0.616828,-0.0677804)
+ *** FresnelRefraction *** 
+Track (trackID 1572, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1571, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1570, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.42368,0.81456,-0.39622)
- Old Polarization:       (-0.89675,0.31547,-0.31036)
- New Momentum Direction: (0.57349,0.61926,-0.53631)
- New Polarization:       (-0.19911,-0.52967,-0.8245)
+ Old Momentum Direction: (0.859986,0.496768,0.116811)
+ Old Polarization:       (0.133282,0.00231074,-0.991075)
+ New Momentum Direction: (0.72339,0.672109,0.158042)
+ New Polarization:       (-0.242807,0.461919,-0.853039)
  *** FresnelRefraction *** 
 Track (trackID 1569, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.90099,-0.26158,-0.34612)
-Old Polarization: (-0.35757,-0.89954,-0.25095)
-New Polarization: (0.85857,0.48758,0.15851)
-Polarization Change: (0.85857,0.48758,0.15851)
-New Momentum Direction: (0.51166,-0.83455,-0.20429)
-Momentum Change: (0.51166,-0.83455,-0.20429)
+### pop requested out of 23 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1568, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,0.60833,-0.62384)
- Old Polarization:       (-0.82011,0.080536,-0.56651)
- New Momentum Direction: (0.49067,0.60833,0.62384)
- New Polarization:       (0.82011,-0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,0.60833,0.62384)
- Old Polarization:       (0.82011,-0.080536,-0.56651)
- New Momentum Direction: (0.49067,-0.60833,0.62384)
- New Polarization:       (-0.82011,-0.080536,0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,-0.60833,0.62384)
- Old Polarization:       (-0.82011,-0.080536,0.56651)
- New Momentum Direction: (-0.49067,-0.60833,0.62384)
- New Polarization:       (-0.82011,0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49067,-0.60833,0.62384)
- Old Polarization:       (-0.82011,0.080536,-0.56651)
- New Momentum Direction: (-0.49067,-0.60833,-0.62384)
- New Polarization:       (0.82011,-0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49067,-0.60833,-0.62384)
- Old Polarization:       (0.82011,-0.080536,-0.56651)
- New Momentum Direction: (-0.49067,0.60833,-0.62384)
- New Polarization:       (-0.82011,-0.080536,0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49067,0.60833,-0.62384)
- Old Polarization:       (-0.82011,-0.080536,0.56651)
- New Momentum Direction: (0.49067,0.60833,-0.62384)
- New Polarization:       (-0.82011,0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,0.60833,-0.62384)
- Old Polarization:       (-0.82011,0.080536,-0.56651)
- New Momentum Direction: (0.49067,0.60833,0.62384)
- New Polarization:       (0.82011,-0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,0.60833,0.62384)
- Old Polarization:       (0.82011,-0.080536,-0.56651)
- New Momentum Direction: (0.49067,-0.60833,0.62384)
- New Polarization:       (-0.82011,-0.080536,0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.49067,-0.60833,0.62384)
- Old Polarization:       (-0.82011,-0.080536,0.56651)
- New Momentum Direction: (-0.49067,-0.60833,0.62384)
- New Polarization:       (-0.82011,0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49067,-0.60833,0.62384)
- Old Polarization:       (-0.82011,0.080536,-0.56651)
- New Momentum Direction: (-0.49067,-0.60833,-0.62384)
- New Polarization:       (0.82011,-0.080536,-0.56651)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.49067,-0.60833,-0.62384)
- Old Polarization:       (0.82011,-0.080536,-0.56651)
- New Momentum Direction: (-0.49067,0.60833,-0.62384)
- New Polarization:       (-0.82011,-0.080536,0.56651)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.49067,0.60833,-0.62384)
-Old Polarization: (-0.82011,-0.080536,0.56651)
-New Polarization: (0.79692,0.32433,-0.50963)
-Polarization Change: (0.79692,0.32433,-0.50963)
-New Momentum Direction: (0.19396,-0.93635,-0.29261)
-Momentum Change: (0.19396,-0.93635,-0.29261)
- Photon at Boundary! 
- Old Momentum Direction: (0.19396,-0.93635,-0.29261)
- Old Polarization:       (0.79692,0.32433,-0.50963)
- New Momentum Direction: (0.2629,-0.87954,-0.39661)
- New Polarization:       (0.70659,0.45542,-0.54159)
- *** FresnelRefraction *** 
-Track (trackID 1567, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.52606,0.76653,0.36835)
- Old Polarization:       (-0.7827,0.26698,0.56224)
- New Momentum Direction: (0.70859,0.50173,0.49616)
- New Polarization:       (-0.25466,-0.47392,0.84294)
- *** FresnelRefraction *** 
-Track (trackID 1566, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93698,-0.30379,-0.17254)
- Old Polarization:       (-0.31721,-0.94672,-0.055697)
- New Momentum Direction: (0.88014,-0.41279,-0.23444)
- New Polarization:       (-0.44993,-0.88286,-0.13463)
+ Old Momentum Direction: (0.0698679,0.842946,0.533442)
+ Old Polarization:       (-0.761504,0.390497,-0.517325)
+ New Momentum Direction: (0.0948713,0.68288,0.724344)
+ New Polarization:       (-0.481862,-0.605203,0.633671)
  *** FresnelRefraction *** 
-Track (trackID 1565, parentID 1) is processed with stopping code 2
+Track (trackID 1567, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85993,-0.19675,-0.47096)
- Old Polarization:       (-0.40364,-0.82689,-0.39157)
- New Momentum Direction: (0.72069,-0.26723,-0.63968)
- New Polarization:       (-0.60622,-0.69055,-0.39451)
+ Old Momentum Direction: (0.951286,-0.0235054,0.307411)
+ Old Polarization:       (0.235495,-0.588141,-0.773713)
+ New Momentum Direction: (0.908631,-0.0318378,0.416384)
+ New Polarization:       (-0.354992,-0.584013,0.730006)
+ *** FresnelRefraction *** 
+Track (trackID 1566, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.455793,-0.32622,0.828151)
+ Old Polarization:       (-0.326511,-0.926834,-0.185389)
+ New Momentum Direction: (0.619148,-0.443137,0.648294)
+ New Polarization:       (-0.288291,-0.896186,-0.337251)
+ *** FresnelRefraction *** 
+Track (trackID 1565, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.46055,-0.318943,0.828353)
+ Old Polarization:       (-0.320352,-0.930043,-0.179987)
+ New Momentum Direction: (0.621037,-0.430084,0.655241)
+ New Polarization:       (-0.283962,-0.902668,-0.32335)
  *** FresnelRefraction *** 
 Track (trackID 1564, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1563, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1562, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.76774,0.25306,0.58867)
- Old Polarization:       (-0.50748,-0.32074,0.79974)
- New Momentum Direction: (0.4917,0.3439,0.79998)
- New Polarization:       (-0.76919,-0.25908,0.58415)
+ Old Momentum Direction: (0.406898,0.873281,0.267983)
+ Old Polarization:       (-0.381669,0.429063,-0.818678)
+ New Momentum Direction: (0.550941,0.751535,0.36285)
+ New Polarization:       (0.784221,-0.614921,0.0828853)
+ *** FresnelRefraction *** 
+Track (trackID 1563, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.11908,0.348249,0.929808)
+ Old Polarization:       (-0.984069,-0.16591,-0.0638894)
+ New Momentum Direction: (-0.160592,0.469652,0.868123)
+ New Polarization:       (-0.985642,-0.12279,-0.115902)
+ *** FresnelRefraction *** 
+Track (trackID 1562, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.0432943,0.820714,0.569697)
+ Old Polarization:       (-0.796431,0.372626,-0.476286)
+ New Momentum Direction: (0.0584879,0.635813,0.769624)
+ New Polarization:       (-0.598986,-0.594396,0.536571)
  *** FresnelRefraction *** 
 Track (trackID 1561, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1560, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1559, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.4654,0.85497,0.22898)
-Old Polarization: (-0.84708,0.35523,0.39531)
-New Polarization: (0.78643,-0.50942,-0.34932)
-Polarization Change: (0.78643,-0.50942,-0.34932)
-New Momentum Direction: (0.42189,0.85606,-0.29861)
-Momentum Change: (0.42189,0.85606,-0.29861)
  Photon at Boundary! 
- Old Momentum Direction: (0.42189,0.85606,-0.29861)
- Old Polarization:       (0.78643,-0.50942,-0.34932)
- New Momentum Direction: (0.5735,0.71156,-0.40592)
- New Polarization:       (0.64689,-0.69738,-0.30853)
+ Old Momentum Direction: (0.323443,-0.268132,0.907464)
+ Old Polarization:       (-0.477776,-0.874066,-0.0879725)
+ New Momentum Direction: (0.435489,-0.361018,0.824631)
+ New Polarization:       (-0.434375,-0.886629,-0.158766)
  *** FresnelRefraction *** 
-Track (trackID 1558, parentID 1) is processed with stopping code 2
+Track (trackID 1560, parentID 1) is processed with stopping code 2
 ### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93258,-0.17976,0.31301)
- Old Polarization:       (-0.32106,-0.80938,0.49175)
- New Momentum Direction: (0.87193,-0.24384,0.42458)
- New Polarization:       (-0.45846,-0.71102,0.53317)
+ Old Momentum Direction: (-0.132055,0.37802,0.916331)
+ Old Polarization:       (-0.987162,-0.133945,-0.0870051)
+ New Momentum Direction: (-0.179564,0.514019,0.838773)
+ New Polarization:       (-0.983668,-0.0830361,-0.159696)
  *** FresnelRefraction *** 
-Track (trackID 1557, parentID 1) is processed with stopping code 2
+Track (trackID 1559, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41749,0.86415,-0.28096)
- Old Polarization:       (-0.90724,0.379,-0.18242)
- New Momentum Direction: (0.56232,0.73525,-0.37842)
- New Polarization:       (0.21665,-0.57264,-0.79067)
+ Old Momentum Direction: (0.966986,0.130425,0.218921)
+ Old Polarization:       (0.253747,-0.413758,-0.874309)
+ New Momentum Direction: (0.938584,0.176603,0.296431)
+ New Polarization:       (-0.344257,0.53752,0.769779)
  *** FresnelRefraction *** 
-Track (trackID 1556, parentID 1) is processed with stopping code 2
+Track (trackID 1558, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72901,0.3445,0.5915)
- Old Polarization:       (-0.5508,-0.21781,0.80571)
- New Momentum Direction: (0.3709,0.46738,0.80249)
- New Polarization:       (-0.83303,-0.21451,0.50995)
+ Old Momentum Direction: (0.92997,0.337958,0.144707)
+ Old Polarization:       (0.214149,-0.178037,-0.960439)
+ New Momentum Direction: (0.867805,0.456792,0.19559)
+ New Polarization:       (-0.34756,0.839298,-0.418069)
  *** FresnelRefraction *** 
-Track (trackID 1555, parentID 1) is processed with stopping code 2
+Track (trackID 1557, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.85019,0.050005,0.52409)
- Old Polarization:       (-0.4152,-0.54838,0.72587)
- New Momentum Direction: (0.69803,0.068014,0.71283)
- New Polarization:       (-0.62577,-0.42597,0.65342)
+ Old Momentum Direction: (0.0999559,-0.107386,0.98918)
+ Old Polarization:       (-0.729895,-0.683559,-0.000452161)
+ New Momentum Direction: (0.135345,-0.145405,0.980071)
+ New Polarization:       (-0.729179,-0.684323,-0.000830161)
  *** FresnelRefraction *** 
-Track (trackID 1554, parentID 1) is processed with stopping code 2
+Track (trackID 1556, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.51707,0.55322,-0.65314)
- Old Polarization:       (-0.79293,0.022225,-0.60891)
- New Momentum Direction: (0.51707,0.55322,0.65314)
- New Polarization:       (0.79293,-0.022225,-0.60891)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (0.708269,0.692092,0.139157)
+ Old Polarization:       (-0.0345636,0.230883,-0.972367)
+ New Momentum Direction: (-0.708269,0.692092,0.139157)
+ New Polarization:       (-0.0173499,-0.214128,0.976651)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.51707,0.55322,0.65314)
- Old Polarization:       (0.79293,-0.022225,-0.60891)
- New Momentum Direction: (0.51707,-0.55322,0.65314)
- New Polarization:       (-0.79293,-0.022225,0.60891)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.51707,-0.55322,0.65314)
- Old Polarization:       (-0.79293,-0.022225,0.60891)
- New Momentum Direction: (-0.51707,-0.55322,0.65314)
- New Polarization:       (-0.79293,0.022225,-0.60891)
- *** TotalInternalReflection *** 
+ Old Momentum Direction: (-0.708269,0.692092,0.139157)
+ Old Polarization:       (-0.0173499,-0.214128,0.976651)
+ New Momentum Direction: (-0.952504,0.240237,0.187143)
+ New Polarization:       (0.0713449,-0.421392,0.904068)
+ *** FresnelRefraction *** 
+Track (trackID 1555, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1553, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.46834,0.67808,-0.56644)
- Old Polarization:       (-0.84717,0.16257,-0.50584)
- New Momentum Direction: (0.63274,0.11829,-0.76528)
- New Polarization:       (-0.69417,-0.35132,-0.62825)
- *** FresnelRefraction *** 
-Track (trackID 1552, parentID 1) is processed with stopping code 2
+Track (trackID 1554, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.8857,-0.23744,-0.39895)
- Old Polarization:       (-0.37432,-0.87356,-0.31109)
- New Momentum Direction: (0.77645,-0.32229,-0.54153)
- New Polarization:       (-0.55683,-0.75323,-0.35011)
+ Old Momentum Direction: (-0.0770296,0.692669,0.717131)
+ Old Polarization:       (-0.924789,0.219161,-0.31102)
+ New Momentum Direction: (-0.104788,0.942276,0.318019)
+ New Polarization:       (-0.811376,0.103905,-0.575215)
  *** FresnelRefraction *** 
-Track (trackID 1551, parentID 1) is processed with stopping code 2
+Track (trackID 1553, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.54613,0.73075,0.40957)
- Old Polarization:       (-0.75974,0.22609,0.60966)
- New Momentum Direction: (0.73552,0.39338,0.5516)
- New Polarization:       (-0.3886,-0.42198,0.8191)
+ Old Momentum Direction: (0.920171,0.367264,0.135653)
+ Old Polarization:       (0.200723,-0.145051,-0.96885)
+ New Momentum Direction: (0.847936,0.497263,0.183669)
+ New Polarization:       (-0.335753,0.771918,-0.539827)
  *** FresnelRefraction *** 
-Track (trackID 1550, parentID 1) is processed with stopping code 2
+Track (trackID 1552, parentID 1) is processed with stopping code 2
 ### pop requested out of 6 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.88632,-0.22782,-0.40315)
- Old Polarization:       (-0.37023,-0.87157,-0.3214)
- New Momentum Direction: (0.781,-0.30726,-0.54372)
- New Polarization:       (-0.54798,-0.75478,-0.36059)
+ Old Momentum Direction: (0.638371,-0.324469,0.697999)
+ Old Polarization:       (-0.116432,-0.937082,-0.329122)
+ New Momentum Direction: (0.860442,-0.437343,0.261479)
+ New Polarization:       (-0.208668,-0.770588,-0.602206)
  *** FresnelRefraction *** 
-Track (trackID 1549, parentID 1) is processed with stopping code 2
+Track (trackID 1551, parentID 1) is processed with stopping code 2
 ### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.74958,0.013971,-0.66177)
- Old Polarization:       (-0.52738,-0.59156,-0.60985)
- New Momentum Direction: (0.44222,0.018931,-0.8967)
- New Polarization:       (-0.79645,-0.45145,-0.40231)
+ Old Momentum Direction: (0.72538,-0.304195,0.617486)
+ Old Polarization:       (-0.0206493,-0.906267,-0.422201)
+ New Momentum Direction: (-0.72538,-0.304195,0.617486)
+ New Polarization:       (-0.00867576,0.901024,0.433683)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.72538,-0.304195,0.617486)
+ Old Polarization:       (-0.00867576,0.901024,0.433683)
+ New Momentum Direction: (-0.72538,-0.304195,-0.617486)
+ New Polarization:       (0.00867576,-0.901024,0.433683)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.72538,-0.304195,-0.617486)
+ Old Polarization:       (0.00867576,-0.901024,0.433683)
+ New Momentum Direction: (-0.72538,0.304195,-0.617486)
+ New Polarization:       (-0.00867576,-0.901024,-0.433683)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.72538,0.304195,-0.617486)
+ Old Polarization:       (-0.00867576,-0.901024,-0.433683)
+ New Momentum Direction: (-0.361406,0.41205,-0.836421)
+ New Polarization:       (0.0176077,-0.893879,-0.447963)
  *** FresnelRefraction *** 
-Track (trackID 1548, parentID 1) is processed with stopping code 2
+Track (trackID 1550, parentID 1) is processed with stopping code 2
 ### pop requested out of 4 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56024,0.69212,0.45508)
- Old Polarization:       (-0.74062,0.1725,0.64941)
- New Momentum Direction: (0.56024,-0.69212,0.45508)
- New Polarization:       (0.53297,-0.11937,-0.83767)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.56024,-0.69212,0.45508)
- Old Polarization:       (0.53297,-0.11937,-0.83767)
- New Momentum Direction: (-0.56024,-0.69212,0.45508)
- New Polarization:       (0.53297,0.11937,0.83767)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.56024,-0.69212,0.45508)
- Old Polarization:       (0.53297,0.11937,0.83767)
- New Momentum Direction: (-0.56024,-0.69212,-0.45508)
- New Polarization:       (-0.53297,-0.11937,0.83767)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.56024,-0.69212,-0.45508)
-Old Polarization: (-0.53297,-0.11937,0.83767)
-New Polarization: (0.2534,0.65675,0.71026)
-Polarization Change: (0.2534,0.65675,0.71026)
-New Momentum Direction: (-0.68116,-0.4002,0.61307)
-Momentum Change: (-0.68116,-0.4002,0.61307)
- Photon at Boundary! 
- Old Momentum Direction: (-0.68116,-0.4002,0.61307)
- Old Polarization:       (0.2534,0.65675,0.71026)
- New Momentum Direction: (-0.68116,-0.4002,-0.61307)
- New Polarization:       (-0.2534,-0.65675,0.71026)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.68116,-0.4002,-0.61307)
-Old Polarization: (-0.2534,-0.65675,0.71026)
-New Polarization: (0.087557,-0.57025,0.8168)
-Polarization Change: (0.087557,-0.57025,0.8168)
-New Momentum Direction: (0.92737,0.34606,0.14219)
-Momentum Change: (0.92737,0.34606,0.14219)
-Scattering Photon!
-Old Momentum Direction: (0.92737,0.34606,0.14219)
-Old Polarization: (0.087557,-0.57025,0.8168)
-New Polarization: (-0.27157,-0.3713,0.88791)
-Polarization Change: (-0.27157,-0.3713,0.88791)
-New Momentum Direction: (0.8234,-0.56727,0.014626)
-Momentum Change: (0.8234,-0.56727,0.014626)
- Photon at Boundary! 
- Old Momentum Direction: (0.8234,-0.56727,0.014626)
- Old Polarization:       (-0.27157,-0.3713,0.88791)
- New Momentum Direction: (0.6365,-0.77102,0.019879)
- New Polarization:       (-0.47066,-0.36786,0.80197)
+ Old Momentum Direction: (-0.0806454,0.673423,0.734845)
+ Old Polarization:       (-0.935663,0.202966,-0.288685)
+ New Momentum Direction: (-0.109124,0.911231,0.397178)
+ New Polarization:       (-0.841878,0.127723,-0.524336)
  *** FresnelRefraction *** 
-Track (trackID 1547, parentID 1) is processed with stopping code 2
+Track (trackID 1549, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.88151,-0.032819,0.47102)
-Old Polarization: (-0.38002,-0.64137,0.66651)
-New Polarization: (0.71359,0.4063,-0.57071)
-Polarization Change: (0.71359,0.4063,-0.57071)
-New Momentum Direction: (-0.66091,0.66062,-0.35607)
-Momentum Change: (-0.66091,0.66062,-0.35607)
-Scattering Photon!
-Old Momentum Direction: (-0.66091,0.66062,-0.35607)
-Old Polarization: (0.71359,0.4063,-0.57071)
-New Polarization: (-0.84093,-0.53911,-0.046884)
-Polarization Change: (-0.84093,-0.53911,-0.046884)
-New Momentum Direction: (-0.077479,0.034204,0.99641)
-Momentum Change: (-0.077479,0.034204,0.99641)
  Photon at Boundary! 
- Old Momentum Direction: (-0.077479,0.034204,0.99641)
- Old Polarization:       (-0.84093,-0.53911,-0.046884)
- New Momentum Direction: (-0.10537,0.046517,0.99334)
- New Polarization:       (-0.90908,-0.4094,-0.077261)
+ Old Momentum Direction: (0.0762409,0.846031,0.527655)
+ Old Polarization:       (-0.75479,0.394758,-0.523887)
+ New Momentum Direction: (0.103469,0.690287,0.716099)
+ New Polarization:       (-0.455755,-0.60703,0.651001)
  *** FresnelRefraction *** 
-Track (trackID 1546, parentID 1) is processed with stopping code 2
+Track (trackID 1548, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84578,-0.17064,-0.50551)
- Old Polarization:       (-0.41912,-0.79878,-0.43161)
- New Momentum Direction: (0.6899,-0.23153,-0.68589)
- New Polarization:       (-0.63081,-0.65708,-0.4127)
- *** FresnelRefraction *** 
-Track (trackID 1545, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1547, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 91
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 81
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 92 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1739, parentID 1) is processed with stopping code 2
-### pop requested out of 91 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1738, parentID 1) is processed with stopping code 2
-### pop requested out of 90 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1737, parentID 1) is processed with stopping code 2
-### pop requested out of 89 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.43251,0.88375,0.17867)
- Old Polarization:       (-0.69886,0.20339,0.68573)
- New Momentum Direction: (0.58698,0.77243,0.24248)
- New Polarization:       (0.079314,-0.35293,0.93228)
- *** FresnelRefraction *** 
-Track (trackID 1736, parentID 1) is processed with stopping code 2
-### pop requested out of 88 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.18704,0.89098,-0.41373)
- Old Polarization:       (-0.97795,0.2087,0.0073163)
- New Momentum Direction: (0.25443,0.78646,-0.5628)
- New Polarization:       (-0.55147,-0.36007,-0.75248)
- *** FresnelRefraction *** 
-Track (trackID 1735, parentID 1) is processed with stopping code 2
-### pop requested out of 87 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.5011,0.83073,0.24247)
- Old Polarization:       (-0.622,0.15094,0.76833)
- New Momentum Direction: (0.67517,0.66137,0.3267)
- New Polarization:       (-0.18793,-0.27405,0.94317)
- *** FresnelRefraction *** 
-Track (trackID 1734, parentID 1) is processed with stopping code 2
-### pop requested out of 86 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95913,0.14631,0.24219)
- Old Polarization:       (-0.09378,-0.64318,0.75995)
- New Momentum Direction: (0.9235,0.19836,0.32834)
- New Polarization:       (-0.16571,-0.56567,0.80781)
- *** FresnelRefraction *** 
-Track (trackID 1733, parentID 1) is processed with stopping code 2
-### pop requested out of 85 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1732, parentID 1) is processed with stopping code 2
-### pop requested out of 84 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58727,0.74266,0.32181)
- Old Polarization:       (-0.52136,0.04298,0.85225)
- New Momentum Direction: (0.79578,0.42021,0.43607)
- New Polarization:       (-0.44365,-0.085597,0.8921)
- *** FresnelRefraction *** 
-Track (trackID 1731, parentID 1) is processed with stopping code 2
-### pop requested out of 83 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.21831,0.67,-0.70954)
- Old Polarization:       (-0.94273,-0.0431,-0.33075)
- New Momentum Direction: (0.21831,0.67,0.70954)
- New Polarization:       (0.85388,-0.48316,0.19352)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.21831,0.67,0.70954)
- Old Polarization:       (0.85388,-0.48316,0.19352)
- New Momentum Direction: (0.21831,-0.67,0.70954)
- New Polarization:       (-0.85388,-0.48316,-0.19352)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (0.21831,-0.67,0.70954)
-Old Polarization: (-0.85388,-0.48316,-0.19352)
-New Polarization: (0.20132,-0.87116,-0.44783)
-Polarization Change: (0.20132,-0.87116,-0.44783)
-New Momentum Direction: (-0.97821,-0.20248,-0.04585)
-Momentum Change: (-0.97821,-0.20248,-0.04585)
- Photon at Boundary! 
- Old Momentum Direction: (-0.97821,-0.20248,-0.04585)
- Old Polarization:       (0.20132,-0.87116,-0.44783)
- New Momentum Direction: (-0.95933,-0.27531,-0.062341)
- New Polarization:       (0.27758,-0.87993,-0.38558)
- *** FresnelRefraction *** 
-Track (trackID 1730, parentID 1) is processed with stopping code 2
 ### pop requested out of 82 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97431,-0.124,-0.18798)
- Old Polarization:       (-0.07102,-0.96134,0.26604)
- New Momentum Direction: (0.95276,-0.16724,-0.25353)
- New Polarization:       (-0.12458,-0.97648,0.17599)
+ Old Momentum Direction: (0.972625,-0.139503,-0.185848)
+ Old Polarization:       (-0.205608,-0.889299,-0.408502)
+ New Momentum Direction: (0.949349,-0.188634,-0.251302)
+ New Polarization:       (-0.292936,-0.820656,-0.490624)
  *** FresnelRefraction *** 
-Track (trackID 1729, parentID 1) is processed with stopping code 2
+Track (trackID 1711, parentID 1) is processed with stopping code 2
 ### pop requested out of 81 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92949,-0.1516,-0.33626)
- Old Polarization:       (-0.12685,-0.98741,0.094541)
- New Momentum Direction: (0.86631,-0.2053,-0.45536)
- New Polarization:       (-0.22383,-0.97453,0.01355)
+ Old Momentum Direction: (0.941798,-0.211264,0.261504)
+ Old Polarization:       (-0.245472,-0.96364,0.105553)
+ New Momentum Direction: (0.889395,-0.287278,0.355594)
+ New Polarization:       (-0.377641,-0.900073,0.217385)
  *** FresnelRefraction *** 
-Track (trackID 1728, parentID 1) is processed with stopping code 2
+Track (trackID 1710, parentID 1) is processed with stopping code 2
 ### pop requested out of 80 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1727, parentID 1) is processed with stopping code 2
-### pop requested out of 79 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.959,0.15472,0.23743)
- Old Polarization:       (-0.086228,-0.63877,0.76455)
- New Momentum Direction: (0.92448,0.20814,0.3194)
- New Polarization:       (-0.15119,-0.56893,0.80837)
- *** FresnelRefraction *** 
-Track (trackID 1726, parentID 1) is processed with stopping code 2
-### pop requested out of 78 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1725, parentID 1) is processed with stopping code 2
-### pop requested out of 77 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1724, parentID 1) is processed with stopping code 2
-### pop requested out of 76 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.92227,0.23978,0.30318)
- Old Polarization:       (-0.13434,-0.53661,0.83307)
- New Momentum Direction: (0.85236,0.32441,0.41018)
- New Polarization:       (-0.23664,-0.46018,0.85571)
- *** FresnelRefraction *** 
-Track (trackID 1723, parentID 1) is processed with stopping code 2
-### pop requested out of 75 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99705,-0.066698,-0.038056)
- Old Polarization:       (-0.04312,-0.89635,0.44124)
- New Momentum Direction: (0.99464,-0.089841,-0.051261)
- New Polarization:       (-0.069801,-0.94871,0.30835)
- *** FresnelRefraction *** 
-Track (trackID 1722, parentID 1) is processed with stopping code 2
-### pop requested out of 74 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98333,-0.11258,-0.14276)
- Old Polarization:       (-0.062096,-0.94596,0.31828)
- New Momentum Direction: (0.96938,-0.15207,-0.19283)
- New Polarization:       (-0.1084,-0.96953,0.21967)
- *** FresnelRefraction *** 
-Track (trackID 1721, parentID 1) is processed with stopping code 2
-### pop requested out of 73 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30042,0.95281,-0.043574)
- Old Polarization:       (-0.85377,0.289,0.43309)
- New Momentum Direction: (0.40596,0.91199,-0.058882)
- New Polarization:       (0.91137,-0.39921,0.10023)
- *** FresnelRefraction *** 
-Track (trackID 1720, parentID 1) is processed with stopping code 2
-### pop requested out of 72 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99717,-0.012281,0.074215)
- Old Polarization:       (-0.052202,-0.82334,0.56515)
- New Momentum Direction: (0.99477,-0.016683,0.10082)
- New Polarization:       (-0.08122,-0.72779,0.68097)
- *** FresnelRefraction *** 
-Track (trackID 1719, parentID 1) is processed with stopping code 2
-### pop requested out of 71 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.20169,0.76712,-0.60897)
- Old Polarization:       (-0.97133,0.076786,-0.22498)
- New Momentum Direction: (0.27175,0.50296,-0.82048)
- New Polarization:       (-0.90851,-0.14713,-0.3911)
- *** FresnelRefraction *** 
-Track (trackID 1718, parentID 1) is processed with stopping code 2
-### pop requested out of 70 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.25572,0.57529,-0.77695)
- Old Polarization:       (-0.90029,-0.15112,-0.40821)
- New Momentum Direction: (0.25572,0.57529,0.77695)
- New Polarization:       (0.86811,-0.49031,0.077322)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.25572,0.57529,0.77695)
- Old Polarization:       (0.86811,-0.49031,0.077322)
- New Momentum Direction: (0.25572,-0.57529,0.77695)
- New Polarization:       (-0.86811,-0.49031,-0.077322)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1717, parentID 1) is processed with stopping code 2
-### pop requested out of 69 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1716, parentID 1) is processed with stopping code 2
-### pop requested out of 68 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36061,0.9293,0.079717)
- Old Polarization:       (-0.78057,0.25389,0.57119)
- New Momentum Direction: (0.49002,0.86496,0.10832)
- New Polarization:       (0.53794,-0.39783,0.7432)
- *** FresnelRefraction *** 
-Track (trackID 1715, parentID 1) is processed with stopping code 2
-### pop requested out of 67 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.31907,0.94768,0.0094293)
- Old Polarization:       (-0.82748,0.27372,0.49026)
- New Momentum Direction: (0.43393,0.90085,0.012824)
- New Polarization:       (0.81303,-0.39768,0.42524)
- *** FresnelRefraction *** 
-Track (trackID 1714, parentID 1) is processed with stopping code 2
-### pop requested out of 66 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1713, parentID 1) is processed with stopping code 2
-### pop requested out of 65 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.5362,0.79424,0.28578)
- Old Polarization:       (-0.5799,0.10061,0.80845)
- New Momentum Direction: (0.72779,0.56557,0.38789)
- New Polarization:       (-0.34097,-0.19233,0.92019)
- *** FresnelRefraction *** 
-Track (trackID 1712, parentID 1) is processed with stopping code 2
-### pop requested out of 64 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.1882,0.87083,-0.45414)
- Old Polarization:       (-0.98082,0.19057,-0.041027)
- New Momentum Direction: (0.25501,0.74586,-0.61535)
- New Polarization:       (-0.65412,-0.3356,-0.67786)
- *** FresnelRefraction *** 
-Track (trackID 1711, parentID 1) is processed with stopping code 2
-### pop requested out of 63 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1710, parentID 1) is processed with stopping code 2
-### pop requested out of 62 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.72916,0.56539,0.38556)
- Old Polarization:       (-0.35953,-0.16289,0.91881)
- New Momentum Direction: (0.36463,0.7693,0.52461)
- New Polarization:       (-0.63422,-0.20732,0.74484)
- *** FresnelRefraction *** 
 Track (trackID 1709, parentID 1) is processed with stopping code 2
-### pop requested out of 61 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.22508,0.93995,-0.25657)
- Old Polarization:       (-0.94277,0.27659,0.18622)
- New Momentum Direction: (0.30364,0.8877,-0.34612)
- New Polarization:       (0.16419,-0.40658,-0.89874)
- *** FresnelRefraction *** 
+### pop requested out of 79 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1708, parentID 1) is processed with stopping code 2
-### pop requested out of 60 stacked tracks.
+### pop requested out of 78 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.22888,0.64523,-0.7289)
- Old Polarization:       (-0.93222,-0.070339,-0.35498)
- New Momentum Direction: (0.22888,0.64523,0.7289)
- New Polarization:       (0.85702,-0.48866,0.16346)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.22888,0.64523,0.7289)
- Old Polarization:       (0.85702,-0.48866,0.16346)
- New Momentum Direction: (0.22888,-0.64523,0.7289)
- New Polarization:       (-0.85702,-0.48866,-0.16346)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.975801,-0.154842,-0.15439)
+ Old Polarization:       (-0.202572,-0.90599,-0.371682)
+ New Momentum Direction: (0.955223,-0.20953,-0.208918)
+ New Polarization:       (-0.283459,-0.850511,-0.443037)
+ *** FresnelRefraction *** 
 Track (trackID 1707, parentID 1) is processed with stopping code 2
-### pop requested out of 59 stacked tracks.
-
-** Photon absorbed! **
+### pop requested out of 77 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.973321,-0.155088,-0.169095)
+Old Polarization: (-0.210059,-0.898788,-0.38478)
+New Polarization: (0.0643366,-0.985629,-0.156195)
+Polarization Change: (0.0643366,-0.985629,-0.156195)
+New Momentum Direction: (0.747482,-0.0561026,0.661909)
+Momentum Change: (0.747482,-0.0561026,0.661909)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.747482,-0.0561026,0.661909)
+ Old Polarization:       (0.0643366,-0.985629,-0.156195)
+ New Momentum Direction: (0.427847,-0.0763356,0.900622)
+ New Polarization:       (-0.128722,-0.991417,-0.0228811)
+ *** FresnelRefraction *** 
 Track (trackID 1706, parentID 1) is processed with stopping code 2
-### pop requested out of 58 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.18326,0.85495,-0.48525)
- Old Polarization:       (-0.9829,0.1683,-0.074672)
- New Momentum Direction: (0.18326,-0.85495,-0.48525)
- New Polarization:       (0.9577,0.043854,0.28442)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.18326,-0.85495,-0.48525)
- Old Polarization:       (0.9577,0.043854,0.28442)
- New Momentum Direction: (0.18326,-0.85495,0.48525)
- New Polarization:       (-0.9577,-0.043854,0.28442)
- *** TotalInternalReflection *** 
+### pop requested out of 76 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1705, parentID 1) is processed with stopping code 2
-### pop requested out of 57 stacked tracks.
+### pop requested out of 75 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.3222,0.44395,-0.83612)
- Old Polarization:       (-0.82522,-0.3011,-0.47787)
- New Momentum Direction: (0.43738,0.60265,-0.66747)
- New Polarization:       (0.062421,0.72009,0.69107)
+ Old Momentum Direction: (0.335639,0.904333,0.263681)
+ Old Polarization:       (-0.941843,0.317216,0.110931)
+ New Momentum Direction: (0.453457,0.816988,0.35624)
+ New Polarization:       (0.198118,-0.482091,0.853427)
  *** FresnelRefraction *** 
 Track (trackID 1704, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
+### pop requested out of 74 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.21435,0.71417,-0.66634)
- Old Polarization:       (-0.95639,0.014871,-0.29172)
- New Momentum Direction: (0.28885,0.33212,-0.89792)
- New Polarization:       (-0.94823,-0.030082,-0.31616)
+ Old Momentum Direction: (0.858896,0.157798,-0.487235)
+ Old Polarization:       (-0.333649,-0.549368,-0.766076)
+ New Momentum Direction: (0.725352,0.212096,-0.654889)
+ New Polarization:       (-0.525731,-0.443454,-0.725917)
  *** FresnelRefraction *** 
 Track (trackID 1703, parentID 1) is processed with stopping code 2
-### pop requested out of 55 stacked tracks.
+### pop requested out of 73 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.366392,0.779024,0.5088)
+Old Polarization: (-0.904324,0.169448,0.391772)
+New Polarization: (-0.431318,-0.385549,0.815669)
+Polarization Change: (-0.431318,-0.385549,0.815669)
+New Momentum Direction: (0.819093,-0.546356,0.174878)
+Momentum Change: (0.819093,-0.546356,0.174878)
  Photon at Boundary! 
- Old Momentum Direction: (0.52978,0.13867,-0.83672)
- Old Polarization:       (-0.58739,-0.65166,-0.47991)
- New Momentum Direction: (0.71856,0.18808,-0.66955)
- New Polarization:       (0.69547,-0.19512,0.69156)
+ Old Momentum Direction: (0.819093,-0.546356,0.174878)
+ Old Polarization:       (-0.431318,-0.385549,0.815669)
+ New Momentum Direction: (0.629557,-0.739972,0.236851)
+ New Polarization:       (-0.659612,-0.347944,0.666218)
  *** FresnelRefraction *** 
 Track (trackID 1702, parentID 1) is processed with stopping code 2
-### pop requested out of 54 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.19898,0.91645,-0.34718)
- Old Polarization:       (-0.96696,0.24121,0.08252)
- New Momentum Direction: (0.26999,0.83977,-0.47106)
- New Polarization:       (-0.3009,-0.39114,-0.86975)
- *** FresnelRefraction *** 
+### pop requested out of 72 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1701, parentID 1) is processed with stopping code 2
-### pop requested out of 53 stacked tracks.
+### pop requested out of 71 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.92045,-0.14377,-0.36346)
- Old Polarization:       (-0.13062,-0.98958,0.060639)
- New Momentum Direction: (0.85088,-0.19324,-0.48853)
- New Polarization:       (-0.22815,-0.97355,-0.012282)
+ Old Momentum Direction: (0.659732,0.19027,0.727015)
+ Old Polarization:       (-0.566879,-0.509106,0.647657)
+ New Momentum Direction: (0.890967,0.256959,0.374366)
+ New Polarization:       (0.413902,-0.120572,-0.902301)
  *** FresnelRefraction *** 
 Track (trackID 1700, parentID 1) is processed with stopping code 2
-### pop requested out of 52 stacked tracks.
+### pop requested out of 70 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70935,0.59987,0.37009)
- Old Polarization:       (-0.37894,-0.11817,0.91784)
- New Momentum Direction: (0.31421,0.80796,0.49847)
- New Polarization:       (-0.65842,-0.1928,0.72754)
+ Old Momentum Direction: (0.9799,-0.163264,-0.114633)
+ Old Polarization:       (-0.19254,-0.924371,-0.329343)
+ New Momentum Direction: (0.963332,-0.21959,-0.154181)
+ New Polarization:       (-0.263049,-0.886195,-0.381396)
  *** FresnelRefraction *** 
 Track (trackID 1699, parentID 1) is processed with stopping code 2
-### pop requested out of 51 stacked tracks.
+### pop requested out of 69 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.577121,0.661061,-0.47951)
+ Old Polarization:       (-0.662378,0.0354573,-0.748331)
+ New Momentum Direction: (0.577121,-0.661061,-0.47951)
+ New Polarization:       (0.662378,0.0354573,0.748331)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.577121,-0.661061,-0.47951)
+ Old Polarization:       (0.662378,0.0354573,0.748331)
+ New Momentum Direction: (-0.577121,-0.661061,-0.47951)
+ New Polarization:       (0.662378,-0.0354573,-0.748331)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.577121,-0.661061,-0.47951)
+ Old Polarization:       (0.662378,-0.0354573,-0.748331)
+ New Momentum Direction: (-0.577121,-0.661061,0.47951)
+ New Polarization:       (-0.662378,0.0354573,-0.748331)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.577121,-0.661061,0.47951)
+ Old Polarization:       (-0.662378,0.0354573,-0.748331)
+ New Momentum Direction: (-0.577121,0.661061,0.47951)
+ New Polarization:       (0.662378,0.0354573,0.748331)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.577121,0.661061,0.47951)
+ Old Polarization:       (0.662378,0.0354573,0.748331)
+ New Momentum Direction: (0.577121,0.661061,0.47951)
+ New Polarization:       (0.662378,-0.0354573,-0.748331)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1698, parentID 1) is processed with stopping code 2
-### pop requested out of 50 stacked tracks.
+### pop requested out of 68 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.67719,0.6387,0.36535)
- Old Polarization:       (-0.41741,-0.075448,0.90558)
- New Momentum Direction: (0.099009,0.86376,0.49409)
- New Polarization:       (-0.75522,-0.25808,0.60252)
+ Old Momentum Direction: (0.839554,-0.0867566,0.536304)
+ Old Polarization:       (-0.358557,-0.830117,0.427016)
+ New Momentum Direction: (0.679618,-0.117144,0.724152)
+ New Polarization:       (-0.568083,-0.708607,0.418518)
  *** FresnelRefraction *** 
 Track (trackID 1697, parentID 1) is processed with stopping code 2
-### pop requested out of 49 stacked tracks.
+### pop requested out of 67 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,0.674303)
+ Old Polarization:       (-0.808664,-0.0523308,0.585938)
+ New Momentum Direction: (0.45073,0.584943,-0.674303)
+ New Polarization:       (0.208519,-0.80348,-0.557619)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,-0.674303)
+ Old Polarization:       (0.208519,-0.80348,-0.557619)
+ New Momentum Direction: (0.45073,-0.584943,-0.674303)
+ New Polarization:       (-0.208519,-0.80348,0.557619)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,-0.584943,-0.674303)
+ Old Polarization:       (-0.208519,-0.80348,0.557619)
+ New Momentum Direction: (-0.45073,-0.584943,-0.674303)
+ New Polarization:       (-0.208519,0.80348,-0.557619)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,-0.584943,-0.674303)
+ Old Polarization:       (-0.208519,0.80348,-0.557619)
+ New Momentum Direction: (-0.45073,-0.584943,0.674303)
+ New Polarization:       (0.848758,-0.04685,0.526701)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,-0.584943,0.674303)
+ Old Polarization:       (0.848758,-0.04685,0.526701)
+ New Momentum Direction: (-0.45073,0.584943,0.674303)
+ New Polarization:       (-0.848758,-0.04685,-0.526701)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,0.584943,0.674303)
+ Old Polarization:       (-0.848758,-0.04685,-0.526701)
+ New Momentum Direction: (0.45073,0.584943,0.674303)
+ New Polarization:       (-0.848758,0.04685,0.526701)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,0.674303)
+ Old Polarization:       (-0.848758,0.04685,0.526701)
+ New Momentum Direction: (0.45073,0.584943,-0.674303)
+ New Polarization:       (0.313897,-0.811002,-0.493705)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,-0.674303)
+ Old Polarization:       (0.313897,-0.811002,-0.493705)
+ New Momentum Direction: (0.45073,-0.584943,-0.674303)
+ New Polarization:       (-0.313897,-0.811002,0.493705)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,-0.584943,-0.674303)
+ Old Polarization:       (-0.313897,-0.811002,0.493705)
+ New Momentum Direction: (0.45073,-0.584943,0.674303)
+ New Polarization:       (0.364288,0.810154,0.459287)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,-0.584943,0.674303)
+ Old Polarization:       (0.364288,0.810154,0.459287)
+ New Momentum Direction: (-0.45073,-0.584943,0.674303)
+ New Polarization:       (0.364288,-0.810154,-0.459287)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,-0.584943,0.674303)
+ Old Polarization:       (0.364288,-0.810154,-0.459287)
+ New Momentum Direction: (-0.45073,0.584943,0.674303)
+ New Polarization:       (-0.364288,-0.810154,0.459287)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,0.584943,0.674303)
+ Old Polarization:       (-0.364288,-0.810154,0.459287)
+ New Momentum Direction: (-0.45073,0.584943,-0.674303)
+ New Polarization:       (0.884814,0.192822,-0.424175)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,0.584943,-0.674303)
+ Old Polarization:       (0.884814,0.192822,-0.424175)
+ New Momentum Direction: (-0.45073,-0.584943,-0.674303)
+ New Polarization:       (-0.884814,0.192822,0.424175)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.45073,-0.584943,-0.674303)
+ Old Polarization:       (-0.884814,0.192822,0.424175)
+ New Momentum Direction: (0.45073,-0.584943,-0.674303)
+ New Polarization:       (-0.884814,-0.192822,-0.424175)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,-0.584943,-0.674303)
+ Old Polarization:       (-0.884814,-0.192822,-0.424175)
+ New Momentum Direction: (0.45073,-0.584943,0.674303)
+ New Polarization:       (0.456371,0.800203,0.389102)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,-0.584943,0.674303)
+ Old Polarization:       (0.456371,0.800203,0.389102)
+ New Momentum Direction: (0.45073,0.584943,0.674303)
+ New Polarization:       (-0.456371,0.800203,-0.389102)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,0.674303)
+ Old Polarization:       (-0.456371,0.800203,-0.389102)
+ New Momentum Direction: (0.45073,0.584943,-0.674303)
+ New Polarization:       (0.497021,-0.791915,-0.354741)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45073,0.584943,-0.674303)
+ Old Polarization:       (0.497021,-0.791915,-0.354741)
+ New Momentum Direction: (-0.45073,0.584943,-0.674303)
+ New Polarization:       (0.497021,0.791915,0.354741)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1696, parentID 1) is processed with stopping code 2
-### pop requested out of 48 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93217,-0.15428,-0.3275)
- Old Polarization:       (-0.12626,-0.98639,0.1053)
- New Momentum Direction: (0.87082,-0.2095,-0.44472)
- New Polarization:       (-0.22355,-0.97446,0.021316)
- *** FresnelRefraction *** 
-Track (trackID 1695, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99165,0.032547,0.1248)
- Old Polarization:       (-0.053495,-0.77668,0.62762)
- New Momentum Direction: (0.98468,0.044006,0.16874)
- New Polarization:       (-0.091562,-0.69304,0.71506)
- *** FresnelRefraction *** 
-Track (trackID 1694, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.45059,0.24075,-0.85966)
- Old Polarization:       (-0.67806,-0.53408,-0.50498)
- New Momentum Direction: (0.61162,0.32679,-0.72051)
- New Polarization:       (0.68319,0.2411,0.68929)
- *** FresnelRefraction *** 
-Track (trackID 1693, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.74601,0.54257,0.38612)
- Old Polarization:       (-0.33983,-0.18846,0.92141)
- New Momentum Direction: (-0.74601,0.54257,0.38612)
- New Polarization:       (-0.12055,0.4602,-0.87959)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74601,0.54257,0.38612)
- Old Polarization:       (-0.12055,0.4602,-0.87959)
- New Momentum Direction: (-0.74601,-0.54257,0.38612)
- New Polarization:       (0.12055,0.4602,0.87959)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74601,-0.54257,0.38612)
- Old Polarization:       (0.12055,0.4602,0.87959)
- New Momentum Direction: (-0.74601,-0.54257,-0.38612)
- New Polarization:       (-0.12055,-0.4602,0.87959)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.74601,-0.54257,-0.38612)
- Old Polarization:       (-0.12055,-0.4602,0.87959)
- New Momentum Direction: (-0.42536,-0.73737,-0.52474)
- New Polarization:       (0.23745,-0.65042,0.72151)
- *** FresnelRefraction *** 
-Track (trackID 1692, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.2168,0.69263,-0.68794)
- Old Polarization:       (-0.94982,-0.013095,-0.31252)
- New Momentum Direction: (0.2932,0.22009,-0.93037)
- New Polarization:       (-0.95147,-0.027971,-0.30647)
- *** FresnelRefraction *** 
-Track (trackID 1691, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95561,0.15744,0.24904)
- Old Polarization:       (-0.096552,-0.63124,0.76955)
- New Momentum Direction: (0.91699,0.21317,0.33719)
- New Polarization:       (-0.17043,-0.55488,0.81429)
- *** FresnelRefraction *** 
-Track (trackID 1690, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.83152,-0.12107,-0.54214)
-Old Polarization: (-0.23606,-0.96047,-0.14758)
-New Polarization: (-0.79795,-0.52996,0.28708)
-Polarization Change: (-0.79795,-0.52996,0.28708)
-New Momentum Direction: (0.37929,-0.8117,-0.44416)
-Momentum Change: (0.37929,-0.8117,-0.44416)
-
-** Photon absorbed! **
-Track (trackID 1689, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.96946,0.12207,0.2127)
- Old Polarization:       (-0.07583,-0.6756,0.73336)
- New Momentum Direction: (0.94381,0.16451,0.28665)
- New Polarization:       (-0.13308,-0.60472,0.78524)
- *** FresnelRefraction *** 
-Track (trackID 1688, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7237,-0.053157,-0.68807)
- Old Polarization:       (-0.36318,-0.87713,-0.31422)
- New Momentum Direction: (0.36216,-0.071797,-0.92935)
- New Polarization:       (-0.63231,-0.75147,-0.18835)
- *** FresnelRefraction *** 
-Track (trackID 1687, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.18494,0.81591,-0.5478)
- Old Polarization:       (-0.9814,0.12412,-0.14645)
- New Momentum Direction: (0.25132,0.61858,-0.74444)
- New Polarization:       (-0.84576,-0.23366,-0.47968)
- *** FresnelRefraction *** 
-Track (trackID 1686, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93493,-0.14659,-0.32315)
- Old Polarization:       (-0.11717,-0.98713,0.10881)
- New Momentum Direction: (0.87795,-0.19778,-0.43599)
- New Polarization:       (-0.2059,-0.97814,0.029087)
- *** FresnelRefraction *** 
-Track (trackID 1685, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98809,0.042864,0.14777)
- Old Polarization:       (-0.063984,-0.75896,0.64798)
- New Momentum Direction: (0.97785,0.058306,0.20101)
- New Polarization:       (-0.11067,-0.67113,0.73304)
- *** FresnelRefraction *** 
-Track (trackID 1684, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.49968,0.82839,0.25314)
- Old Polarization:       (-0.62172,0.13951,0.77071)
- New Momentum Direction: (0.67838,0.64937,0.34367)
- New Polarization:       (-0.22764,-0.25897,0.93868)
- *** FresnelRefraction *** 
-Track (trackID 1683, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.91528,-0.1488,-0.37432)
- Old Polarization:       (-0.14051,-0.98884,0.049512)
- New Momentum Direction: (0.83922,-0.20088,-0.50532)
- New Polarization:       (-0.24667,-0.96879,-0.024543)
- *** FresnelRefraction *** 
-Track (trackID 1682, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9328,0.21377,0.29014)
- Old Polarization:       (-0.12395,-0.56568,0.81526)
- New Momentum Direction: (0.87255,0.28978,0.39331)
- New Polarization:       (-0.21901,-0.48762,0.84514)
- *** FresnelRefraction *** 
-Track (trackID 1681, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.2395,0.62431,-0.74356)
- Old Polarization:       (-0.92233,-0.092879,-0.37506)
- New Momentum Direction: (0.32432,0.84541,-0.42439)
- New Polarization:       (-0.55419,0.53339,0.63904)
- *** FresnelRefraction *** 
-Track (trackID 1680, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.3712,0.36784,-0.85259)
- Old Polarization:       (-0.77153,-0.38873,-0.50362)
- New Momentum Direction: (0.5018,0.49725,-0.70777)
- New Polarization:       (0.35547,0.62741,0.69282)
- *** FresnelRefraction *** 
-Track (trackID 1679, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.81791,-0.126,-0.56137)
- Old Polarization:       (-0.25775,-0.95258,-0.16173)
- New Momentum Direction: (0.62318,-0.17128,-0.7631)
- New Polarization:       (-0.45267,-0.87466,-0.17335)
- *** FresnelRefraction *** 
-Track (trackID 1678, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.55484,0.77426,0.30443)
- Old Polarization:       (-0.55829,0.07521,0.82623)
- New Momentum Direction: (0.55484,-0.77426,0.30443)
- New Polarization:       (0.46784,-0.012219,-0.88373)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.55484,-0.77426,0.30443)
- Old Polarization:       (0.46784,-0.012219,-0.88373)
- New Momentum Direction: (-0.55484,-0.77426,0.30443)
- New Polarization:       (0.46784,0.012219,0.88373)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.55484,-0.77426,0.30443)
- Old Polarization:       (0.46784,0.012219,0.88373)
- New Momentum Direction: (-0.55484,-0.77426,-0.30443)
- New Polarization:       (-0.46784,-0.012219,0.88373)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.55484,-0.77426,-0.30443)
-Old Polarization: (-0.46784,-0.012219,0.88373)
-New Polarization: (0.058982,0.13503,-0.98908)
-Polarization Change: (0.058982,0.13503,-0.98908)
-New Momentum Direction: (0.96644,-0.25588,0.022698)
-Momentum Change: (0.96644,-0.25588,0.022698)
- Photon at Boundary! 
- Old Momentum Direction: (0.96644,-0.25588,0.022698)
- Old Polarization:       (0.058982,0.13503,-0.98908)
- New Momentum Direction: (0.96644,0.25588,0.022698)
- New Polarization:       (-0.058982,0.13503,0.98908)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.96644,0.25588,0.022698)
- Old Polarization:       (-0.058982,0.13503,0.98908)
- New Momentum Direction: (0.93692,0.34818,0.030886)
- New Polarization:       (-0.1073,0.20238,0.97341)
- *** FresnelRefraction *** 
-Track (trackID 1677, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.21856,0.68042,-0.69947)
- Old Polarization:       (-0.94582,-0.028675,-0.32342)
- New Momentum Direction: (0.29615,0.922,-0.24943)
- New Polarization:       (-0.69836,0.38717,0.60199)
- *** FresnelRefraction *** 
-Track (trackID 1676, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1675, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.89535,-0.15419,-0.41781)
- Old Polarization:       (-0.16878,-0.98565,0.0020515)
- New Momentum Direction: (-0.89535,-0.15419,-0.41781)
- New Polarization:       (0.08096,0.86617,-0.49315)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.89535,-0.15419,-0.41781)
- Old Polarization:       (0.08096,0.86617,-0.49315)
- New Momentum Direction: (-0.89535,-0.15419,0.41781)
- New Polarization:       (-0.08096,-0.86617,-0.49315)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.89535,-0.15419,0.41781)
- Old Polarization:       (-0.08096,-0.86617,-0.49315)
- New Momentum Direction: (-0.7962,-0.20948,0.56761)
- New Polarization:       (0.14987,-0.9772,-0.15041)
- *** FresnelRefraction *** 
-Track (trackID 1674, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1673, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84206,-0.13698,-0.52169)
- Old Polarization:       (-0.22964,-0.96622,-0.11696)
- New Momentum Direction: (0.68063,-0.18606,-0.70861)
- New Polarization:       (-0.40358,-0.90245,-0.15069)
- *** FresnelRefraction *** 
-Track (trackID 1672, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.903,-0.15537,-0.40057)
- Old Polarization:       (-0.16012,-0.98686,0.021817)
- New Momentum Direction: (0.81193,-0.2111,-0.54425)
- New Polarization:       (-0.2831,-0.95774,-0.050861)
- *** FresnelRefraction *** 
-Track (trackID 1671, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.97359,-0.13316,-0.18547)
-Old Polarization: (-0.080301,-0.96013,0.26778)
-New Polarization: (0.6451,-0.40239,0.64956)
-Polarization Change: (0.6451,-0.40239,0.64956)
-New Momentum Direction: (0.4742,0.87742,0.072596)
-Momentum Change: (0.4742,0.87742,0.072596)
-
-** Photon absorbed! **
-Track (trackID 1670, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23336,0.95085,-0.20355)
- Old Polarization:       (-0.92742,0.28056,0.24734)
- New Momentum Direction: (0.31666,0.90743,-0.27621)
- New Polarization:       (0.43447,-0.39761,-0.80817)
- *** FresnelRefraction *** 
-Track (trackID 1669, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9989,-0.037226,0.028428)
- Old Polarization:       (-0.046554,-0.85584,0.51514)
- New Momentum Direction: (0.99799,-0.050398,0.038487)
- New Polarization:       (-0.063202,-0.83997,0.53894)
- *** FresnelRefraction *** 
-Track (trackID 1668, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9851,0.056552,0.16241)
- Old Polarization:       (-0.06696,-0.74373,0.66512)
- New Momentum Direction: (0.97228,0.076893,0.22082)
- New Polarization:       (-0.1167,-0.6588,0.74321)
- *** FresnelRefraction *** 
-Track (trackID 1667, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.55897,0.10697,-0.82226)
- Old Polarization:       (-0.55404,-0.68961,-0.46635)
- New Momentum Direction: (0.75667,0.1448,-0.63756)
- New Polarization:       (0.64438,-0.33015,0.68977)
- *** FresnelRefraction *** 
-Track (trackID 1666, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1665, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.9066,-0.15083,-0.39412)
- Old Polarization:       (-0.15244,-0.98793,0.02743)
- New Momentum Direction: (0.821,-0.20407,-0.53322)
- New Polarization:       (-0.26813,-0.96235,-0.04455)
- *** FresnelRefraction *** 
-Track (trackID 1664, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.62383,0.70019,0.34724)
- Old Polarization:       (-0.4795,-0.007971,0.8775)
- New Momentum Direction: (0.8475,0.2433,0.47175)
- New Polarization:       (-0.48255,-0.017048,0.8757)
- *** FresnelRefraction *** 
-Track (trackID 1663, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1662, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93037,-0.15357,-0.33291)
- Old Polarization:       (-0.12752,-0.9869,0.098874)
- New Momentum Direction: (0.86752,-0.20836,-0.45167)
- New Polarization:       (-0.22553,-0.9741,0.016185)
- *** FresnelRefraction *** 
-Track (trackID 1661, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.23039,0.94367,-0.2375)
- Old Polarization:       (-0.93676,0.28116,0.20841)
- New Momentum Direction: (0.31075,0.89489,-0.32034)
- New Polarization:       (0.26879,-0.406,-0.87345)
- *** FresnelRefraction *** 
-Track (trackID 1660, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.63107,0.69614,0.34226)
- Old Polarization:       (-0.47053,-0.0072718,0.88236)
- New Momentum Direction: (0.85157,0.24804,0.46185)
- New Polarization:       (-0.47326,-0.015251,0.88079)
- *** FresnelRefraction *** 
-Track (trackID 1659, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1658, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98252,0.072661,0.1714)
- Old Polarization:       (-0.064794,-0.72964,0.68075)
- New Momentum Direction: (0.96776,0.098311,0.2319)
- New Polarization:       (-0.11327,-0.65248,0.7493)
- *** FresnelRefraction *** 
-Track (trackID 1657, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.99123,0.034889,0.12743)
- Old Polarization:       (-0.053843,-0.77409,0.63078)
- New Momentum Direction: (0.98392,0.047166,0.17227)
- New Polarization:       (-0.092343,-0.69126,0.71668)
- *** FresnelRefraction *** 
-Track (trackID 1656, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44999,0.87153,0.19482)
- Old Polarization:       (-0.67988,0.19288,0.7075)
- New Momentum Direction: (0.609,0.74807,0.26366)
- New Polarization:       (0.0080894,-0.33825,0.94102)
- *** FresnelRefraction *** 
-Track (trackID 1655, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.43698,0.88166,0.17813)
- Old Polarization:       (-0.69515,0.20536,0.68891)
- New Momentum Direction: (0.59104,0.76982,0.24093)
- New Polarization:       (0.081626,-0.35422,0.93159)
- *** FresnelRefraction *** 
-Track (trackID 1654, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.22564,0.65165,-0.72418)
- Old Polarization:       (-0.93514,-0.06351,-0.34853)
- New Momentum Direction: (0.30655,0.8853,-0.34968)
- New Polarization:       (-0.63188,0.46401,0.62082)
- *** FresnelRefraction *** 
-Track (trackID 1653, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.93399,0.20859,0.29008)
- Old Polarization:       (-0.12475,-0.57041,0.81183)
- New Momentum Direction: (0.87424,0.28344,0.39416)
- New Polarization:       (-0.22105,-0.49045,0.84297)
- *** FresnelRefraction *** 
-Track (trackID 1652, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.27985,0.95575,-0.090704)
- Old Polarization:       (-0.87794,0.293,0.37864)
- New Momentum Direction: (0.37801,0.91766,-0.12252)
- New Polarization:       (0.89139,-0.3965,-0.21956)
- *** FresnelRefraction *** 
-Track (trackID 1651, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1650, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.2463,0.95401,-0.17087)
- Old Polarization:       (-0.91444,0.28717,0.2852)
- New Momentum Direction: (0.33355,0.91389,-0.23139)
- New Polarization:       (0.61108,-0.3965,-0.6851)
- *** FresnelRefraction *** 
-Track (trackID 1649, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 67
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 68 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.37297,0.89263,0.25318)
- Old Polarization:       (-0.91816,0.31575,0.23934)
- New Momentum Direction: (0.50555,0.79161,0.34317)
- New Polarization:       (0.19337,-0.49159,0.84909)
- *** FresnelRefraction *** 
-Track (trackID 1806, parentID 1) is processed with stopping code 2
-### pop requested out of 67 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65645,0.43074,-0.6193)
- Old Polarization:       (-0.58571,-0.22635,-0.77827)
- New Momentum Direction: (-0.65645,0.43074,-0.6193)
- New Polarization:       (-0.58571,0.22635,0.77827)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1805, parentID 1) is processed with stopping code 2
 ### pop requested out of 66 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1804, parentID 1) is processed with stopping code 2
+Track (trackID 1695, parentID 1) is processed with stopping code 2
 ### pop requested out of 65 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39472,0.8871,-0.23928)
- Old Polarization:       (-0.89081,0.30568,-0.33619)
- New Momentum Direction: (0.53634,0.77886,-0.32513)
- New Polarization:       (0.18813,-0.48586,-0.85355)
+ Old Momentum Direction: (0.810805,0.245094,-0.53153)
+ Old Polarization:       (-0.393152,-0.444704,-0.804779)
+ New Momentum Direction: (0.609478,0.331977,-0.71995)
+ New Polarization:       (-0.62505,-0.357416,-0.693949)
  *** FresnelRefraction *** 
-Track (trackID 1803, parentID 1) is processed with stopping code 2
+Track (trackID 1694, parentID 1) is processed with stopping code 2
 ### pop requested out of 64 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.50245,0.63775,0.58379)
- Old Polarization:       (-0.76972,0.022412,0.63799)
- New Momentum Direction: (0.50245,-0.63775,0.58379)
- New Polarization:       (0.76972,0.022412,-0.63799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.50245,-0.63775,0.58379)
- Old Polarization:       (0.76972,0.022412,-0.63799)
- New Momentum Direction: (0.50245,-0.63775,-0.58379)
- New Polarization:       (-0.76972,-0.022412,-0.63799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.50245,-0.63775,-0.58379)
- Old Polarization:       (-0.76972,-0.022412,-0.63799)
- New Momentum Direction: (-0.50245,-0.63775,-0.58379)
- New Polarization:       (-0.76972,0.022412,0.63799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.50245,-0.63775,-0.58379)
- Old Polarization:       (-0.76972,0.022412,0.63799)
- New Momentum Direction: (-0.50245,0.63775,-0.58379)
- New Polarization:       (0.76972,0.022412,-0.63799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.50245,0.63775,-0.58379)
- Old Polarization:       (0.76972,0.022412,-0.63799)
- New Momentum Direction: (-0.50245,0.63775,0.58379)
- New Polarization:       (-0.76972,-0.022412,-0.63799)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.50245,0.63775,0.58379)
- Old Polarization:       (-0.76972,-0.022412,-0.63799)
- New Momentum Direction: (0.50245,0.63775,0.58379)
- New Polarization:       (-0.76972,0.022412,0.63799)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1802, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (0.893419,0.0650763,-0.444486)
+ Old Polarization:       (-0.300579,-0.64873,-0.699144)
+ New Momentum Direction: (0.791764,0.0884866,-0.604384)
+ New Polarization:       (-0.476522,-0.529546,-0.701789)
+ *** FresnelRefraction *** 
+Track (trackID 1693, parentID 1) is processed with stopping code 2
 ### pop requested out of 63 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65402,0.44678,-0.61045)
- Old Polarization:       (-0.58888,-0.20585,-0.78157)
- New Momentum Direction: (-0.65402,0.44678,-0.61045)
- New Polarization:       (-0.58888,0.20585,0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65402,0.44678,-0.61045)
- Old Polarization:       (-0.58888,0.20585,0.78157)
- New Momentum Direction: (-0.65402,0.44678,0.61045)
- New Polarization:       (0.58888,-0.20585,0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65402,0.44678,0.61045)
- Old Polarization:       (0.58888,-0.20585,0.78157)
- New Momentum Direction: (-0.65402,-0.44678,0.61045)
- New Polarization:       (-0.58888,-0.20585,-0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65402,-0.44678,0.61045)
- Old Polarization:       (-0.58888,-0.20585,-0.78157)
- New Momentum Direction: (-0.65402,0.44678,0.61045)
- New Polarization:       (0.58888,-0.20585,0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65402,0.44678,0.61045)
- Old Polarization:       (0.58888,-0.20585,0.78157)
- New Momentum Direction: (-0.65402,-0.44678,0.61045)
- New Polarization:       (-0.58888,-0.20585,-0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65402,-0.44678,0.61045)
- Old Polarization:       (-0.58888,-0.20585,-0.78157)
- New Momentum Direction: (0.65402,-0.44678,0.61045)
- New Polarization:       (-0.58888,0.20585,0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65402,-0.44678,0.61045)
- Old Polarization:       (-0.58888,0.20585,0.78157)
- New Momentum Direction: (0.65402,-0.44678,-0.61045)
- New Polarization:       (0.58888,-0.20585,0.78157)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65402,-0.44678,-0.61045)
- Old Polarization:       (0.58888,-0.20585,0.78157)
- New Momentum Direction: (-0.65402,-0.44678,-0.61045)
- New Polarization:       (0.58888,0.20585,-0.78157)
- *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (0.459276,0.836112,-0.299971)
+Old Polarization: (-0.801303,0.244217,-0.546142)
+New Polarization: (0.406248,0.194219,0.892884)
+Polarization Change: (0.406248,0.194219,0.892884)
+New Momentum Direction: (-0.76222,0.610955,0.213904)
+Momentum Change: (-0.76222,0.610955,0.213904)
 
 ** Photon absorbed! **
-Track (trackID 1801, parentID 1) is processed with stopping code 2
+Track (trackID 1692, parentID 1) is processed with stopping code 2
 ### pop requested out of 62 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.58091,0.57419,-0.57694)
- Old Polarization:       (-0.67468,-0.056872,-0.73592)
- New Momentum Direction: (-0.58091,0.57419,-0.57694)
- New Polarization:       (-0.67468,0.056872,0.73592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.58091,0.57419,-0.57694)
- Old Polarization:       (-0.67468,0.056872,0.73592)
- New Momentum Direction: (-0.58091,0.57419,0.57694)
- New Polarization:       (0.67468,-0.056872,0.73592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.58091,0.57419,0.57694)
- Old Polarization:       (0.67468,-0.056872,0.73592)
- New Momentum Direction: (-0.58091,-0.57419,0.57694)
- New Polarization:       (-0.67468,-0.056872,-0.73592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.58091,-0.57419,0.57694)
- Old Polarization:       (-0.67468,-0.056872,-0.73592)
- New Momentum Direction: (0.58091,-0.57419,0.57694)
- New Polarization:       (-0.67468,0.056872,0.73592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.58091,-0.57419,0.57694)
- Old Polarization:       (-0.67468,0.056872,0.73592)
- New Momentum Direction: (0.58091,-0.57419,-0.57694)
- New Polarization:       (0.67468,-0.056872,0.73592)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.58091,-0.57419,-0.57694)
- Old Polarization:       (0.67468,-0.056872,0.73592)
- New Momentum Direction: (0.58091,0.57419,-0.57694)
- New Polarization:       (-0.67468,-0.056872,-0.73592)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1800, parentID 1) is processed with stopping code 2
+Track (trackID 1691, parentID 1) is processed with stopping code 2
 ### pop requested out of 61 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97874,-0.19548,-0.062165)
- Old Polarization:       (-0.2022,-0.9704,-0.13206)
- New Momentum Direction: (0.9611,-0.26322,-0.083706)
- New Polarization:       (-0.27403,-0.94668,-0.16946)
+ Old Momentum Direction: (0.882465,-0.144447,0.44765)
+ Old Polarization:       (-0.309996,-0.894365,0.322512)
+ New Momentum Direction: (0.771409,-0.195411,0.605592)
+ New Polarization:       (-0.490429,-0.788978,0.370127)
  *** FresnelRefraction *** 
-Track (trackID 1799, parentID 1) is processed with stopping code 2
+Track (trackID 1690, parentID 1) is processed with stopping code 2
 ### pop requested out of 60 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.39252,0.84225,0.36952)
- Old Polarization:       (-0.89288,0.25255,0.37282)
- New Momentum Direction: (0.53371,0.68024,0.50243)
- New Polarization:       (-0.25389,-0.43782,0.86247)
+ Old Momentum Direction: (0.967501,-0.218837,0.126694)
+ Old Polarization:       (-0.214389,-0.975573,-0.0479133)
+ New Momentum Direction: (0.939298,-0.296931,0.171906)
+ New Polarization:       (-0.311839,-0.947784,0.066796)
  *** FresnelRefraction *** 
-Track (trackID 1798, parentID 1) is processed with stopping code 2
+Track (trackID 1689, parentID 1) is processed with stopping code 2
 ### pop requested out of 59 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.36428,0.93128,-0.0042148)
- Old Polarization:       (-0.92956,0.36332,-0.06255)
- New Momentum Direction: (0.49307,0.86997,-0.005705)
- New Polarization:       (0.86804,-0.49239,-0.063718)
- *** FresnelRefraction *** 
-Track (trackID 1797, parentID 1) is processed with stopping code 2
-### pop requested out of 58 stacked tracks.
+ Old Momentum Direction: (0.485888,0.499102,0.717503)
+ Old Polarization:       (-0.765075,-0.154029,0.625248)
+ New Momentum Direction: (0.485888,0.499102,-0.717503)
+ New Polarization:       (0.159958,-0.857836,-0.488397)
+ *** FresnelReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.96481,-0.1991,0.17177)
- Old Polarization:       (-0.22449,-0.96381,0.1438)
- New Momentum Direction: (0.93429,-0.26994,0.23288)
- New Polarization:       (-0.32539,-0.91257,0.24766)
- *** FresnelRefraction *** 
-Track (trackID 1796, parentID 1) is processed with stopping code 2
-### pop requested out of 57 stacked tracks.
+ Old Momentum Direction: (0.485888,0.499102,-0.717503)
+ Old Polarization:       (0.159958,-0.857836,-0.488397)
+ New Momentum Direction: (0.485888,-0.499102,-0.717503)
+ New Polarization:       (-0.159958,-0.857836,0.488397)
+ *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.92795,-0.14151,0.34479)
- Old Polarization:       (-0.26641,-0.89881,0.34809)
- New Momentum Direction: (0.86346,-0.19153,0.46664)
- New Polarization:       (-0.4103,-0.8048,0.42889)
- *** FresnelRefraction *** 
-Track (trackID 1795, parentID 1) is processed with stopping code 2
-### pop requested out of 56 stacked tracks.
+ Old Momentum Direction: (0.485888,-0.499102,-0.717503)
+ Old Polarization:       (-0.159958,-0.857836,0.488397)
+ New Momentum Direction: (-0.485888,-0.499102,-0.717503)
+ New Polarization:       (-0.159958,0.857836,-0.488397)
+ *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1794, parentID 1) is processed with stopping code 2
+Track (trackID 1688, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1687, parentID 1) is processed with stopping code 2
+### pop requested out of 57 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1686, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.392248,0.909402,-0.138311)
+ Old Polarization:       (-0.876943,0.324304,-0.354681)
+ New Momentum Direction: (0.529501,0.827508,-0.186709)
+ New Polarization:       (0.50491,-0.484292,-0.714512)
+ *** FresnelRefraction *** 
+Track (trackID 1685, parentID 1) is processed with stopping code 2
+### pop requested out of 55 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.588627,0.309365,0.746868)
+ Old Polarization:       (-0.648598,-0.37073,0.66474)
+ New Momentum Direction: (0.797627,0.41921,0.433653)
+ New Polarization:       (0.392177,0.185783,-0.900934)
+ *** FresnelRefraction *** 
+Track (trackID 1684, parentID 1) is processed with stopping code 2
+### pop requested out of 54 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.936501,-0.203358,0.285678)
+ Old Polarization:       (-0.249306,-0.959026,0.134592)
+ New Momentum Direction: (0.879756,-0.275708,0.387317)
+ New Polarization:       (-0.385325,-0.890703,0.241191)
+ *** FresnelRefraction *** 
+Track (trackID 1683, parentID 1) is processed with stopping code 2
+### pop requested out of 53 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.349117,0.936589,0.0303183)
+ Old Polarization:       (-0.923489,0.349364,-0.158472)
+ New Momentum Direction: (0.473245,0.879972,0.0410979)
+ New Polarization:       (0.880181,-0.474252,0.0191535)
+ *** FresnelRefraction *** 
+Track (trackID 1682, parentID 1) is processed with stopping code 2
+### pop requested out of 52 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1681, parentID 1) is processed with stopping code 2
+### pop requested out of 51 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.974895,-0.153562,-0.161241)
+ Old Polarization:       (-0.204798,-0.902608,-0.378626)
+ New Momentum Direction: (0.953394,-0.208087,-0.218492)
+ New Polarization:       (-0.28788,-0.844188,-0.452185)
+ *** FresnelRefraction *** 
+Track (trackID 1680, parentID 1) is processed with stopping code 2
+### pop requested out of 50 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57301,0.662417,-0.482559)
+ Old Polarization:       (-0.666151,0.0334725,-0.745066)
+ New Momentum Direction: (0.57301,-0.662417,-0.482559)
+ New Polarization:       (0.666151,0.0334725,0.745066)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.57301,-0.662417,-0.482559)
+ Old Polarization:       (0.666151,0.0334725,0.745066)
+ New Momentum Direction: (-0.57301,-0.662417,-0.482559)
+ New Polarization:       (0.666151,-0.0334725,-0.745066)
+ *** TotalInternalReflection *** 
+Scattering Photon!
+Old Momentum Direction: (-0.57301,-0.662417,-0.482559)
+Old Polarization: (0.666151,-0.0334725,-0.745066)
+New Polarization: (-0.706188,-0.400562,0.583823)
+Polarization Change: (-0.706188,-0.400562,0.583823)
+New Momentum Direction: (-0.0801443,0.864504,0.496196)
+Momentum Change: (-0.0801443,0.864504,0.496196)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.0801443,0.864504,0.496196)
+ Old Polarization:       (-0.706188,-0.400562,0.583823)
+ New Momentum Direction: (-0.108794,0.731066,0.673577)
+ New Polarization:       (-0.574393,-0.599263,0.557635)
+ *** FresnelRefraction *** 
+Track (trackID 1679, parentID 1) is processed with stopping code 2
+### pop requested out of 49 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.956893,-0.214897,0.195385)
+ Old Polarization:       (-0.225084,-0.973838,0.0312499)
+ New Momentum Direction: (0.919379,-0.291056,0.264628)
+ New Polarization:       (-0.337536,-0.929169,0.150715)
+ *** FresnelRefraction *** 
+Track (trackID 1678, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.38496,0.727906,0.567414)
+ Old Polarization:       (-0.882219,0.109633,0.457897)
+ New Momentum Direction: (0.52192,0.368506,0.769287)
+ New Polarization:       (-0.755466,-0.219063,0.61748)
+ *** FresnelRefraction *** 
+Track (trackID 1677, parentID 1) is processed with stopping code 2
+### pop requested out of 47 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.8757,-0.137182,0.462958)
+ Old Polarization:       (-0.318169,-0.885142,0.339546)
+ New Momentum Direction: (0.756812,-0.1857,0.626698)
+ New Polarization:       (-0.504186,-0.776028,0.378916)
+ *** FresnelRefraction *** 
+Track (trackID 1676, parentID 1) is processed with stopping code 2
+### pop requested out of 46 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1675, parentID 1) is processed with stopping code 2
+### pop requested out of 45 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.356049,0.80632,0.47231)
+ Old Polarization:       (-0.915569,0.199873,0.348977)
+ New Momentum Direction: (0.482619,0.597672,0.640209)
+ New Polarization:       (-0.548436,-0.363688,0.75296)
+ *** FresnelRefraction *** 
+Track (trackID 1674, parentID 1) is processed with stopping code 2
+### pop requested out of 44 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.473063,0.814393,-0.336117)
+ Old Polarization:       (-0.783188,0.213989,-0.583802)
+ New Momentum Direction: (0.638689,0.621406,-0.453797)
+ New Polarization:       (-0.259238,-0.381503,-0.887272)
+ *** FresnelRefraction *** 
+Track (trackID 1673, parentID 1) is processed with stopping code 2
+### pop requested out of 43 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.336389,0.914967,0.222885)
+ Old Polarization:       (-0.941601,0.330597,0.0639781)
+ New Momentum Direction: (0.454145,0.838575,0.300907)
+ New Polarization:       (0.370674,-0.484971,0.792088)
+ *** FresnelRefraction *** 
+Track (trackID 1672, parentID 1) is processed with stopping code 2
+### pop requested out of 42 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1671, parentID 1) is processed with stopping code 2
+### pop requested out of 41 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1670, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1669, parentID 1) is processed with stopping code 2
+### pop requested out of 39 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.423994,0.653121,0.627425)
+ Old Polarization:       (-0.842395,0.0300101,0.538025)
+ New Momentum Direction: (0.423994,-0.653121,0.627425)
+ New Polarization:       (0.842395,0.0300101,-0.538025)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.423994,-0.653121,0.627425)
+ Old Polarization:       (0.842395,0.0300101,-0.538025)
+ New Momentum Direction: (0.423994,-0.653121,-0.627425)
+ New Polarization:       (-0.842395,-0.0300101,-0.538025)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.423994,-0.653121,-0.627425)
+ Old Polarization:       (-0.842395,-0.0300101,-0.538025)
+ New Momentum Direction: (-0.423994,-0.653121,-0.627425)
+ New Polarization:       (-0.842395,0.0300101,0.538025)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1668, parentID 1) is processed with stopping code 2
+### pop requested out of 38 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.906226,-0.178421,0.383303)
+ Old Polarization:       (-0.285857,-0.926543,0.244549)
+ New Momentum Direction: (0.818307,-0.242559,0.521093)
+ New Polarization:       (-0.451187,-0.832737,0.320905)
+ *** FresnelRefraction *** 
+Track (trackID 1667, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.847302,0.178406,-0.500251)
+ Old Polarization:       (-0.348523,-0.523959,-0.777173)
+ New Momentum Direction: (0.698446,0.240398,-0.674079)
+ New Polarization:       (-0.550858,-0.420704,-0.720808)
+ *** FresnelRefraction *** 
+Track (trackID 1666, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.542663,0.707424,-0.452845)
+ Old Polarization:       (-0.700417,0.0835452,-0.708827)
+ New Momentum Direction: (0.737799,0.276744,-0.615683)
+ New Polarization:       (-0.591372,-0.174783,-0.78723)
+ *** FresnelRefraction *** 
+Track (trackID 1665, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.45331,0.835335,-0.311007)
+ Old Polarization:       (-0.803183,0.231494,-0.548916)
+ New Momentum Direction: (0.615279,0.665761,-0.42213)
+ New Polarization:       (-0.174013,-0.407574,-0.896439)
+ *** FresnelRefraction *** 
+Track (trackID 1664, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.937928,-0.0388431,-0.344648)
+ Old Polarization:       (-0.248013,-0.769754,-0.588191)
+ New Momentum Direction: (0.882431,-0.052687,-0.467482)
+ New Polarization:       (-0.382851,-0.657899,-0.648532)
+ *** FresnelRefraction *** 
+Track (trackID 1663, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.50792,0.76429,-0.397339)
+ Old Polarization:       (-0.742078,0.153998,-0.652384)
+ New Momentum Direction: (0.686965,0.489159,-0.537404)
+ New Polarization:       (-0.451641,-0.291955,-0.843079)
+ *** FresnelRefraction *** 
+Track (trackID 1662, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.93994,-0.0394738,-0.339048)
+ Old Polarization:       (-0.243537,-0.773531,-0.585098)
+ New Momentum Direction: (0.887052,-0.0533893,-0.458572)
+ New Polarization:       (-0.374693,-0.663545,-0.647544)
+ *** FresnelRefraction *** 
+Track (trackID 1661, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.673956,0.166416,0.719784)
+ Old Polarization:       (-0.550403,-0.536786,0.639466)
+ New Momentum Direction: (0.910077,0.22472,0.348224)
+ New Polarization:       (0.390448,-0.183183,-0.902216)
+ *** FresnelRefraction *** 
+Track (trackID 1660, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.887137,0.0820447,-0.454156)
+ Old Polarization:       (-0.306602,-0.630742,-0.712854)
+ New Momentum Direction: (0.779531,0.111352,-0.616386)
+ New Polarization:       (-0.48604,-0.513185,-0.707394)
+ *** FresnelRefraction *** 
+Track (trackID 1659, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.737749,0.394694,-0.547671)
+ Old Polarization:       (-0.47555,-0.271962,-0.836594)
+ New Momentum Direction: (0.420065,0.530581,-0.736226)
+ New Polarization:       (-0.746435,-0.259387,-0.612824)
+ *** FresnelRefraction *** 
+Track (trackID 1658, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.882612,0.0943627,-0.460535)
+ Old Polarization:       (-0.31088,-0.617693,-0.722364)
+ New Momentum Direction: (0.770801,0.127879,-0.62411)
+ New Polarization:       (-0.492603,-0.50159,-0.71116)
+ *** FresnelRefraction *** 
+Track (trackID 1657, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.350721,0.936476,-0.00286949)
+ Old Polarization:       (-0.91859,0.343423,-0.195581)
+ New Momentum Direction: (0.477237,0.878766,-0.00390461)
+ New Polarization:       (0.867672,-0.471906,-0.156367)
+ *** FresnelRefraction *** 
+Track (trackID 1656, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.932617,-0.0285129,-0.359739)
+Old Polarization: (-0.25567,-0.755725,-0.60292)
+New Polarization: (-0.00348073,-0.603801,-0.797128)
+Polarization Change: (-0.00348073,-0.603801,-0.797128)
+New Momentum Direction: (0.727033,0.545782,-0.416588)
+Momentum Change: (0.727033,0.545782,-0.416588)
+ Photon at Boundary! 
+ Old Momentum Direction: (0.727033,0.545782,-0.416588)
+ Old Polarization:       (-0.00348073,-0.603801,-0.797128)
+ New Momentum Direction: (0.359081,0.741887,-0.566273)
+ New Polarization:       (-0.00713106,-0.60454,-0.796543)
+ *** FresnelRefraction *** 
+Track (trackID 1655, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.736535,0.0539846,0.674241)
+ Old Polarization:       (-0.479322,-0.661664,0.576585)
+ New Momentum Direction: (0.393349,0.0733781,0.916456)
+ New Polarization:       (-0.764593,-0.527449,0.3704)
+ *** FresnelRefraction *** 
+Track (trackID 1654, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1653, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.576633,0.330157,0.747322)
+ Old Polarization:       (-0.662248,-0.346794,0.664199)
+ New Momentum Direction: (0.781854,0.447658,0.433943)
+ New Polarization:       (0.367009,0.232181,-0.900775)
+ *** FresnelRefraction *** 
+Track (trackID 1652, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.33929,0.928211,0.152666)
+ Old Polarization:       (-0.938151,0.345788,-0.0174149)
+ New Momentum Direction: (0.458107,0.864667,0.206128)
+ New Polarization:       (0.642453,-0.482335,0.595489)
+ *** FresnelRefraction *** 
+Track (trackID 1651, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.940201,-0.0488723,-0.337096)
+Old Polarization: (-0.247254,-0.778615,-0.576736)
+New Polarization: (-0.593336,0.45159,0.666348)
+Polarization Change: (-0.593336,0.45159,0.666348)
+New Momentum Direction: (0.738708,0.634339,0.22787)
+Momentum Change: (0.738708,0.634339,0.22787)
+
+** Photon absorbed! **
+Track (trackID 1650, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.978587,-0.202969,0.0342216)
+ Old Polarization:       (-0.195431,-0.968385,-0.155038)
+ New Momentum Direction: (0.960791,-0.273416,0.0460992)
+ New Polarization:       (-0.269326,-0.959782,-0.079262)
+ *** FresnelRefraction *** 
+Track (trackID 1649, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1648, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.785894,-0.00427196,0.618346)
+ Old Polarization:       (-0.419325,-0.738613,0.527843)
+ New Momentum Direction: (0.555399,-0.00574502,0.831564)
+ New Polarization:       (-0.660106,-0.611218,0.43666)
+ *** FresnelRefraction *** 
+Track (trackID 1647, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1646, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.487259,0.794858,-0.361635)
+ Old Polarization:       (-0.766612,0.191032,-0.613035)
+ New Momentum Direction: (0.658033,0.573128,-0.488381)
+ New Polarization:       (-0.343542,-0.348644,-0.872024)
+ *** FresnelRefraction *** 
+Track (trackID 1645, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.514376,0.455276,0.726733)
+ Old Polarization:       (-0.735138,-0.202268,0.647039)
+ New Momentum Direction: (0.694782,0.614954,0.372974)
+ New Polarization:       (0.11708,0.414959,-0.902275)
+ *** FresnelRefraction *** 
+Track (trackID 1644, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.344471,0.935835,0.0745114)
+ Old Polarization:       (-0.930159,0.350967,-0.10783)
+ New Momentum Direction: (0.466199,0.878914,0.100842)
+ New Polarization:       (0.842971,-0.475911,0.250816)
+ *** FresnelRefraction *** 
+Track (trackID 1643, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.358909,0.790154,0.496831)
+ Old Polarization:       (-0.910095,0.178123,0.374163)
+ New Momentum Direction: (0.487858,0.553098,0.675334)
+ New Polarization:       (-0.613791,-0.332747,0.715919)
+ *** FresnelRefraction *** 
+Track (trackID 1642, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.884243,-0.138238,0.446099)
+ Old Polarization:       (-0.304453,-0.894949,0.32615)
+ New Momentum Direction: (0.778033,-0.185951,0.600072)
+ New Polarization:       (-0.478988,-0.793641,0.375105)
+ *** FresnelRefraction *** 
+Track (trackID 1641, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.35284,0.935639,0.00916056)
+ Old Polarization:       (-0.919321,0.348476,-0.182791)
+ New Momentum Direction: (0.478228,0.878148,0.0124159)
+ New Polarization:       (0.874876,-0.475116,-0.0941138)
+ *** FresnelRefraction *** 
+Track (trackID 1640, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44786,0.588476,0.67314)
+ Old Polarization:       (-0.811267,-0.0490246,0.582618)
+ New Momentum Direction: (0.44786,0.588476,-0.67314)
+ New Polarization:       (0.811267,0.0490246,0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44786,0.588476,-0.67314)
+ Old Polarization:       (0.811267,0.0490246,0.582618)
+ New Momentum Direction: (0.44786,-0.588476,-0.67314)
+ New Polarization:       (-0.811267,0.0490246,-0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44786,-0.588476,-0.67314)
+ Old Polarization:       (-0.811267,0.0490246,-0.582618)
+ New Momentum Direction: (-0.44786,-0.588476,-0.67314)
+ New Polarization:       (-0.811267,-0.0490246,0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44786,-0.588476,-0.67314)
+ Old Polarization:       (-0.811267,-0.0490246,0.582618)
+ New Momentum Direction: (-0.44786,-0.588476,0.67314)
+ New Polarization:       (0.811267,0.0490246,0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44786,-0.588476,0.67314)
+ Old Polarization:       (0.811267,0.0490246,0.582618)
+ New Momentum Direction: (-0.44786,0.588476,0.67314)
+ New Polarization:       (-0.811267,0.0490246,-0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.44786,0.588476,0.67314)
+ Old Polarization:       (-0.811267,0.0490246,-0.582618)
+ New Momentum Direction: (0.44786,0.588476,0.67314)
+ New Polarization:       (-0.811267,-0.0490246,0.582618)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.44786,0.588476,0.67314)
+ Old Polarization:       (-0.811267,-0.0490246,0.582618)
+ New Momentum Direction: (0.44786,0.588476,-0.67314)
+ New Polarization:       (0.811267,0.0490246,0.582618)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1639, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.966696,-0.209134,0.14752)
+ Old Polarization:       (-0.20806,-0.977849,-0.0228495)
+ New Momentum Direction: (0.938876,-0.281312,0.198433)
+ New Polarization:       (-0.304148,-0.947843,0.0953313)
+ *** FresnelRefraction *** 
+Track (trackID 1638, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.376906,0.923884,-0.0661797)
+ Old Polarization:       (-0.897505,0.346613,-0.272662)
+ New Momentum Direction: (0.506971,0.857354,-0.0890174)
+ New Polarization:       (0.742245,-0.48673,-0.460615)
+ *** FresnelRefraction *** 
+Track (trackID 1637, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.68297,0.15184,0.71449)
+ Old Polarization:       (-0.539943,-0.553835,0.633821)
+ New Momentum Direction: (0.921982,0.204978,0.328531)
+ New Polarization:       (0.370589,-0.221015,-0.902118)
+ *** FresnelRefraction *** 
+Track (trackID 1636, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.882971,0.0897482,-0.460768)
+ Old Polarization:       (-0.312002,-0.621178,-0.718883)
+ New Momentum Direction: (0.770217,0.121935,-0.626018)
+ New Polarization:       (-0.495495,-0.503604,-0.70772)
+ *** FresnelRefraction *** 
+Track (trackID 1635, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.964464,-0.211717,0.158069)
+ Old Polarization:       (-0.212691,-0.977058,-0.0109284)
+ New Momentum Direction: (0.934385,-0.285476,0.213137)
+ New Polarization:       (-0.31295,-0.943597,0.108107)
+ *** FresnelRefraction *** 
+Track (trackID 1634, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.397527,0.904755,-0.15294)
+ Old Polarization:       (-0.871311,0.319932,-0.372103)
+ New Momentum Direction: (0.536259,0.81845,-0.206315)
+ New Polarization:       (0.448871,-0.483537,-0.75147)
+ *** FresnelRefraction *** 
+Track (trackID 1633, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.431716,0.86935,-0.240523)
+ Old Polarization:       (-0.833051,0.282019,-0.475911)
+ New Momentum Direction: (0.581045,0.746721,-0.32372)
+ New Polarization:       (0.0991635,-0.459744,-0.882498)
+ *** FresnelRefraction *** 
+Track (trackID 1632, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.926929,-0.191193,0.322875)
+ Old Polarization:       (-0.258186,-0.949359,0.179044)
+ New Momentum Direction: (0.861792,-0.258463,0.436477)
+ New Polarization:       (-0.40159,-0.873313,0.275771)
+ *** FresnelRefraction *** 
+Track (trackID 1631, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 62
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 63 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.216436,0.785445,0.579855)
+ Old Polarization:       (-0.962986,0.0740104,0.259192)
+ New Momentum Direction: (0.29445,0.539439,0.788863)
+ New Polarization:       (-0.890855,-0.143874,0.430903)
+ *** FresnelRefraction *** 
+Track (trackID 1773, parentID 1) is processed with stopping code 2
+### pop requested out of 62 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.640823,0.658757,-0.394189)
+ Old Polarization:       (-0.466869,-0.0731909,-0.881292)
+ New Momentum Direction: (0.640823,-0.658757,-0.394189)
+ New Polarization:       (0.466869,-0.0731909,0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.640823,-0.658757,-0.394189)
+ Old Polarization:       (0.466869,-0.0731909,0.881292)
+ New Momentum Direction: (-0.640823,-0.658757,-0.394189)
+ New Polarization:       (0.466869,0.0731909,-0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.640823,-0.658757,-0.394189)
+ Old Polarization:       (0.466869,0.0731909,-0.881292)
+ New Momentum Direction: (-0.640823,-0.658757,0.394189)
+ New Polarization:       (-0.466869,-0.0731909,-0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.640823,-0.658757,0.394189)
+ Old Polarization:       (-0.466869,-0.0731909,-0.881292)
+ New Momentum Direction: (-0.640823,0.658757,0.394189)
+ New Polarization:       (0.466869,-0.0731909,0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.640823,0.658757,0.394189)
+ Old Polarization:       (0.466869,-0.0731909,0.881292)
+ New Momentum Direction: (0.640823,0.658757,0.394189)
+ New Polarization:       (0.466869,0.0731909,-0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.640823,0.658757,0.394189)
+ Old Polarization:       (0.466869,0.0731909,-0.881292)
+ New Momentum Direction: (0.640823,-0.658757,0.394189)
+ New Polarization:       (-0.466869,0.0731909,0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.640823,-0.658757,0.394189)
+ Old Polarization:       (-0.466869,0.0731909,0.881292)
+ New Momentum Direction: (0.640823,-0.658757,-0.394189)
+ New Polarization:       (0.466869,-0.0731909,0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.640823,-0.658757,-0.394189)
+ Old Polarization:       (0.466869,-0.0731909,0.881292)
+ New Momentum Direction: (-0.640823,-0.658757,-0.394189)
+ New Polarization:       (0.466869,0.0731909,-0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.640823,-0.658757,-0.394189)
+ Old Polarization:       (0.466869,0.0731909,-0.881292)
+ New Momentum Direction: (-0.640823,0.658757,-0.394189)
+ New Polarization:       (-0.466869,0.0731909,0.881292)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.640823,0.658757,-0.394189)
+ Old Polarization:       (-0.466869,0.0731909,0.881292)
+ New Momentum Direction: (0.640823,0.658757,-0.394189)
+ New Polarization:       (-0.466869,-0.0731909,-0.881292)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1772, parentID 1) is processed with stopping code 2
+### pop requested out of 61 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.785139,-0.0381152,0.618146)
+ Old Polarization:       (-0.292869,-0.902303,0.316351)
+ New Momentum Direction: (0.552316,-0.0513049,0.832054)
+ New Polarization:       (-0.504622,-0.815044,0.284711)
+ *** FresnelRefraction *** 
+Track (trackID 1771, parentID 1) is processed with stopping code 2
+### pop requested out of 60 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.965723,0.111518,-0.234398)
+ Old Polarization:       (-0.0859287,-0.714751,-0.69408)
+ New Momentum Direction: (0.935752,0.151508,-0.318453)
+ New Polarization:       (-0.152324,-0.640787,-0.752456)
+ *** FresnelRefraction *** 
+Track (trackID 1770, parentID 1) is processed with stopping code 2
+### pop requested out of 59 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1769, parentID 1) is processed with stopping code 2
+### pop requested out of 58 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.938384,-0.11718,0.325123)
+ Old Polarization:       (-0.1116,-0.993107,-0.035827)
+ New Momentum Direction: (0.884586,-0.158133,0.43875)
+ New Polarization:       (-0.196474,-0.979563,0.0430709)
+ *** FresnelRefraction *** 
+Track (trackID 1768, parentID 1) is processed with stopping code 2
+### pop requested out of 57 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.218162,0.819645,0.529705)
+ Old Polarization:       (-0.970218,0.123611,0.208318)
+ New Momentum Direction: (0.294286,0.634691,0.714537)
+ New Polarization:       (-0.811816,-0.228524,0.537338)
+ *** FresnelRefraction *** 
+Track (trackID 1767, parentID 1) is processed with stopping code 2
+### pop requested out of 56 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.940676,0.178659,-0.28846)
+ Old Polarization:       (-0.112393,-0.638086,-0.761718)
+ New Momentum Direction: (0.88814,0.241985,-0.390705)
+ New Polarization:       (-0.198746,-0.564302,-0.801288)
+ *** FresnelRefraction *** 
+Track (trackID 1766, parentID 1) is processed with stopping code 2
 ### pop requested out of 55 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1793, parentID 1) is processed with stopping code 2
+Track (trackID 1765, parentID 1) is processed with stopping code 2
 ### pop requested out of 54 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97749,-0.20098,-0.064194)
- Old Polarization:       (-0.20799,-0.96902,-0.13317)
- New Momentum Direction: (0.95838,-0.27197,-0.086867)
- New Polarization:       (-0.28328,-0.94373,-0.17066)
+ Old Momentum Direction: (0.5673,0.743727,-0.353611)
+ Old Polarization:       (-0.552998,0.025863,-0.832781)
+ New Momentum Direction: (0.771264,0.417175,-0.480747)
+ New Polarization:       (-0.507836,-0.0520384,-0.859881)
  *** FresnelRefraction *** 
-Track (trackID 1792, parentID 1) is processed with stopping code 2
+Track (trackID 1764, parentID 1) is processed with stopping code 2
 ### pop requested out of 53 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41416,0.86046,-0.29679)
- Old Polarization:       (-0.8703,0.27887,-0.40598)
- New Momentum Direction: (0.56104,0.72359,-0.40204)
- New Polarization:       (-0.035286,-0.46434,-0.88495)
- *** FresnelRefraction *** 
-Track (trackID 1791, parentID 1) is processed with stopping code 2
-### pop requested out of 52 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71845,0.33384,-0.61023)
- Old Polarization:       (-0.51197,-0.34008,-0.78882)
- New Momentum Direction: (0.35565,0.44857,-0.81994)
- New Polarization:       (-0.79438,-0.31714,-0.51806)
- *** FresnelRefraction *** 
-Track (trackID 1790, parentID 1) is processed with stopping code 2
-### pop requested out of 51 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.96898,-0.2079,0.13362)
- Old Polarization:       (-0.22171,-0.97014,0.098363)
- New Momentum Direction: (0.94189,-0.28259,0.18162)
- New Polarization:       (-0.31599,-0.9288,0.19358)
- *** FresnelRefraction *** 
-Track (trackID 1789, parentID 1) is processed with stopping code 2
-### pop requested out of 50 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36055,0.92389,0.12818)
- Old Polarization:       (-0.93186,0.35083,0.092523)
- New Momentum Direction: (0.48921,0.85465,0.17392)
- New Polarization:       (0.66627,-0.4949,0.55781)
- *** FresnelRefraction *** 
-Track (trackID 1788, parentID 1) is processed with stopping code 2
-### pop requested out of 49 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.62513,0.39608,0.67256)
- Old Polarization:       (-0.62285,-0.26615,0.73567)
- New Momentum Direction: (0.62513,0.39608,-0.67256)
- New Polarization:       (0.62285,0.26615,0.73567)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.62513,0.39608,-0.67256)
- Old Polarization:       (0.62285,0.26615,0.73567)
- New Momentum Direction: (-0.62513,0.39608,-0.67256)
- New Polarization:       (0.62285,-0.26615,-0.73567)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.62513,0.39608,-0.67256)
- Old Polarization:       (0.62285,-0.26615,-0.73567)
- New Momentum Direction: (-0.62513,-0.39608,-0.67256)
- New Polarization:       (-0.62285,-0.26615,0.73567)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1787, parentID 1) is processed with stopping code 2
-### pop requested out of 48 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.51645,0.60531,0.6057)
- Old Polarization:       (-0.7517,-0.018311,0.65925)
- New Momentum Direction: (0.51645,0.60531,-0.6057)
- New Polarization:       (0.7517,0.018311,0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.51645,0.60531,-0.6057)
- Old Polarization:       (0.7517,0.018311,0.65925)
- New Momentum Direction: (0.51645,-0.60531,-0.6057)
- New Polarization:       (-0.7517,0.018311,-0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.51645,-0.60531,-0.6057)
- Old Polarization:       (-0.7517,0.018311,-0.65925)
- New Momentum Direction: (-0.51645,-0.60531,-0.6057)
- New Polarization:       (-0.7517,-0.018311,0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.51645,-0.60531,-0.6057)
- Old Polarization:       (-0.7517,-0.018311,0.65925)
- New Momentum Direction: (-0.51645,-0.60531,0.6057)
- New Polarization:       (0.7517,0.018311,0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.51645,-0.60531,0.6057)
- Old Polarization:       (0.7517,0.018311,0.65925)
- New Momentum Direction: (-0.51645,0.60531,0.6057)
- New Polarization:       (-0.7517,0.018311,-0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.51645,0.60531,0.6057)
- Old Polarization:       (-0.7517,0.018311,-0.65925)
- New Momentum Direction: (0.51645,0.60531,0.6057)
- New Polarization:       (-0.7517,-0.018311,0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.51645,0.60531,0.6057)
- Old Polarization:       (-0.7517,-0.018311,0.65925)
- New Momentum Direction: (0.51645,0.60531,-0.6057)
- New Polarization:       (0.7517,0.018311,0.65925)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.51645,0.60531,-0.6057)
- Old Polarization:       (0.7517,0.018311,0.65925)
- New Momentum Direction: (0.51645,-0.60531,-0.6057)
- New Polarization:       (-0.7517,0.018311,-0.65925)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1786, parentID 1) is processed with stopping code 2
-### pop requested out of 47 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.3715,0.8886,0.26904)
- Old Polarization:       (-0.91706,0.306,0.25566)
- New Momentum Direction: (0.5053,0.78151,0.36594)
- New Polarization:       (0.1252,-0.48596,0.86497)
- *** FresnelRefraction *** 
-Track (trackID 1785, parentID 1) is processed with stopping code 2
-### pop requested out of 46 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.4569,0.71447,0.52988)
- Old Polarization:       (-0.81949,0.10643,0.56312)
- New Momentum Direction: (0.4569,-0.71447,0.52988)
- New Polarization:       (0.7199,-0.052893,-0.69206)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4569,-0.71447,0.52988)
- Old Polarization:       (0.7199,-0.052893,-0.69206)
- New Momentum Direction: (0.4569,-0.71447,-0.52988)
- New Polarization:       (-0.7199,0.052893,-0.69206)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4569,-0.71447,-0.52988)
- Old Polarization:       (-0.7199,0.052893,-0.69206)
- New Momentum Direction: (-0.4569,-0.71447,-0.52988)
- New Polarization:       (-0.7199,-0.052893,0.69206)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1784, parentID 1) is processed with stopping code 2
-### pop requested out of 45 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.55256,0.61814,-0.55909)
- Old Polarization:       (-0.70656,-0.0084151,-0.7076)
- New Momentum Direction: (0.55256,-0.61814,-0.55909)
- New Polarization:       (0.70656,-0.0084151,0.7076)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.55256,-0.61814,-0.55909)
- Old Polarization:       (0.70656,-0.0084151,0.7076)
- New Momentum Direction: (-0.55256,-0.61814,-0.55909)
- New Polarization:       (0.70656,0.0084151,-0.7076)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.55256,-0.61814,-0.55909)
- Old Polarization:       (0.70656,0.0084151,-0.7076)
- New Momentum Direction: (-0.55256,-0.61814,0.55909)
- New Polarization:       (-0.70656,-0.0084151,-0.7076)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1783, parentID 1) is processed with stopping code 2
-### pop requested out of 44 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.38884,0.86176,0.32586)
- Old Polarization:       (-0.90165,0.28328,0.32677)
- New Momentum Direction: (0.52566,0.72775,0.44052)
- New Polarization:       (-0.089061,-0.46791,0.87928)
- *** FresnelRefraction *** 
-Track (trackID 1782, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.96044,-0.16319,-0.22567)
-Old Polarization: (-0.23135,-0.91861,-0.32037)
-New Polarization: (-0.25253,0.88721,0.38611)
-Polarization Change: (-0.25253,0.88721,0.38611)
-New Momentum Direction: (0.95613,0.29004,-0.041136)
-Momentum Change: (0.95613,0.29004,-0.041136)
- Photon at Boundary! 
- Old Momentum Direction: (0.95613,0.29004,-0.041136)
- Old Polarization:       (-0.25253,0.88721,0.38611)
- New Momentum Direction: (0.91737,0.39409,-0.055892)
- New Polarization:       (-0.36565,0.88987,0.27281)
- *** FresnelRefraction *** 
-Track (trackID 1781, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95678,-0.18513,0.22429)
- Old Polarization:       (-0.23231,-0.95048,0.20644)
- New Momentum Direction: (0.91932,-0.2505,0.30349)
- New Polarization:       (-0.34433,-0.88543,0.31218)
- *** FresnelRefraction *** 
-Track (trackID 1780, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.40083,0.82508,0.39822)
- Old Polarization:       (-0.88344,0.23297,0.40653)
- New Momentum Direction: (0.54483,0.64045,0.54128)
- New Polarization:       (-0.34912,-0.41365,0.84084)
- *** FresnelRefraction *** 
-Track (trackID 1779, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.41449,0.85578,-0.30958)
- Old Polarization:       (-0.86768,0.26903,-0.41803)
- New Momentum Direction: (0.56327,0.71115,-0.4207)
- New Polarization:       (-0.086495,-0.45561,-0.88597)
- *** FresnelRefraction *** 
-Track (trackID 1778, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.38465,0.9011,-0.20017)
- Old Polarization:       (-0.90176,0.32052,-0.28998)
- New Momentum Direction: (0.52319,0.80756,-0.27226)
- New Polarization:       (0.34425,-0.49252,-0.79932)
- *** FresnelRefraction *** 
-Track (trackID 1777, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.44829,0.73899,0.50292)
- Old Polarization:       (-0.83207,0.13939,0.53687)
- New Momentum Direction: (0.60549,0.41468,0.67928)
- New Polarization:       (-0.63103,-0.26994,0.72728)
- *** FresnelRefraction *** 
-Track (trackID 1776, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.79302,0.080802,0.60381)
- Old Polarization:       (-0.4268,-0.63356,0.64533)
- New Momentum Direction: (0.56013,0.10988,0.82109)
- New Polarization:       (-0.67525,-0.51361,0.52938)
- *** FresnelRefraction *** 
-Track (trackID 1775, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.5865,0.45838,0.66776)
- Old Polarization:       (-0.66703,-0.19431,0.71924)
- New Momentum Direction: (0.5865,0.45838,-0.66776)
- New Polarization:       (0.66703,0.19431,0.71924)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.5865,0.45838,-0.66776)
- Old Polarization:       (0.66703,0.19431,0.71924)
- New Momentum Direction: (-0.5865,0.45838,-0.66776)
- New Polarization:       (0.66703,-0.19431,-0.71924)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.5865,0.45838,-0.66776)
- Old Polarization:       (0.66703,-0.19431,-0.71924)
- New Momentum Direction: (-0.5865,-0.45838,-0.66776)
- New Polarization:       (-0.66703,-0.19431,0.71924)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.5865,-0.45838,-0.66776)
- Old Polarization:       (-0.66703,-0.19431,0.71924)
- New Momentum Direction: (-0.5865,-0.45838,0.66776)
- New Polarization:       (0.66703,0.19431,0.71924)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.5865,-0.45838,0.66776)
-Old Polarization: (0.66703,0.19431,0.71924)
-New Polarization: (-0.67791,-0.45796,-0.57507)
-Polarization Change: (-0.67791,-0.45796,-0.57507)
-New Momentum Direction: (0.066504,-0.81725,0.57243)
-Momentum Change: (0.066504,-0.81725,0.57243)
-
-** Photon absorbed! **
-Track (trackID 1774, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.97796,-0.19421,-0.076662)
- Old Polarization:       (-0.20384,-0.96759,-0.14908)
- New Momentum Direction: (0.9596,-0.26173,-0.10331)
- New Polarization:       (-0.27766,-0.94027,-0.19699)
- *** FresnelRefraction *** 
-Track (trackID 1773, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95921,-0.19425,0.20538)
- Old Polarization:       (-0.2325,-0.95536,0.1823)
- New Momentum Direction: (0.92335,-0.26384,0.27895)
- New Polarization:       (-0.34257,-0.89422,0.28814)
- *** FresnelRefraction *** 
-Track (trackID 1772, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1771, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1770, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.81926,0.0398,0.57204)
- Old Polarization:       (-0.39492,-0.68412,0.6132)
- New Momentum Direction: (0.6292,0.053947,0.77537)
- New Polarization:       (-0.62284,-0.56177,0.54451)
- *** FresnelRefraction *** 
-Track (trackID 1769, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1768, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1767, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.39435,0.88759,-0.23804)
-Old Polarization: (-0.89119,0.30618,-0.33471)
-New Polarization: (-0.98178,0.1368,-0.13186)
-Polarization Change: (-0.98178,0.1368,-0.13186)
-New Momentum Direction: (-0.18899,-0.63161,0.75189)
-Momentum Change: (-0.18899,-0.63161,0.75189)
-Scattering Photon!
-Old Momentum Direction: (-0.18899,-0.63161,0.75189)
-Old Polarization: (-0.98178,0.1368,-0.13186)
-New Polarization: (0.95722,0.28034,-0.071754)
-Polarization Change: (0.95722,0.28034,-0.071754)
-New Momentum Direction: (0.28308,-0.85567,0.43323)
-Momentum Change: (0.28308,-0.85567,0.43323)
- Photon at Boundary! 
- Old Momentum Direction: (0.28308,-0.85567,0.43323)
- Old Polarization:       (0.95722,0.28034,-0.071754)
- New Momentum Direction: (0.38467,-0.71095,0.58871)
- New Polarization:       (0.88229,0.47064,-0.0081225)
- *** FresnelRefraction *** 
-Track (trackID 1766, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.94135,-0.11414,-0.31753)
- Old Polarization:       (-0.25057,-0.86671,-0.4313)
- New Momentum Direction: (0.88965,-0.15447,-0.42971)
- New Polarization:       (-0.38098,-0.76988,-0.512)
- *** FresnelRefraction *** 
-Track (trackID 1765, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1764, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.84134,0.012986,0.54035)
- Old Polarization:       (-0.36556,-0.72272,0.58655)
- New Momentum Direction: (0.68626,0.017475,0.72715)
- New Polarization:       (-0.572,-0.60457,0.55436)
+ Old Momentum Direction: (0.466474,0.319592,0.824781)
+ Old Polarization:       (-0.675232,-0.473658,0.565429)
+ New Momentum Direction: (0.62743,0.429867,0.649265)
+ New Polarization:       (0.539299,0.361561,-0.760546)
  *** FresnelRefraction *** 
 Track (trackID 1763, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
-
-** Photon absorbed! **
+### pop requested out of 52 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.454357,0.32985,0.827501)
+ Old Polarization:       (-0.68794,-0.460232,0.561181)
+ New Momentum Direction: (0.613696,0.445526,0.651831)
+ New Polarization:       (0.514031,0.401186,-0.75817)
+ *** FresnelRefraction *** 
 Track (trackID 1762, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
+### pop requested out of 51 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.56626,0.59983,-0.56528)
- Old Polarization:       (-0.69178,-0.026967,-0.7216)
- New Momentum Direction: (0.56626,-0.59983,-0.56528)
- New Polarization:       (0.69178,-0.026967,0.7216)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.56626,-0.59983,-0.56528)
- Old Polarization:       (0.69178,-0.026967,0.7216)
- New Momentum Direction: (-0.56626,-0.59983,-0.56528)
- New Polarization:       (0.69178,0.026967,-0.7216)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.56626,-0.59983,-0.56528)
- Old Polarization:       (0.69178,0.026967,-0.7216)
- New Momentum Direction: (-0.56626,-0.59983,0.56528)
- New Polarization:       (-0.69178,-0.026967,-0.7216)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.56626,-0.59983,0.56528)
- Old Polarization:       (-0.69178,-0.026967,-0.7216)
- New Momentum Direction: (-0.56626,0.59983,0.56528)
- New Polarization:       (0.69178,-0.026967,0.7216)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.56626,0.59983,0.56528)
- Old Polarization:       (0.69178,-0.026967,0.7216)
- New Momentum Direction: (0.56626,0.59983,0.56528)
- New Polarization:       (0.69178,0.026967,-0.7216)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.56626,0.59983,0.56528)
- Old Polarization:       (0.69178,0.026967,-0.7216)
- New Momentum Direction: (0.56626,0.59983,-0.56528)
- New Polarization:       (-0.69178,-0.026967,-0.7216)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.27078,0.66056,0.700242)
+ Old Polarization:       (-0.908358,-0.0654888,0.413035)
+ New Momentum Direction: (0.364927,0.890229,0.272617)
+ New Polarization:       (-0.549638,0.442334,-0.708688)
+ *** FresnelRefraction *** 
 Track (trackID 1761, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+### pop requested out of 50 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.71093,0.23425,0.6631)
- Old Polarization:       (-0.52188,-0.45629,0.72072)
- New Momentum Direction: (0.30353,0.31738,0.89841)
- New Polarization:       (-0.82042,-0.39243,0.41582)
+ Old Momentum Direction: (0.981613,-0.105874,0.158828)
+ Old Polarization:       (-0.0669238,-0.970151,-0.233086)
+ New Momentum Direction: (0.965813,-0.14379,0.215708)
+ New Polarization:       (-0.117723,-0.984601,-0.129237)
  *** FresnelRefraction *** 
 Track (trackID 1760, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
+### pop requested out of 49 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.252372,0.682053,0.686376)
+ Old Polarization:       (-0.921829,-0.0461831,0.384837)
+ New Momentum Direction: (0.252372,0.682053,-0.686376)
+ New Polarization:       (0.749275,-0.586593,-0.3074)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.252372,0.682053,-0.686376)
+ Old Polarization:       (0.749275,-0.586593,-0.3074)
+ New Momentum Direction: (0.34304,0.109074,-0.932967)
+ New Polarization:       (0.411669,-0.910224,0.0449505)
+ *** FresnelRefraction *** 
+Track (trackID 1759, parentID 1) is processed with stopping code 2
+### pop requested out of 48 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1759, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.41039,0.87066,-0.27115)
- Old Polarization:       (-0.87711,0.29552,-0.37862)
- New Momentum Direction: (0.55414,0.74759,-0.36612)
- New Polarization:       (0.066768,-0.47832,-0.87564)
- *** FresnelRefraction *** 
 Track (trackID 1758, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+### pop requested out of 47 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.35855,0.93061,0.073566)
- Old Polarization:       (-0.93351,0.35742,0.028543)
- New Momentum Direction: (0.48689,0.86773,0.099897)
- New Polarization:       (0.80731,-0.49072,0.32777)
+ Old Momentum Direction: (0.364272,0.922684,-0.12633)
+ Old Polarization:       (-0.790243,0.234468,-0.566163)
+ New Momentum Direction: (0.495549,0.851408,-0.171857)
+ New Polarization:       (0.358411,-0.38067,-0.852427)
  *** FresnelRefraction *** 
 Track (trackID 1757, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.97565,-0.20648,0.074042)
- Old Polarization:       (-0.20911,-0.97744,0.029696)
- New Momentum Direction: (0.95504,-0.27907,0.10007)
- New Polarization:       (-0.28869,-0.95221,0.099773)
- *** FresnelRefraction *** 
+### pop requested out of 46 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1756, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+### pop requested out of 45 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (0.297341,0.954569,0.0196649)
+Old Polarization: (-0.873309,0.280239,-0.398495)
+New Polarization: (-0.851431,0.484658,-0.20043)
+Polarization Change: (-0.851431,0.484658,-0.20043)
+New Momentum Direction: (0.200218,0.653583,0.729892)
+Momentum Change: (0.200218,0.653583,0.729892)
  Photon at Boundary! 
- Old Momentum Direction: (0.81253,0.14265,-0.5652)
- Old Polarization:       (-0.40259,-0.56388,-0.72108)
- New Momentum Direction: (0.61353,0.19324,-0.76566)
- New Polarization:       (-0.63443,-0.45671,-0.62363)
+ Old Momentum Direction: (0.200218,0.653583,0.729892)
+ Old Polarization:       (-0.851431,0.484658,-0.20043)
+ New Momentum Direction: (0.200218,-0.653583,0.729892)
+ New Polarization:       (0.851431,0.484658,0.20043)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.200218,-0.653583,0.729892)
+ Old Polarization:       (0.851431,0.484658,0.20043)
+ New Momentum Direction: (0.270839,-0.884115,0.380772)
+ New Polarization:       (0.916259,0.115485,-0.38358)
  *** FresnelRefraction *** 
 Track (trackID 1755, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+### pop requested out of 44 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.97425,-0.20247,0.099227)
- Old Polarization:       (-0.20895,-0.97609,0.059851)
- New Momentum Direction: (0.95264,-0.27308,0.13383)
- New Polarization:       (-0.29131,-0.94576,0.14381)
+ Old Momentum Direction: (0.717411,0.0216554,0.696314)
+ Old Polarization:       (-0.373851,-0.831435,0.411036)
+ New Momentum Direction: (0.34909,0.0291294,0.936636)
+ New Polarization:       (-0.644377,-0.718242,0.262501)
  *** FresnelRefraction *** 
 Track (trackID 1754, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+### pop requested out of 43 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1753, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+### pop requested out of 42 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6232,0.40241,0.67059)
- Old Polarization:       (-0.62536,-0.2585,0.73628)
- New Momentum Direction: (0.6232,0.40241,-0.67059)
- New Polarization:       (0.62536,0.2585,0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6232,0.40241,-0.67059)
- Old Polarization:       (0.62536,0.2585,0.73628)
- New Momentum Direction: (-0.6232,0.40241,-0.67059)
- New Polarization:       (0.62536,-0.2585,-0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6232,0.40241,-0.67059)
- Old Polarization:       (0.62536,-0.2585,-0.73628)
- New Momentum Direction: (-0.6232,-0.40241,-0.67059)
- New Polarization:       (-0.62536,-0.2585,0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6232,-0.40241,-0.67059)
- Old Polarization:       (-0.62536,-0.2585,0.73628)
- New Momentum Direction: (-0.6232,-0.40241,0.67059)
- New Polarization:       (0.62536,0.2585,0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6232,-0.40241,0.67059)
- Old Polarization:       (0.62536,0.2585,0.73628)
- New Momentum Direction: (0.6232,-0.40241,0.67059)
- New Polarization:       (0.62536,-0.2585,-0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6232,-0.40241,0.67059)
- Old Polarization:       (0.62536,-0.2585,-0.73628)
- New Momentum Direction: (0.6232,-0.40241,-0.67059)
- New Polarization:       (-0.62536,0.2585,-0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6232,-0.40241,-0.67059)
- Old Polarization:       (-0.62536,0.2585,-0.73628)
- New Momentum Direction: (0.6232,0.40241,-0.67059)
- New Polarization:       (0.62536,0.2585,0.73628)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6232,0.40241,-0.67059)
- Old Polarization:       (0.62536,0.2585,0.73628)
- New Momentum Direction: (-0.6232,0.40241,-0.67059)
- New Polarization:       (0.62536,-0.2585,-0.73628)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (0.716713,0.558932,-0.417034)
+ Old Polarization:       (-0.378328,-0.190724,-0.90581)
+ New Momentum Direction: (0.315996,0.760419,-0.56737)
+ New Polarization:       (-0.667256,-0.247007,-0.702679)
+ *** FresnelRefraction *** 
 Track (trackID 1752, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1751, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+### pop requested out of 41 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.7915,0.19051,-0.58072)
- Old Polarization:       (-0.42567,-0.50998,-0.74748)
- New Momentum Direction: (0.56655,0.25686,-0.78297)
- New Polarization:       (-0.66634,-0.41618,-0.6187)
+ Old Momentum Direction: (0.269459,0.959547,0.0816191)
+ Old Polarization:       (-0.903309,0.281222,-0.323955)
+ New Momentum Direction: (0.365676,0.924128,0.110764)
+ New Polarization:       (0.894132,-0.381845,0.233927)
+ *** FresnelRefraction *** 
+Track (trackID 1751, parentID 1) is processed with stopping code 2
+### pop requested out of 40 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.440155,0.349719,0.827019)
+ Old Polarization:       (-0.704545,-0.436489,0.559549)
+ New Momentum Direction: (0.594869,0.472645,0.650183)
+ New Polarization:       (0.464874,0.457585,-0.757963)
  *** FresnelRefraction *** 
 Track (trackID 1750, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+### pop requested out of 39 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.751615,0.511677,-0.416246)
+ Old Polarization:       (-0.336509,-0.245298,-0.90917)
+ New Momentum Direction: (-0.751615,0.511677,-0.416246)
+ New Polarization:       (-0.106569,0.528564,0.842178)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.751615,0.511677,-0.416246)
+ Old Polarization:       (-0.106569,0.528564,0.842178)
+ New Momentum Direction: (-0.751615,-0.511677,-0.416246)
+ New Polarization:       (0.106569,0.528564,-0.842178)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.751615,-0.511677,-0.416246)
+ Old Polarization:       (0.106569,0.528564,-0.842178)
+ New Momentum Direction: (-0.751615,-0.511677,0.416246)
+ New Polarization:       (-0.106569,-0.528564,-0.842178)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.751615,-0.511677,0.416246)
+ Old Polarization:       (-0.106569,-0.528564,-0.842178)
+ New Momentum Direction: (0.751615,-0.511677,0.416246)
+ New Polarization:       (0.0297747,0.656733,0.753535)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1749, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
-
-** Photon absorbed! **
+### pop requested out of 38 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.208623,0.921397,0.327879)
+ Old Polarization:       (-0.97192,0.232642,-0.0353504)
+ New Momentum Direction: (0.283873,0.848748,0.446143)
+ New Polarization:       (-0.26092,-0.379352,0.887701)
+ *** FresnelRefraction *** 
 Track (trackID 1748, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.232076,0.778014,0.583811)
+ Old Polarization:       (-0.957724,0.0778608,0.276953)
+ New Momentum Direction: (0.232076,-0.778014,0.583811)
+ New Polarization:       (0.924865,-0.00939989,-0.380179)
+ *** FresnelReflection *** 
 
 ** Photon absorbed! **
 Track (trackID 1747, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.65302,0.43838,-0.61757)
-Old Polarization: (-0.58974,-0.21726,-0.77782)
-New Polarization: (-0.49584,0.66814,-0.55474)
-Polarization Change: (-0.49584,0.66814,-0.55474)
-New Momentum Direction: (-0.37128,-0.74057,-0.5601)
-Momentum Change: (-0.37128,-0.74057,-0.5601)
- Photon at Boundary! 
- Old Momentum Direction: (-0.37128,-0.74057,-0.5601)
- Old Polarization:       (-0.49584,0.66814,-0.55474)
- New Momentum Direction: (-0.37128,-0.74057,0.5601)
- New Polarization:       (0.49584,-0.66814,-0.55474)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.37128,-0.74057,0.5601)
- Old Polarization:       (0.49584,-0.66814,-0.55474)
- New Momentum Direction: (-0.5043,-0.40855,0.76077)
- New Polarization:       (-0.16493,0.91035,0.37955)
- *** FresnelRefraction *** 
-Track (trackID 1746, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.90217,-0.028739,-0.43043)
- Old Polarization:       (-0.29514,-0.76884,-0.56726)
- New Momentum Direction: (0.8129,-0.038799,-0.58111)
- New Polarization:       (-0.45979,-0.65518,-0.59944)
- *** FresnelRefraction *** 
-Track (trackID 1745, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1744, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7329,0.18834,0.65374)
- Old Polarization:       (-0.49675,-0.50842,0.70338)
- New Momentum Direction: (0.37957,0.25612,0.889)
- New Polarization:       (-0.78469,-0.4199,0.45601)
- *** FresnelRefraction *** 
-Track (trackID 1743, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73484,0.18606,0.65222)
- Old Polarization:       (-0.49436,-0.51143,0.70288)
- New Momentum Direction: (-0.73484,0.18606,0.65222)
- New Polarization:       (-0.25058,0.81912,-0.51599)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.73484,0.18606,0.65222)
- Old Polarization:       (-0.25058,0.81912,-0.51599)
- New Momentum Direction: (-0.73484,0.18606,-0.65222)
- New Polarization:       (0.25058,-0.81912,-0.51599)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1742, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.53246,0.65958,-0.53051)
- Old Polarization:       (-0.73145,0.043112,-0.68054)
- New Momentum Direction: (0.53246,-0.65958,-0.53051)
- New Polarization:       (0.73145,0.043112,0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.53246,-0.65958,-0.53051)
- Old Polarization:       (0.73145,0.043112,0.68054)
- New Momentum Direction: (-0.53246,-0.65958,-0.53051)
- New Polarization:       (0.73145,-0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53246,-0.65958,-0.53051)
- Old Polarization:       (0.73145,-0.043112,-0.68054)
- New Momentum Direction: (-0.53246,-0.65958,0.53051)
- New Polarization:       (-0.73145,0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53246,-0.65958,0.53051)
- Old Polarization:       (-0.73145,0.043112,-0.68054)
- New Momentum Direction: (-0.53246,0.65958,0.53051)
- New Polarization:       (0.73145,0.043112,0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53246,0.65958,0.53051)
- Old Polarization:       (0.73145,0.043112,0.68054)
- New Momentum Direction: (0.53246,0.65958,0.53051)
- New Polarization:       (0.73145,-0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.53246,0.65958,0.53051)
- Old Polarization:       (0.73145,-0.043112,-0.68054)
- New Momentum Direction: (0.53246,0.65958,-0.53051)
- New Polarization:       (-0.73145,0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.53246,0.65958,-0.53051)
- Old Polarization:       (-0.73145,0.043112,-0.68054)
- New Momentum Direction: (0.53246,-0.65958,-0.53051)
- New Polarization:       (0.73145,0.043112,0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.53246,-0.65958,-0.53051)
- Old Polarization:       (0.73145,0.043112,0.68054)
- New Momentum Direction: (-0.53246,-0.65958,-0.53051)
- New Polarization:       (0.73145,-0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53246,-0.65958,-0.53051)
- Old Polarization:       (0.73145,-0.043112,-0.68054)
- New Momentum Direction: (-0.53246,-0.65958,0.53051)
- New Polarization:       (-0.73145,0.043112,-0.68054)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.53246,-0.65958,0.53051)
- Old Polarization:       (-0.73145,0.043112,-0.68054)
- New Momentum Direction: (-0.53246,0.65958,0.53051)
- New Polarization:       (0.73145,0.043112,0.68054)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1741, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.95424,-0.14967,-0.2589)
- Old Polarization:       (-0.23888,-0.90233,-0.35881)
- New Momentum Direction: (0.91366,-0.20344,-0.3519)
- New Polarization:       (-0.3561,-0.81807,-0.45161)
- *** FresnelRefraction *** 
-Track (trackID 1740, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 41
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 42 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.28077,0.70099,-0.65558)
- Old Polarization:       (-0.95976,0.20169,-0.19538)
- New Momentum Direction: (0.38063,0.25537,-0.88877)
- New Polarization:       (-0.79303,-0.40421,-0.45577)
- *** FresnelRefraction *** 
-Track (trackID 1847, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1846, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1845, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54455,-0.00078938,-0.83873)
- Old Polarization:       (-0.64224,-0.64356,-0.41637)
- New Momentum Direction: (0.73802,-0.0010698,-0.67477)
- New Polarization:       (0.57737,-0.51655,0.63231)
- *** FresnelRefraction *** 
-Track (trackID 1844, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1843, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.795,0.5352,0.28555)
- Old Polarization:       (-0.33988,0.0030921,0.94046)
- New Momentum Direction: (0.5708,0.72443,0.38651)
- New Polarization:       (-0.56921,0.0098691,0.82213)
- *** FresnelRefraction *** 
-Track (trackID 1842, parentID 1) is processed with stopping code 2
 ### pop requested out of 36 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.33615,0.87119,-0.3578)
- Old Polarization:       (-0.89632,0.41257,0.16246)
- New Momentum Direction: (0.45408,0.74847,-0.48333)
- New Polarization:       (0.15612,-0.60093,-0.78391)
- *** FresnelRefraction *** 
-Track (trackID 1841, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1746, parentID 1) is processed with stopping code 2
 ### pop requested out of 35 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1840, parentID 1) is processed with stopping code 2
+Track (trackID 1745, parentID 1) is processed with stopping code 2
 ### pop requested out of 34 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69685,0.68086,0.22545)
- Old Polarization:       (-0.45824,0.18085,0.87024)
- New Momentum Direction: (-0.69685,0.68086,0.22545)
- New Polarization:       (-0.32179,-0.015881,-0.94668)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69685,0.68086,0.22545)
- Old Polarization:       (-0.32179,-0.015881,-0.94668)
- New Momentum Direction: (-0.69685,-0.68086,0.22545)
- New Polarization:       (0.31851,-0.012139,0.94784)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.69685,-0.68086,0.22545)
- Old Polarization:       (0.31851,-0.012139,0.94784)
- New Momentum Direction: (-0.24593,-0.92015,0.30469)
- New Polarization:       (0.5928,0.10592,0.79836)
+ Old Momentum Direction: (0.220359,0.938093,0.267252)
+ Old Polarization:       (-0.960917,0.255846,-0.105746)
+ New Momentum Direction: (0.299076,0.882603,0.362721)
+ New Polarization:       (0.0394617,-0.391234,0.919445)
  *** FresnelRefraction *** 
-Track (trackID 1839, parentID 1) is processed with stopping code 2
+Track (trackID 1744, parentID 1) is processed with stopping code 2
 ### pop requested out of 33 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.93157,-0.24825,-0.2656)
- Old Polarization:       (-0.17381,-0.94578,0.27439)
- New Momentum Direction: (0.87086,-0.33564,-0.3591)
- New Polarization:       (-0.29324,-0.94108,0.16846)
+ Old Momentum Direction: (0.994091,0.00973269,-0.108112)
+ Old Polarization:       (-0.0513197,-0.835493,-0.547099)
+ New Momentum Direction: (0.989093,0.0132066,-0.1467)
+ New Polarization:       (-0.086736,-0.752754,-0.652563)
  *** FresnelRefraction *** 
-Track (trackID 1838, parentID 1) is processed with stopping code 2
+Track (trackID 1743, parentID 1) is processed with stopping code 2
 ### pop requested out of 32 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.72361,0.64769,0.2385)
- Old Polarization:       (-0.4246,0.14531,0.89364)
- New Momentum Direction: (0.37151,0.87124,0.32081)
- New Polarization:       (-0.70161,0.037153,0.71159)
+ Old Momentum Direction: (0.221555,0.941916,0.252405)
+ Old Polarization:       (-0.958123,0.258424,-0.12336)
+ New Momentum Direction: (0.301093,0.889764,0.343019)
+ New Polarization:       (0.112826,-0.390425,0.913695)
  *** FresnelRefraction *** 
-Track (trackID 1837, parentID 1) is processed with stopping code 2
+Track (trackID 1742, parentID 1) is processed with stopping code 2
 ### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.798115,0.440884,-0.410651)
+ Old Polarization:       (-0.282254,-0.328562,-0.901321)
+ New Momentum Direction: (0.574816,0.598779,-0.557719)
+ New Polarization:       (-0.493734,-0.289729,-0.819929)
+ *** FresnelRefraction *** 
+Track (trackID 1741, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.233611,0.759586,0.607005)
+ Old Polarization:       (-0.952201,0.0523503,0.300952)
+ New Momentum Direction: (0.315006,0.480447,0.8185)
+ New Polarization:       (-0.907056,-0.10141,0.408613)
+ *** FresnelRefraction *** 
+Track (trackID 1740, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.393642,0.422096,0.816628)
+ Old Polarization:       (-0.759857,-0.350559,0.547472)
+ New Momentum Direction: (0.531927,0.570377,0.625879)
+ New Polarization:       (0.246371,0.6029,-0.758823)
+ *** FresnelRefraction *** 
+Track (trackID 1739, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.322019,0.549116,0.771217)
+ Old Polarization:       (-0.845684,-0.199352,0.495053)
+ New Momentum Direction: (0.434735,0.741324,0.511316)
+ New Polarization:       (-0.19826,0.632632,-0.748645)
+ *** FresnelRefraction *** 
+Track (trackID 1738, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.263438,0.665083,0.698759)
+ Old Polarization:       (-0.912368,-0.0635053,0.404415)
+ New Momentum Direction: (0.356766,0.9007,0.247907)
+ New Polarization:       (-0.567609,0.419766,-0.708249)
+ *** FresnelRefraction *** 
+Track (trackID 1737, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.989077,-0.0906586,0.11622)
+ Old Polarization:       (-0.0543763,-0.957288,-0.283978)
+ New Momentum Direction: (0.9799,-0.122697,0.157292)
+ New Polarization:       (-0.0945032,-0.979907,-0.175647)
+ *** FresnelRefraction *** 
+Track (trackID 1736, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.354232,0.929375,-0.103832)
+ Old Polarization:       (-0.803656,0.245763,-0.541976)
+ New Momentum Direction: (0.480717,0.86548,-0.140908)
+ New Polarization:       (0.465216,-0.387937,-0.795663)
+ *** FresnelRefraction *** 
+Track (trackID 1735, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.993443,0.0212475,-0.112341)
+ Old Polarization:       (-0.04533,-0.828855,-0.557624)
+ New Momentum Direction: (0.98804,0.0286562,-0.151512)
+ New Polarization:       (-0.077656,-0.75641,-0.649472)
+ *** FresnelRefraction *** 
+Track (trackID 1734, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.999168,-0.0388942,-0.0122496)
+ Old Polarization:       (-0.0403342,-0.898477,-0.437163)
+ New Momentum Direction: (0.998482,-0.0525411,-0.0165477)
+ New Polarization:       (-0.0547547,-0.913787,-0.402486)
+ *** FresnelRefraction *** 
+Track (trackID 1733, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.244636,0.955124,0.167006)
+ Old Polarization:       (-0.93405,0.278362,-0.223752)
+ New Momentum Direction: (0.331476,0.915924,0.226289)
+ New Polarization:       (0.585577,-0.387791,0.711841)
+ *** FresnelRefraction *** 
+Track (trackID 1732, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.29339,0.593429,0.749509)
+ Old Polarization:       (-0.874895,-0.149341,0.460713)
+ New Momentum Direction: (0.398282,0.805593,0.438624)
+ New Polarization:       (-0.355981,0.576461,-0.735507)
+ *** FresnelRefraction *** 
+Track (trackID 1731, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.304179,0.580102,0.755617)
+ Old Polarization:       (-0.865405,-0.163276,0.473725)
+ New Momentum Direction: (0.304179,0.580102,-0.755617)
+ New Polarization:       (0.769697,-0.617024,-0.163854)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.304179,0.580102,-0.755617)
+ Old Polarization:       (0.769697,-0.617024,-0.163854)
+ New Momentum Direction: (0.304179,-0.580102,-0.755617)
+ New Polarization:       (-0.769697,-0.617024,0.163854)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.304179,-0.580102,-0.755617)
+ Old Polarization:       (-0.769697,-0.617024,0.163854)
+ New Momentum Direction: (-0.304179,-0.580102,-0.755617)
+ New Polarization:       (-0.769697,0.617024,-0.163854)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.304179,-0.580102,-0.755617)
+ Old Polarization:       (-0.769697,0.617024,-0.163854)
+ New Momentum Direction: (-0.304179,-0.580102,0.755617)
+ New Polarization:       (0.906162,-0.420874,0.0416683)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.304179,-0.580102,0.755617)
+ Old Polarization:       (0.906162,-0.420874,0.0416683)
+ New Momentum Direction: (-0.304179,0.580102,0.755617)
+ New Polarization:       (-0.906162,-0.420874,-0.0416683)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1730, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.947237,0.163233,-0.275856)
+ Old Polarization:       (-0.10445,-0.656448,-0.747105)
+ New Momentum Direction: (0.900884,0.221048,-0.373559)
+ New Polarization:       (-0.184727,-0.583543,-0.790793)
+ *** FresnelRefraction *** 
+Track (trackID 1729, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1728, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.923203,-0.123798,0.363828)
+ Old Polarization:       (-0.135742,-0.990717,0.00733417)
+ New Momentum Direction: (0.852881,-0.168185,0.494274)
+ New Polarization:       (-0.240552,-0.966809,0.0861053)
+ *** FresnelRefraction *** 
+Track (trackID 1727, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.840266,0.375588,-0.391007)
+ Old Polarization:       (-0.230302,-0.40563,-0.884548)
+ New Momentum Direction: (0.679574,0.508202,-0.529066)
+ New Polarization:       (-0.402112,-0.34515,-0.848043)
+ *** FresnelRefraction *** 
+Track (trackID 1726, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.869469,-0.106934,0.482275)
+ Old Polarization:       (-0.199729,-0.96903,0.145219)
+ New Momentum Direction: (0.740565,-0.145466,0.656051)
+ New Polarization:       (-0.352537,-0.915253,0.195014)
+ *** FresnelRefraction *** 
+Track (trackID 1725, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.960904,-0.122109,0.248501)
+ Old Polarization:       (-0.0923836,-0.987463,-0.127993)
+ New Momentum Direction: (0.926427,-0.166031,0.337886)
+ New Polarization:       (-0.163996,-0.985848,-0.0347787)
+ *** FresnelRefraction *** 
+Track (trackID 1724, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.880737,-0.10153,0.462594)
+ Old Polarization:       (-0.179854,-0.975281,0.128372)
+ New Momentum Direction: (0.769392,-0.136939,0.623926)
+ New Polarization:       (-0.314174,-0.931568,0.182962)
+ *** FresnelRefraction *** 
+Track (trackID 1723, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.66292,0.634046,-0.398148)
+ Old Polarization:       (-0.440335,-0.0999034,-0.892258)
+ New Momentum Direction: (-0.66292,0.634046,-0.398148)
+ New Polarization:       (-0.440335,0.0999034,0.892258)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66292,0.634046,-0.398148)
+ Old Polarization:       (-0.440335,0.0999034,0.892258)
+ New Momentum Direction: (-0.66292,-0.634046,-0.398148)
+ New Polarization:       (0.440335,0.0999034,-0.892258)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.66292,-0.634046,-0.398148)
+ Old Polarization:       (0.440335,0.0999034,-0.892258)
+ New Momentum Direction: (-0.66292,-0.634046,0.398148)
+ New Polarization:       (-0.440335,-0.0999034,-0.892258)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1722, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.926805,-0.120569,0.355661)
+ Old Polarization:       (-0.128653,-0.991689,-0.000931147)
+ New Momentum Direction: (0.861011,-0.163284,0.481662)
+ New Polarization:       (-0.227202,-0.970796,0.0770417)
+ *** FresnelRefraction *** 
+Track (trackID 1721, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.982022,0.064428,-0.177432)
+ Old Polarization:       (-0.0632582,-0.773281,-0.6309)
+ New Momentum Direction: (0.966782,0.0872399,-0.240255)
+ New Polarization:       (-0.111121,-0.703027,-0.702428)
+ *** FresnelRefraction *** 
+Track (trackID 1720, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.982051,-0.0947798,0.163073)
+ Old Polarization:       (-0.0556948,-0.971741,-0.229384)
+ New Momentum Direction: (0.9673,-0.127452,0.219287)
+ New Polarization:       (-0.0975236,-0.985006,-0.142307)
+ *** FresnelRefraction *** 
+Track (trackID 1719, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.614289,0.118145,0.780186)
+ Old Polarization:       (-0.497888,-0.709028,0.499387)
+ New Momentum Direction: (0.832543,0.160121,0.530314)
+ New Polarization:       (0.548851,-0.36814,-0.75049)
+ *** FresnelRefraction *** 
+Track (trackID 1718, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.548955,0.763762,-0.339581)
+ Old Polarization:       (-0.574531,0.0497051,-0.816972)
+ New Momentum Direction: (0.746021,0.480087,-0.461485)
+ New Polarization:       (-0.477133,-0.0980724,-0.873342)
+ *** FresnelRefraction *** 
+Track (trackID 1717, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.967204,-0.11468,0.226636)
+ Old Polarization:       (-0.0808385,-0.984858,-0.153359)
+ New Momentum Direction: (0.938986,-0.155296,0.306901)
+ New Polarization:       (-0.142874,-0.987754,-0.0626811)
+ *** FresnelRefraction *** 
+Track (trackID 1716, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.561222,0.752807,-0.343964)
+ Old Polarization:       (-0.560535,0.0399417,-0.827167)
+ New Momentum Direction: (0.760199,0.452793,-0.465914)
+ New Polarization:       (-0.486374,-0.0788264,-0.870188)
+ *** FresnelRefraction *** 
+Track (trackID 1715, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.766051,0.494575,-0.410562)
+ Old Polarization:       (-0.317383,-0.264397,-0.910693)
+ New Momentum Direction: (0.496108,0.668067,-0.554584)
+ New Polarization:       (-0.549568,-0.252886,-0.796256)
+ *** FresnelRefraction *** 
+Track (trackID 1714, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.418329,0.387729,0.821381)
+ Old Polarization:       (-0.731912,-0.391614,0.557622)
+ New Momentum Direction: (0.563847,0.522603,0.639502)
+ New Polarization:       (0.360221,0.54117,-0.759852)
+ *** FresnelRefraction *** 
+Track (trackID 1713, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.429824,0.878011,-0.21059)
+ Old Polarization:       (-0.716412,0.189681,-0.671397)
+ New Momentum Direction: (0.58137,0.762152,-0.284839)
+ New Polarization:       (-0.027356,-0.331572,-0.943033)
+ *** FresnelRefraction *** 
+Track (trackID 1712, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 37
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 38 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.251738,0.640938,0.725139)
+ Old Polarization:       (-0.947403,0.316208,0.0494075)
+ New Momentum Direction: (0.341907,0.870514,0.353984)
+ New Polarization:       (-0.911397,0.398977,-0.100858)
+ *** FresnelRefraction *** 
+Track (trackID 1810, parentID 1) is processed with stopping code 2
+### pop requested out of 37 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.234996,0.433395,0.870026)
+ Old Polarization:       (-0.97106,0.0654049,0.229705)
+ New Momentum Direction: (0.318266,0.586966,0.744431)
+ New Polarization:       (-0.500775,0.770857,-0.393706)
+ *** FresnelRefraction *** 
+Track (trackID 1809, parentID 1) is processed with stopping code 2
+### pop requested out of 36 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.379906,0.817481,0.432893)
+ Old Polarization:       (-0.790908,0.529758,-0.306302)
+ New Momentum Direction: (0.516361,0.622239,0.58838)
+ New Polarization:       (0.176236,-0.749567,0.638037)
+ *** FresnelRefraction *** 
+Track (trackID 1808, parentID 1) is processed with stopping code 2
+### pop requested out of 35 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.317831,0.0659686,0.94585)
+ Old Polarization:       (-0.867015,-0.383541,0.31809)
+ New Momentum Direction: (0.431652,0.0895932,0.89758)
+ New Polarization:       (0.899174,0.0365205,-0.436064)
+ *** FresnelRefraction *** 
+Track (trackID 1807, parentID 1) is processed with stopping code 2
+### pop requested out of 34 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.998724,0.0151527,-0.0481698)
+ Old Polarization:       (-0.0363482,-0.446461,-0.894064)
+ New Momentum Direction: (0.997653,0.0205449,-0.0653118)
+ New Polarization:       (-0.0557965,-0.30887,-0.949466)
+ *** FresnelRefraction *** 
+Track (trackID 1806, parentID 1) is processed with stopping code 2
+### pop requested out of 33 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.444859,0.831526,0.332664)
+ Old Polarization:       (-0.713901,0.553521,-0.428906)
+ New Momentum Direction: (0.602438,0.658876,0.450501)
+ New Polarization:       (0.49075,-0.750895,0.441951)
+ *** FresnelRefraction *** 
+Track (trackID 1805, parentID 1) is processed with stopping code 2
+### pop requested out of 32 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.643264,0.762494,0.0693899)
+ Old Polarization:       (-0.470857,0.465432,-0.749444)
+ New Momentum Direction: (0.872975,0.478589,0.0941691)
+ New Polarization:       (0.455745,-0.731524,-0.507118)
+ *** FresnelRefraction *** 
+Track (trackID 1804, parentID 1) is processed with stopping code 2
+### pop requested out of 31 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.490113,-0.202894,0.847717)
+ Old Polarization:       (-0.660397,-0.721186,0.209203)
+ New Momentum Direction: (0.660448,-0.273408,0.699326)
+ New Polarization:       (0.00168327,-0.93081,-0.365499)
+ *** FresnelRefraction *** 
+Track (trackID 1803, parentID 1) is processed with stopping code 2
+### pop requested out of 30 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1802, parentID 1) is processed with stopping code 2
+### pop requested out of 29 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.622777,-0.32911,0.709813)
+ Old Polarization:       (-0.495812,-0.867816,0.0326464)
+ New Momentum Direction: (0.622777,-0.32911,-0.709813)
+ New Polarization:       (0.451895,0.891908,-0.0170559)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.622777,-0.32911,-0.709813)
+ Old Polarization:       (0.451895,0.891908,-0.0170559)
+ New Momentum Direction: (-0.622777,-0.32911,-0.709813)
+ New Polarization:       (0.451895,-0.891908,0.0170559)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.622777,-0.32911,-0.709813)
+ Old Polarization:       (0.451895,-0.891908,0.0170559)
+ New Momentum Direction: (-0.622777,0.32911,-0.709813)
+ New Polarization:       (-0.451895,-0.891908,-0.0170559)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.622777,0.32911,-0.709813)
+ Old Polarization:       (-0.451895,-0.891908,-0.0170559)
+ New Momentum Direction: (-0.622777,0.32911,0.709813)
+ New Polarization:       (0.475125,0.879873,0.00890567)
+ *** FresnelReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1801, parentID 1) is processed with stopping code 2
+### pop requested out of 28 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1800, parentID 1) is processed with stopping code 2
+### pop requested out of 27 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.974857,0.196171,-0.105693)
+ Old Polarization:       (-0.0599978,-0.225725,-0.972342)
+ New Momentum Direction: (0.953743,0.264655,-0.142591)
+ New Polarization:       (-0.106395,-0.146461,-0.983478)
+ *** FresnelRefraction *** 
+Track (trackID 1799, parentID 1) is processed with stopping code 2
+### pop requested out of 26 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.236741,0.394918,0.88769)
+ Old Polarization:       (-0.968024,0.0178536,0.250222)
+ New Momentum Direction: (0.320876,0.535269,0.781361)
+ New Polarization:       (-0.371431,0.830017,-0.416067)
+ *** FresnelRefraction *** 
+Track (trackID 1798, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.306033,0.749515,0.587002)
+ Old Polarization:       (-0.88392,0.45271,-0.117213)
+ New Momentum Direction: (0.414508,0.442774,0.795069)
+ New Polarization:       (-0.356923,-0.724562,0.58959)
+ *** FresnelRefraction *** 
+Track (trackID 1797, parentID 1) is processed with stopping code 2
+### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.796605,0.600642,-0.0681815)
+ Old Polarization:       (-0.282708,0.270478,-0.920281)
+ New Momentum Direction: (0.574317,0.813409,-0.0923336)
+ New Polarization:       (-0.492168,0.25295,-0.832938)
+ *** FresnelRefraction *** 
+Track (trackID 1796, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.986682,0.130917,-0.0965391)
+ Old Polarization:       (-0.0526401,-0.304566,-0.951035)
+ New Momentum Direction: (0.975306,0.177754,-0.131077)
+ New Polarization:       (-0.0931556,-0.207023,-0.973891)
+ *** FresnelRefraction *** 
+Track (trackID 1795, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1794, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.277616,0.213416,0.936687)
+ Old Polarization:       (-0.92485,-0.204471,0.320694)
+ New Momentum Direction: (0.373861,0.287404,0.881832)
+ New Polarization:       (0.478168,0.754954,-0.448776)
+ *** FresnelRefraction *** 
+Track (trackID 1793, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1792, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.240876,0.587541,0.772512)
+ Old Polarization:       (-0.961627,0.252192,0.108037)
+ New Momentum Direction: (0.326864,0.797282,0.507445)
+ New Polarization:       (-0.851157,0.481697,-0.208565)
+ *** FresnelRefraction *** 
+Track (trackID 1791, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1790, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.975977,0.190149,-0.10636)
+ Old Polarization:       (-0.0603816,-0.232986,-0.970604)
+ New Momentum Direction: (0.955682,0.256938,-0.143718)
+ New Polarization:       (-0.107202,-0.150943,-0.982713)
+ *** FresnelRefraction *** 
+Track (trackID 1789, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.615799,0.781665,0.0989559)
+ Old Polarization:       (-0.504349,0.487552,-0.712688)
+ New Momentum Direction: (0.836329,0.5315,0.134394)
+ New Polarization:       (0.535885,-0.740829,-0.404969)
+ *** FresnelRefraction *** 
+Track (trackID 1788, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.963739,-0.229589,0.136004)
+ Old Polarization:       (-0.0825209,-0.741101,-0.666303)
+ New Momentum Direction: (0.931795,-0.312302,0.185001)
+ New Polarization:       (-0.147469,-0.791412,-0.593228)
+ *** FresnelRefraction *** 
+Track (trackID 1787, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1786, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.540433,-0.269414,0.797087)
+ Old Polarization:       (-0.596007,-0.791266,0.136653)
+ New Momentum Direction: (0.734207,-0.366012,0.571818)
+ New Polarization:       (-0.262277,-0.929762,-0.258367)
+ *** FresnelRefraction *** 
+Track (trackID 1785, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.53125,0.82295,0.201311)
+ Old Polarization:       (-0.606928,0.535463,-0.587297)
+ New Momentum Direction: (0.722443,0.634925,0.273761)
+ New Polarization:       (0.662059,-0.749396,-0.00909425)
+ *** FresnelRefraction *** 
+Track (trackID 1784, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.938689,0.318945,-0.13091)
+ Old Polarization:       (-0.112375,-0.0759244,-0.990761)
+ New Momentum Direction: (0.883344,0.433621,-0.177978)
+ New Polarization:       (-0.20045,0.00623692,-0.979684)
+ *** FresnelRefraction *** 
+Track (trackID 1783, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.613329,-0.314168,0.724656)
+ Old Polarization:       (-0.50746,-0.859805,0.0567399)
+ New Momentum Direction: (0.826247,-0.423232,0.37174)
+ New Polarization:       (-0.412319,-0.904028,-0.112811)
+ *** FresnelRefraction *** 
+Track (trackID 1782, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1781, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.964596,0.233782,-0.122069)
+ Old Polarization:       (-0.080623,-0.179304,-0.980485)
+ New Momentum Direction: (0.933547,0.317747,-0.165911)
+ New Polarization:       (-0.143968,-0.0915131,-0.985342)
+ *** FresnelRefraction *** 
+Track (trackID 1780, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1779, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.603909,-0.313289,0.732901)
+ Old Polarization:       (-0.518988,-0.852437,0.0632584)
+ New Momentum Direction: (0.816574,-0.423613,0.39212)
+ New Polarization:       (-0.408479,-0.90403,-0.125996)
+ *** FresnelRefraction *** 
+Track (trackID 1778, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.698106,0.715808,0.0163285)
+ Old Polarization:       (-0.403387,0.412049,-0.817003)
+ New Momentum Direction: (0.698106,-0.715808,0.0163285)
+ New Polarization:       (-0.258012,-0.230227,0.93831)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.698106,-0.715808,0.0163285)
+ Old Polarization:       (-0.258012,-0.230227,0.93831)
+ New Momentum Direction: (0.245618,-0.969115,0.0221068)
+ New Polarization:       (-0.501338,-0.107477,0.85855)
+ *** FresnelRefraction *** 
+Track (trackID 1777, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.931517,0.342447,-0.122496)
+ Old Polarization:       (-0.114029,-0.0448339,-0.992465)
+ New Momentum Direction: (0.871238,0.462182,-0.165326)
+ New Polarization:       (-0.20146,0.0295493,-0.979051)
+ *** FresnelRefraction *** 
+Track (trackID 1776, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1775, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (0.662612,-0.351308,0.661459)
+ Old Polarization:       (-0.447157,-0.894051,-0.0269036)
+ New Momentum Direction: (-0.662612,-0.351308,0.661459)
+ New Polarization:       (-0.447157,0.894051,0.0269036)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.662612,-0.351308,0.661459)
+ Old Polarization:       (-0.447157,0.894051,0.0269036)
+ New Momentum Direction: (-0.662612,-0.351308,-0.661459)
+ New Polarization:       (0.447157,-0.894051,0.0269036)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1774, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 26
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 27 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1836, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1835, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
+### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.86896,0.40102,0.28999)
- Old Polarization:       (-0.2464,-0.15758,0.95627)
- New Momentum Direction: (0.74604,0.5396,0.3902)
- New Polarization:       (-0.4128,-0.085028,0.90684)
+ Old Momentum Direction: (-0.515204,0.016564,-0.856908)
+ Old Polarization:       (0.732105,0.528358,-0.429954)
+ New Momentum Direction: (-0.694083,0.0223151,-0.719549)
+ New Polarization:       (-0.634894,0.452188,0.626447)
+ *** FresnelRefraction *** 
+Track (trackID 1835, parentID 1) is processed with stopping code 2
+### pop requested out of 25 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.97252,0.226986,-0.0517988)
+ Old Polarization:       (0.151246,0.785082,0.600642)
+ New Momentum Direction: (-0.948548,0.308697,-0.0704453)
+ New Polarization:       (0.240392,0.846903,0.474307)
  *** FresnelRefraction *** 
 Track (trackID 1834, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
+### pop requested out of 24 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.33712,0.42762,-0.83874)
- Old Polarization:       (-0.89666,-0.12571,-0.42449)
- New Momentum Direction: (0.45464,0.57668,-0.67878)
- New Polarization:       (-0.028748,0.7712,0.63594)
+ Old Momentum Direction: (-0.754965,0.319826,-0.572485)
+ Old Polarization:       (0.42497,0.903493,-0.055682)
+ New Momentum Direction: (-0.453811,0.434601,-0.777932)
+ New Polarization:       (0.695262,0.718745,-0.00404908)
  *** FresnelRefraction *** 
 Track (trackID 1833, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71257,-0.19458,-0.67408)
- Old Polarization:       (-0.44057,-0.87183,-0.21405)
- New Momentum Direction: (-0.71257,-0.19458,-0.67408)
- New Polarization:       (-0.27012,0.9628,0.0076133)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.71257,-0.19458,-0.67408)
- Old Polarization:       (-0.27012,0.9628,0.0076133)
- New Momentum Direction: (-0.71257,-0.19458,0.67408)
- New Polarization:       (0.27012,-0.9628,0.0076133)
- *** TotalInternalReflection *** 
+### pop requested out of 23 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1832, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
+### pop requested out of 22 stacked tracks.
 
 ** Photon absorbed! **
 Track (trackID 1831, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
+### pop requested out of 21 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6493,0.73633,0.19034)
- Old Polarization:       (-0.51607,0.24274,0.82143)
- New Momentum Direction: (0.6493,-0.73633,0.19034)
- New Polarization:       (0.18135,-0.093157,-0.979)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.6493,-0.73633,0.19034)
- Old Polarization:       (0.18135,-0.093157,-0.979)
- New Momentum Direction: (-0.6493,-0.73633,0.19034)
- New Polarization:       (0.18135,0.093157,0.979)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.6493,-0.73633,0.19034)
- Old Polarization:       (0.18135,0.093157,0.979)
- New Momentum Direction: (-0.88132,-0.39563,0.25836)
- New Polarization:       (0.19863,0.18592,0.96228)
+ Old Momentum Direction: (-0.874985,-0.430907,0.220726)
+ Old Polarization:       (0.26723,-0.0496774,0.962351)
+ New Momentum Direction: (-0.758383,-0.580129,0.297163)
+ New Polarization:       (0.438727,-0.117155,0.890951)
  *** FresnelRefraction *** 
 Track (trackID 1830, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
+### pop requested out of 20 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.99096,-0.0092776,0.13386)
- Old Polarization:       (-0.10762,-0.65079,0.75159)
- New Momentum Direction: (-0.99096,-0.0092776,0.13386)
- New Polarization:       (0.10564,0.5611,0.82098)
- *** FresnelReflection *** 
-
-** Photon absorbed! **
+ Old Momentum Direction: (-0.363701,-0.47427,-0.801741)
+ Old Polarization:       (0.927559,-0.105144,-0.358578)
+ New Momentum Direction: (-0.490028,-0.639003,-0.592915)
+ New Polarization:       (0.283573,-0.760036,0.584749)
+ *** FresnelRefraction *** 
 Track (trackID 1829, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1828, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
+### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.38395,0.89598,-0.22318)
- Old Polarization:       (-0.83698,0.43979,0.32565)
- New Momentum Direction: (0.51951,0.79932,-0.30198)
- New Polarization:       (0.63648,-0.5978,-0.48737)
+ Old Momentum Direction: (-0.673865,-0.737177,0.0497591)
+ Old Polarization:       (0.527297,-0.432649,0.731282)
+ New Momentum Direction: (-0.914388,-0.399169,0.0675197)
+ New Polarization:       (-0.263383,0.713215,0.64958)
+ *** FresnelRefraction *** 
+Track (trackID 1828, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.991975,0.0956886,0.0826439)
+ Old Polarization:       (0.124413,0.622215,0.772897)
+ New Momentum Direction: (-0.985172,0.129846,0.112145)
+ New Polarization:       (0.170066,0.652651,0.738325)
  *** FresnelRefraction *** 
 Track (trackID 1827, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.61572,-0.095456,-0.78216)
- Old Polarization:       (-0.55638,-0.75557,-0.34577)
- New Momentum Direction: (0.83589,-0.12959,-0.53338)
- New Polarization:       (0.25428,-0.76975,0.58552)
- *** FresnelRefraction *** 
+### pop requested out of 17 stacked tracks.
+
+** Photon absorbed! **
 Track (trackID 1826, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
+### pop requested out of 16 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.47266,0.11026,-0.87432)
- Old Polarization:       (-0.72853,-0.50934,-0.45807)
- New Momentum Direction: (0.64103,0.14953,-0.75281)
- New Polarization:       (0.76643,-0.072562,0.63822)
+ Old Momentum Direction: (-0.855881,-0.468061,0.219968)
+ Old Polarization:       (0.295439,-0.0934017,0.950785)
+ New Momentum Direction: (-0.713899,-0.633753,0.297836)
+ New Polarization:       (0.487132,-0.143921,0.861388)
  *** FresnelRefraction *** 
 Track (trackID 1825, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
+### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.61421,-0.088806,-0.78413)
- Old Polarization:       (-0.55839,-0.75104,-0.35233)
- New Momentum Direction: (0.83143,-0.12021,-0.54246)
- New Polarization:       (0.27508,-0.75921,0.58985)
+ Old Momentum Direction: (-0.356488,-0.507571,-0.784403)
+ Old Polarization:       (0.932731,-0.144708,-0.330261)
+ New Momentum Direction: (-0.356488,-0.507571,0.784403)
+ New Polarization:       (-0.788865,0.613366,0.0383811)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.356488,-0.507571,0.784403)
+ Old Polarization:       (-0.788865,0.613366,0.0383811)
+ New Momentum Direction: (-0.356488,0.507571,0.784403)
+ New Polarization:       (0.788865,0.613366,-0.0383811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.356488,0.507571,0.784403)
+ Old Polarization:       (0.788865,0.613366,-0.0383811)
+ New Momentum Direction: (0.356488,0.507571,0.784403)
+ New Polarization:       (0.788865,-0.613366,0.0383811)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.356488,0.507571,0.784403)
+ Old Polarization:       (0.788865,-0.613366,0.0383811)
+ New Momentum Direction: (0.482147,0.686486,0.544308)
+ New Polarization:       (0.842728,-0.533233,-0.0739689)
  *** FresnelRefraction *** 
 Track (trackID 1824, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1823, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
+### pop requested out of 14 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.5059,0.8625,0.012189)
- Old Polarization:       (-0.68846,0.39522,0.60813)
- New Momentum Direction: (0.68625,0.72718,0.016534)
- New Polarization:       (0.61835,-0.59521,0.5132)
+ Old Momentum Direction: (-0.375052,-0.365284,-0.852)
+ Old Polarization:       (0.908631,0.0372185,-0.415938)
+ New Momentum Direction: (-0.507449,-0.494233,-0.705853)
+ New Polarization:       (-0.107285,-0.776545,0.62086)
+ *** FresnelRefraction *** 
+Track (trackID 1823, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.953639,-0.200015,0.224871)
+ Old Polarization:       (0.172831,0.247728,0.953289)
+ New Momentum Direction: (-0.912836,-0.271375,0.305099)
+ New Polarization:       (0.282482,0.119836,0.951758)
  *** FresnelRefraction *** 
 Track (trackID 1822, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
+### pop requested out of 12 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.36691,0.89423,-0.25637)
- Old Polarization:       (-0.85525,0.43268,0.28519)
- New Momentum Direction: (0.49791,0.79439,-0.3479)
- New Polarization:       (0.53168,-0.59655,-0.60121)
+ Old Momentum Direction: (-0.614035,0.172987,-0.770089)
+ Old Polarization:       (0.604543,0.730356,-0.317975)
+ New Momentum Direction: (-0.827181,0.233034,-0.511339)
+ New Polarization:       (-0.10313,0.831547,0.545796)
  *** FresnelRefraction *** 
 Track (trackID 1821, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
+### pop requested out of 11 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.34244,0.39367,-0.85309)
- Old Polarization:       (-0.88548,-0.16834,-0.43312)
- New Momentum Direction: (0.46426,0.53372,-0.70683)
- New Polarization:       (0.090549,0.76527,0.63731)
+ Old Momentum Direction: (-0.47436,-0.830724,-0.291341)
+ Old Polarization:       (0.779647,-0.550123,0.299191)
+ New Momentum Direction: (-0.64401,-0.654829,-0.395537)
+ New Polarization:       (-0.497379,0.751239,-0.433883)
  *** FresnelRefraction *** 
 Track (trackID 1820, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
+### pop requested out of 10 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.977452,-0.0852839,0.193168)
+Old Polarization: (0.145374,0.391691,0.90854)
+New Polarization: (-0.351634,-0.528247,0.772858)
+Polarization Change: (-0.351634,-0.528247,0.772858)
+New Momentum Direction: (-0.336568,-0.69904,-0.630924)
+Momentum Change: (-0.336568,-0.69904,-0.630924)
  Photon at Boundary! 
- Old Momentum Direction: (0.34761,0.37208,-0.86065)
- Old Polarization:       (-0.87737,-0.1947,-0.43854)
- New Momentum Direction: (0.47232,0.50556,-0.72203)
- New Polarization:       (0.16939,0.75183,0.63723)
+ Old Momentum Direction: (-0.336568,-0.69904,-0.630924)
+ Old Polarization:       (-0.351634,-0.528247,0.772858)
+ New Momentum Direction: (0.336568,-0.69904,-0.630924)
+ New Polarization:       (-0.351634,0.528247,-0.772858)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.336568,-0.69904,-0.630924)
+ Old Polarization:       (-0.351634,0.528247,-0.772858)
+ New Momentum Direction: (0.457881,-0.23153,-0.858335)
+ New Polarization:       (-0.345394,0.843316,-0.41173)
  *** FresnelRefraction *** 
 Track (trackID 1819, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
+### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.65196,-0.12398,-0.74805)
- Old Polarization:       (-0.51263,-0.799,-0.31435)
- New Momentum Direction: (0.87892,-0.16714,-0.44673)
- New Polarization:       (0.123,-0.82549,0.55086)
+ Old Momentum Direction: (-0.360323,-0.611335,-0.704583)
+ Old Polarization:       (0.931141,-0.281121,-0.232268)
+ New Momentum Direction: (-0.485825,-0.824266,-0.29079)
+ New Polarization:       (0.692704,-0.565984,0.447016)
  *** FresnelRefraction *** 
 Track (trackID 1818, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
+### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.41251,0.89734,-0.15689)
- Old Polarization:       (-0.80163,0.43939,0.40536)
- New Momentum Direction: (0.55882,0.80159,-0.21254)
- New Polarization:       (0.77176,-0.59648,-0.22046)
+ Old Momentum Direction: (-0.589471,0.14785,-0.794144)
+ Old Polarization:       (0.635055,0.692397,-0.342477)
+ New Momentum Direction: (-0.797371,0.199994,-0.569388)
+ New Polarization:       (-0.209765,0.792815,0.572227)
  *** FresnelRefraction *** 
 Track (trackID 1817, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
+### pop requested out of 7 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.987764,0.152079,0.0345679)
+Old Polarization: (0.131342,0.691641,0.710198)
+New Polarization: (-0.992266,0.014989,-0.123222)
+Polarization Change: (-0.992266,0.014989,-0.123222)
+New Momentum Direction: (0.0761821,-0.710204,-0.699862)
+Momentum Change: (0.0761821,-0.710204,-0.699862)
  Photon at Boundary! 
- Old Momentum Direction: (0.80507,-0.25384,-0.53612)
- Old Polarization:       (-0.33004,-0.94268,-0.049267)
- New Momentum Direction: (0.59094,-0.34522,-0.72912)
- New Polarization:       (-0.55694,-0.82844,-0.059142)
+ Old Momentum Direction: (0.0761821,-0.710204,-0.699862)
+ Old Polarization:       (-0.992266,0.014989,-0.123222)
+ New Momentum Direction: (0.103535,-0.965203,-0.240131)
+ New Polarization:       (-0.951564,-0.166393,0.258535)
  *** FresnelRefraction *** 
 Track (trackID 1816, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.63534,-0.10816,-0.76462)
- Old Polarization:       (-0.53289,-0.77802,-0.33273)
- New Momentum Direction: (0.85762,-0.146,-0.49312)
- New Polarization:       (0.19186,-0.7988,0.57018)
- *** FresnelRefraction *** 
-Track (trackID 1815, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
+### pop requested out of 6 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1814, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
+Track (trackID 1815, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.89985,-0.25701,-0.35245)
- Old Polarization:       (-0.20915,-0.96327,0.16842)
- New Momentum Direction: (0.80928,-0.3461,-0.47463)
- New Polarization:       (-0.35168,-0.93266,0.080458)
+ Old Momentum Direction: (-0.413238,-0.795731,-0.442771)
+ Old Polarization:       (0.856466,-0.504806,0.107879)
+ New Momentum Direction: (-0.561355,-0.568427,-0.601474)
+ New Polarization:       (-0.0441832,0.74634,-0.664097)
+ *** FresnelRefraction *** 
+Track (trackID 1814, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.46434,-0.829713,-0.309782)
+ Old Polarization:       (0.791243,-0.545779,0.275789)
+ New Momentum Direction: (-0.631414,-0.651053,-0.421245)
+ New Polarization:       (-0.452026,0.750411,-0.48224)
  *** FresnelRefraction *** 
 Track (trackID 1813, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
+### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.69003,0.68784,0.22524)
- Old Polarization:       (-0.46705,0.18542,0.86457)
- New Momentum Direction: (0.19091,0.93286,0.30548)
- New Polarization:       (-0.79088,-0.038151,0.61078)
- *** FresnelRefraction *** 
+ Old Momentum Direction: (-0.370446,-0.669264,-0.644093)
+ Old Polarization:       (0.920235,-0.358687,-0.156562)
+ New Momentum Direction: (-0.370446,0.669264,-0.644093)
+ New Polarization:       (-0.608717,0.348847,0.712579)
+ *** FresnelReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.370446,0.669264,-0.644093)
+ Old Polarization:       (-0.608717,0.348847,0.712579)
+ New Momentum Direction: (-0.370446,0.669264,0.644093)
+ New Polarization:       (0.608717,-0.348847,0.712579)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
 Track (trackID 1812, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
+### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.98037,0.071223,0.18383)
- Old Polarization:       (-0.11331,-0.55952,0.82104)
- New Momentum Direction: (0.96392,0.096168,0.24822)
- New Polarization:       (-0.18341,-0.43587,0.88112)
+ Old Momentum Direction: (-0.704751,-0.705428,0.0754791)
+ Old Polarization:       (0.4874,-0.404113,0.774037)
+ New Momentum Direction: (-0.94914,-0.297993,0.101653)
+ New Polarization:       (-0.141651,0.692482,0.707392)
  *** FresnelRefraction *** 
 Track (trackID 1811, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.7173,0.6539,0.24061)
- Old Polarization:       (-0.43339,0.14832,0.88892)
- New Momentum Direction: (0.33707,0.88356,0.32512)
- New Polarization:       (-0.72217,0.021095,0.6914)
- *** FresnelRefraction *** 
-Track (trackID 1810, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1809, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.77957,0.55742,0.28557)
- Old Polarization:       (-0.36052,0.02654,0.93237)
- New Momentum Direction: (0.52383,0.75812,0.3884)
- New Polarization:       (-0.60725,0.012584,0.79441)
- *** FresnelRefraction *** 
-Track (trackID 1808, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.98701,-0.15474,-0.043257)
- Old Polarization:       (-0.10666,-0.83237,0.54386)
- New Momentum Direction: (0.97612,-0.20922,-0.058487)
- New Polarization:       (-0.16701,-0.89489,0.41387)
- *** FresnelRefraction *** 
-Track (trackID 1807, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 43
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 44 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.42049,0.83061,-0.36507)
- Old Polarization:       (-0.081218,0.43522,0.89665)
- New Momentum Direction: (0.57063,0.65493,-0.49543)
- New Polarization:       (0.75368,-0.65724,-0.000766)
- *** FresnelRefraction *** 
-Track (trackID 1890, parentID 1) is processed with stopping code 2
-### pop requested out of 43 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.27104,0.45041,-0.85069)
- Old Polarization:       (-0.95848,-0.044987,0.28157)
- New Momentum Direction: (-0.36732,0.6104,-0.70178)
- New Polarization:       (-0.88147,0.012317,0.47208)
- *** FresnelRefraction *** 
-Track (trackID 1889, parentID 1) is processed with stopping code 2
-### pop requested out of 42 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.069553,0.79318,-0.605)
- Old Polarization:       (-0.7034,0.39105,0.59355)
- New Momentum Direction: (-0.094205,0.56538,-0.81943)
- New Polarization:       (-0.68759,-0.6322,-0.35715)
- *** FresnelRefraction *** 
-Track (trackID 1888, parentID 1) is processed with stopping code 2
-### pop requested out of 41 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.3348,-0.2688,-0.90314)
- Old Polarization:       (-0.18942,-0.95808,0.21493)
- New Momentum Direction: (0.45369,-0.36425,-0.81332)
- New Polarization:       (-0.094805,-0.9272,0.36236)
- *** FresnelRefraction *** 
-Track (trackID 1887, parentID 1) is processed with stopping code 2
-### pop requested out of 40 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.63882,0.69416,-0.33174)
- Old Polarization:       (0.19905,0.26739,0.9428)
- New Momentum Direction: (0.86378,0.22951,-0.44857)
- New Polarization:       (0.49855,-0.51828,0.69486)
- *** FresnelRefraction *** 
-Track (trackID 1886, parentID 1) is processed with stopping code 2
-### pop requested out of 39 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.82255,-0.022158,-0.56826)
- Old Polarization:       (0.42425,-0.64151,0.63912)
- New Momentum Direction: (0.63424,-0.030124,-0.77255)
- New Polarization:       (-0.65378,-0.55427,-0.51512)
- *** FresnelRefraction *** 
-Track (trackID 1885, parentID 1) is processed with stopping code 2
-### pop requested out of 38 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.48287,-0.26636,-0.8342)
- Old Polarization:       (-0.0020842,-0.95296,0.30308)
- New Momentum Direction: (0.65505,-0.36134,-0.66358)
- New Polarization:       (0.039454,-0.86068,0.50762)
- *** FresnelRefraction *** 
-Track (trackID 1884, parentID 1) is processed with stopping code 2
-### pop requested out of 37 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71587,-0.16196,-0.67918)
- Old Polarization:       (0.28914,-0.81663,0.4995)
- New Momentum Direction: (0.31283,-0.22032,-0.9239)
- New Polarization:       (-0.54344,-0.8393,0.016141)
- *** FresnelRefraction *** 
-Track (trackID 1883, parentID 1) is processed with stopping code 2
-### pop requested out of 36 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.75859,-0.11681,-0.64101)
-Old Polarization: (0.34536,-0.76214,0.5476)
-New Polarization: (-0.47951,0.80342,-0.35296)
-Polarization Change: (-0.47951,0.80342,-0.35296)
-New Momentum Direction: (-0.50514,0.076194,0.85967)
-Momentum Change: (-0.50514,0.076194,0.85967)
-
-** Photon absorbed! **
-Track (trackID 1882, parentID 1) is processed with stopping code 2
-### pop requested out of 35 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.35849,-0.27335,-0.89262)
- Old Polarization:       (-0.15975,-0.96003,0.22983)
- New Momentum Direction: (0.48677,-0.37116,-0.79075)
- New Polarization:       (-0.070357,-0.91896,0.38803)
- *** FresnelRefraction *** 
-Track (trackID 1881, parentID 1) is processed with stopping code 2
-### pop requested out of 34 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.20467,0.87221,-0.44425)
- Old Polarization:       (-0.35439,0.48909,0.79699)
- New Momentum Direction: (0.27757,0.74832,-0.60247)
- New Polarization:       (0.32072,-0.66331,-0.67613)
- *** FresnelRefraction *** 
-Track (trackID 1880, parentID 1) is processed with stopping code 2
-### pop requested out of 33 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.51691,-0.25797,-0.81624)
- Old Polarization:       (0.041954,-0.94473,0.32514)
- New Momentum Direction: (0.70032,-0.34949,-0.62242)
- New Polarization:       (0.063825,-0.8378,0.54224)
- *** FresnelRefraction *** 
-Track (trackID 1879, parentID 1) is processed with stopping code 2
-### pop requested out of 32 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1878, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.061644,0.84898,-0.52481)
- Old Polarization:       (-0.54031,0.47049,0.69765)
- New Momentum Direction: (0.083109,0.70175,-0.70756)
- New Polarization:       (-0.26676,-0.66844,-0.69428)
- *** FresnelRefraction *** 
-Track (trackID 1877, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.021659,-0.11496,-0.99313)
- Old Polarization:       (-0.64064,-0.76102,0.10207)
- New Momentum Direction: (-0.029387,-0.15599,-0.98732)
- New Polarization:       (-0.54367,-0.82637,0.14674)
- *** FresnelRefraction *** 
-Track (trackID 1876, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1875, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.87009,0.14299,-0.4717)
- Old Polarization:       (0.48351,-0.43344,0.76049)
- New Momentum Direction: (0.74208,0.19445,-0.64148)
- New Polarization:       (-0.66364,0.078518,-0.74392)
- *** FresnelRefraction *** 
-Track (trackID 1874, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1873, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.1419,0.014163,-0.98978)
- Old Polarization:       (-0.79417,-0.59851,0.10529)
- New Momentum Direction: (-0.19235,0.019198,-0.98114)
- New Polarization:       (-0.86541,-0.4747,0.16037)
- *** FresnelRefraction *** 
-Track (trackID 1872, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1871, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1870, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1869, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1868, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1867, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1866, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.60287,-0.23125,-0.76359)
- Old Polarization:       (0.14925,-0.90749,0.39267)
- New Momentum Direction: (0.81832,-0.31389,-0.48149)
- New Polarization:       (0.095244,-0.75207,0.65217)
- *** FresnelRefraction *** 
-Track (trackID 1865, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.54936,-0.24961,-0.79743)
- Old Polarization:       (0.082836,-0.93337,0.34922)
- New Momentum Direction: (0.74458,-0.33831,-0.57545)
- New Polarization:       (0.081249,-0.80972,0.58116)
- *** FresnelRefraction *** 
-Track (trackID 1864, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1863, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.6335,-0.21355,-0.74369)
- Old Polarization:       (0.19027,-0.88865,0.41726)
- New Momentum Direction: (0.8581,-0.28927,-0.42426)
- New Polarization:       (0.099133,-0.71736,0.68961)
- *** FresnelRefraction *** 
-Track (trackID 1862, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.39228,-0.27476,-0.87785)
- Old Polarization:       (-0.11712,-0.9615,0.2486)
- New Momentum Direction: (0.53275,-0.37315,-0.75957)
- New Polarization:       (-0.037609,-0.90709,0.41924)
- *** FresnelRefraction *** 
-Track (trackID 1861, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.66204,0.67511,-0.32546)
- Old Polarization:       (0.22298,0.23716,0.94553)
- New Momentum Direction: (0.66204,-0.67511,-0.32546)
- New Polarization:       (-0.22298,0.23716,-0.94553)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.66204,-0.67511,-0.32546)
- Old Polarization:       (-0.22298,0.23716,-0.94553)
- New Momentum Direction: (-0.66204,-0.67511,-0.32546)
- New Polarization:       (-0.22298,-0.23716,0.94553)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.66204,-0.67511,-0.32546)
- Old Polarization:       (-0.22298,-0.23716,0.94553)
- New Momentum Direction: (-0.66204,-0.67511,0.32546)
- New Polarization:       (0.22298,0.23716,0.94553)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1860, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.61985,0.71156,-0.33084)
- Old Polarization:       (0.17303,0.2873,0.94208)
- New Momentum Direction: (0.83955,0.30719,-0.4481)
- New Polarization:       (0.54165,-0.53727,0.64649)
- *** FresnelRefraction *** 
-Track (trackID 1859, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.73972,0.58502,-0.3325)
- Old Polarization:       (0.32296,0.12484,0.93814)
- New Momentum Direction: (0.40809,0.7937,-0.45111)
- New Polarization:       (-0.57466,0.60728,0.54861)
- *** FresnelRefraction *** 
-Track (trackID 1858, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.33445,0.85219,-0.40239)
- Old Polarization:       (-0.189,0.47896,0.85725)
- New Momentum Direction: (0.44988,0.71038,-0.54127)
- New Polarization:       (0.66596,-0.67066,-0.32667)
- *** FresnelRefraction *** 
-Track (trackID 1857, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1856, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.13184,-0.0055593,-0.99126)
- Old Polarization:       (-0.77698,-0.62039,0.10682)
- New Momentum Direction: (-0.17928,-0.0075596,-0.98377)
- New Polarization:       (-0.84767,-0.50634,0.15837)
- *** FresnelRefraction *** 
-Track (trackID 1855, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.15648,0.72361,-0.67224)
- Old Polarization:       (-0.80827,0.29735,0.50821)
- New Momentum Direction: (-0.21274,0.34563,-0.91394)
- New Polarization:       (-0.83522,-0.54976,-0.013489)
- *** FresnelRefraction *** 
-Track (trackID 1854, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.24627,0.57375,-0.78113)
- Old Polarization:       (-0.92222,0.10915,0.37093)
- New Momentum Direction: (-0.33464,0.77964,-0.52932)
- New Polarization:       (-0.78146,0.084311,0.61823)
- *** FresnelRefraction *** 
-Track (trackID 1853, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1852, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.22156,0.15335,-0.96301)
- Old Polarization:       (-0.89584,-0.42213,0.13889)
- New Momentum Direction: (-0.30023,0.20779,-0.93096)
- New Polarization:       (-0.92535,-0.3003,0.23139)
- *** FresnelRefraction *** 
-Track (trackID 1851, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1850, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1849, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.26725,0.32471,-0.90727)
- Old Polarization:       (-0.9564,-0.20443,0.20856)
- New Momentum Direction: (-0.36166,0.43941,-0.82227)
- New Polarization:       (-0.93002,-0.10822,0.35122)
- *** FresnelRefraction *** 
-Track (trackID 1848, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 31
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 32 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.094796,-0.71033,-0.69746)
-Old Polarization: (-0.14433,-0.70302,0.69638)
-New Polarization: (-0.43888,-0.52689,0.72786)
-Polarization Change: (-0.43888,-0.52689,0.72786)
-New Momentum Direction: (-0.79088,0.61099,-0.034591)
-Momentum Change: (-0.79088,0.61099,-0.034591)
- Photon at Boundary! 
- Old Momentum Direction: (-0.79088,0.61099,-0.034591)
- Old Polarization:       (-0.43888,-0.52689,0.72786)
- New Momentum Direction: (-0.55581,0.82998,-0.046988)
- New Polarization:       (0.68794,0.49096,0.53451)
- *** FresnelRefraction *** 
-Track (trackID 1921, parentID 1) is processed with stopping code 2
-### pop requested out of 31 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1920, parentID 1) is processed with stopping code 2
-### pop requested out of 30 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.68375,0.071328,-0.72622)
- Old Polarization:       (0.66259,0.35625,0.65883)
- New Momentum Direction: (0.92366,0.096355,-0.37089)
- New Polarization:       (0.34133,0.23302,0.9106)
- *** FresnelRefraction *** 
-Track (trackID 1919, parentID 1) is processed with stopping code 2
-### pop requested out of 29 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.16134,-0.70319,-0.69245)
- Old Polarization:       (-0.053802,-0.70687,0.70529)
- New Momentum Direction: (0.21785,-0.27975,-0.93503)
- New Polarization:       (0.13182,0.95769,-0.25582)
- *** FresnelRefraction *** 
-Track (trackID 1918, parentID 1) is processed with stopping code 2
-### pop requested out of 28 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.29213,-0.67294,-0.67957)
- Old Polarization:       (0.12901,-0.67634,0.7252)
- New Momentum Direction: (0.39251,-0.90416,-0.16859)
- New Polarization:       (-0.020125,-0.1917,0.98125)
- *** FresnelRefraction *** 
-Track (trackID 1917, parentID 1) is processed with stopping code 2
-### pop requested out of 27 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.5973,0.24883,-0.76244)
- Old Polarization:       (0.53122,0.58948,0.60854)
- New Momentum Direction: (0.5973,0.24883,0.76244)
- New Polarization:       (-0.042844,-0.9394,0.34015)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.5973,0.24883,0.76244)
- Old Polarization:       (-0.042844,-0.9394,0.34015)
- New Momentum Direction: (-0.5973,0.24883,0.76244)
- New Polarization:       (-0.042844,0.9394,-0.34015)
- *** TotalInternalReflection *** 
-Scattering Photon!
-Old Momentum Direction: (-0.5973,0.24883,0.76244)
-Old Polarization: (-0.042844,0.9394,-0.34015)
-New Polarization: (0.097391,0.8686,-0.48584)
-Polarization Change: (0.097391,0.8686,-0.48584)
-New Momentum Direction: (-0.64782,0.42592,0.63161)
-Momentum Change: (-0.64782,0.42592,0.63161)
- Photon at Boundary! 
- Old Momentum Direction: (-0.64782,0.42592,0.63161)
- Old Polarization:       (0.097391,0.8686,-0.48584)
- New Momentum Direction: (-0.64782,-0.42592,0.63161)
- New Polarization:       (-0.097391,0.8686,0.48584)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.64782,-0.42592,0.63161)
- Old Polarization:       (-0.097391,0.8686,0.48584)
- New Momentum Direction: (-0.64782,-0.42592,-0.63161)
- New Polarization:       (0.097391,-0.8686,0.48584)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1916, parentID 1) is processed with stopping code 2
-### pop requested out of 26 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.70587,0.013915,-0.7082)
-Old Polarization: (0.67845,0.27408,0.6816)
-New Polarization: (-0.89162,0.29402,-0.34433)
-Polarization Change: (-0.89162,0.29402,-0.34433)
-New Momentum Direction: (0.002587,0.76377,0.64548)
-Momentum Change: (0.002587,0.76377,0.64548)
- Photon at Boundary! 
- Old Momentum Direction: (0.002587,0.76377,0.64548)
- Old Polarization:       (-0.89162,0.29402,-0.34433)
- New Momentum Direction: (0.0035175,0.47929,0.87765)
- New Polarization:       (-0.80038,-0.5248,0.2898)
- *** FresnelRefraction *** 
-Track (trackID 1915, parentID 1) is processed with stopping code 2
-### pop requested out of 25 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30835,-0.67296,-0.67235)
- Old Polarization:       (0.14772,-0.66434,0.73269)
- New Momentum Direction: (0.30835,0.67296,-0.67235)
- New Polarization:       (-0.67087,0.65493,0.34785)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.30835,0.67296,-0.67235)
- Old Polarization:       (-0.67087,0.65493,0.34785)
- New Momentum Direction: (0.30835,0.67296,0.67235)
- New Polarization:       (0.67087,-0.65493,0.34785)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.30835,0.67296,0.67235)
- Old Polarization:       (0.67087,-0.65493,0.34785)
- New Momentum Direction: (-0.30835,0.67296,0.67235)
- New Polarization:       (0.67087,0.65493,-0.34785)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1914, parentID 1) is processed with stopping code 2
-### pop requested out of 24 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1913, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.47741,0.35357,-0.8044)
- Old Polarization:       (0.37928,0.74287,0.55163)
- New Momentum Direction: (0.64508,0.47775,-0.59635)
- New Polarization:       (0.29902,0.56037,0.77238)
- *** FresnelRefraction *** 
-Track (trackID 1912, parentID 1) is processed with stopping code 2
-### pop requested out of 22 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.32477,0.42635,-0.84425)
- Old Polarization:       (0.17298,0.8508,0.4962)
- New Momentum Direction: (0.43719,0.57393,-0.69244)
- New Polarization:       (0.17774,0.69959,0.69208)
- *** FresnelRefraction *** 
-Track (trackID 1911, parentID 1) is processed with stopping code 2
-### pop requested out of 21 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.42497,-0.31234,-0.84962)
- Old Polarization:       (-0.85524,-0.169,0.48991)
- New Momentum Direction: (-0.57477,-0.42245,-0.70084)
- New Polarization:       (-0.70595,-0.17716,0.68575)
- *** FresnelRefraction *** 
-Track (trackID 1910, parentID 1) is processed with stopping code 2
-### pop requested out of 20 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1909, parentID 1) is processed with stopping code 2
-### pop requested out of 19 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.18923,0.36566,-0.91131)
- Old Polarization:       (-0.52563,0.74619,0.40856)
- New Momentum Direction: (-0.25749,0.49758,-0.82832)
- New Polarization:       (-0.45912,0.69128,0.55798)
- *** FresnelRefraction *** 
-Track (trackID 1908, parentID 1) is processed with stopping code 2
-### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.71013,-0.11269,-0.69499)
- Old Polarization:       (0.70404,0.10399,0.70251)
- New Momentum Direction: (0.31548,-0.15188,-0.9367)
- New Polarization:       (-0.94891,-0.056887,-0.31037)
- *** FresnelRefraction *** 
-Track (trackID 1907, parentID 1) is processed with stopping code 2
-### pop requested out of 17 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.43424,0.38896,-0.81249)
- Old Polarization:       (0.31355,0.7803,0.54113)
- New Momentum Direction: (0.59003,0.52851,-0.61036)
- New Polarization:       (0.25614,0.59439,0.76229)
- *** FresnelRefraction *** 
-Track (trackID 1906, parentID 1) is processed with stopping code 2
-### pop requested out of 16 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.25831,0.44215,-0.85894)
- Old Polarization:       (0.081638,0.87594,0.47546)
- New Momentum Direction: (0.34723,0.59437,-0.72536)
- New Polarization:       (0.1107,0.7421,0.66108)
- *** FresnelRefraction *** 
-Track (trackID 1905, parentID 1) is processed with stopping code 2
-### pop requested out of 15 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1904, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1903, parentID 1) is processed with stopping code 2
-### pop requested out of 13 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.14825,0.38726,-0.90997)
- Old Polarization:       (-0.47329,0.78014,0.40911)
- New Momentum Direction: (-0.20122,0.52561,-0.82658)
- New Polarization:       (-0.40472,0.72384,0.5588)
- *** FresnelRefraction *** 
-Track (trackID 1902, parentID 1) is processed with stopping code 2
-### pop requested out of 12 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,-0.63558,-0.66554)
- Old Polarization:       (0.26285,-0.61589,0.74269)
- New Momentum Direction: (0.39127,-0.63558,0.66554)
- New Polarization:       (-0.26285,0.61589,0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,-0.63558,0.66554)
- Old Polarization:       (-0.26285,0.61589,0.74269)
- New Momentum Direction: (0.39127,0.63558,0.66554)
- New Polarization:       (0.26285,0.61589,-0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,0.63558,0.66554)
- Old Polarization:       (0.26285,0.61589,-0.74269)
- New Momentum Direction: (-0.39127,0.63558,0.66554)
- New Polarization:       (0.26285,-0.61589,0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.39127,0.63558,0.66554)
- Old Polarization:       (0.26285,-0.61589,0.74269)
- New Momentum Direction: (-0.39127,0.63558,-0.66554)
- New Polarization:       (-0.26285,0.61589,0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.39127,0.63558,-0.66554)
- Old Polarization:       (-0.26285,0.61589,0.74269)
- New Momentum Direction: (-0.39127,-0.63558,-0.66554)
- New Polarization:       (0.26285,0.61589,-0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.39127,-0.63558,-0.66554)
- Old Polarization:       (0.26285,0.61589,-0.74269)
- New Momentum Direction: (-0.39127,-0.63558,0.66554)
- New Polarization:       (-0.26285,-0.61589,-0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.39127,-0.63558,0.66554)
- Old Polarization:       (-0.26285,-0.61589,-0.74269)
- New Momentum Direction: (0.39127,-0.63558,0.66554)
- New Polarization:       (-0.26285,0.61589,0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,-0.63558,0.66554)
- Old Polarization:       (-0.26285,0.61589,0.74269)
- New Momentum Direction: (0.39127,0.63558,0.66554)
- New Polarization:       (0.26285,0.61589,-0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,0.63558,0.66554)
- Old Polarization:       (0.26285,0.61589,-0.74269)
- New Momentum Direction: (0.39127,0.63558,-0.66554)
- New Polarization:       (-0.26285,-0.61589,-0.74269)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.39127,0.63558,-0.66554)
- Old Polarization:       (-0.26285,-0.61589,-0.74269)
- New Momentum Direction: (0.39127,-0.63558,-0.66554)
- New Polarization:       (0.26285,-0.61589,0.74269)
- *** TotalInternalReflection *** 
-
-** Photon absorbed! **
-Track (trackID 1901, parentID 1) is processed with stopping code 2
-### pop requested out of 11 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1900, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1899, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1898, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1897, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.41006,-0.35853,-0.83863)
- Old Polarization:       (-0.83158,-0.23069,0.50523)
- New Momentum Direction: (-0.41006,-0.35853,0.83863)
- New Polarization:       (0.36176,-0.90801,-0.2113)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.41006,-0.35853,0.83863)
- Old Polarization:       (0.36176,-0.90801,-0.2113)
- New Momentum Direction: (0.41006,-0.35853,0.83863)
- New Polarization:       (0.36176,0.90801,0.2113)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.41006,-0.35853,0.83863)
- Old Polarization:       (0.36176,0.90801,0.2113)
- New Momentum Direction: (0.41006,0.35853,0.83863)
- New Polarization:       (-0.36176,0.90801,-0.2113)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.41006,0.35853,0.83863)
- Old Polarization:       (-0.36176,0.90801,-0.2113)
- New Momentum Direction: (0.55548,0.48567,0.67495)
- New Polarization:       (-0.30927,0.87414,-0.37448)
- *** FresnelRefraction *** 
-Track (trackID 1896, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.32323,-0.49928,-0.80389)
- Old Polarization:       (-0.71703,-0.42516,0.55236)
- New Momentum Direction: (-0.43697,-0.67497,-0.59453)
- New Polarization:       (-0.5391,-0.33257,0.7738)
- *** FresnelRefraction *** 
-Track (trackID 1895, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1894, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1893, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.30545,-0.67228,-0.67435)
- Old Polarization:       (0.14493,-0.66712,0.73072)
- New Momentum Direction: (0.41194,-0.90666,-0.090927)
- New Polarization:       (-0.040504,-0.11791,0.9922)
- *** FresnelRefraction *** 
-Track (trackID 1892, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1891, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
  Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 25
 Track (trackID 1, parentID 0) is processed with stopping code 4
 ### pop requested out of 26 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.2275,-0.096386,-0.969)
- Old Polarization:       (-0.91301,0.36714,0.17783)
- New Momentum Direction: (-0.30654,-0.12988,-0.94296)
- New Polarization:       (-0.93343,0.23498,0.27108)
+ Old Momentum Direction: (-0.948167,-0.315919,-0.0342637)
+ Old Polarization:       (0.317635,-0.945392,-0.0730915)
+ New Momentum Direction: (-0.90371,-0.42565,-0.0461648)
+ New Polarization:       (0.428046,-0.900558,-0.0759698)
  *** FresnelRefraction *** 
-Track (trackID 1946, parentID 1) is processed with stopping code 2
+Track (trackID 1861, parentID 1) is processed with stopping code 2
 ### pop requested out of 25 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.6179,0.18069,-0.76521)
- Old Polarization:       (0.38168,0.78194,0.49284)
- New Momentum Direction: (0.83785,0.24501,-0.48782)
- New Polarization:       (0.26432,0.5998,0.75524)
+ Old Momentum Direction: (-0.841657,-0.0248534,0.53944)
+ Old Polarization:       (0.462521,-0.548776,0.696362)
+ New Momentum Direction: (-0.683656,-0.0335883,0.729031)
+ New Polarization:       (0.669887,-0.425275,0.608599)
  *** FresnelRefraction *** 
-Track (trackID 1945, parentID 1) is processed with stopping code 2
+Track (trackID 1860, parentID 1) is processed with stopping code 2
 ### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.577315,0.815525,0.0403291)
+ Old Polarization:       (0.816521,0.576666,0.0273831)
+ New Momentum Direction: (-0.780541,0.622722,0.0545257)
+ New Polarization:       (-0.615914,-0.781036,0.103116)
+ *** FresnelRefraction *** 
+Track (trackID 1859, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1944, parentID 1) is processed with stopping code 2
-### pop requested out of 23 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.18382,-0.56072,-0.80734)
- Old Polarization:       (-0.83578,-0.34316,0.42862)
- New Momentum Direction: (-0.24875,-0.75881,-0.60194)
- New Polarization:       (-0.68434,-0.3021,0.66363)
- *** FresnelRefraction *** 
-Track (trackID 1943, parentID 1) is processed with stopping code 2
+Track (trackID 1858, parentID 1) is processed with stopping code 2
 ### pop requested out of 22 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.52106,-0.65837,-0.54318)
- Old Polarization:       (0.24103,-0.49699,0.83361)
- New Momentum Direction: (0.52106,0.65837,-0.54318)
- New Polarization:       (-0.24103,-0.49699,-0.83361)
+ Old Momentum Direction: (-0.655026,0.562453,0.504566)
+ Old Polarization:       (0.714178,0.242778,0.656512)
+ New Momentum Direction: (0.655026,0.562453,0.504566)
+ New Polarization:       (0.714178,-0.242778,-0.656512)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52106,0.65837,-0.54318)
- Old Polarization:       (-0.24103,-0.49699,-0.83361)
- New Momentum Direction: (0.52106,0.65837,0.54318)
- New Polarization:       (0.24103,0.49699,-0.83361)
+ Old Momentum Direction: (0.655026,0.562453,0.504566)
+ Old Polarization:       (0.714178,-0.242778,-0.656512)
+ New Momentum Direction: (0.655026,-0.562453,0.504566)
+ New Polarization:       (-0.714178,-0.242778,0.656512)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (0.52106,0.65837,0.54318)
- Old Polarization:       (0.24103,0.49699,-0.83361)
- New Momentum Direction: (-0.52106,0.65837,0.54318)
- New Polarization:       (0.24103,-0.49699,0.83361)
+ Old Momentum Direction: (0.655026,-0.562453,0.504566)
+ Old Polarization:       (-0.714178,-0.242778,0.656512)
+ New Momentum Direction: (0.655026,-0.562453,-0.504566)
+ New Polarization:       (0.714178,0.242778,0.656512)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.52106,0.65837,0.54318)
- Old Polarization:       (0.24103,-0.49699,0.83361)
- New Momentum Direction: (-0.52106,-0.65837,0.54318)
- New Polarization:       (-0.24103,-0.49699,-0.83361)
+ Old Momentum Direction: (0.655026,-0.562453,-0.504566)
+ Old Polarization:       (0.714178,0.242778,0.656512)
+ New Momentum Direction: (-0.655026,-0.562453,-0.504566)
+ New Polarization:       (0.714178,-0.242778,-0.656512)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1942, parentID 1) is processed with stopping code 2
+Track (trackID 1857, parentID 1) is processed with stopping code 2
 ### pop requested out of 21 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1941, parentID 1) is processed with stopping code 2
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.93812,-0.312915,0.148374)
+ Old Polarization:       (0.335919,-0.926389,0.170182)
+ New Momentum Direction: (-0.882697,-0.424625,0.201344)
+ New Polarization:       (0.462264,-0.861678,0.209339)
+ *** FresnelRefraction *** 
+Track (trackID 1856, parentID 1) is processed with stopping code 2
 ### pop requested out of 20 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.57607,-0.62021,-0.53243)
- Old Polarization:       (0.31828,-0.42977,0.84498)
- New Momentum Direction: (0.57607,0.62021,-0.53243)
- New Polarization:       (-0.31828,-0.42977,-0.84498)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57607,0.62021,-0.53243)
- Old Polarization:       (-0.31828,-0.42977,-0.84498)
- New Momentum Direction: (-0.57607,0.62021,-0.53243)
- New Polarization:       (-0.31828,0.42977,0.84498)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57607,0.62021,-0.53243)
- Old Polarization:       (-0.31828,0.42977,0.84498)
- New Momentum Direction: (-0.57607,0.62021,0.53243)
- New Polarization:       (0.31828,-0.42977,0.84498)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57607,0.62021,0.53243)
- Old Polarization:       (0.31828,-0.42977,0.84498)
- New Momentum Direction: (-0.57607,-0.62021,0.53243)
- New Polarization:       (-0.31828,-0.42977,-0.84498)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.57607,-0.62021,0.53243)
- Old Polarization:       (-0.31828,-0.42977,-0.84498)
- New Momentum Direction: (0.57607,-0.62021,0.53243)
- New Polarization:       (-0.31828,0.42977,0.84498)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.57607,-0.62021,0.53243)
- Old Polarization:       (-0.31828,0.42977,0.84498)
- New Momentum Direction: (0.57607,-0.62021,-0.53243)
- New Polarization:       (0.31828,-0.42977,0.84498)
- *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1940, parentID 1) is processed with stopping code 2
+Track (trackID 1855, parentID 1) is processed with stopping code 2
 ### pop requested out of 19 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.1681,0.26676,-0.94899)
- Old Polarization:       (-0.30206,0.93032,0.208)
- New Momentum Direction: (0.22633,0.35917,-0.90541)
- New Polarization:       (-0.1747,0.92943,0.32503)
+ Old Momentum Direction: (-0.840066,0.041408,-0.540901)
+ Old Polarization:       (0.464035,-0.461625,-0.756025)
+ New Momentum Direction: (-0.681751,0.0558421,-0.72945)
+ New Polarization:       (0.670768,-0.350307,-0.653724)
  *** FresnelRefraction *** 
-Track (trackID 1939, parentID 1) is processed with stopping code 2
+Track (trackID 1854, parentID 1) is processed with stopping code 2
 ### pop requested out of 18 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.46814,-0.6958,-0.54471)
- Old Polarization:       (0.15431,-0.54258,0.82571)
- New Momentum Direction: (0.63526,-0.22382,-0.73916)
- New Polarization:       (0.49193,0.85508,0.16385)
- *** FresnelRefraction *** 
-Track (trackID 1938, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1853, parentID 1) is processed with stopping code 2
 ### pop requested out of 17 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.36888,-0.73603,-0.56761)
- Old Polarization:       (0.0057425,-0.60886,0.79326)
- New Momentum Direction: (0.49946,-0.39988,-0.76853)
- New Polarization:       (0.46859,0.87083,-0.14858)
- *** FresnelRefraction *** 
-Track (trackID 1937, parentID 1) is processed with stopping code 2
+
+** Photon absorbed! **
+Track (trackID 1852, parentID 1) is processed with stopping code 2
 ### pop requested out of 16 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.85958,-0.0895348,0.503096)
+Old Polarization: (0.440086,-0.630076,0.639788)
+New Polarization: (0.451066,-0.829137,0.330259)
+Polarization Change: (0.451066,-0.829137,0.330259)
+New Momentum Direction: (0.0541381,0.39478,0.917179)
+Momentum Change: (0.0541381,0.39478,0.917179)
  Photon at Boundary! 
- Old Momentum Direction: (-0.17458,0.027237,-0.98427)
- Old Polarization:       (-0.81908,0.55077,0.16052)
- New Momentum Direction: (-0.23654,0.036903,-0.97092)
- New Polarization:       (-0.85911,0.45882,0.22674)
+ Old Momentum Direction: (0.0541381,0.39478,0.917179)
+ Old Polarization:       (0.451066,-0.829137,0.330259)
+ New Momentum Direction: (0.0734835,0.535849,0.84111)
+ New Polarization:       (0.539159,0.688171,-0.485519)
  *** FresnelRefraction *** 
-Track (trackID 1936, parentID 1) is processed with stopping code 2
+Track (trackID 1851, parentID 1) is processed with stopping code 2
 ### pop requested out of 15 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.19431,0.0042786,-0.98093)
- Old Polarization:       (-0.84204,0.51224,0.16903)
- New Momentum Direction: (-0.2641,0.0058154,-0.96448)
- New Polarization:       (-0.88167,0.40397,0.24386)
- *** FresnelRefraction *** 
-Track (trackID 1935, parentID 1) is processed with stopping code 2
-### pop requested out of 14 stacked tracks.
-Scattering Photon!
-Old Momentum Direction: (0.70105,-0.46572,-0.54003)
-Old Polarization: (0.51197,-0.19845,0.83577)
-New Polarization: (-0.06997,0.56583,0.82155)
-Polarization Change: (-0.06997,0.56583,0.82155)
-New Momentum Direction: (0.65231,-0.59714,0.46682)
-Momentum Change: (0.65231,-0.59714,0.46682)
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,-0.59714,0.46682)
- Old Polarization:       (-0.06997,0.56583,0.82155)
- New Momentum Direction: (-0.65231,-0.59714,0.46682)
- New Polarization:       (-0.06997,-0.56583,-0.82155)
+ Old Momentum Direction: (-0.621182,0.644834,0.445334)
+ Old Polarization:       (0.754962,0.34002,0.56073)
+ New Momentum Direction: (-0.621182,-0.644834,0.445334)
+ New Polarization:       (-0.754962,0.34002,-0.56073)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65231,-0.59714,0.46682)
- Old Polarization:       (-0.06997,-0.56583,-0.82155)
- New Momentum Direction: (-0.65231,0.59714,0.46682)
- New Polarization:       (0.06997,-0.56583,0.82155)
+ Old Momentum Direction: (-0.621182,-0.644834,0.445334)
+ Old Polarization:       (-0.754962,0.34002,-0.56073)
+ New Momentum Direction: (0.621182,-0.644834,0.445334)
+ New Polarization:       (-0.754962,-0.34002,0.56073)
  *** TotalInternalReflection *** 
  Photon at Boundary! 
- Old Momentum Direction: (-0.65231,0.59714,0.46682)
- Old Polarization:       (0.06997,-0.56583,0.82155)
- New Momentum Direction: (-0.65231,0.59714,-0.46682)
- New Polarization:       (-0.06997,0.56583,0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65231,0.59714,-0.46682)
- Old Polarization:       (-0.06997,0.56583,0.82155)
- New Momentum Direction: (0.65231,0.59714,-0.46682)
- New Polarization:       (-0.06997,-0.56583,-0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,0.59714,-0.46682)
- Old Polarization:       (-0.06997,-0.56583,-0.82155)
- New Momentum Direction: (0.65231,-0.59714,-0.46682)
- New Polarization:       (0.06997,-0.56583,0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,-0.59714,-0.46682)
- Old Polarization:       (0.06997,-0.56583,0.82155)
- New Momentum Direction: (-0.65231,-0.59714,-0.46682)
- New Polarization:       (0.06997,0.56583,-0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.65231,-0.59714,-0.46682)
- Old Polarization:       (0.06997,0.56583,-0.82155)
- New Momentum Direction: (0.65231,-0.59714,-0.46682)
- New Polarization:       (0.06997,-0.56583,0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,-0.59714,-0.46682)
- Old Polarization:       (0.06997,-0.56583,0.82155)
- New Momentum Direction: (0.65231,-0.59714,0.46682)
- New Polarization:       (-0.06997,0.56583,0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,-0.59714,0.46682)
- Old Polarization:       (-0.06997,0.56583,0.82155)
- New Momentum Direction: (0.65231,0.59714,0.46682)
- New Polarization:       (0.06997,0.56583,-0.82155)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.65231,0.59714,0.46682)
- Old Polarization:       (0.06997,0.56583,-0.82155)
- New Momentum Direction: (-0.65231,0.59714,0.46682)
- New Polarization:       (0.06997,-0.56583,0.82155)
+ Old Momentum Direction: (0.621182,-0.644834,0.445334)
+ Old Polarization:       (-0.754962,-0.34002,0.56073)
+ New Momentum Direction: (0.621182,-0.644834,-0.445334)
+ New Polarization:       (0.754962,0.34002,0.56073)
  *** TotalInternalReflection *** 
 
 ** Photon absorbed! **
-Track (trackID 1934, parentID 1) is processed with stopping code 2
+Track (trackID 1850, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.823253,0.0451986,0.565873)
+ Old Polarization:       (0.48593,-0.459225,0.743629)
+ New Momentum Direction: (-0.646518,0.0607424,0.760477)
+ New Polarization:       (0.69988,-0.349491,0.622916)
+ *** FresnelRefraction *** 
+Track (trackID 1849, parentID 1) is processed with stopping code 2
 ### pop requested out of 13 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.70459,-0.46353,-0.53731)
- Old Polarization:       (0.51191,-0.19235,0.83723)
- New Momentum Direction: (0.27082,-0.6288,-0.72888)
- New Polarization:       (-0.81871,-0.54872,0.16917)
+ Old Momentum Direction: (-0.94385,-0.319722,0.0832193)
+ Old Polarization:       (0.326368,-0.94145,0.0845956)
+ New Momentum Direction: (-0.894523,-0.432608,0.112602)
+ New Polarization:       (0.444083,-0.888824,0.113056)
  *** FresnelRefraction *** 
-Track (trackID 1933, parentID 1) is processed with stopping code 2
+Track (trackID 1848, parentID 1) is processed with stopping code 2
 ### pop requested out of 12 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1932, parentID 1) is processed with stopping code 2
+Track (trackID 1847, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.736482,0.34836,-0.579862)
+ Old Polarization:       (0.603163,-0.0499023,-0.796056)
+ New Momentum Direction: (-0.397898,0.472455,-0.786424)
+ New Polarization:       (0.868054,-0.083545,-0.48939)
+ *** FresnelRefraction *** 
+Track (trackID 1846, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.66658,0.564164,-0.487227)
+Old Polarization: (0.69659,0.238725,-0.676589)
+New Polarization: (0.259435,0.294255,-0.919841)
+Polarization Change: (0.259435,0.294255,-0.919841)
+New Momentum Direction: (-0.964843,0.037471,-0.26014)
+Momentum Change: (-0.964843,0.037471,-0.26014)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.964843,0.037471,-0.26014)
+ Old Polarization:       (0.259435,0.294255,-0.919841)
+ New Momentum Direction: (-0.93457,0.0507233,-0.352144)
+ New Polarization:       (0.353276,0.249506,-0.901634)
+ *** FresnelRefraction *** 
+Track (trackID 1845, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.783255,0.197947,-0.589345)
+ Old Polarization:       (0.541311,-0.249088,-0.80308)
+ New Momentum Direction: (-0.534274,0.269144,-0.80132)
+ New Polarization:       (0.786958,-0.187734,-0.587753)
+ *** FresnelRefraction *** 
+Track (trackID 1844, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.914061,-0.246658,0.32195)
+ Old Polarization:       (0.367584,-0.839276,0.400622)
+ New Momentum Direction: (-0.835062,-0.334588,0.436719)
+ New Polarization:       (0.521023,-0.735858,0.432491)
+ *** FresnelRefraction *** 
+Track (trackID 1843, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.944062,-0.326166,0.0486102)
+ Old Polarization:       (0.328063,-0.943892,0.0379785)
+ New Momentum Direction: (-0.894281,-0.442618,0.0659657)
+ New Polarization:       (0.446266,-0.893029,0.0578541)
+ *** FresnelRefraction *** 
+Track (trackID 1842, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.826898,0.069182,-0.55808)
+ Old Polarization:       (0.483073,-0.420665,-0.767908)
+ New Momentum Direction: (-0.647106,0.0937924,-0.756609)
+ New Polarization:       (0.701993,-0.313847,-0.6393)
+ *** FresnelRefraction *** 
+Track (trackID 1841, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1840, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.655286,0.607713,-0.448648)
+ Old Polarization:       (0.713317,0.302397,-0.632246)
+ New Momentum Direction: (0.655286,0.607713,-0.448648)
+ New Polarization:       (0.713317,-0.302397,0.632246)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.655286,0.607713,-0.448648)
+ Old Polarization:       (0.713317,-0.302397,0.632246)
+ New Momentum Direction: (0.655286,-0.607713,-0.448648)
+ New Polarization:       (-0.713317,-0.302397,-0.632246)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.655286,-0.607713,-0.448648)
+ Old Polarization:       (-0.713317,-0.302397,-0.632246)
+ New Momentum Direction: (0.655286,-0.607713,0.448648)
+ New Polarization:       (0.713317,0.302397,-0.632246)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.655286,-0.607713,0.448648)
+ Old Polarization:       (0.713317,0.302397,-0.632246)
+ New Momentum Direction: (-0.655286,-0.607713,0.448648)
+ New Polarization:       (0.713317,-0.302397,0.632246)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.655286,-0.607713,0.448648)
+ Old Polarization:       (0.713317,-0.302397,0.632246)
+ New Momentum Direction: (-0.655286,0.607713,0.448648)
+ New Polarization:       (-0.713317,-0.302397,-0.632246)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1839, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.93868,-0.310312,0.150285)
+ Old Polarization:       (0.334054,-0.926433,0.173578)
+ New Momentum Direction: (-0.884216,-0.420373,0.203588)
+ New Polarization:       (0.459124,-0.862347,0.213456)
+ *** FresnelRefraction *** 
+Track (trackID 1838, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.591545,0.77069,-0.236879)
+Old Polarization: (0.793839,0.505324,-0.33833)
+New Polarization: (-0.866183,-0.470586,-0.168152)
+Polarization Change: (-0.866183,-0.470586,-0.168152)
+New Momentum Direction: (0.0838157,0.194915,-0.977232)
+Momentum Change: (0.0838157,0.194915,-0.977232)
+
+** Photon absorbed! **
+Track (trackID 1837, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 23
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 24 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.798985,0.348074,-0.490375)
+ Old Polarization:       (0.598769,0.384991,-0.702324)
+ New Momentum Direction: (-0.588562,0.467948,-0.659257)
+ New Polarization:       (0.806689,0.286109,-0.517102)
+ *** FresnelRefraction *** 
+Track (trackID 1884, parentID 1) is processed with stopping code 2
+### pop requested out of 23 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.850182,-0.417587,-0.320641)
+ Old Polarization:       (0.524257,-0.727475,-0.442644)
+ New Momentum Direction: (-0.701472,-0.56528,-0.434046)
+ New Polarization:       (0.711137,-0.595439,-0.373814)
+ *** FresnelRefraction *** 
+Track (trackID 1883, parentID 1) is processed with stopping code 2
+### pop requested out of 22 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.820291,0.0803784,0.56627)
+ Old Polarization:       (0.567394,-0.0102993,0.823382)
+ New Momentum Direction: (-0.628281,0.109334,0.770266)
+ New Polarization:       (0.774882,-0.000420551,0.632106)
+ *** FresnelRefraction *** 
+Track (trackID 1882, parentID 1) is processed with stopping code 2
+### pop requested out of 21 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.861575,-0.490153,0.132055)
+ Old Polarization:       (0.507581,-0.835463,0.210625)
+ New Momentum Direction: (-0.727401,-0.662587,0.178511)
+ New Polarization:       (0.686178,-0.704942,0.179491)
+ *** FresnelRefraction *** 
+Track (trackID 1881, parentID 1) is processed with stopping code 2
+### pop requested out of 20 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.814686,0.0274426,-0.579253)
+ Old Polarization:       (0.575397,-0.08602,-0.813338)
+ New Momentum Direction: (-0.6187,0.037178,-0.784747)
+ New Polarization:       (0.782547,-0.0592061,-0.61977)
+ *** FresnelRefraction *** 
+Track (trackID 1880, parentID 1) is processed with stopping code 2
+### pop requested out of 19 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.784841,0.496202,-0.371226)
+ Old Polarization:       (0.618586,0.591454,-0.517235)
+ New Momentum Direction: (-0.545681,0.670995,-0.501995)
+ New Polarization:       (0.837254,0.411404,-0.360211)
+ *** FresnelRefraction *** 
+Track (trackID 1879, parentID 1) is processed with stopping code 2
+### pop requested out of 18 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1878, parentID 1) is processed with stopping code 2
+### pop requested out of 17 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1877, parentID 1) is processed with stopping code 2
+### pop requested out of 16 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.782596,0.622168,-0.021216)
+ Old Polarization:       (0.622457,0.782571,-0.0113843)
+ New Momentum Direction: (-0.54435,0.838371,-0.0285885)
+ New Polarization:       (0.83881,0.544369,-0.00779491)
+ *** FresnelRefraction *** 
+Track (trackID 1876, parentID 1) is processed with stopping code 2
+### pop requested out of 15 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1875, parentID 1) is processed with stopping code 2
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.799386,0.363437,0.47843)
+ Old Polarization:       (0.597115,0.392306,0.699678)
+ New Momentum Direction: (-0.576844,0.494119,0.65046)
+ New Polarization:       (0.814375,0.285882,0.505039)
+ *** FresnelRefraction *** 
+Track (trackID 1874, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1873, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.824527,0.0930874,0.558113)
+ Old Polarization:       (0.561199,0.00870637,0.827635)
+ New Momentum Direction: (-0.644305,0.125817,0.754348)
+ New Polarization:       (0.761571,0.0154497,0.647898)
+ *** FresnelRefraction *** 
+Track (trackID 1872, parentID 1) is processed with stopping code 2
+### pop requested out of 11 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.791547,0.523313,0.315589)
+ Old Polarization:       (0.609053,0.633234,0.477566)
+ New Momentum Direction: (-0.564614,0.706781,0.42623)
+ New Polarization:       (0.823975,0.452833,0.340598)
+ *** FresnelRefraction *** 
+Track (trackID 1871, parentID 1) is processed with stopping code 2
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.82548,0.126064,0.550173)
+ Old Polarization:       (0.559761,0.0577136,0.826642)
+ New Momentum Direction: (-0.650219,0.169687,0.740555)
+ New Polarization:       (0.756493,0.0544809,0.651729)
+ *** FresnelRefraction *** 
+Track (trackID 1870, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.798202,0.409485,0.441809)
+ Old Polarization:       (0.599053,0.462491,0.653634)
+ New Momentum Direction: (-0.577383,0.555012,0.598824)
+ New Polarization:       (0.814229,0.337065,0.472671)
+ *** FresnelRefraction *** 
+Track (trackID 1869, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.787522,0.409857,-0.460246)
+ Old Polarization:       (0.614282,0.461847,-0.639809)
+ New Momentum Direction: (-0.548808,0.555942,-0.62429)
+ New Polarization:       (0.834619,0.322294,-0.446697)
+ *** FresnelRefraction *** 
+Track (trackID 1868, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.827551,-0.0703794,-0.556961)
+ Old Polarization:       (0.556718,-0.23061,-0.79805)
+ New Momentum Direction: (-0.655246,-0.0947036,-0.749455)
+ New Polarization:       (0.752153,-0.173886,-0.635633)
+ *** FresnelRefraction *** 
+Track (trackID 1867, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.781444,0.529068,-0.330806)
+Old Polarization: (0.623193,0.63521,-0.456222)
+New Polarization: (-0.0721932,0.995798,0.0563452)
+Polarization Change: (-0.0721932,0.995798,0.0563452)
+New Momentum Direction: (-0.80237,-0.0915407,0.589766)
+Momentum Change: (-0.80237,-0.0915407,0.589766)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.80237,-0.0915407,0.589766)
+ Old Polarization:       (-0.0721932,0.995798,0.0563452)
+ New Momentum Direction: (-0.588464,-0.12401,0.798956)
+ New Polarization:       (0.137757,0.95834,0.250213)
+ *** FresnelRefraction *** 
+Track (trackID 1866, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.840934,-0.15008,0.519909)
+ Old Polarization:       (0.537513,-0.342672,0.770491)
+ New Momentum Direction: (-0.681339,-0.203005,0.703254)
+ New Polarization:       (0.72944,-0.268098,0.629318)
+ *** FresnelRefraction *** 
+Track (trackID 1865, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1864, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1863, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.784405,0.600376,0.155747)
+ Old Polarization:       (0.619453,0.745583,0.245732)
+ New Momentum Direction: (-0.546394,0.810694,0.210307)
+ New Polarization:       (0.836998,0.519619,0.171553)
+ *** FresnelRefraction *** 
+Track (trackID 1862, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 9
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 10 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.932077,-0.10021,-0.348124)
+ Old Polarization:       (0.359496,-0.374353,-0.854764)
+ New Momentum Direction: (-0.87131,-0.135749,-0.471584)
+ New Polarization:       (0.488724,-0.326929,-0.808867)
+ *** FresnelRefraction *** 
+Track (trackID 1893, parentID 1) is processed with stopping code 2
+### pop requested out of 9 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.84651,-0.335547,0.413314)
+ Old Polarization:       (0.498574,-0.771888,0.394478)
+ New Momentum Direction: (-0.696836,-0.452061,0.556831)
+ New Polarization:       (0.692428,-0.626418,0.357972)
+ *** FresnelRefraction *** 
+Track (trackID 1892, parentID 1) is processed with stopping code 2
+### pop requested out of 8 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1891, parentID 1) is processed with stopping code 2
+### pop requested out of 7 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.737421,0.368977,0.565744)
+ Old Polarization:       (0.675306,0.38644,0.628193)
+ New Momentum Direction: (-0.3995,0.500795,0.767857)
+ New Polarization:       (0.916654,0.20723,0.341761)
+ *** FresnelRefraction *** 
+Track (trackID 1890, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.889118,0.289504,-0.35448)
+ Old Polarization:       (0.429469,0.260044,-0.864831)
+ New Momentum Direction: (-0.784562,0.392213,-0.480241)
+ New Polarization:       (0.599093,0.279833,-0.750187)
+ *** FresnelRefraction *** 
+Track (trackID 1889, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.849173,-0.355369,0.390663)
+ Old Polarization:       (0.494341,-0.795156,0.351218)
+ New Momentum Direction: (-0.700161,-0.480441,0.528158)
+ New Polarization:       (0.689275,-0.647761,0.324509)
+ *** FresnelRefraction *** 
+Track (trackID 1888, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.813812,-0.237184,0.530522)
+ Old Polarization:       (0.552232,-0.599926,0.578903)
+ New Momentum Direction: (-0.617964,-0.320886,0.717741)
+ New Polarization:       (0.765784,-0.452392,0.457074)
+ *** FresnelRefraction *** 
+Track (trackID 1887, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.77187,-0.0261039,0.635244)
+ Old Polarization:       (0.619892,-0.252872,0.742825)
+ New Momentum Direction: (-0.506472,-0.0354025,0.861529)
+ New Polarization:       (0.85172,-0.176263,0.493462)
+ *** FresnelRefraction *** 
+Track (trackID 1886, parentID 1) is processed with stopping code 2
+### pop requested out of 2 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1885, parentID 1) is processed with stopping code 2
+### pop requested out of 1 stacked tracks.
+
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 13
+Track (trackID 1, parentID 0) is processed with stopping code 4
+### pop requested out of 14 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605501,0.53596,0.588316)
+ Old Polarization:       (0.795765,0.418184,0.438041)
+ New Momentum Direction: (0.605501,0.53596,0.588316)
+ New Polarization:       (0.795765,-0.418184,-0.438041)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605501,0.53596,0.588316)
+ Old Polarization:       (0.795765,-0.418184,-0.438041)
+ New Momentum Direction: (0.605501,0.53596,-0.588316)
+ New Polarization:       (-0.795765,0.418184,-0.438041)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605501,0.53596,-0.588316)
+ Old Polarization:       (-0.795765,0.418184,-0.438041)
+ New Momentum Direction: (0.605501,-0.53596,-0.588316)
+ New Polarization:       (0.795765,0.418184,0.438041)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1906, parentID 1) is processed with stopping code 2
+### pop requested out of 13 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.917133,-0.170981,0.360046)
+ Old Polarization:       (0.177684,-0.983978,-0.0146679)
+ New Momentum Direction: (-0.841364,-0.231846,0.488215)
+ New Polarization:       (0.305175,-0.94933,0.0750996)
+ *** FresnelRefraction *** 
+Track (trackID 1905, parentID 1) is processed with stopping code 2
+### pop requested out of 12 stacked tracks.
+
+** Photon absorbed! **
+Track (trackID 1904, parentID 1) is processed with stopping code 2
 ### pop requested out of 11 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1931, parentID 1) is processed with stopping code 2
+Track (trackID 1903, parentID 1) is processed with stopping code 2
 ### pop requested out of 10 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.025325,0.20598,-0.97823)
- Old Polarization:       (-0.52341,0.83643,0.16257)
- New Momentum Direction: (0.034094,0.2773,-0.96018)
- New Polarization:       (-0.40192,0.88343,0.24086)
- *** FresnelRefraction *** 
-Track (trackID 1930, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.620464,0.609273,0.493772)
+ Old Polarization:       (0.77376,0.578165,0.258885)
+ New Momentum Direction: (0.620464,0.609273,0.493772)
+ New Polarization:       (0.77376,-0.578165,-0.258885)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.620464,0.609273,0.493772)
+ Old Polarization:       (0.77376,-0.578165,-0.258885)
+ New Momentum Direction: (0.620464,-0.609273,0.493772)
+ New Polarization:       (-0.77376,-0.578165,0.258885)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.620464,-0.609273,0.493772)
+ Old Polarization:       (-0.77376,-0.578165,0.258885)
+ New Momentum Direction: (0.620464,-0.609273,-0.493772)
+ New Polarization:       (0.77376,0.578165,0.258885)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.620464,-0.609273,-0.493772)
+ Old Polarization:       (0.77376,0.578165,0.258885)
+ New Momentum Direction: (-0.620464,-0.609273,-0.493772)
+ New Polarization:       (0.77376,-0.578165,-0.258885)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.620464,-0.609273,-0.493772)
+ Old Polarization:       (0.77376,-0.578165,-0.258885)
+ New Momentum Direction: (-0.620464,0.609273,-0.493772)
+ New Polarization:       (-0.77376,-0.578165,0.258885)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.620464,0.609273,-0.493772)
+ Old Polarization:       (-0.77376,-0.578165,0.258885)
+ New Momentum Direction: (-0.620464,0.609273,0.493772)
+ New Polarization:       (0.77376,0.578165,0.258885)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1902, parentID 1) is processed with stopping code 2
 ### pop requested out of 9 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.081929,-0.74476,-0.66228)
- Old Polarization:       (-0.43169,-0.62546,0.64996)
- New Momentum Direction: (0.11079,-0.43093,-0.89556)
- New Polarization:       (-0.19298,0.87463,-0.44473)
+ Old Momentum Direction: (-0.999535,-0.0301643,0.00435897)
+ Old Polarization:       (0.0179835,-0.699188,-0.714712)
+ New Momentum Direction: (-0.999142,-0.0409825,0.00592229)
+ New Polarization:       (0.0291772,-0.798266,-0.601597)
  *** FresnelRefraction *** 
-Track (trackID 1929, parentID 1) is processed with stopping code 2
+Track (trackID 1901, parentID 1) is processed with stopping code 2
 ### pop requested out of 8 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (0.2182,-0.76386,-0.60738)
- Old Polarization:       (-0.22293,-0.64493,0.731)
- New Momentum Direction: (0.29614,-0.4825,-0.82432)
- New Polarization:       (0.18727,0.87561,-0.44524)
+ Old Momentum Direction: (-0.838333,-0.115863,0.532704)
+ Old Polarization:       (0.333283,-0.882205,0.33262)
+ New Momentum Direction: (-0.675101,-0.156789,0.720871)
+ New Polarization:       (0.541273,-0.769217,0.339602)
  *** FresnelRefraction *** 
-Track (trackID 1928, parentID 1) is processed with stopping code 2
+Track (trackID 1900, parentID 1) is processed with stopping code 2
 ### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.0028938,0.20718,-0.9783)
- Old Polarization:       (-0.54724,0.81914,0.17185)
- New Momentum Direction: (0.0039291,0.28129,-0.95961)
- New Polarization:       (-0.43128,0.86626,0.25216)
- *** FresnelRefraction *** 
-Track (trackID 1927, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.25173,-0.39784,-0.88224)
- Old Polarization:       (-0.94473,-0.096854,0.31323)
- New Momentum Direction: (-0.33993,-0.53724,-0.77189)
- New Polarization:       (-0.85369,-0.16805,0.49292)
- *** FresnelRefraction *** 
-Track (trackID 1926, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.21669,-0.7611,-0.61136)
- Old Polarization:       (-0.22576,-0.64833,0.72712)
- New Momentum Direction: (0.29325,-0.47906,-0.82735)
- New Polarization:       (0.17961,0.87759,-0.44449)
- *** FresnelRefraction *** 
-Track (trackID 1925, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.65553,0.13658,-0.74272)
- Old Polarization:       (0.44679,0.72276,0.52725)
- New Momentum Direction: (0.8853,0.18446,-0.42687)
- New Polarization:       (0.27232,0.53846,0.79744)
- *** FresnelRefraction *** 
-Track (trackID 1924, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
 
 ** Photon absorbed! **
-Track (trackID 1923, parentID 1) is processed with stopping code 2
+Track (trackID 1899, parentID 1) is processed with stopping code 2
+### pop requested out of 6 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.967809,0.220915,-0.120596)
+ Old Polarization:       (0.0742199,-0.207341,-0.975449)
+ New Momentum Direction: (-0.940184,0.299014,-0.16323)
+ New Polarization:       (0.131793,-0.122584,-0.983669)
+ *** FresnelRefraction *** 
+Track (trackID 1898, parentID 1) is processed with stopping code 2
+### pop requested out of 5 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.953811,0.277558,-0.114919)
+ Old Polarization:       (0.0924305,-0.0928357,-0.991382)
+ New Momentum Direction: (-0.914748,0.373294,-0.154557)
+ New Polarization:       (0.161969,-0.0116385,-0.986727)
+ *** FresnelRefraction *** 
+Track (trackID 1897, parentID 1) is processed with stopping code 2
+### pop requested out of 4 stacked tracks.
+Scattering Photon!
+Old Momentum Direction: (-0.695098,0.690062,0.201624)
+Old Polarization: (0.616217,0.716346,-0.3273)
+New Polarization: (-0.0282555,0.853389,-0.520508)
+Polarization Change: (-0.0282555,0.853389,-0.520508)
+New Momentum Direction: (-0.989019,-0.0994331,-0.109335)
+Momentum Change: (-0.989019,-0.0994331,-0.109335)
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.989019,-0.0994331,-0.109335)
+ Old Polarization:       (-0.0282555,0.853389,-0.520508)
+ New Momentum Direction: (-0.97964,-0.135074,-0.148526)
+ New Polarization:       (0.0514238,0.546304,-0.836007)
+ *** FresnelRefraction *** 
+Track (trackID 1896, parentID 1) is processed with stopping code 2
+### pop requested out of 3 stacked tracks.
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605602,0.473672,0.639439)
+ Old Polarization:       (0.792964,0.291807,0.534843)
+ New Momentum Direction: (-0.605602,0.473672,-0.639439)
+ New Polarization:       (-0.792964,-0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605602,0.473672,-0.639439)
+ Old Polarization:       (-0.792964,-0.291807,0.534843)
+ New Momentum Direction: (0.605602,0.473672,-0.639439)
+ New Polarization:       (-0.792964,0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,0.473672,-0.639439)
+ Old Polarization:       (-0.792964,0.291807,-0.534843)
+ New Momentum Direction: (0.605602,-0.473672,-0.639439)
+ New Polarization:       (0.792964,0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,-0.473672,-0.639439)
+ Old Polarization:       (0.792964,0.291807,0.534843)
+ New Momentum Direction: (-0.605602,-0.473672,-0.639439)
+ New Polarization:       (0.792964,-0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605602,-0.473672,-0.639439)
+ Old Polarization:       (0.792964,-0.291807,-0.534843)
+ New Momentum Direction: (0.605602,-0.473672,-0.639439)
+ New Polarization:       (0.792964,0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,-0.473672,-0.639439)
+ Old Polarization:       (0.792964,0.291807,0.534843)
+ New Momentum Direction: (0.605602,-0.473672,0.639439)
+ New Polarization:       (-0.792964,-0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,-0.473672,0.639439)
+ Old Polarization:       (-0.792964,-0.291807,0.534843)
+ New Momentum Direction: (0.605602,0.473672,0.639439)
+ New Polarization:       (0.792964,-0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,0.473672,0.639439)
+ Old Polarization:       (0.792964,-0.291807,-0.534843)
+ New Momentum Direction: (0.605602,0.473672,-0.639439)
+ New Polarization:       (-0.792964,0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,0.473672,-0.639439)
+ Old Polarization:       (-0.792964,0.291807,-0.534843)
+ New Momentum Direction: (-0.605602,0.473672,-0.639439)
+ New Polarization:       (-0.792964,-0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605602,0.473672,-0.639439)
+ Old Polarization:       (-0.792964,-0.291807,0.534843)
+ New Momentum Direction: (0.605602,0.473672,-0.639439)
+ New Polarization:       (-0.792964,0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,0.473672,-0.639439)
+ Old Polarization:       (-0.792964,0.291807,-0.534843)
+ New Momentum Direction: (0.605602,-0.473672,-0.639439)
+ New Polarization:       (0.792964,0.291807,0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.605602,-0.473672,-0.639439)
+ Old Polarization:       (0.792964,0.291807,0.534843)
+ New Momentum Direction: (-0.605602,-0.473672,-0.639439)
+ New Polarization:       (0.792964,-0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (-0.605602,-0.473672,-0.639439)
+ Old Polarization:       (0.792964,-0.291807,-0.534843)
+ New Momentum Direction: (-0.605602,-0.473672,0.639439)
+ New Polarization:       (-0.792964,0.291807,-0.534843)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1895, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.19449,-0.54509,-0.81551)
- Old Polarization:       (-0.85147,-0.31896,0.41626)
- New Momentum Direction: (-0.26326,-0.73783,-0.62153)
- New Polarization:       (-0.70469,-0.29292,0.64623)
+ Old Momentum Direction: (-0.642928,0.292805,0.707749)
+ Old Polarization:       (0.72555,-0.0632307,0.685258)
+ New Momentum Direction: (-0.869632,0.396052,0.29476)
+ New Polarization:       (-0.197732,0.267658,-0.943006)
  *** FresnelRefraction *** 
-Track (trackID 1922, parentID 1) is processed with stopping code 2
+Track (trackID 1894, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 10
+ Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 2
 Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 11 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.21455,-0.51975,-0.82694)
- Old Polarization:       (0.7129,0.66207,-0.23116)
- New Momentum Direction: (0.29079,-0.70444,-0.64746)
- New Polarization:       (0.91293,0.0017525,0.40812)
- *** FresnelRefraction *** 
-Track (trackID 1956, parentID 1) is processed with stopping code 2
-### pop requested out of 10 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.61378,-0.70822,-0.34885)
- Old Polarization:       (-0.72629,0.33333,0.60116)
- New Momentum Direction: (-0.83393,-0.28265,-0.47398)
- New Polarization:       (-0.53721,0.61237,0.58001)
- *** FresnelRefraction *** 
-Track (trackID 1955, parentID 1) is processed with stopping code 2
-### pop requested out of 9 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1954, parentID 1) is processed with stopping code 2
-### pop requested out of 8 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.33596,-0.75483,-0.56335)
- Old Polarization:       (0.94133,0.24876,0.22806)
- New Momentum Direction: (0.45322,-0.46585,-0.75999)
- New Polarization:       (0.86041,0.45148,0.23636)
- *** FresnelRefraction *** 
-Track (trackID 1953, parentID 1) is processed with stopping code 2
-### pop requested out of 7 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.070384,-0.4462,-0.89216)
- Old Polarization:       (0.47228,0.80269,-0.3642)
- New Momentum Direction: (0.094722,-0.60049,-0.794)
- New Polarization:       (0.57565,-0.61768,0.53582)
- *** FresnelRefraction *** 
-Track (trackID 1952, parentID 1) is processed with stopping code 2
-### pop requested out of 6 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.28065,-0.36064,-0.88948)
- Old Polarization:       (-0.1488,0.93187,-0.33088)
- New Momentum Direction: (-0.38181,-0.49063,-0.78327)
- New Polarization:       (-0.84331,-0.16187,0.51247)
- *** FresnelRefraction *** 
-Track (trackID 1951, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (0.33705,-0.78565,-0.51879)
- Old Polarization:       (0.9311,0.19655,0.30727)
- New Momentum Direction: (0.45626,-0.54645,-0.7023)
- New Polarization:       (0.88491,0.36162,0.29353)
- *** FresnelRefraction *** 
-Track (trackID 1950, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
- Photon at Boundary! 
- Old Momentum Direction: (-0.26905,-0.95306,-0.1389)
- Old Polarization:       (-0.13652,-0.10502,0.98505)
- New Momentum Direction: (-0.36283,-0.91284,-0.18732)
- New Polarization:       (-0.77385,0.18317,0.6063)
- *** FresnelRefraction *** 
-Track (trackID 1949, parentID 1) is processed with stopping code 2
 ### pop requested out of 3 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.4802,-0.41335,-0.77366)
- Old Polarization:       (-0.50523,0.85135,-0.14127)
- New Momentum Direction: (-0.4802,-0.41335,0.77366)
- New Polarization:       (0.67258,-0.73969,0.022262)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4802,-0.41335,0.77366)
- Old Polarization:       (0.67258,-0.73969,0.022262)
- New Momentum Direction: (0.4802,-0.41335,0.77366)
- New Polarization:       (0.67258,0.73969,-0.022262)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4802,-0.41335,0.77366)
- Old Polarization:       (0.67258,0.73969,-0.022262)
- New Momentum Direction: (0.4802,0.41335,0.77366)
- New Polarization:       (-0.67258,0.73969,0.022262)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4802,0.41335,0.77366)
- Old Polarization:       (-0.67258,0.73969,0.022262)
- New Momentum Direction: (0.4802,0.41335,-0.77366)
- New Polarization:       (0.64921,-0.7606,-0.0034239)
- *** FresnelReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (0.4802,0.41335,-0.77366)
- Old Polarization:       (0.64921,-0.7606,-0.0034239)
- New Momentum Direction: (-0.4802,0.41335,-0.77366)
- New Polarization:       (0.64921,0.7606,0.0034239)
- *** TotalInternalReflection *** 
- Photon at Boundary! 
- Old Momentum Direction: (-0.4802,0.41335,-0.77366)
- Old Polarization:       (0.64921,0.7606,0.0034239)
- New Momentum Direction: (-0.64967,0.55923,-0.51496)
- New Polarization:       (0.64933,0.76047,0.0066562)
+ Old Momentum Direction: (-0.665322,0.260052,0.699799)
+ Old Polarization:       (-0.477895,-0.868502,-0.131606)
+ New Momentum Direction: (-0.902155,0.352622,0.248543)
+ New Polarization:       (-0.414508,-0.868188,-0.272822)
  *** FresnelRefraction *** 
-Track (trackID 1948, parentID 1) is processed with stopping code 2
-### pop requested out of 2 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1947, parentID 1) is processed with stopping code 2
-### pop requested out of 1 stacked tracks.
-
- Exiting from G4Cerenkov::DoIt -- NumberOfSecondaries = 5
-Track (trackID 1, parentID 0) is processed with stopping code 4
-### pop requested out of 6 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1961, parentID 1) is processed with stopping code 2
-### pop requested out of 5 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1960, parentID 1) is processed with stopping code 2
-### pop requested out of 4 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1959, parentID 1) is processed with stopping code 2
-### pop requested out of 3 stacked tracks.
-
-** Photon absorbed! **
-Track (trackID 1958, parentID 1) is processed with stopping code 2
+Track (trackID 1908, parentID 1) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
  Photon at Boundary! 
- Old Momentum Direction: (-0.036261,-0.79475,-0.60586)
- Old Polarization:       (-0.58968,-0.47245,0.65503)
- New Momentum Direction: (-0.0491,-0.5697,-0.82038)
- New Polarization:       (-0.5218,0.71501,-0.46529)
- *** FresnelRefraction *** 
-Track (trackID 1957, parentID 1) is processed with stopping code 2
+ Old Momentum Direction: (-0.651249,0.497179,0.573313)
+ Old Polarization:       (-0.46712,0.332757,-0.819189)
+ New Momentum Direction: (0.651249,0.497179,0.573313)
+ New Polarization:       (-0.46712,-0.332757,0.819189)
+ *** TotalInternalReflection *** 
+ Photon at Boundary! 
+ Old Momentum Direction: (0.651249,0.497179,0.573313)
+ Old Polarization:       (-0.46712,-0.332757,0.819189)
+ New Momentum Direction: (0.651249,0.497179,-0.573313)
+ New Polarization:       (0.46712,0.332757,0.819189)
+ *** TotalInternalReflection *** 
+
+** Photon absorbed! **
+Track (trackID 1907, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
 Track (trackID 1, parentID 0) is processed with stopping code 2
 ### pop requested out of 2 stacked tracks.
-Track (trackID 1963, parentID 1) is processed with stopping code 2
+Track (trackID 1910, parentID 1) is processed with stopping code 2
 ### pop requested out of 1 stacked tracks.
-Track (trackID 1962, parentID 1) is processed with stopping code 2
+Track (trackID 1909, parentID 1) is processed with stopping code 2
 ### pop requested out of 0 stacked tracks.
 ### 0 waiting tracks are re-classified to
      0 urgent tracks and 0 waiting tracks.
 NULL returned from G4StackManager.
 Terminate current event processing.
-number of event = 1 User=3.18s Real=3.55s Sys=0.29s
+number of event = 1 User=2.84s Real=3.22s Sys=0.3s
 exit
diff --git a/examples/novice/N06/include/ExN06DetectorConstruction.hh b/examples/novice/N06/include/ExN06DetectorConstruction.hh
index 83383a60e7..22bae419e6 100644
--- a/examples/novice/N06/include/ExN06DetectorConstruction.hh
+++ b/examples/novice/N06/include/ExN06DetectorConstruction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef ExN06DetectorConstruction_h
diff --git a/examples/novice/N06/include/ExN06PhysicsList.hh b/examples/novice/N06/include/ExN06PhysicsList.hh
index 4d4cd50f8b..19d51a3141 100644
--- a/examples/novice/N06/include/ExN06PhysicsList.hh
+++ b/examples/novice/N06/include/ExN06PhysicsList.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef ExN06PhysicsList_h
diff --git a/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh b/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh
index 98dd45dbea..4d82a93bb9 100644
--- a/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh
+++ b/examples/novice/N06/include/ExN06PrimaryGeneratorAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef ExN06PrimaryGeneratorAction_h
diff --git a/examples/novice/N06/include/ExN06RunAction.hh b/examples/novice/N06/include/ExN06RunAction.hh
index a45c2852d9..4113197994 100644
--- a/examples/novice/N06/include/ExN06RunAction.hh
+++ b/examples/novice/N06/include/ExN06RunAction.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef ExN06RunAction_h
diff --git a/examples/novice/N06/src/ExN06DetectorConstruction.cc b/examples/novice/N06/src/ExN06DetectorConstruction.cc
index 171fdf64e0..906e6b5e81 100644
--- a/examples/novice/N06/src/ExN06DetectorConstruction.cc
+++ b/examples/novice/N06/src/ExN06DetectorConstruction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #include "ExN06DetectorConstruction.hh"
diff --git a/examples/novice/N06/src/ExN06PhysicsList.cc b/examples/novice/N06/src/ExN06PhysicsList.cc
index db169e7682..f11e38478d 100644
--- a/examples/novice/N06/src/ExN06PhysicsList.cc
+++ b/examples/novice/N06/src/ExN06PhysicsList.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #include "G4ios.hh"
diff --git a/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc b/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc
index 4a6c148b38..b36524a39d 100644
--- a/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc
+++ b/examples/novice/N06/src/ExN06PrimaryGeneratoraction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #include "ExN06PrimaryGeneratorAction.hh"
diff --git a/examples/novice/N06/src/ExN06RunAction.cc b/examples/novice/N06/src/ExN06RunAction.cc
index 9afc812585..1c58c8d1a2 100644
--- a/examples/novice/N06/src/ExN06RunAction.cc
+++ b/examples/novice/N06/src/ExN06RunAction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 // Make this appear first!
diff --git a/source/GNUmakefile b/source/GNUmakefile
index 98f557023b..f3ed3c5bc2 100644
--- a/source/GNUmakefile
+++ b/source/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.26 2001/02/12 08:17:31 gcosmo Exp $
+# $Id: GNUmakefile,v 1.28 2001/06/26 02:14:39 morita Exp $
 # -----------------------------------------------------------------
 # "gmake" makes default libraries for each subdomain.
 # "gmake global" makes global libraries for each subdomain.
@@ -35,7 +35,7 @@ all:
 ifdef G4USE_HEPODBMS
 	@$(ECHO) Making granular libraries with HepODBMS option ...
 	@for dir in $(SUBDIR4); do (cd $$dir && $(MAKE) cleandb); done;:
-	@if [ ! -f $(G4TMPDIR)/schema/G4SCHEMA ] ; then \
+	@if [ ! -f $(G4LIBDIR)/schema/G4SCHEMA ] ; then \
 	  $(ECHO) "Temporary boot file does not exist.  Stop." ; exit 1 ; \
 	 fi
 endif
@@ -51,7 +51,7 @@ glob global:
 ifdef G4USE_HEPODBMS
 	@$(ECHO) Making global libraries with HepODBMS option ...
 	@for dir in $(SUBDIR4); do (cd $$dir && $(MAKE) cleandb); done;:
-	@if [ ! -f $(G4TMPDIR)/schema/G4SCHEMA ] ; then \
+	@if [ ! -f $(G4LIBDIR)/schema/G4SCHEMA ] ; then \
 	  $(ECHO) "Temporary boot file does not exist.  Stop." ; exit 1 ; \
 	 fi
 endif
@@ -111,12 +111,14 @@ includes:
 	@for dir in $(SUBDIR1); do (cd $$dir && $(MAKE) $@); done
 	@for dir in $(SUBDIR2); do (cd $$dir && $(MAKE) $@); done
 	@for dir in $(SUBDIR3); do (cd $$dir && $(MAKE) $@); done
+	@for dir in $(SUBDIR4); do (cd $$dir && $(MAKE) $@); done
 
 clean_libs:
 	@echo Removing all libraries ...
 	@for dir in $(SUBDIR1); do (cd $$dir && $(MAKE) clean_libs); done
 	@for dir in $(SUBDIR2); do (cd $$dir && $(MAKE) clean_libs); done
 	@for dir in $(SUBDIR3); do (cd $$dir && $(MAKE) clean_libs); done
+	@for dir in $(SUBDIR4); do (cd $$dir && $(MAKE) $@ cleandb); done
 	@rm -rf $(G4LIBDIR)/libname.map
 
 clean:
diff --git a/source/analysis/Lab/include/G4LabSystem.hh b/source/analysis/Lab/include/G4LabSystem.hh
index ef8f91b400..3d509d9eea 100644
--- a/source/analysis/Lab/include/G4LabSystem.hh
+++ b/source/analysis/Lab/include/G4LabSystem.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LabSystem.hh,v 1.2 2000/11/16 13:44:38 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LabSystem.hh,v 1.2.4.1 2001/06/28 19:07:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lab/src/G4LabSystem.cc b/source/analysis/Lab/src/G4LabSystem.cc
index 79e6ab8ff7..0fea63ebc9 100644
--- a/source/analysis/Lab/src/G4LabSystem.cc
+++ b/source/analysis/Lab/src/G4LabSystem.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LabSystem.cc,v 1.2 2000/11/16 13:44:41 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LabSystem.cc,v 1.2.4.1 2001/06/28 19:07:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lizard/include/G4LizardSystem.hh b/source/analysis/Lizard/include/G4LizardSystem.hh
index 35f49ddf2f..1eb289d0bf 100644
--- a/source/analysis/Lizard/include/G4LizardSystem.hh
+++ b/source/analysis/Lizard/include/G4LizardSystem.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LizardSystem.hh,v 1.5 2000/11/16 13:44:41 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LizardSystem.hh,v 1.5.4.1 2001/06/28 19:07:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/Lizard/src/G4LizardSystem.cc b/source/analysis/Lizard/src/G4LizardSystem.cc
index 659cc56049..cb5352dc35 100644
--- a/source/analysis/Lizard/src/G4LizardSystem.cc
+++ b/source/analysis/Lizard/src/G4LizardSystem.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LizardSystem.cc,v 1.8 2000/11/17 08:16:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LizardSystem.cc,v 1.8.4.1 2001/06/28 19:07:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/jas/include/G4JasSystem.hh b/source/analysis/jas/include/G4JasSystem.hh
index 0a5e1faff5..388fd688fd 100644
--- a/source/analysis/jas/include/G4JasSystem.hh
+++ b/source/analysis/jas/include/G4JasSystem.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4JasSystem.hh,v 1.8 2000/11/16 13:44:43 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4JasSystem.hh,v 1.8.4.1 2001/06/28 19:07:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/jas/include/JasAxis.h b/source/analysis/jas/include/JasAxis.h
index 30ec40321d..b04cea94ec 100644
--- a/source/analysis/jas/include/JasAxis.h
+++ b/source/analysis/jas/include/JasAxis.h
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef JASAXIS_H
 #define JASAXIS_H
 
diff --git a/source/analysis/jas/include/JasHistogram1D.h b/source/analysis/jas/include/JasHistogram1D.h
index 4355503588..f5c9adc49a 100644
--- a/source/analysis/jas/include/JasHistogram1D.h
+++ b/source/analysis/jas/include/JasHistogram1D.h
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef JASHISTOGRAM1D_H
 #define JASHISTOGRAM1D_H
 
diff --git a/source/analysis/jas/include/JasHistogram2D.h b/source/analysis/jas/include/JasHistogram2D.h
index 9880efa8eb..c9c58364a8 100644
--- a/source/analysis/jas/include/JasHistogram2D.h
+++ b/source/analysis/jas/include/JasHistogram2D.h
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef JASHISTOGRAM2D_H
 #define JASHISTOGRAM2D_H
 
diff --git a/source/analysis/jas/include/JasHistogramFactory.h b/source/analysis/jas/include/JasHistogramFactory.h
index 228f6f33c0..d8ae357a84 100644
--- a/source/analysis/jas/include/JasHistogramFactory.h
+++ b/source/analysis/jas/include/JasHistogramFactory.h
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // JHistogramFactory.h: interface for the JHistogramFactory class.
 //////////////////////////////////////////////////////////////////////
 #ifndef JASHISTOGRAMFACTORY
diff --git a/source/analysis/jas/src/G4JasSystem.cc b/source/analysis/jas/src/G4JasSystem.cc
index 7281d558c5..42241d700a 100644
--- a/source/analysis/jas/src/G4JasSystem.cc
+++ b/source/analysis/jas/src/G4JasSystem.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4JasSystem.cc,v 1.8 2000/11/16 13:44:43 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4JasSystem.cc,v 1.8.4.1 2001/06/28 19:07:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 14 September 2000
diff --git a/source/analysis/jas/src/JasAxis.cc b/source/analysis/jas/src/JasAxis.cc
index 016185a792..bd03f7c48c 100644
--- a/source/analysis/jas/src/JasAxis.cc
+++ b/source/analysis/jas/src/JasAxis.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifdef G4ANALYSIS_BUILD_JAS
 
diff --git a/source/analysis/jas/src/JasHistogram1D.cc b/source/analysis/jas/src/JasHistogram1D.cc
index 30f52cc243..fc84b0758e 100644
--- a/source/analysis/jas/src/JasHistogram1D.cc
+++ b/source/analysis/jas/src/JasHistogram1D.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // JasHistogram.cpp: implementation of the JasHistogram1D class.
 //////////////////////////////////////////////////////////////////////
 
diff --git a/source/analysis/jas/src/JasHistogram2D.cc b/source/analysis/jas/src/JasHistogram2D.cc
index 48127e705d..beea7ad0a3 100644
--- a/source/analysis/jas/src/JasHistogram2D.cc
+++ b/source/analysis/jas/src/JasHistogram2D.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // JasHistogram.cpp: implementation of the JasHistogram2D class.
 //////////////////////////////////////////////////////////////////////
 
diff --git a/source/analysis/jas/src/JasHistogramFactory.cc b/source/analysis/jas/src/JasHistogramFactory.cc
index e656a1cf65..af2d5d5278 100644
--- a/source/analysis/jas/src/JasHistogramFactory.cc
+++ b/source/analysis/jas/src/JasHistogramFactory.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // JasHistogramFactory.cpp: implementation of the JasHistogramFactory class.
 //
 //////////////////////////////////////////////////////////////////////
diff --git a/source/analysis/management/include/G4AnalysisManager.hh b/source/analysis/management/include/G4AnalysisManager.hh
index baf0dcfe34..0f71fcf4c3 100644
--- a/source/analysis/management/include/G4AnalysisManager.hh
+++ b/source/analysis/management/include/G4AnalysisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AnalysisManager.hh,v 1.8 2000/11/16 13:44:45 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AnalysisManager.hh,v 1.8.4.1 2001/06/28 19:07:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 20th Mai 2000
diff --git a/source/analysis/management/include/G4VAnalysisManager.hh b/source/analysis/management/include/G4VAnalysisManager.hh
index ec97acb71e..a9fec8eddf 100644
--- a/source/analysis/management/include/G4VAnalysisManager.hh
+++ b/source/analysis/management/include/G4VAnalysisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VAnalysisManager.hh,v 1.5 2000/11/16 13:44:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VAnalysisManager.hh,v 1.5.4.1 2001/06/28 19:07:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Guy Barrand 20th Mai 2000
 //
diff --git a/source/analysis/management/include/G4VAnalysisSystem.hh b/source/analysis/management/include/G4VAnalysisSystem.hh
index 36ca0f66fc..fdfd4921ee 100644
--- a/source/analysis/management/include/G4VAnalysisSystem.hh
+++ b/source/analysis/management/include/G4VAnalysisSystem.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VAnalysisSystem.hh,v 1.8 2000/11/16 13:44:46 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VAnalysisSystem.hh,v 1.8.4.1 2001/06/28 19:07:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/analysis/management/src/G4AnalysisManager.cc b/source/analysis/management/src/G4AnalysisManager.cc
index 2e3058b323..3b6b61f8d5 100644
--- a/source/analysis/management/src/G4AnalysisManager.cc
+++ b/source/analysis/management/src/G4AnalysisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AnalysisManager.cc,v 1.10 2000/11/21 15:41:25 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AnalysisManager.cc,v 1.10.4.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Guy Barrand 20th Mai 2000
 //
diff --git a/source/digits+hits/detector/include/G4CollectionNameVector.hh b/source/digits+hits/detector/include/G4CollectionNameVector.hh
index b8672641e7..904b335b83 100644
--- a/source/digits+hits/detector/include/G4CollectionNameVector.hh
+++ b/source/digits+hits/detector/include/G4CollectionNameVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CollectionNameVector.hh,v 1.1 2001/02/08 06:08:53 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CollectionNameVector.hh,v 1.1.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4CollectionNameVector_H 
diff --git a/source/digits+hits/detector/include/G4HCtable.hh b/source/digits+hits/detector/include/G4HCtable.hh
index 72b3b92491..f63a6c1695 100644
--- a/source/digits+hits/detector/include/G4HCtable.hh
+++ b/source/digits+hits/detector/include/G4HCtable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HCtable.hh,v 1.5 2001/02/08 06:07:10 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HCtable.hh,v 1.5.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4HCtable_H
diff --git a/source/digits+hits/detector/include/G4SDManager.hh b/source/digits+hits/detector/include/G4SDManager.hh
index e855b878cd..ef6eb6d8ea 100644
--- a/source/digits+hits/detector/include/G4SDManager.hh
+++ b/source/digits+hits/detector/include/G4SDManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDManager.hh,v 1.3 1999/12/15 14:49:33 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDManager.hh,v 1.3.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4SDManager_h
diff --git a/source/digits+hits/detector/include/G4SDStructure.hh b/source/digits+hits/detector/include/G4SDStructure.hh
index fea86cf6cf..02408edb74 100644
--- a/source/digits+hits/detector/include/G4SDStructure.hh
+++ b/source/digits+hits/detector/include/G4SDStructure.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDStructure.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDStructure.hh,v 1.5.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4SDStructure_h
diff --git a/source/digits+hits/detector/include/G4SDmessenger.hh b/source/digits+hits/detector/include/G4SDmessenger.hh
index 92245ec517..dd7b33f631 100644
--- a/source/digits+hits/detector/include/G4SDmessenger.hh
+++ b/source/digits+hits/detector/include/G4SDmessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDmessenger.hh,v 1.3 1999/12/15 14:49:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDmessenger.hh,v 1.3.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4SDmessenger_h
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
index 3cf8480485..b8f99fba4c 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SensitiveVolumeList.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SensitiveVolumeList.hh,v 1.5.2.2 2001/06/28 20:18:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1996
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on Hits+Digi domain
 //      object model of April 1996, S.Piperov
 //
diff --git a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
index fcfc4b43ac..b7f299dd8e 100644
--- a/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
+++ b/source/digits+hits/detector/include/G4SensitiveVolumeList.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SensitiveVolumeList.icc,v 1.4 2001/02/08 06:07:11 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SensitiveVolumeList.icc,v 1.4.2.2 2001/06/28 20:18:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------
 //      Inline functions of GEANT 4 class header file.
 //  --- Copyright CERN 1996, CERN Geneva Switzerland ---
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on Hits+Digi domain
 //      object model of April 1996, S.Piperov
 //
diff --git a/source/digits+hits/detector/include/G4VReadOutGeometry.hh b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
index c8ed91f5d9..be0724f709 100644
--- a/source/digits+hits/detector/include/G4VReadOutGeometry.hh
+++ b/source/digits+hits/detector/include/G4VReadOutGeometry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VReadOutGeometry.hh,v 1.2 1999/12/15 14:49:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VReadOutGeometry.hh,v 1.2.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/include/G4VSensitiveDetector.hh b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
index 1ee81e4798..a14af75bce 100644
--- a/source/digits+hits/detector/include/G4VSensitiveDetector.hh
+++ b/source/digits+hits/detector/include/G4VSensitiveDetector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSensitiveDetector.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSensitiveDetector.hh,v 1.5.2.1 2001/06/28 19:07:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VSensitiveDetector_h
diff --git a/source/digits+hits/detector/src/G4HCtable.cc b/source/digits+hits/detector/src/G4HCtable.cc
index 02dd1bdc5d..f97f865b67 100644
--- a/source/digits+hits/detector/src/G4HCtable.cc
+++ b/source/digits+hits/detector/src/G4HCtable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HCtable.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HCtable.cc,v 1.4.2.1 2001/06/28 19:07:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4HCtable.hh"
diff --git a/source/digits+hits/detector/src/G4SDManager.cc b/source/digits+hits/detector/src/G4SDManager.cc
index f35cea377e..af43f595ea 100644
--- a/source/digits+hits/detector/src/G4SDManager.cc
+++ b/source/digits+hits/detector/src/G4SDManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDManager.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDManager.cc,v 1.2.2.1 2001/06/28 19:07:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4SDManager.hh"
diff --git a/source/digits+hits/detector/src/G4SDStructure.cc b/source/digits+hits/detector/src/G4SDStructure.cc
index 16ca55eb8c..d4db332de3 100644
--- a/source/digits+hits/detector/src/G4SDStructure.cc
+++ b/source/digits+hits/detector/src/G4SDStructure.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDStructure.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDStructure.cc,v 1.4.2.1 2001/06/28 19:07:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4SDStructure
diff --git a/source/digits+hits/detector/src/G4SDmessenger.cc b/source/digits+hits/detector/src/G4SDmessenger.cc
index 09edf22f14..ae8d355d28 100644
--- a/source/digits+hits/detector/src/G4SDmessenger.cc
+++ b/source/digits+hits/detector/src/G4SDmessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SDmessenger.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SDmessenger.cc,v 1.2.2.1 2001/06/28 19:07:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
index 856af5b386..46dfb45d25 100644
--- a/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
+++ b/source/digits+hits/detector/src/G4SensitiveVolumeList.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SensitiveVolumeList.cc,v 1.3 2001/02/08 06:07:13 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SensitiveVolumeList.cc,v 1.3.2.2 2001/06/28 20:18:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation June'96, based on Hits+Digi
 //      domain model of April 1996, S.Piperov
 //
diff --git a/source/digits+hits/detector/src/G4VReadOutGeometry.cc b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
index ea90910414..fa9af17ac1 100644
--- a/source/digits+hits/detector/src/G4VReadOutGeometry.cc
+++ b/source/digits+hits/detector/src/G4VReadOutGeometry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VReadOutGeometry.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VReadOutGeometry.cc,v 1.3.2.1 2001/06/28 19:07:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VReadOutGeometry.hh"
diff --git a/source/digits+hits/detector/src/G4VSensitiveDetector.cc b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
index 2e4ff18463..07f8abe65d 100644
--- a/source/digits+hits/detector/src/G4VSensitiveDetector.cc
+++ b/source/digits+hits/detector/src/G4VSensitiveDetector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSensitiveDetector.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSensitiveDetector.cc,v 1.3.2.1 2001/06/28 19:07:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VSensitiveDetector
 #include "G4VSensitiveDetector.hh"
diff --git a/source/digits+hits/digits/include/G4DCofThisEvent.hh b/source/digits+hits/digits/include/G4DCofThisEvent.hh
index 6ad82bbc8e..31c2114400 100644
--- a/source/digits+hits/digits/include/G4DCofThisEvent.hh
+++ b/source/digits+hits/digits/include/G4DCofThisEvent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DCofThisEvent.hh,v 1.5 2001/02/08 06:07:13 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DCofThisEvent.hh,v 1.5.2.1 2001/06/28 19:07:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4DCofThisEvent_h
diff --git a/source/digits+hits/digits/include/G4TDigiCollection.hh b/source/digits+hits/digits/include/G4TDigiCollection.hh
index 7921b2b54d..c2288b85d7 100644
--- a/source/digits+hits/digits/include/G4TDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4TDigiCollection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TDigiCollection.hh,v 1.8 2001/02/08 06:07:13 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TDigiCollection.hh,v 1.8.2.1 2001/06/28 19:07:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4TDigiCollection_h
diff --git a/source/digits+hits/digits/include/G4VDigi.hh b/source/digits+hits/digits/include/G4VDigi.hh
index c5dc6833b0..e3af3f88c4 100644
--- a/source/digits+hits/digits/include/G4VDigi.hh
+++ b/source/digits+hits/digits/include/G4VDigi.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigi.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigi.hh,v 1.5.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VDigi_h
diff --git a/source/digits+hits/digits/include/G4VDigiCollection.hh b/source/digits+hits/digits/include/G4VDigiCollection.hh
index 5fdc8cf037..c72df5ad8c 100644
--- a/source/digits+hits/digits/include/G4VDigiCollection.hh
+++ b/source/digits+hits/digits/include/G4VDigiCollection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigiCollection.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigiCollection.hh,v 1.5.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VDigiCollection_h
diff --git a/source/digits+hits/digits/src/G4DCofThisEvent.cc b/source/digits+hits/digits/src/G4DCofThisEvent.cc
index ce949f1a5d..d2a038a45e 100644
--- a/source/digits+hits/digits/src/G4DCofThisEvent.cc
+++ b/source/digits+hits/digits/src/G4DCofThisEvent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DCofThisEvent.cc,v 1.4 2001/02/08 06:07:14 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DCofThisEvent.cc,v 1.4.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4DCofThisEvent.hh"
diff --git a/source/digits+hits/digits/src/G4TDigiCollection.cc b/source/digits+hits/digits/src/G4TDigiCollection.cc
index c81a975a28..a7b7d51df8 100644
--- a/source/digits+hits/digits/src/G4TDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4TDigiCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TDigiCollection.cc,v 1.2 1999/12/15 14:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TDigiCollection.cc,v 1.2.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4TDigiCollection.hh"
diff --git a/source/digits+hits/digits/src/G4VDigi.cc b/source/digits+hits/digits/src/G4VDigi.cc
index ca4668df71..7f582dee1a 100644
--- a/source/digits+hits/digits/src/G4VDigi.cc
+++ b/source/digits+hits/digits/src/G4VDigi.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigi.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigi.cc,v 1.4.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4VDigi
diff --git a/source/digits+hits/digits/src/G4VDigiCollection.cc b/source/digits+hits/digits/src/G4VDigiCollection.cc
index 46496d67df..c4d370da89 100644
--- a/source/digits+hits/digits/src/G4VDigiCollection.cc
+++ b/source/digits+hits/digits/src/G4VDigiCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigiCollection.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigiCollection.cc,v 1.4.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4VDigiCollection
diff --git a/source/digits+hits/hits/include/G4HCofThisEvent.hh b/source/digits+hits/hits/include/G4HCofThisEvent.hh
index 25a2b9ac5e..59785f8933 100644
--- a/source/digits+hits/hits/include/G4HCofThisEvent.hh
+++ b/source/digits+hits/hits/include/G4HCofThisEvent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HCofThisEvent.hh,v 1.5 2001/02/08 06:07:14 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HCofThisEvent.hh,v 1.5.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4HCofThisEvent_h
diff --git a/source/digits+hits/hits/include/G4THitsCollection.hh b/source/digits+hits/hits/include/G4THitsCollection.hh
index 1bb9468a37..6ba91354de 100644
--- a/source/digits+hits/hits/include/G4THitsCollection.hh
+++ b/source/digits+hits/hits/include/G4THitsCollection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4THitsCollection.hh,v 1.7 2001/02/08 06:07:14 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4THitsCollection.hh,v 1.7.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4THitsCollection_h
diff --git a/source/digits+hits/hits/include/G4VHit.hh b/source/digits+hits/hits/include/G4VHit.hh
index 83dd29a0a5..752a70de3d 100644
--- a/source/digits+hits/hits/include/G4VHit.hh
+++ b/source/digits+hits/hits/include/G4VHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHit.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHit.hh,v 1.4.2.1 2001/06/28 19:07:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VHit_h
diff --git a/source/digits+hits/hits/include/G4VHitsCollection.hh b/source/digits+hits/hits/include/G4VHitsCollection.hh
index b2030e3cf5..1b1db9f539 100644
--- a/source/digits+hits/hits/include/G4VHitsCollection.hh
+++ b/source/digits+hits/hits/include/G4VHitsCollection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHitsCollection.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHitsCollection.hh,v 1.4.2.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VHitsCollection_h
diff --git a/source/digits+hits/hits/src/G4HCofThisEvent.cc b/source/digits+hits/hits/src/G4HCofThisEvent.cc
index bd1897e3fd..302f943689 100644
--- a/source/digits+hits/hits/src/G4HCofThisEvent.cc
+++ b/source/digits+hits/hits/src/G4HCofThisEvent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HCofThisEvent.cc,v 1.4 2001/02/08 06:07:15 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HCofThisEvent.cc,v 1.4.2.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4HCofThisEvent.hh"
diff --git a/source/digits+hits/hits/src/G4THitsCollection.cc b/source/digits+hits/hits/src/G4THitsCollection.cc
index 6b83566227..e550ce53e8 100644
--- a/source/digits+hits/hits/src/G4THitsCollection.cc
+++ b/source/digits+hits/hits/src/G4THitsCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4THitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4THitsCollection.cc,v 1.2.2.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4THitsCollection.hh"
diff --git a/source/digits+hits/hits/src/G4VHit.cc b/source/digits+hits/hits/src/G4VHit.cc
index 1770c0573b..34a4badfd0 100644
--- a/source/digits+hits/hits/src/G4VHit.cc
+++ b/source/digits+hits/hits/src/G4VHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHit.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHit.cc,v 1.2.2.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4VHit
diff --git a/source/digits+hits/hits/src/G4VHitsCollection.cc b/source/digits+hits/hits/src/G4VHitsCollection.cc
index aee3f6e41c..7ebc4e40d3 100644
--- a/source/digits+hits/hits/src/G4VHitsCollection.cc
+++ b/source/digits+hits/hits/src/G4VHitsCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHitsCollection.cc,v 1.2.2.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4VHitsCollection
diff --git a/source/event/History b/source/event/History
index 9dec64c9a7..a0bce7f9e4 100644
--- a/source/event/History
+++ b/source/event/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.21 2001/02/08 06:13:53 asaim Exp $
+$Id: History,v 1.23 2001/06/28 15:07:28 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Jun 28 2001, G.Cosmo (event-V03-01-01)
+- Added CVS headers to G4GeneralParticleSource[.hh.cc] and
+  G4GeneralParticleSourceMessenger[.hh.cc].
+  Removed <CR> characters and corrected format for comments to
+  appear in the Software Reference Manual.
+
+Apr 20 2001, G.Cosmo (event-V03-01-00)
+- Modified G4GeneralParticleSource.cc according to recent migration to
+  STL vector for the geometry domain (tag "geometry-V03-01-00").
+
 Feb 8 2001, M.Asai (event-V03-00-03)
 - Migration to STL vector classes
   affected files :
diff --git a/source/event/include/G4ClassificationOfNewTrack.hh b/source/event/include/G4ClassificationOfNewTrack.hh
index 612ebffd71..1dd679597f 100644
--- a/source/event/include/G4ClassificationOfNewTrack.hh
+++ b/source/event/include/G4ClassificationOfNewTrack.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClassificationOfNewTrack.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClassificationOfNewTrack.hh,v 1.3.4.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4EvManMessenger.hh b/source/event/include/G4EvManMessenger.hh
index 55d7f6f706..6e3be58ee9 100644
--- a/source/event/include/G4EvManMessenger.hh
+++ b/source/event/include/G4EvManMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EvManMessenger.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EvManMessenger.hh,v 1.3.4.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4EvManMessenger_h
diff --git a/source/event/include/G4Event.hh b/source/event/include/G4Event.hh
index 93193e672f..da96dffe64 100644
--- a/source/event/include/G4Event.hh
+++ b/source/event/include/G4Event.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Event.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Event.hh,v 1.3.4.1 2001/06/28 19:07:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4Event_h
diff --git a/source/event/include/G4EventManager.hh b/source/event/include/G4EventManager.hh
index aae5559bd8..7c40690acb 100644
--- a/source/event/include/G4EventManager.hh
+++ b/source/event/include/G4EventManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EventManager.hh,v 1.5 2000/01/12 01:29:50 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EventManager.hh,v 1.5.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4GeneralParticleSource.hh b/source/event/include/G4GeneralParticleSource.hh
index f89f42e5ab..f2e44f906c 100644
--- a/source/event/include/G4GeneralParticleSource.hh
+++ b/source/event/include/G4GeneralParticleSource.hh
@@ -1,616 +1,639 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// MODULE:        G4GeneralParticleSource.hh
-//
-// Version:       1.1
-// Date:          18/10/00
-// Author:        C Ferguson, F Lei & P Truscott
-// Organisation:  University of Southampton / DERA
-// Customer:      ESA/ESTEC
-//
-///////////////////////////////////////////////////////////////////////////////
-//
-// DESCRIPTION
-// -----------
-// The General Particle Source is designed to extend the functionality of the
-// G4ParticleGun class. It is designed to allow specification of input
-// particles in terms of position, direction (or angular) and energy
-// distributions.  This class is derived from G4VPrimaryGenerator.
-//
-///////////////////////////////////////////////////////////////////////////////
-//
-// CHANGE HISTORY
-// --------------
-//
-// Version 1.0, 28 February 2000, C Ferguson, Created.
-//
-// Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
-// New name at the request of M. Asai.
-//
-///////////////////////////////////////////////////////////////////////////////
-//
-// MEMBER FUNCTIONS
-// ----------------
-//
-// G4GeneralParticleSource ()
-//    Constructor: Initializes variables and instantiates the 
-//                 Messenger and Navigator classes
-//
-// ~G4GeneralParticleSource ()
-//    Destructor:  deletes Messenger and prints out run information.
-//
-// void GeneratePrimaryVertex(G4Event *evt)
-//    Generate the particles initial parameters.
-//
-// void SetPosDisType(G4String)
-//    Allows user to choose Point, Plane, Surface or Volume source
-//    position distributions.
-//
-// void SetPosDisShape(G4String)
-//    Allows the user to choose the particular shape they wish for the
-//    position distribution. Choices are Square, Circle, Ellipse, Rectangle,
-//    Sphere, Ellipsoid, Cylinder, Parallelepiped.
-//
-// void SetCentreCoords(G4ThreeVector)
-//    Sets the co-ordinates of the centre of the position distribution.
-//
-// void SetPosRot1(G4ThreeVector)
-//    Used to specify the co-ordinate system for the position distribution
-//    along with SetPosRot2. SetPosRot1 sets the vector x' and need not be
-//    a unit vector.
-//
-// void SetPosRot2(G4ThreeVector)
-//    Used in connection with SetPosRot1. This sets a vector in the plane
-//    x'y'. By a series of cross products x', y', z' are generated. Again
-//    need not be a unit vector.
-// 
-// void SetHalfX(G4double)
-//    Sets the half length in x.
-//
-// void SetHalfY(G4double)
-//    Sets the half length in y.
-//
-// void SetHalfZ(G4double)
-//    Sets the half length in z.
-//
-// void SetRadius(G4double)
-//    Sets the radius where appropriate for source distribution shapes.
-//
-// void SetRadius0(G4double)
-//    Sets the inner radius where appropriate for source distribution shapes.
-//
-// void SetParAlpha(G4double)
-//    Sets the angle Alpha in the Parallelepiped shapes.
-//
-// void SetParTheta(G4double)
-//    Sets the angle Theta in the Parallelepiped shapes.
-//
-// void SetParPhi(G4double)
-//    Sets the angle Phi in the Parallelepiped shapes.
-//
-// void ConfineSourceToVolume(G4String)
-//    Used to confine the start positions to a particular volume.
-//
-// void GenerateRotationMatrices()
-//    This is used to calculate the cross products and determine the
-//    vectors x', y', z' for the position distribution.
-//
-// void GeneratePointSource()
-//    Generates a point source.
-//
-// void GeneratePointsInPlane()
-//    Generates starting positions confined to a plane source.
-//
-// void GeneratePointsOnSurface()
-//    Generates starting positions confined to the surface of a shape.
-//
-// void GeneratePointsInVolume()
-//    Generates starting positions within the volume of a shape.
-//
-// G4bool IsSourceConfined()
-//    Checks the source is confined to the requested volume. 
-//
-// Angular Distribution Methods:
-//
-// void SetAngDistType(G4String)
-//    Used to set the type of angular distribution wanted. Arguments
-//    are iso, cos and user for isotropic, cosine-law and user-defined
-//    respectively.
-//
-// void DefineAngRefAxes(G4String, G4ThreeVector)
-//    DefineAngRefAxes is used in a similar way as SetPosRot to
-//    define vectors, one x' and one in the plane x'y', to create
-//    a rotated set of axes for the angular distribution.
-//
-// void SetMinTheta(G4double)
-//    Sets the minimum value for the angle theta.
-//
-// void SetMinPhi(G4double)
-//    Sets the minimum value for phi.  
-//
-// void SetMaxTheta(G4double)
-//    Sets the maximum value for theta.
-//
-// void SetMaxPhi(G4double)
-//    Sets the maximum value for phi.
-//
-// void UserDefAngTheta(G4ThreeVector)
-//    This method allows the user to define a histogram in Theta.
-//
-// void UserDefAngPhi(G4ThreeVector)
-//    This method allows the user to define a histogram in phi.
-//
-// void GenerateIsotropicFlux()
-//    This method generates momentum vectors for particles according
-//    to an isotropic distribution.
-//
-// void GenerateCosineLawFlux()
-//    This method generates momentum vectors for particles according
-//    to a cosine-law distribution.
-//
-// void GenerateUserDefFlux()
-//    Controls generation of momentum vectors according to user-defined
-//    distributions.
-//
-// G4double GenerateUserDefTheta()
-//    Generates the theta angle according to a user-defined distribution.
-//
-// G4double GenerateUserDefPhi()
-//    Generates phi according to a user-defined distribution.
-//
-// void SetUserWRTSurface(G4bool)
-//    Allows user to have user-defined spectra either with respect to the
-//    co-ordinate system (default) or with respect to the surface normal.
-//
-// Energy Distribution methods:
-//
-// void SetEnergyDisType(G4String)
-//    Allows the user to choose the energy distribution type. The arguments
-//    are Mono (mono-energetic), Lin (linear), Pow (power-law), Exp 
-//    (exponential), Brem (bremsstrahlung), BBody (black-body), Cdg
-//    (cosmic diffuse gamma-ray), User (user-defined), Arb (arbitrary
-//    point-wise), Epn (energy per nucleon).
-//
-// void SetEmin(G4double)
-//    Sets the minimum energy.
-//
-// void SetEmax(G4double)
-//    Sets the maximum energy.
-//
-// void SetMonoEnergy(G4double)
-//    Sets energy for mono-energetic distribution.
-//
-// void SetAlpha(G4double)
-//    Sets alpha for a power-law distribution.
-//
-// void SetTemp(G4double)
-//    Sets Temperature for a Brem or BBody distributions.
-//
-// void SetEzero(G4double)
-//    Sets Ezero for an exponential distribution.
-//
-// void SetGradient(G4double)
-//    Sets gradient for a linear distribution.
-//
-// void SetInterCept(G4double)
-//    Sets intercept for a linear distribution.
-//
-// void UserEnergyHisto(G4ThreeVector)
-//    Allows user to defined a histogram for the energy distribution.
-//
-// void ArbEnergyHisto(G4ThreeVector)
-//    Allows the user to define an Arbitrary set of points for the
-//    energy distribution.
-//
-// void EpnEnergyHisto(G4ThreeVector)
-//    Allows the user to define an Energy per nucleon histogram.
-//
-// void Calculate()
-//    Controls the calculation of Integral PDF for the Cdg and BBody
-//    distributions.
-//
-// void CalculateCdgSpectrum()
-//    Calculates the integral PDF for the Cdg distribution.
-//
-// void CalculateBbodySpectrum()
-//    Calculates the Integral PDF for the Bbody distribution.
-//
-// void InputEnergySpectra(G4bool)
-//    Allows the user to choose between momentum and energy histograms
-//    for user-defined histograms and arbitrary point-wise spectr.
-//    The default is true (energy).
-//
-// void InputDifferentialSpectra(G4bool)
-//    Allows the user to choose between integral and differential 
-//    distributions when using the arbitrary point-wise option.
-//
-// void ArbInterpolate(G4String)
-//    ArbInterpolate allows the user to specify the type of function to
-//    interpolate the Arbitrary points spectrum with.
-//
-// void LinearInterpolation()
-//    Interpolates arbitrary points with a series of line segments.
-//
-// void LogInterpolation()
-//    Interpolates arbitrary points with a series of power-laws.
-//
-// void ExpInterpolation()
-//    Interpolates arbitrary points with a series of exponentials.
-//
-// void SplineInterpolation()
-//    Interpolates arbitrary points using cubic splines.
-//
-// void GenerateMonoEnergetic()
-//    Generates a mono-energetic source.
-//
-// void GenerateLinearEnergies()
-//    Generates particle energies according to a linear distribution.
-//
-// void GeneratePowEnergies()
-//    Generates particle energies according to a power-law distribution.
-//
-// void GenerateExpEnergies()
-//    Generates particle energies according to an exponential distribution.
-//
-// void GenerateBremEnergies()
-//    Generates particle energies according to a bremsstrahlung distribution.
-//
-// void GenerateBbodyEnergies()
-//    Generates particle energies according to a black-body distribution.
-//
-// void GenerateCdgEnergies()
-//    Generates particle energies according to a Cdg distribution.
-//
-// void GenUserHistEnergies()
-//    Generates particle energies according to a user-defined distribution.
-//
-// void GenEpnHistEnergies()
-//    Generates particle energies according to a energy per nucleon
-//    distribution.
-//
-// void GenArbPointEnergies()
-//    Generates particle energies according to an arbitrary point-wise
-//    spectrum.
-//
-// void ConvertEPNToEnergy()
-//    Converts energy per nucleon histograms to energy histograms.
-//
-// Biasing Methods:
-//
-// void SetXBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate x co-ordinates.
-//
-// void SetYBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate y co-ordinates.
-//
-// void SetZBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate z co-ordinates.
-//
-// void SetThetaBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate values of theta.
-//
-// void SetPhiBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate values of phi.
-//
-// void SetEnergyBias(G4ThreeVector)
-//    Allows the user to re-distribute the random
-//    numbers used to generate the energies.
-//
-// G4double GenRandX()
-//    Generates the random number for x, with or without biasing.
-//
-// G4double GenRandY()
-//    Generates the random number for y, with or without biasing.
-//
-// G4double GenRandZ()
-//    Generates the random number for z, with or without biasing.
-//
-// G4double GenRandTheta()
-//    Generates the random number for theta, with or without biasing.
-//
-// G4double GenRandPhi()
-//    Generates the random number for phi, with or without biasing.
-//
-// G4double GenRandEnergy()
-//    Generates the random number for energy, with or without biasing.
-//
-// void SetVerbosity(G4int)
-//    Sets the verbosity level.
-//
-///////////////////////////////////////////////////////////////////////////////
-//
-#include "G4VPrimaryGenerator.hh"
-#include "G4Navigator.hh"
-#include "G4PhysicsOrderedFreeVector.hh"
-#include "G4ParticleMomentum.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4DataInterpolation.hh"
-
-#include "G4GeneralParticleSourceMessenger.hh"
-
-class G4GeneralParticleSource : public G4VPrimaryGenerator
-{
-public:
-  G4GeneralParticleSource (); 
-  ~G4GeneralParticleSource ();
-  void GeneratePrimaryVertex(G4Event *evt);
-
-  // methods to create source position dist.
-  void SetPosDisType(G4String); // Point, Plane, Surface, Volume
-  inline G4String GetPosDisType()
-  { return SourcePosType; }
-  void SetPosDisShape(G4String);
-  inline G4String GetPosDisShape()
-  { return Shape; }
-  // SetPosDisShape - Square, Circle, Annulus, Ellipse, Rectangle, Sphere,
-  // Ellipsoid, Cylinder, Right (parallelepiped).
-  void SetCentreCoords(G4ThreeVector);
-  inline G4ThreeVector GetCentreCoords()
-  { return CentreCoords; }
-  void SetPosRot1(G4ThreeVector); 
-  void SetPosRot2(G4ThreeVector); 
-  void SetHalfX(G4double);
-  inline G4double GetHalfX()
-  { return halfx; }
-  void SetHalfY(G4double);
-  inline G4double GetHalfY()
-  { return halfy; }
-  void SetHalfZ(G4double);
-  inline G4double GetHalfZ()
-  { return halfz; }
-  void SetRadius(G4double);
-  inline G4double GetRadius()
-  { return Radius; }
-  void SetRadius0(G4double);
-  void SetParAlpha(G4double);
-  void SetParTheta(G4double);
-  void SetParPhi(G4double);
-  void ConfineSourceToVolume(G4String);
-  void GenerateRotationMatrices();
-  // the following routines generate the source position
-  void GeneratePointSource();
-  void GeneratePointsInPlane();
-  void GeneratePointsOnSurface();
-  void GeneratePointsInVolume();
-
-  G4bool IsSourceConfined();
-
-  // Angular Distribution Methods
-  void SetAngDistType(G4String);
-  void DefineAngRefAxes(G4String, G4ThreeVector);
-  void SetMinTheta(G4double);
-  void SetMinPhi(G4double);
-  void SetMaxTheta(G4double);
-  void SetMaxPhi(G4double);
-  void UserDefAngTheta(G4ThreeVector);
-  void UserDefAngPhi(G4ThreeVector);
-  // These methods generate the momentum vectors for the particles.
-  void GenerateIsotropicFlux();
-  void GenerateCosineLawFlux();
-  void GenerateUserDefFlux();
-  G4double GenerateUserDefTheta();
-  G4double GenerateUserDefPhi();
-  void SetUserWRTSurface(G4bool);
-
-  // Energy Distribution methods
-  void SetEnergyDisType(G4String);
-  inline G4String GetEnergyDisType()
-  {return EnergyDisType;}
-  void SetEmin(G4double);
-  inline G4double GetEmin()
-  {return Emin;}
-  inline G4double GetArbEmin()
-  {return ArbEmin;}
-  void SetEmax(G4double);
-  inline G4double GetEmax()
-  {return Emax;}
-  inline G4double GetArbEmax()
-  {return ArbEmax;}
-  void SetMonoEnergy(G4double);
-  void SetAlpha(G4double);
-  void SetTemp(G4double);
-  void SetEzero(G4double);
-  void SetGradient(G4double);
-  void SetInterCept(G4double);
-  void UserEnergyHisto(G4ThreeVector);
-  void ArbEnergyHisto(G4ThreeVector);
-  void EpnEnergyHisto(G4ThreeVector);
-  void Calculate();
-  void CalculateCdgSpectrum(); 
-  void CalculateBbodySpectrum();
-  void InputEnergySpectra(G4bool);
-  void InputDifferentialSpectra(G4bool);
-  void ArbInterpolate(G4String);
-  inline G4String GetIntType()
-  {return IntType;}
-  void LinearInterpolation();
-  void LogInterpolation();
-  void ExpInterpolation();
-  void SplineInterpolation();
-  // The following methods generate energies according to the spectral
-  // parameters defined above.
-  void GenerateMonoEnergetic();
-  void GenerateLinearEnergies();
-  void GeneratePowEnergies();
-  void GenerateExpEnergies();
-  void GenerateBremEnergies();
-  void GenerateBbodyEnergies();
-  void GenerateCdgEnergies();
-  void GenUserHistEnergies();
-  void GenEpnHistEnergies();
-  void GenArbPointEnergies();
-  // converts energy per nucleon to energy.
-  void ConvertEPNToEnergy();
-
-  // Biasing Methods 
-  void SetXBias(G4ThreeVector);
-  void SetYBias(G4ThreeVector);
-  void SetZBias(G4ThreeVector);
-  void SetThetaBias(G4ThreeVector);
-  void SetPhiBias(G4ThreeVector);
-  void SetEnergyBias(G4ThreeVector);
-  G4double GenRandX();
-  G4double GenRandY();
-  G4double GenRandZ();
-  G4double GenRandTheta();
-  G4double GenRandPhi();
-  G4double GenRandEnergy();
-
-  // Set the verbosity level.
-  void SetVerbosity(G4int);
-
-  // Set the particle species
-  void SetParticleDefinition (G4ParticleDefinition * aParticleDefinition);
-  inline G4ParticleDefinition * GetParticleDefinition ()
-  {return particle_definition;}
-
-  // SR1.3 - allowing user to define an isotope by A,Z,energy.
-  //  void  SetNucleus(Nucleus theIon1); // Sets the isotope.
-  //inline Nucleus GetNucleus() {return theIon;} // Returns the isotope.
-
-  inline void SetParticleCharge(G4double aCharge)
-  { particle_charge = aCharge; }
-
-  // Set polarization
-  inline void SetParticlePolarization (G4ThreeVector aVal)
-  {particle_polarization = aVal;}
-  inline G4ThreeVector GetParticlePolarization ()
-  {return particle_polarization;}
-
-  // Set Time.
-  inline void SetParticleTime(G4double aTime)
-  { particle_time = aTime; }
-  inline G4double GetParticleTime()
-  { return particle_time; }
-
-  inline void SetNumberOfParticles(G4int i)
-  { NumberOfParticlesToBeGenerated = i; }
-  inline G4int GetNumberOfParticles()
-  { return NumberOfParticlesToBeGenerated; }
-
-  inline G4ThreeVector GetParticlePosition()
-  { return particle_position;}
-  
-  inline G4ThreeVector GetParticleMomentumDirection()
-  { return particle_momentum_direction;}
-
-  inline G4double GetTheta()
-  { return Theta;}
-  
-  inline G4double GetPhi()
-  { return Phi;}
-
-  inline G4double GetParticleEnergy()
-  {return particle_energy;}
-
-private:
-
-  // Position distribution Variables
-  G4String SourcePosType; //Point,Plane,Surface,Volume
-  G4String Shape; //Circle,Square,Rectangle etc..
-  G4double halfx, halfy, halfz; //half lengths
-  G4double Radius; //Radius for circles or spheres
-  G4double Radius0; // The inner radius of an annulus
-  G4ThreeVector CentreCoords; // Coords of centre of input shape
-  G4ThreeVector Rotx, Roty, Rotz; // Unit vectors defining rotation matrix
-  G4double ParAlpha, ParTheta, ParPhi; //Angle for Right Parallellepipeds
-  G4bool Confine; //If true confines source distribution to VolName
-  G4String VolName;
-  G4ThreeVector SideRefVec1,SideRefVec2,SideRefVec3; //Side rotation matrices
-
-  // Angular distribution variables.
-  G4String AngDistType; // String to hold Ang dist type iso, cos, user
-  G4ThreeVector AngRef1, AngRef2, AngRef3; // Reference axes for ang dist
-  G4double MinTheta, MaxTheta, MinPhi, MaxPhi; // min/max theta/phi
-  G4double Theta, Phi; // Store these for use with DEBUG
-  G4bool IPDFThetaExist, IPDFPhiExist; // tell whether IPDF histos exist
-  G4PhysicsOrderedFreeVector UDefThetaH; // Theta histo data
-  G4PhysicsOrderedFreeVector IPDFThetaH; //Cumulative Theta histogram.
-  G4PhysicsOrderedFreeVector UDefPhiH; // Phi histo bins
-  G4PhysicsOrderedFreeVector IPDFPhiH; // Cumulative phi histogram.
-  G4String UserDistType; //String to hold user distributions
-  G4bool UserWRTSurface; // G4bool to tell whether user wants distribution wrt
-                       // surface normals or co-ordinate system
-
-  // Energy Distribution variables
-  G4String EnergyDisType; // energy dis type Variable  - Mono,Lin,Exp,etc
-  G4double MonoEnergy; //Mono-energteic energy
-  G4double Emin, Emax; // emin and emax
-  G4double alpha, Ezero, Temp; // alpha (pow), E0 (exp) and Temp (bbody,brem)
-  G4double grad, cept; // gradient and intercept for linear spectra
-  G4bool EnergySpec; // true - energy spectra, false - momentum spectra
-  G4bool DiffSpec;  // true - differential spec, false integral spec
-  G4bool ApplyRig; // false no rigidity cutoff, true then apply one
-  G4double ERig; // energy of rigidity cutoff
-  G4PhysicsOrderedFreeVector UDefEnergyH; // energy hist data
-  G4PhysicsOrderedFreeVector IPDFEnergyH;  
-  G4bool IPDFEnergyExist, IPDFArbExist, Epnflag;
-  G4PhysicsOrderedFreeVector ArbEnergyH; // Arb x,y histogram
-  G4PhysicsOrderedFreeVector IPDFArbEnergyH; // IPDF for Arb
-  G4PhysicsOrderedFreeVector EpnEnergyH; 
-  G4double CDGhist[3]; // cumulative histo for cdg
-  G4double BBHist[10001], Bbody_x[10001];
-  G4String IntType; // Interpolation type
-  G4double Arb_grad[256], Arb_cept[256]; // grad and cept for 256 segments
-  G4double Arb_alpha[256], Arb_Const[256]; // alpha and constants
-  G4double Arb_ezero[256]; // ezero
-  G4double ArbEmin, ArbEmax; // Emin and Emax for the whole arb distribution
-  //use primarily for debug.
-
-  // Bias variables
-  G4bool XBias, IPDFXBias;
-  G4PhysicsOrderedFreeVector XBiasH;
-  G4PhysicsOrderedFreeVector IPDFXBiasH;
-  G4bool YBias, IPDFYBias;
-  G4PhysicsOrderedFreeVector YBiasH;
-  G4PhysicsOrderedFreeVector IPDFYBiasH;
-  G4bool ZBias, IPDFZBias;
-  G4PhysicsOrderedFreeVector ZBiasH;
-  G4PhysicsOrderedFreeVector IPDFZBiasH;
-  G4bool ThetaBias, IPDFThetaBias;
-  G4PhysicsOrderedFreeVector ThetaBiasH;
-  G4PhysicsOrderedFreeVector IPDFThetaBiasH;
-  G4bool PhiBias, IPDFPhiBias;
-  G4PhysicsOrderedFreeVector PhiBiasH;
-  G4PhysicsOrderedFreeVector IPDFPhiBiasH;
-  G4bool EnergyBias, IPDFEnergyBias;
-  G4PhysicsOrderedFreeVector EnergyBiasH;
-  G4PhysicsOrderedFreeVector IPDFEnergyBiasH;
-  G4double bweights[6], bweight; //record x,y,z,theta,phi,energy weights
-
-  // Other particle properties
-  G4int                  NumberOfParticlesToBeGenerated;
-  G4ParticleDefinition * particle_definition;
-  G4ParticleMomentum     particle_momentum_direction;
-  G4double               particle_energy;
-  G4double               particle_charge;
-  G4ThreeVector          particle_position;
-  G4double               particle_time;
-  G4ThreeVector          particle_polarization;
-
-  // Verbosity
-  G4int verbosityLevel;
-
-private:
-
-  G4DataInterpolation *SplineInt; // holds Spline stuff
-
-  G4GeneralParticleSourceMessenger *theMessenger;
-  G4Navigator *gNavigator;
-
-  //  Nucleus theIon;
-  
-};
-
-
-
-
-
-
-
-
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+// MODULE:        G4GeneralParticleSource.hh
+//
+// Version:       1.1
+// Date:          18/10/00
+// Author:        C Ferguson, F Lei & P Truscott
+// Organisation:  University of Southampton / DERA
+// Customer:      ESA/ESTEC
+//
+///////////////////////////////////////////////////////////////////////////////
+// $Id: G4GeneralParticleSource.hh,v 1.3 2001/06/29 08:05:59 gcosmo Exp $
+// GEANT4 tag $Name: event-V03-01-01 $
+///////////////////////////////////////////////////////////////////////////////
+//
+// Class Description:
+//
+// The General Particle Source is designed to extend the functionality of the
+// G4ParticleGun class. It is designed to allow specification of input
+// particles in terms of position, direction (or angular) and energy
+// distributions.  This class is derived from G4VPrimaryGenerator.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+// MEMBER FUNCTIONS
+// ----------------
+//
+// G4GeneralParticleSource ()
+//    Constructor: Initializes variables and instantiates the 
+//                 Messenger and Navigator classes
+//
+// ~G4GeneralParticleSource ()
+//    Destructor:  deletes Messenger and prints out run information.
+//
+// void GeneratePrimaryVertex(G4Event *evt)
+//    Generate the particles initial parameters.
+//
+// void SetPosDisType(G4String)
+//    Allows user to choose Point, Plane, Surface or Volume source
+//    position distributions.
+//
+// void SetPosDisShape(G4String)
+//    Allows the user to choose the particular shape they wish for the
+//    position distribution. Choices are Square, Circle, Ellipse, Rectangle,
+//    Sphere, Ellipsoid, Cylinder, Parallelepiped.
+//
+// void SetCentreCoords(G4ThreeVector)
+//    Sets the co-ordinates of the centre of the position distribution.
+//
+// void SetPosRot1(G4ThreeVector)
+//    Used to specify the co-ordinate system for the position distribution
+//    along with SetPosRot2. SetPosRot1 sets the vector x' and need not be
+//    a unit vector.
+//
+// void SetPosRot2(G4ThreeVector)
+//    Used in connection with SetPosRot1. This sets a vector in the plane
+//    x'y'. By a series of cross products x', y', z' are generated. Again
+//    need not be a unit vector.
+// 
+// void SetHalfX(G4double)
+//    Sets the half length in x.
+//
+// void SetHalfY(G4double)
+//    Sets the half length in y.
+//
+// void SetHalfZ(G4double)
+//    Sets the half length in z.
+//
+// void SetRadius(G4double)
+//    Sets the radius where appropriate for source distribution shapes.
+//
+// void SetRadius0(G4double)
+//    Sets the inner radius where appropriate for source distribution shapes.
+//
+// void SetParAlpha(G4double)
+//    Sets the angle Alpha in the Parallelepiped shapes.
+//
+// void SetParTheta(G4double)
+//    Sets the angle Theta in the Parallelepiped shapes.
+//
+// void SetParPhi(G4double)
+//    Sets the angle Phi in the Parallelepiped shapes.
+//
+// void ConfineSourceToVolume(G4String)
+//    Used to confine the start positions to a particular volume.
+//
+// void GenerateRotationMatrices()
+//    This is used to calculate the cross products and determine the
+//    vectors x', y', z' for the position distribution.
+//
+// void GeneratePointSource()
+//    Generates a point source.
+//
+// void GeneratePointsInPlane()
+//    Generates starting positions confined to a plane source.
+//
+// void GeneratePointsOnSurface()
+//    Generates starting positions confined to the surface of a shape.
+//
+// void GeneratePointsInVolume()
+//    Generates starting positions within the volume of a shape.
+//
+// G4bool IsSourceConfined()
+//    Checks the source is confined to the requested volume. 
+//
+// Angular Distribution Methods:
+//
+// void SetAngDistType(G4String)
+//    Used to set the type of angular distribution wanted. Arguments
+//    are iso, cos and user for isotropic, cosine-law and user-defined
+//    respectively.
+//
+// void DefineAngRefAxes(G4String, G4ThreeVector)
+//    DefineAngRefAxes is used in a similar way as SetPosRot to
+//    define vectors, one x' and one in the plane x'y', to create
+//    a rotated set of axes for the angular distribution.
+//
+// void SetMinTheta(G4double)
+//    Sets the minimum value for the angle theta.
+//
+// void SetMinPhi(G4double)
+//    Sets the minimum value for phi.  
+//
+// void SetMaxTheta(G4double)
+//    Sets the maximum value for theta.
+//
+// void SetMaxPhi(G4double)
+//    Sets the maximum value for phi.
+//
+// void UserDefAngTheta(G4ThreeVector)
+//    This method allows the user to define a histogram in Theta.
+//
+// void UserDefAngPhi(G4ThreeVector)
+//    This method allows the user to define a histogram in phi.
+//
+// void GenerateIsotropicFlux()
+//    This method generates momentum vectors for particles according
+//    to an isotropic distribution.
+//
+// void GenerateCosineLawFlux()
+//    This method generates momentum vectors for particles according
+//    to a cosine-law distribution.
+//
+// void GenerateUserDefFlux()
+//    Controls generation of momentum vectors according to user-defined
+//    distributions.
+//
+// G4double GenerateUserDefTheta()
+//    Generates the theta angle according to a user-defined distribution.
+//
+// G4double GenerateUserDefPhi()
+//    Generates phi according to a user-defined distribution.
+//
+// void SetUserWRTSurface(G4bool)
+//    Allows user to have user-defined spectra either with respect to the
+//    co-ordinate system (default) or with respect to the surface normal.
+//
+// Energy Distribution methods:
+//
+// void SetEnergyDisType(G4String)
+//    Allows the user to choose the energy distribution type. The arguments
+//    are Mono (mono-energetic), Lin (linear), Pow (power-law), Exp 
+//    (exponential), Brem (bremsstrahlung), BBody (black-body), Cdg
+//    (cosmic diffuse gamma-ray), User (user-defined), Arb (arbitrary
+//    point-wise), Epn (energy per nucleon).
+//
+// void SetEmin(G4double)
+//    Sets the minimum energy.
+//
+// void SetEmax(G4double)
+//    Sets the maximum energy.
+//
+// void SetMonoEnergy(G4double)
+//    Sets energy for mono-energetic distribution.
+//
+// void SetAlpha(G4double)
+//    Sets alpha for a power-law distribution.
+//
+// void SetTemp(G4double)
+//    Sets Temperature for a Brem or BBody distributions.
+//
+// void SetEzero(G4double)
+//    Sets Ezero for an exponential distribution.
+//
+// void SetGradient(G4double)
+//    Sets gradient for a linear distribution.
+//
+// void SetInterCept(G4double)
+//    Sets intercept for a linear distribution.
+//
+// void UserEnergyHisto(G4ThreeVector)
+//    Allows user to defined a histogram for the energy distribution.
+//
+// void ArbEnergyHisto(G4ThreeVector)
+//    Allows the user to define an Arbitrary set of points for the
+//    energy distribution.
+//
+// void EpnEnergyHisto(G4ThreeVector)
+//    Allows the user to define an Energy per nucleon histogram.
+//
+// void Calculate()
+//    Controls the calculation of Integral PDF for the Cdg and BBody
+//    distributions.
+//
+// void CalculateCdgSpectrum()
+//    Calculates the integral PDF for the Cdg distribution.
+//
+// void CalculateBbodySpectrum()
+//    Calculates the Integral PDF for the Bbody distribution.
+//
+// void InputEnergySpectra(G4bool)
+//    Allows the user to choose between momentum and energy histograms
+//    for user-defined histograms and arbitrary point-wise spectr.
+//    The default is true (energy).
+//
+// void InputDifferentialSpectra(G4bool)
+//    Allows the user to choose between integral and differential 
+//    distributions when using the arbitrary point-wise option.
+//
+// void ArbInterpolate(G4String)
+//    ArbInterpolate allows the user to specify the type of function to
+//    interpolate the Arbitrary points spectrum with.
+//
+// void LinearInterpolation()
+//    Interpolates arbitrary points with a series of line segments.
+//
+// void LogInterpolation()
+//    Interpolates arbitrary points with a series of power-laws.
+//
+// void ExpInterpolation()
+//    Interpolates arbitrary points with a series of exponentials.
+//
+// void SplineInterpolation()
+//    Interpolates arbitrary points using cubic splines.
+//
+// void GenerateMonoEnergetic()
+//    Generates a mono-energetic source.
+//
+// void GenerateLinearEnergies()
+//    Generates particle energies according to a linear distribution.
+//
+// void GeneratePowEnergies()
+//    Generates particle energies according to a power-law distribution.
+//
+// void GenerateExpEnergies()
+//    Generates particle energies according to an exponential distribution.
+//
+// void GenerateBremEnergies()
+//    Generates particle energies according to a bremsstrahlung distribution.
+//
+// void GenerateBbodyEnergies()
+//    Generates particle energies according to a black-body distribution.
+//
+// void GenerateCdgEnergies()
+//    Generates particle energies according to a Cdg distribution.
+//
+// void GenUserHistEnergies()
+//    Generates particle energies according to a user-defined distribution.
+//
+// void GenEpnHistEnergies()
+//    Generates particle energies according to a energy per nucleon
+//    distribution.
+//
+// void GenArbPointEnergies()
+//    Generates particle energies according to an arbitrary point-wise
+//    spectrum.
+//
+// void ConvertEPNToEnergy()
+//    Converts energy per nucleon histograms to energy histograms.
+//
+// Biasing Methods:
+//
+// void SetXBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate x co-ordinates.
+//
+// void SetYBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate y co-ordinates.
+//
+// void SetZBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate z co-ordinates.
+//
+// void SetThetaBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate values of theta.
+//
+// void SetPhiBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate values of phi.
+//
+// void SetEnergyBias(G4ThreeVector)
+//    Allows the user to re-distribute the random
+//    numbers used to generate the energies.
+//
+// G4double GenRandX()
+//    Generates the random number for x, with or without biasing.
+//
+// G4double GenRandY()
+//    Generates the random number for y, with or without biasing.
+//
+// G4double GenRandZ()
+//    Generates the random number for z, with or without biasing.
+//
+// G4double GenRandTheta()
+//    Generates the random number for theta, with or without biasing.
+//
+// G4double GenRandPhi()
+//    Generates the random number for phi, with or without biasing.
+//
+// G4double GenRandEnergy()
+//    Generates the random number for energy, with or without biasing.
+//
+// void SetVerbosity(G4int)
+//    Sets the verbosity level.
+
+///////////////////////////////////////////////////////////////////////////////
+//
+//
+// CHANGE HISTORY
+// --------------
+//
+// Version 1.0, 28 February 2000, C Ferguson, Created.
+//
+// Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
+// New name at the request of M. Asai.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+#ifndef G4GeneralParticleSource_h
+#define G4GeneralParticleSource_h 1
+
+#include "G4VPrimaryGenerator.hh"
+#include "G4Navigator.hh"
+#include "G4PhysicsOrderedFreeVector.hh"
+#include "G4ParticleMomentum.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4DataInterpolation.hh"
+
+#include "G4GeneralParticleSourceMessenger.hh"
+
+class G4GeneralParticleSource : public G4VPrimaryGenerator
+{
+public:
+  G4GeneralParticleSource (); 
+  ~G4GeneralParticleSource ();
+  void GeneratePrimaryVertex(G4Event *evt);
+
+  // methods to create source position dist.
+  void SetPosDisType(G4String); // Point, Plane, Surface, Volume
+  inline G4String GetPosDisType()
+  { return SourcePosType; }
+  void SetPosDisShape(G4String);
+  inline G4String GetPosDisShape()
+  { return Shape; }
+  // SetPosDisShape - Square, Circle, Annulus, Ellipse, Rectangle, Sphere,
+  // Ellipsoid, Cylinder, Right (parallelepiped).
+  void SetCentreCoords(G4ThreeVector);
+  inline G4ThreeVector GetCentreCoords()
+  { return CentreCoords; }
+  void SetPosRot1(G4ThreeVector); 
+  void SetPosRot2(G4ThreeVector); 
+  void SetHalfX(G4double);
+  inline G4double GetHalfX()
+  { return halfx; }
+  void SetHalfY(G4double);
+  inline G4double GetHalfY()
+  { return halfy; }
+  void SetHalfZ(G4double);
+  inline G4double GetHalfZ()
+  { return halfz; }
+  void SetRadius(G4double);
+  inline G4double GetRadius()
+  { return Radius; }
+  void SetRadius0(G4double);
+  void SetParAlpha(G4double);
+  void SetParTheta(G4double);
+  void SetParPhi(G4double);
+  void ConfineSourceToVolume(G4String);
+  void GenerateRotationMatrices();
+  // the following routines generate the source position
+  void GeneratePointSource();
+  void GeneratePointsInPlane();
+  void GeneratePointsOnSurface();
+  void GeneratePointsInVolume();
+
+  G4bool IsSourceConfined();
+
+  // Angular Distribution Methods
+  void SetAngDistType(G4String);
+  void DefineAngRefAxes(G4String, G4ThreeVector);
+  void SetMinTheta(G4double);
+  void SetMinPhi(G4double);
+  void SetMaxTheta(G4double);
+  void SetMaxPhi(G4double);
+  void UserDefAngTheta(G4ThreeVector);
+  void UserDefAngPhi(G4ThreeVector);
+  // These methods generate the momentum vectors for the particles.
+  void GenerateIsotropicFlux();
+  void GenerateCosineLawFlux();
+  void GenerateUserDefFlux();
+  G4double GenerateUserDefTheta();
+  G4double GenerateUserDefPhi();
+  void SetUserWRTSurface(G4bool);
+
+  // Energy Distribution methods
+  void SetEnergyDisType(G4String);
+  inline G4String GetEnergyDisType()
+  {return EnergyDisType;}
+  void SetEmin(G4double);
+  inline G4double GetEmin()
+  {return Emin;}
+  inline G4double GetArbEmin()
+  {return ArbEmin;}
+  void SetEmax(G4double);
+  inline G4double GetEmax()
+  {return Emax;}
+  inline G4double GetArbEmax()
+  {return ArbEmax;}
+  void SetMonoEnergy(G4double);
+  void SetAlpha(G4double);
+  void SetTemp(G4double);
+  void SetEzero(G4double);
+  void SetGradient(G4double);
+  void SetInterCept(G4double);
+  void UserEnergyHisto(G4ThreeVector);
+  void ArbEnergyHisto(G4ThreeVector);
+  void EpnEnergyHisto(G4ThreeVector);
+  void Calculate();
+  void CalculateCdgSpectrum(); 
+  void CalculateBbodySpectrum();
+  void InputEnergySpectra(G4bool);
+  void InputDifferentialSpectra(G4bool);
+  void ArbInterpolate(G4String);
+  inline G4String GetIntType()
+  {return IntType;}
+  void LinearInterpolation();
+  void LogInterpolation();
+  void ExpInterpolation();
+  void SplineInterpolation();
+  // The following methods generate energies according to the spectral
+  // parameters defined above.
+  void GenerateMonoEnergetic();
+  void GenerateLinearEnergies();
+  void GeneratePowEnergies();
+  void GenerateExpEnergies();
+  void GenerateBremEnergies();
+  void GenerateBbodyEnergies();
+  void GenerateCdgEnergies();
+  void GenUserHistEnergies();
+  void GenEpnHistEnergies();
+  void GenArbPointEnergies();
+  // converts energy per nucleon to energy.
+  void ConvertEPNToEnergy();
+
+  // Biasing Methods 
+  void SetXBias(G4ThreeVector);
+  void SetYBias(G4ThreeVector);
+  void SetZBias(G4ThreeVector);
+  void SetThetaBias(G4ThreeVector);
+  void SetPhiBias(G4ThreeVector);
+  void SetEnergyBias(G4ThreeVector);
+  G4double GenRandX();
+  G4double GenRandY();
+  G4double GenRandZ();
+  G4double GenRandTheta();
+  G4double GenRandPhi();
+  G4double GenRandEnergy();
+
+  // Set the verbosity level.
+  void SetVerbosity(G4int);
+
+  // Set the particle species
+  void SetParticleDefinition (G4ParticleDefinition * aParticleDefinition);
+  inline G4ParticleDefinition * GetParticleDefinition ()
+  {return particle_definition;}
+
+  // SR1.3 - allowing user to define an isotope by A,Z,energy.
+  //  void  SetNucleus(Nucleus theIon1); // Sets the isotope.
+  //inline Nucleus GetNucleus() {return theIon;} // Returns the isotope.
+
+  inline void SetParticleCharge(G4double aCharge)
+  { particle_charge = aCharge; }
+
+  // Set polarization
+  inline void SetParticlePolarization (G4ThreeVector aVal)
+  {particle_polarization = aVal;}
+  inline G4ThreeVector GetParticlePolarization ()
+  {return particle_polarization;}
+
+  // Set Time.
+  inline void SetParticleTime(G4double aTime)
+  { particle_time = aTime; }
+  inline G4double GetParticleTime()
+  { return particle_time; }
+
+  inline void SetNumberOfParticles(G4int i)
+  { NumberOfParticlesToBeGenerated = i; }
+  inline G4int GetNumberOfParticles()
+  { return NumberOfParticlesToBeGenerated; }
+
+  inline G4ThreeVector GetParticlePosition()
+  { return particle_position;}
+  
+  inline G4ThreeVector GetParticleMomentumDirection()
+  { return particle_momentum_direction;}
+
+  inline G4double GetTheta()
+  { return Theta;}
+  
+  inline G4double GetPhi()
+  { return Phi;}
+
+  inline G4double GetParticleEnergy()
+  {return particle_energy;}
+
+private:
+
+  // Position distribution Variables
+  G4String SourcePosType; //Point,Plane,Surface,Volume
+  G4String Shape; //Circle,Square,Rectangle etc..
+  G4double halfx, halfy, halfz; //half lengths
+  G4double Radius; //Radius for circles or spheres
+  G4double Radius0; // The inner radius of an annulus
+  G4ThreeVector CentreCoords; // Coords of centre of input shape
+  G4ThreeVector Rotx, Roty, Rotz; // Unit vectors defining rotation matrix
+  G4double ParAlpha, ParTheta, ParPhi; //Angle for Right Parallellepipeds
+  G4bool Confine; //If true confines source distribution to VolName
+  G4String VolName;
+  G4ThreeVector SideRefVec1,SideRefVec2,SideRefVec3; //Side rotation matrices
+
+  // Angular distribution variables.
+  G4String AngDistType; // String to hold Ang dist type iso, cos, user
+  G4ThreeVector AngRef1, AngRef2, AngRef3; // Reference axes for ang dist
+  G4double MinTheta, MaxTheta, MinPhi, MaxPhi; // min/max theta/phi
+  G4double Theta, Phi; // Store these for use with DEBUG
+  G4bool IPDFThetaExist, IPDFPhiExist; // tell whether IPDF histos exist
+  G4PhysicsOrderedFreeVector UDefThetaH; // Theta histo data
+  G4PhysicsOrderedFreeVector IPDFThetaH; //Cumulative Theta histogram.
+  G4PhysicsOrderedFreeVector UDefPhiH; // Phi histo bins
+  G4PhysicsOrderedFreeVector IPDFPhiH; // Cumulative phi histogram.
+  G4String UserDistType; //String to hold user distributions
+  G4bool UserWRTSurface; // G4bool to tell whether user wants distribution wrt
+                       // surface normals or co-ordinate system
+
+  // Energy Distribution variables
+  G4String EnergyDisType; // energy dis type Variable  - Mono,Lin,Exp,etc
+  G4double MonoEnergy; //Mono-energteic energy
+  G4double Emin, Emax; // emin and emax
+  G4double alpha, Ezero, Temp; // alpha (pow), E0 (exp) and Temp (bbody,brem)
+  G4double grad, cept; // gradient and intercept for linear spectra
+  G4bool EnergySpec; // true - energy spectra, false - momentum spectra
+  G4bool DiffSpec;  // true - differential spec, false integral spec
+  G4bool ApplyRig; // false no rigidity cutoff, true then apply one
+  G4double ERig; // energy of rigidity cutoff
+  G4PhysicsOrderedFreeVector UDefEnergyH; // energy hist data
+  G4PhysicsOrderedFreeVector IPDFEnergyH;  
+  G4bool IPDFEnergyExist, IPDFArbExist, Epnflag;
+  G4PhysicsOrderedFreeVector ArbEnergyH; // Arb x,y histogram
+  G4PhysicsOrderedFreeVector IPDFArbEnergyH; // IPDF for Arb
+  G4PhysicsOrderedFreeVector EpnEnergyH; 
+  G4double CDGhist[3]; // cumulative histo for cdg
+  G4double BBHist[10001], Bbody_x[10001];
+  G4String IntType; // Interpolation type
+  G4double Arb_grad[256], Arb_cept[256]; // grad and cept for 256 segments
+  G4double Arb_alpha[256], Arb_Const[256]; // alpha and constants
+  G4double Arb_ezero[256]; // ezero
+  G4double ArbEmin, ArbEmax; // Emin and Emax for the whole arb distribution
+  //use primarily for debug.
+
+  // Bias variables
+  G4bool XBias, IPDFXBias;
+  G4PhysicsOrderedFreeVector XBiasH;
+  G4PhysicsOrderedFreeVector IPDFXBiasH;
+  G4bool YBias, IPDFYBias;
+  G4PhysicsOrderedFreeVector YBiasH;
+  G4PhysicsOrderedFreeVector IPDFYBiasH;
+  G4bool ZBias, IPDFZBias;
+  G4PhysicsOrderedFreeVector ZBiasH;
+  G4PhysicsOrderedFreeVector IPDFZBiasH;
+  G4bool ThetaBias, IPDFThetaBias;
+  G4PhysicsOrderedFreeVector ThetaBiasH;
+  G4PhysicsOrderedFreeVector IPDFThetaBiasH;
+  G4bool PhiBias, IPDFPhiBias;
+  G4PhysicsOrderedFreeVector PhiBiasH;
+  G4PhysicsOrderedFreeVector IPDFPhiBiasH;
+  G4bool EnergyBias, IPDFEnergyBias;
+  G4PhysicsOrderedFreeVector EnergyBiasH;
+  G4PhysicsOrderedFreeVector IPDFEnergyBiasH;
+  G4double bweights[6], bweight; //record x,y,z,theta,phi,energy weights
+
+  // Other particle properties
+  G4int                  NumberOfParticlesToBeGenerated;
+  G4ParticleDefinition * particle_definition;
+  G4ParticleMomentum     particle_momentum_direction;
+  G4double               particle_energy;
+  G4double               particle_charge;
+  G4ThreeVector          particle_position;
+  G4double               particle_time;
+  G4ThreeVector          particle_polarization;
+
+  // Verbosity
+  G4int verbosityLevel;
+
+private:
+
+  G4DataInterpolation *SplineInt; // holds Spline stuff
+
+  G4GeneralParticleSourceMessenger *theMessenger;
+  G4Navigator *gNavigator;
+
+  //  Nucleus theIon;
+  
+};
+
+#endif
diff --git a/source/event/include/G4GeneralParticleSourceMessenger.hh b/source/event/include/G4GeneralParticleSourceMessenger.hh
index 804d96bb58..e6bdc6ee35 100644
--- a/source/event/include/G4GeneralParticleSourceMessenger.hh
+++ b/source/event/include/G4GeneralParticleSourceMessenger.hh
@@ -1,5 +1,25 @@
-#ifndef G4GeneralParticleSourceMessenger_h
-#define G4GeneralParticleSourceMessenger_h 1
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 ///////////////////////////////////////////////////////////////////////////////
 //
 // MODULE:       G4GeneralParticleSourceMessenger.hh
@@ -11,9 +31,11 @@
 // Customer:     ESA/ESTEC
 //
 ///////////////////////////////////////////////////////////////////////////////
+// $Id: G4GeneralParticleSourceMessenger.hh,v 1.3 2001/06/29 08:06:00 gcosmo Exp $
+// GEANT4 tag $Name: event-V03-01-01 $
+///////////////////////////////////////////////////////////////////////////////
 //
-// DESCRIPTION
-// -----------
+// Class Description:
 //
 // The function of the G4GeneralParticleSourceMessenger is to allow the user to
 // enter commands either in interactive command line mode or through macros to
@@ -22,16 +44,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 //
-// CHANGE HISTORY
-// --------------
-//
-// Version 1.0, 28 February 2000, C Ferguson, Created.
-//
-// Version 1.1, 19 October 2000, Modified to inherit from G4VPrimaryGenerator.
-// New name at the request of M. Asai.
-//
-///////////////////////////////////////////////////////////////////////////////
-//
 // MEMBER FUNCTIONS
 // ----------------
 //
@@ -48,8 +60,22 @@
 // G4String GetCurrentValue(G4UIcommand *command)
 //     Allows the user to retrieve the current values of parameters.
 //     Not implemented yet.
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// CHANGE HISTORY
+// --------------
+//
+// Version 1.0, 28 February 2000, C Ferguson, Created.
+//
+// Version 1.1, 19 October 2000, Modified to inherit from G4VPrimaryGenerator.
+// New name at the request of M. Asai.
 //
 ///////////////////////////////////////////////////////////////////////////////
+//
+#ifndef G4GeneralParticleSourceMessenger_h
+#define G4GeneralParticleSourceMessenger_h 1
+
 #include "G4UImessenger.hh"
 #include "globals.hh"
 //#include "UIcmdWithNucleusAndUnit.hh"
diff --git a/source/event/include/G4HEPEvtInterface.hh b/source/event/include/G4HEPEvtInterface.hh
index 0d4022282a..a7e40821a0 100644
--- a/source/event/include/G4HEPEvtInterface.hh
+++ b/source/event/include/G4HEPEvtInterface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPEvtInterface.hh,v 1.5 2001/02/08 06:07:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPEvtInterface.hh,v 1.5.2.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4HEPEvtInterface_h
diff --git a/source/event/include/G4HEPEvtParticle.hh b/source/event/include/G4HEPEvtParticle.hh
index b12ace34bb..0392fb6e3f 100644
--- a/source/event/include/G4HEPEvtParticle.hh
+++ b/source/event/include/G4HEPEvtParticle.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPEvtParticle.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPEvtParticle.hh,v 1.3.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4ParticleGun.hh b/source/event/include/G4ParticleGun.hh
index 32a3845978..a780493bb0 100644
--- a/source/event/include/G4ParticleGun.hh
+++ b/source/event/include/G4ParticleGun.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleGun.hh,v 1.4 2000/10/18 12:41:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleGun.hh,v 1.4.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4ParticleGun_h
diff --git a/source/event/include/G4ParticleGunMessenger.hh b/source/event/include/G4ParticleGunMessenger.hh
index 0066a309b6..911e959d6e 100644
--- a/source/event/include/G4ParticleGunMessenger.hh
+++ b/source/event/include/G4ParticleGunMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleGunMessenger.hh,v 1.5 2000/10/19 13:29:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleGunMessenger.hh,v 1.5.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/event/include/G4PrimaryParticle.hh b/source/event/include/G4PrimaryParticle.hh
index c073025cc7..6fb1da93e8 100644
--- a/source/event/include/G4PrimaryParticle.hh
+++ b/source/event/include/G4PrimaryParticle.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryParticle.hh,v 1.8 2001/02/08 06:07:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryParticle.hh,v 1.8.2.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4PrimaryTransformer.hh b/source/event/include/G4PrimaryTransformer.hh
index cc32528a1a..9eb8d50a78 100644
--- a/source/event/include/G4PrimaryTransformer.hh
+++ b/source/event/include/G4PrimaryTransformer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryTransformer.hh,v 1.4 2000/10/19 15:19:36 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryTransformer.hh,v 1.4.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4PromaryTransformer_h 
diff --git a/source/event/include/G4PrimaryVertex.hh b/source/event/include/G4PrimaryVertex.hh
index 0954ad6b43..f9f624f8eb 100644
--- a/source/event/include/G4PrimaryVertex.hh
+++ b/source/event/include/G4PrimaryVertex.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryVertex.hh,v 1.5 2000/10/19 15:19:36 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryVertex.hh,v 1.5.4.1 2001/06/28 19:07:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4StackManager.hh b/source/event/include/G4StackManager.hh
index dfb85c8e5a..22a3367ace 100644
--- a/source/event/include/G4StackManager.hh
+++ b/source/event/include/G4StackManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackManager.hh,v 1.5 2000/01/26 06:42:14 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackManager.hh,v 1.5.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/include/G4StackedTrack.hh b/source/event/include/G4StackedTrack.hh
index ec5f3b58b4..11b7370f83 100644
--- a/source/event/include/G4StackedTrack.hh
+++ b/source/event/include/G4StackedTrack.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackedTrack.hh,v 1.4 2000/01/26 06:42:15 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackedTrack.hh,v 1.4.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
diff --git a/source/event/include/G4StackingMessenger.hh b/source/event/include/G4StackingMessenger.hh
index d9f6039e05..f161bad953 100644
--- a/source/event/include/G4StackingMessenger.hh
+++ b/source/event/include/G4StackingMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackingMessenger.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackingMessenger.hh,v 1.3.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4StackingMessenger_h
diff --git a/source/event/include/G4TrackStack.hh b/source/event/include/G4TrackStack.hh
index 41e6b9d4d0..db2a36e2da 100644
--- a/source/event/include/G4TrackStack.hh
+++ b/source/event/include/G4TrackStack.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackStack.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackStack.hh,v 1.3.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/include/G4TrajectoryContainer.hh b/source/event/include/G4TrajectoryContainer.hh
index f2a217e047..3d5d16abc7 100644
--- a/source/event/include/G4TrajectoryContainer.hh
+++ b/source/event/include/G4TrajectoryContainer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoryContainer.hh,v 1.6 2001/02/08 06:07:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoryContainer.hh,v 1.6.2.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //	G4TrajectoryContainer
diff --git a/source/event/include/G4UserEventAction.hh b/source/event/include/G4UserEventAction.hh
index d887248d31..a4574f9956 100644
--- a/source/event/include/G4UserEventAction.hh
+++ b/source/event/include/G4UserEventAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserEventAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserEventAction.hh,v 1.4.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/event/include/G4UserStackingAction.hh b/source/event/include/G4UserStackingAction.hh
index c9741d6c37..197605fbef 100644
--- a/source/event/include/G4UserStackingAction.hh
+++ b/source/event/include/G4UserStackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserStackingAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserStackingAction.hh,v 1.4.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UserStackingAction_h
diff --git a/source/event/include/G4VPrimaryGenerator.hh b/source/event/include/G4VPrimaryGenerator.hh
index 4d63f73778..48875aeef9 100644
--- a/source/event/include/G4VPrimaryGenerator.hh
+++ b/source/event/include/G4VPrimaryGenerator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPrimaryGenerator.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPrimaryGenerator.hh,v 1.3.4.1 2001/06/28 19:07:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VPrimaryGenerator_h
diff --git a/source/event/include/eventgendefs.hh b/source/event/include/eventgendefs.hh
index 0e340b3324..1b59137efe 100644
--- a/source/event/include/eventgendefs.hh
+++ b/source/event/include/eventgendefs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: eventgendefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: eventgendefs.hh,v 1.2.4.1 2001/06/28 19:07:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef EventGenerator_DEBUG
 #define EventGenerator_DEBUG
diff --git a/source/event/include/evmandefs.hh b/source/event/include/evmandefs.hh
index 9342e9f738..317f1e6cd6 100644
--- a/source/event/include/evmandefs.hh
+++ b/source/event/include/evmandefs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: evmandefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: evmandefs.hh,v 1.2.4.1 2001/06/28 19:07:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 ///#define G4EVENTMANAGER_DEBUG 1
diff --git a/source/event/include/trajectoryControl.hh b/source/event/include/trajectoryControl.hh
index 2b08135db0..6b044fd28b 100644
--- a/source/event/include/trajectoryControl.hh
+++ b/source/event/include/trajectoryControl.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: trajectoryControl.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: trajectoryControl.hh,v 1.2.4.1 2001/06/28 19:07:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////#define G4_STORE_TRAJECTORY 1
 
diff --git a/source/event/src/G4EvManMessenger.cc b/source/event/src/G4EvManMessenger.cc
index 99f8493179..90960c2449 100644
--- a/source/event/src/G4EvManMessenger.cc
+++ b/source/event/src/G4EvManMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EvManMessenger.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EvManMessenger.cc,v 1.2.4.1 2001/06/28 19:07:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/event/src/G4Event.cc b/source/event/src/G4Event.cc
index fd99eae16f..66e1923b52 100644
--- a/source/event/src/G4Event.cc
+++ b/source/event/src/G4Event.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Event.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Event.cc,v 1.2.4.1 2001/06/28 19:07:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4Event
diff --git a/source/event/src/G4EventManager.cc b/source/event/src/G4EventManager.cc
index 446b0c4b94..dacbb4c819 100644
--- a/source/event/src/G4EventManager.cc
+++ b/source/event/src/G4EventManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EventManager.cc,v 1.6 2001/02/08 06:07:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EventManager.cc,v 1.6.2.1 2001/06/28 19:07:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/event/src/G4GeneralParticleSource.cc b/source/event/src/G4GeneralParticleSource.cc
index 4b01ba82cb..f9c459b53f 100644
--- a/source/event/src/G4GeneralParticleSource.cc
+++ b/source/event/src/G4GeneralParticleSource.cc
@@ -1,3149 +1,3168 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// MODULE:       G4GeneralParticleSource.cc
-//
-// Version:      1.1
-// Date:         18/10/00
-// Author:       C Ferguson, F Lei, P Truscott
-// Organisation: University of Southampton / DERA
-// Customer:     ESA/ESTEC
-//
-// Documentation avaialable at http://www.space.dera.gov.uk/space_env/gspm.html
-//   These include:
-//       User Requirement Document (URD)
-//       Software Specification Documents (SSD)
-//       Software User Manual (SUM)
-//       Technical Note (TN) on the physics and algorithms
-//
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// CHANGE HISTORY
-// --------------
-//
-// 26-01-2001, F. Lei
-// replace: 
-//          posphi = acos(tx/sin(posthe));
-// 
-// with:
-//          if (posthe != 0. && posthe != pi) 
-//           { posphi = acos(tx/sin(posthe)); }
-//          else 
-//           { posphi = 0.0;}
-//          endif
-//
-// 10-Nov-2000, F. Lei
-//    some bug fixing:
-//          i) dclared ' G4int count' in all ****Interpolation functions
-//          ii) added ' return (0.) ' to GenerateUserDefTheta and GenerateUserDefPhi 
-//              as default.
-//
-// 09-Nov-2000, F Lei
-//    Changed to a fast implementation for generating iso and cos angular directions 
-//
-// Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
-// New name at the request of M. Asai.
-//
-//
-// Version 1.0, 28 February 2000, C Ferguson, Created.
-//
-///////////////////////////////////////////////////////////////////////////////
-//
-#include "G4PrimaryParticle.hh"
-#include "G4Event.hh"
-#include "Randomize.hh"
-#include <math.h>
-#include "G4TransportationManager.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4PhysicalVolumeStore.hh"
-#include "G4ParticleTable.hh"
-#include "G4ParticleDefinition.hh"
-#include "G4IonTable.hh"
-#include "G4Ions.hh"
-#include "G4TrackingManager.hh"
-#include "G4Track.hh"
-#include "G4GeneralParticleSource.hh"
-
-G4GeneralParticleSource::G4GeneralParticleSource()
-{
-  // Initialise all variables
-  // Position distribution Variables
-
-  NumberOfParticlesToBeGenerated = 1;
-  particle_definition = NULL;
-  G4ThreeVector zero;
-  particle_momentum_direction = (G4ParticleMomentum)zero;
-  particle_energy = 0.0;
-  particle_position = zero;
-  particle_time = 0.0;
-  particle_polarization = zero;
-  particle_charge = 0.0;
-
-  SourcePosType = "Point";
-  Shape = "NULL";
-  halfx = 0.;
-  halfy = 0.;
-  halfz = 0.;
-  Radius = 0.;
-  Radius0 = 0.;
-  ParAlpha = 0.;
-  ParTheta = 0.;
-  ParPhi = 0.;
-  CentreCoords = (0.,0.,0.);
-  Rotx = HepXHat;
-  Roty = HepYHat;
-  Rotz = HepZHat;
-  Confine = false; //If true confines source distribution to VolName
-  VolName = "NULL";
-  SideRefVec1 = HepXHat; // x-axis
-  SideRefVec2 = HepYHat; // y-axis
-  SideRefVec3 = HepZHat; // z-axis
-  UserWRTSurface = false; // Any user-defined distribution is wrt co-ordinate
-  // axes.
-
-  // Angular distribution variables.
-  AngDistType = "iso"; 
-  AngRef1 = (1.,0.,0.);
-  AngRef2 = (0.,1.,0.);
-  AngRef3 = (0.,0.,1.);
-  MinTheta = 0.;
-  MaxTheta = pi;
-  MinPhi = 0.;
-  MaxPhi = twopi;
-  UserDistType = "NULL";
-  IPDFThetaExist = false;
-  IPDFPhiExist = false;
-
-  // Energy Distribution variables
-  EnergyDisType = "Mono";
-  MonoEnergy = 1*MeV;
-  Emin = 0.;
-  Emax = 0.;
-  alpha = 0.;
-  Ezero = 0.;
-  Temp = 0.;
-  grad = 0.;
-  cept = 0.;
-  EnergySpec = true; // true - energy spectra, false - momentum spectra
-  DiffSpec = true;  // true - differential spec, false integral spec
-  IntType = "NULL"; // Interpolation type
-  IPDFEnergyExist = false;
-  IPDFArbExist = false;
-
-  // Bias variables
-  XBias = false;
-  IPDFXBias = false;
-  YBias = false;
-  IPDFYBias = false;
-  ZBias = false;
-  IPDFZBias = false;
-  ThetaBias = false;
-  IPDFThetaBias = false;
-  PhiBias = false;
-  IPDFPhiBias = false;
-  EnergyBias = false;
-  IPDFEnergyBias = false;
-
-  ArbEmin = 0.;
-  ArbEmax = 0.;
-
-  // verbosity
-  verbosityLevel = 0;
-
-  theMessenger = new G4GeneralParticleSourceMessenger(this);
-  gNavigator = G4TransportationManager::GetTransportationManager()
-    ->GetNavigatorForTracking();
-}
-
-G4GeneralParticleSource::~G4GeneralParticleSource()
-{
-  delete theMessenger;
-}
-
-void G4GeneralParticleSource::SetPosDisType(G4String PosType)
-{
-  SourcePosType = PosType;
-}
-
-void G4GeneralParticleSource::SetPosDisShape(G4String shapeType)
-{
-  Shape = shapeType;
-}
-
-void G4GeneralParticleSource::SetCentreCoords(G4ThreeVector coordsOfCentre)
-{
-  CentreCoords = coordsOfCentre;
-}
-
-void G4GeneralParticleSource::SetPosRot1(G4ThreeVector posrot1)
-{
-  // This should be x'
-  Rotx = posrot1;
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Vector x' " << Rotx << G4endl;
-    }
-  GenerateRotationMatrices();
-}
-
-void G4GeneralParticleSource::SetPosRot2(G4ThreeVector posrot2)
-{
-  // This is a vector in the plane x'y' but need not
-  // be y'
-  Roty = posrot2;
-  if(verbosityLevel == 2)
-    {
-      G4cout << "The vector in the x'-y' plane " << Roty << G4endl;
-    }
-  GenerateRotationMatrices();
-}
-
-void G4GeneralParticleSource::SetHalfX(G4double xhalf)
-{
-  halfx = xhalf;
-}
-
-void G4GeneralParticleSource::SetHalfY(G4double yhalf)
-{
-  halfy = yhalf;
-}
-
-void G4GeneralParticleSource::SetHalfZ(G4double zhalf)
-{
-  halfz = zhalf;
-}
-
-void G4GeneralParticleSource::SetRadius(G4double rad)
-{
-  Radius = rad;
-}
-
-void G4GeneralParticleSource::SetRadius0(G4double rad)
-{
-  Radius0 = rad;
-}
-
-void G4GeneralParticleSource::SetParAlpha(G4double paralp)
-{
-  ParAlpha = paralp;
-}
-
-void G4GeneralParticleSource::SetParTheta(G4double parthe)
-{
-  ParTheta = parthe;
-}
-
-void G4GeneralParticleSource::SetParPhi(G4double parphi)
-{
-  ParPhi = parphi;
-}
-
-void G4GeneralParticleSource::GenerateRotationMatrices()
-{
-  // This takes in 2 vectors, x' and one in the plane x'-y',
-  // and from these takes a cross product to calculate z'.
-  // Then a cross product is taken between x' and z' to give
-  // y'.
-  Rotx = Rotx.unit(); // x'
-  Roty = Roty.unit(); // vector in x'y' plane
-  Rotz = Rotx.cross(Roty); // z'
-  Roty = Rotz.cross(Rotx); // y'
-  if(verbosityLevel == 2)
-    {
-      G4cout << "The new axes, x', y', z' " << Rotx << " " << Roty << " " << Rotz << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::ConfineSourceToVolume(G4String Vname)
-{
-  VolName = Vname;
-  if(verbosityLevel == 2)
-    G4cout << VolName << G4endl;
-  G4VPhysicalVolume *tempPV      = NULL;
-  G4PhysicalVolumeStore *PVStore = 0;
-  G4String theRequiredVolumeName = VolName;
-  PVStore      = G4PhysicalVolumeStore::GetInstance();
-  G4int      i = 0;
-  G4bool found = false;
-  if(verbosityLevel == 2)
-    G4cout << PVStore->length() << G4endl;
-  while (!found && i<PVStore->length()) {
-    tempPV = (*PVStore)[i];
-    found  = tempPV->GetName() == theRequiredVolumeName;
-    if(verbosityLevel == 2)
-      G4cout << i << " " << " " << tempPV->GetName() << " " << theRequiredVolumeName << " " << found << G4endl;
-    if (!found)
-      {i++;}
-  }
-  // found = true then the volume exists else it doesnt.
-  if(found == true)
-    {
-      if(verbosityLevel >= 1)
-	G4cout << "Volume " << VolName << " exists" << G4endl;
-      Confine = true;
-    }
-  else
-    {
-      G4cout << " **** Error: Volume does not exist **** " << G4endl;
-      G4cout << " Ignoring confine condition" << G4endl;
-      Confine = false;
-      VolName = "NULL";
-    }
-
-}
-
-void G4GeneralParticleSource::GeneratePointSource()
-{
-  // Generates Points given the point source.
-  if(SourcePosType == "Point")
-    particle_position = CentreCoords;
-  else
-    if(verbosityLevel >= 1)
-      G4cout << "Error SourcePosType is not set to Point" << G4endl;
-}
-
-void G4GeneralParticleSource::GeneratePointsInPlane()
-{
-  G4double x, y, z;
-  G4double expression;
-  G4ThreeVector RandPos;
-  G4double tempx, tempy, tempz;
-  z = 0.;
-
-  if(SourcePosType != "Plane" && verbosityLevel >= 1)
-    G4cout << "Error: SourcePosType is not Plane" << G4endl;
-
-  // Private Method to create points in a plane
-  if(Shape == "Circle")
-    {
-      x = Radius + 100.;
-      y = Radius + 100.;
-      while(sqrt((x*x) + (y*y)) > Radius)
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-
-	  x = (x*2.*Radius) - Radius;
-	  y = (y*2.*Radius) - Radius;
-	}
-    }
-  else if(Shape == "Annulus")
-    {
-      x = Radius + 100.;
-      y = Radius + 100.;
-      while(sqrt((x*x) + (y*y)) > Radius || sqrt((x*x) + (y*y)) < Radius0 )
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-
-	  x = (x*2.*Radius) - Radius;
-	  y = (y*2.*Radius) - Radius;
-	}
-    }
-  else if(Shape == "Ellipse")
-    {
-      expression = 20.;
-      while(expression > 1.)
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-
-	  x = (x*2.*halfx) - halfx;
-	  y = (y*2.*halfy) - halfy;
-
-	  expression = ((x*x)/(halfx*halfx)) + ((y*y)/(halfy*halfy));
-	}
-    }
-  else if(Shape == "Square")
-    {
-      x = GenRandX();
-      y = GenRandY();
-      x = (x*2.*halfx) - halfx;
-      y = (y*2.*halfy) - halfy;
-    }
-  else if(Shape == "Rectangle")
-    {
-      x = GenRandX();
-      y = GenRandY();
-      x = (x*2.*halfx) - halfx;
-      y = (y*2.*halfy) - halfy;
-    }
-  else
-    G4cout << "Shape not one of the plane types" << G4endl;
-
-  // Apply Rotation Matrix
-  // x * Rotx, y * Roty and z * Rotz
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Raw position " << x << "," << y << "," << z << G4endl;
-    }
-  tempx = (x * Rotx.x()) + (y * Roty.x()) + (z * Rotz.x());
-  tempy = (x * Rotx.y()) + (y * Roty.y()) + (z * Rotz.y());
-  tempz = (x * Rotx.z()) + (y * Roty.z()) + (z * Rotz.z());
-
-  RandPos.setX(tempx);
-  RandPos.setY(tempy);
-  RandPos.setZ(tempz);
-
-  // Translate
-  particle_position = CentreCoords + RandPos;
-  if(verbosityLevel >= 1)
-    {
-      if(verbosityLevel == 2)
-	{
-	  G4cout << "Rotated Position " << RandPos << G4endl;
-	}
-      G4cout << "Rotated and Translated position " << particle_position << G4endl;
-    }
-
-  // For Cosine-Law make SideRefVecs = to Rotation matrix vectors
-  SideRefVec1 = Rotx;
-  SideRefVec2 = Roty;
-  SideRefVec3 = Rotz;
-  // If rotation matrix z' point to origin then invert the matrix
-  // So that SideRefVecs point away.
-  if((CentreCoords.x() > 0. && Rotz.x() < 0.)
-     || (CentreCoords.x() < 0. && Rotz.x() > 0.)
-     || (CentreCoords.y() > 0. && Rotz.y() < 0.)
-     || (CentreCoords.y() < 0. && Rotz.y() > 0.)
-     || (CentreCoords.z() > 0. && Rotz.z() < 0.)
-     || (CentreCoords.z() < 0. && Rotz.z() > 0.))
-    {
-      // Invert y and z.
-      SideRefVec2 = -SideRefVec2;
-      SideRefVec3 = -SideRefVec3;
-    }
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::GeneratePointsOnSurface()
-{
-  //Private method to create points on a surface
-  G4double theta, phi;
-  G4double x, y, z;
-  G4ThreeVector RandPos;
-  G4double tempx, tempy, tempz;
-
-  if(SourcePosType != "Surface" && verbosityLevel >= 1)
-    G4cout << "Error SourcePosType not Surface" << G4endl;
-
-  if(Shape == "Sphere")
-    {
-      G4double tantheta, tanphi;
-      theta = GenRandTheta();
-      phi = GenRandPhi();
-
-      theta = acos(1. - 2.*theta); // theta isotropic
-      phi = phi * 2. * pi;
-      tantheta = tan(theta);
-      
-      x = Radius * sin(theta) * cos(phi);
-      y = Radius * sin(theta) * sin(phi);
-      z = Radius * cos(theta);
-      
-      RandPos.setX(x);
-      RandPos.setY(y);
-      RandPos.setZ(z);
-
-      // Cosine-law (not a good idea to use this here)
-      G4ThreeVector zdash(x,y,z);
-      zdash = zdash.unit();
-      G4ThreeVector xdash = Rotz.cross(zdash);
-      G4ThreeVector ydash = xdash.cross(zdash);
-      SideRefVec1 = xdash;
-      SideRefVec2 = ydash;
-      SideRefVec3 = zdash;
-    }
-  else if(Shape == "Ellipsoid")
-    {
-      G4double testrand, theta, phi, minphi, maxphi, middlephi;
-      G4double answer, constant;
-
-      constant = pi/(halfx*halfx) + pi/(halfy*halfy) + 
-	twopi/(halfz*halfz);
-      
-      // simplified approach
-      theta = GenRandTheta();
-      phi = GenRandPhi();
-
-      theta = acos(1. - 2.*theta);
-      minphi = 0.;
-      maxphi = twopi;
-      while(maxphi-minphi > 0.)
-	{
-	  middlephi = (maxphi+minphi)/2.;
-	  answer = (1./(halfx*halfx))*(middlephi/2. + sin(2*middlephi)/4.)
-	    + (1./(halfy*halfy))*(middlephi/2. - sin(2*middlephi)/4.)
-	       + middlephi/(halfz*halfz);
-	  answer = answer/constant;
-	  if(answer > phi) maxphi = middlephi;
-	  if(answer < phi) minphi = middlephi;
-	  if(fabs(answer-phi) <= 0.00001)
-	    {
-	      minphi = maxphi +1;
-	      phi = middlephi;
-	    }
-	}
-
-      x = sin(theta)*cos(phi);
-      y = sin(theta)*sin(phi);
-      z = cos(theta);
-      // x,y and z form a unit vector. Put this onto the ellipse.
-      G4double lhs;
-      // solve for x
-      G4double numYinX = y/x;
-      G4double numZinX = z/x;
-      G4double tempxvar;	  
-      tempxvar= 1./(halfx*halfx)+(numYinX*numYinX)/(halfy*halfy)
-	+ (numZinX*numZinX)/(halfz*halfz);
-
-      tempxvar = 1./tempxvar;
-      G4double coordx = sqrt(tempxvar);
-  
-      //solve for y
-      G4double numXinY = x/y;
-      G4double numZinY = z/y;
-      G4double tempyvar;
-      tempyvar=(numXinY*numXinY)/(halfx*halfx)+1./(halfy*halfy)
-	+(numZinY*numZinY)/(halfz*halfz);
-      tempyvar = 1./tempyvar;
-      G4double coordy = sqrt(tempyvar);
-      
-      //solve for z
-      G4double numXinZ = x/z;
-      G4double numYinZ = y/z;
-      G4double tempzvar;
-      tempzvar=(numXinZ*numXinZ)/(halfx*halfx)
-	+(numYinZ*numYinZ)/(halfy*halfy)+1./(halfz*halfz);
-      tempzvar = 1./tempzvar;
-      G4double coordz = sqrt(tempzvar);
-
-      lhs = sqrt((coordx*coordx)/(halfx*halfx) + 
-		 (coordy*coordy)/(halfy*halfy) + 
-		 (coordz*coordz)/(halfz*halfz));
-      
-      if(fabs(lhs-1.) > 0.001 && verbosityLevel >= 1)
-	G4cout << "Error: theta, phi not really on ellipsoid" << G4endl;
-
-      // coordx, coordy and coordz are all positive
-      G4double TestRandVar = G4UniformRand();
-      if(TestRandVar > 0.5)
-	{
-	  coordx = -coordx;
-	}
-      TestRandVar = G4UniformRand();
-      if(TestRandVar > 0.5)
-	{
-	  coordy = -coordy;
-	}
-      TestRandVar = G4UniformRand();
-      if(TestRandVar > 0.5)
-	{
-	  coordz = -coordz;
-	}
-
-      RandPos.setX(coordx);
-      RandPos.setY(coordy);
-      RandPos.setZ(coordz);
-
-      // Cosine-law (not a good idea to use this here)
-      G4ThreeVector zdash(coordx,coordy,coordz);
-      zdash = zdash.unit();
-      G4ThreeVector xdash = Rotz.cross(zdash);
-      G4ThreeVector ydash = xdash.cross(zdash);
-      SideRefVec1 = xdash;
-      SideRefVec2 = ydash;
-      SideRefVec3 = zdash;
-    }
-  else if(Shape == "Cylinder")
-    {
-      G4double AreaTop, AreaBot, AreaLat;
-      G4double AreaTotal, prob1, prob2, prob3;
-      G4double testrand;
-
-      // User giver Radius and z-half length
-      // Calculate surface areas, maybe move this to 
-      // a different routine.
-
-      AreaTop = pi * Radius * Radius;
-      AreaBot = AreaTop;
-      AreaLat = 2. * pi * Radius * 2. * halfz;
-      AreaTotal = AreaTop + AreaBot + AreaLat;
-      
-      prob1 = AreaTop / AreaTotal;
-      prob2 = AreaBot / AreaTotal;
-      prob3 = 1.00 - prob1 - prob2;
-      if(fabs(prob3 - (AreaLat/AreaTotal)) >= 0.001)
-	{
-	  if(verbosityLevel >= 1)
-	    G4cout << AreaLat/AreaTotal << " " << prob3<<G4endl;
-	  G4cout << "Error in prob3" << G4endl;
-	}
-
-      // Decide surface to calculate point on.
-
-      testrand = G4UniformRand();
-      if(testrand <= prob1)
-	{
-	  //Point on Top surface
-	  z = halfz;
-	  x = Radius + 100.;
-	  y = Radius + 100.;
-	  while(((x*x)+(y*y)) > (Radius*Radius))
-	    {
-	      x = GenRandX();
-	      y = GenRandY();
-
-	      x = x * 2. * Radius;
-	      y = y * 2. * Radius;
-	      x = x - Radius;
-	      y = y - Radius;
-	    }
-	  // Cosine law
-	  SideRefVec1 = Rotx;
-	  SideRefVec2 = Roty;
-	  SideRefVec3 = Rotz;
-	}
-      else if((testrand > prob1) && (testrand <= (prob1 + prob2)))
-	{
-	  //Point on Bottom surface
-	  z = -halfz;
-	  x = Radius + 100.;
-	  y = Radius + 100.;
-	  while(((x*x)+(y*y)) > (Radius*Radius))
-	    {
-	      x = GenRandX();
-	      y = GenRandY();
-
-	      x = x * 2. * Radius;
-	      y = y * 2. * Radius;
-	      x = x - Radius;
-	      y = y - Radius;
-	    }
-	  // Cosine law
-	  SideRefVec1 = Rotx;
-	  SideRefVec2 = -Roty;
-	  SideRefVec3 = -Rotz;
-	}
-      else if(testrand > (prob1+prob2))
-	{
-	  G4double rand;
-	  //Point on Lateral Surface
-
-	  rand = G4UniformRand();
-	  rand = rand * 2. * pi;
-
-	  x = Radius * cos(rand);
-	  y = Radius * sin(rand);
-
-	  z = GenRandZ();
-
-	  z = z * 2. * halfz;
-	  z = z - halfz;
-	  
-	  // Cosine law
-	  G4ThreeVector zdash(x,y,0.);
-	  zdash = zdash.unit();
-	  G4ThreeVector xdash = Rotz.cross(zdash);
-	  G4ThreeVector ydash = xdash.cross(zdash);
-	  SideRefVec1 = xdash;
-	  SideRefVec2 = ydash;
-	  SideRefVec3 = zdash;
-	}
-      else
-	G4cout << "Error: testrand " << testrand << G4endl;
-
-      RandPos.setX(x);
-      RandPos.setY(y);
-      RandPos.setZ(z);
-
-    }
-  else if(Shape == "Para")
-    {
-      G4double testrand;
-      //Right Parallelepiped.
-      // User gives x,y,z half lengths and ParAlpha
-      // ParTheta and ParPhi
-      // +x = <1, -x >1 & <2, +y >2 & <3, -y >3 &<4
-      // +z >4 & < 5, -z >5 &<6.
-      testrand = G4UniformRand();
-      G4double AreaX = halfy * halfz * 4.;
-      G4double AreaY = halfx * halfz * 4.;
-      G4double AreaZ = halfx * halfy * 4.;
-      G4double AreaTotal = 2*(AreaX + AreaY + AreaZ);
-      G4double Probs[6];
-      Probs[0] = AreaX/AreaTotal;
-      Probs[1] = Probs[0] + AreaX/AreaTotal;
-      Probs[2] = Probs[1] + AreaY/AreaTotal;
-      Probs[3] = Probs[2] + AreaY/AreaTotal;
-      Probs[4] = Probs[3] + AreaZ/AreaTotal;
-      Probs[5] = Probs[4] + AreaZ/AreaTotal;
-      
-      x = GenRandX();
-      y = GenRandY();
-      z = GenRandZ();
-      
-      x = x * halfx * 2.;
-      x = x - halfx;
-      y = y * halfy * 2.;
-      y = y - halfy;
-      z = z * halfz * 2.;
-      z = z - halfz;
-      // Pick a side first
-      if(testrand < Probs[0])
-	{
-	  // side is +x
-	  x = halfx + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
-	  y = y + z*tan(ParTheta)*sin(ParPhi);
-	  z = z;
-	  // Cosine-law
-	  G4ThreeVector xdash(halfz*tan(ParTheta)*cos(ParPhi),
-			      halfz*tan(ParTheta)*sin(ParPhi), 
-			      halfz/cos(ParPhi));
-	  G4ThreeVector ydash(halfy*tan(ParAlpha), halfy, 0.0);
-	  xdash = xdash.unit();
-	  ydash = ydash.unit();
-	  G4ThreeVector zdash = xdash.cross(ydash);
-	  SideRefVec1 = xdash;
-	  SideRefVec2 = ydash;
-	  SideRefVec3 = zdash;
-	}
-      else if(testrand >= Probs[0] && testrand < Probs[1])
-	{
-	  // side is -x
-	  x = -halfx + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
-	  y = y + z*tan(ParTheta)*sin(ParPhi);
-	  z = z;
-	  // Cosine-law
-	  G4ThreeVector xdash(halfz*tan(ParTheta)*cos(ParPhi),
-			      halfz*tan(ParTheta)*sin(ParPhi), 
-			      halfz/cos(ParPhi));
-	  G4ThreeVector ydash(halfy*tan(ParAlpha), halfy, 0.0);
-	  xdash = xdash.unit();
-	  ydash = ydash.unit();
-	  G4ThreeVector zdash = xdash.cross(ydash);
-	  SideRefVec1 = xdash;
-	  SideRefVec2 = -ydash;
-	  SideRefVec3 = -zdash;
-	}
-      else if(testrand >= Probs[1] && testrand < Probs[2])
-	{
-	  // side is +y
-	  x = x + z*tan(ParTheta)*cos(ParPhi) + halfy*tan(ParAlpha);
-	  y = halfy + z*tan(ParTheta)*sin(ParPhi);
-	  z = z;
-	  // Cosine-law
-	  G4ThreeVector ydash(halfz*tan(ParTheta)*cos(ParPhi),
-			      halfz*tan(ParTheta)*sin(ParPhi), 
-			      halfz/cos(ParPhi));
-	  ydash = ydash.unit();
-	  G4ThreeVector xdash = Roty.cross(ydash);
-	  G4ThreeVector zdash = xdash.cross(ydash);
-	  SideRefVec1 = xdash;
-	  SideRefVec2 = ydash;
-	  SideRefVec3 = zdash;
-	}
-      else if(testrand >= Probs[2] && testrand < Probs[3])
-	{
-	  // side is -y
-	  x = x + z*tan(ParTheta)*cos(ParPhi) - halfy*tan(ParAlpha);
-	  y = -halfy + z*tan(ParTheta)*sin(ParPhi);
-	  z = z;
-	  // Cosine-law
-	  G4ThreeVector ydash(halfz*tan(ParTheta)*cos(ParPhi),
-			      halfz*tan(ParTheta)*sin(ParPhi), 
-			      halfz/cos(ParPhi));
-	  ydash = ydash.unit();
-	  G4ThreeVector xdash = Roty.cross(ydash);
-	  G4ThreeVector zdash = xdash.cross(ydash);
-	  SideRefVec1 = xdash;
-	  SideRefVec2 = -ydash;
-	  SideRefVec3 = -zdash;
-	}
-      else if(testrand >= Probs[3] && testrand < Probs[4])
-	{
-	  // side is +z
-	  z = halfz;
-	  y = y + halfz*sin(ParPhi)*tan(ParTheta);
-	  x = x + halfz*cos(ParPhi)*tan(ParTheta) + y*tan(ParAlpha);
-	  // Cosine-law
-	  SideRefVec1 = Rotx;
-	  SideRefVec2 = Roty;
-	  SideRefVec3 = Rotz;
-	}
-      else if(testrand >= Probs[4] && testrand < Probs[5])
-	{
-	  // side is -z
-	  z = -halfz;
-	  y = y - halfz*sin(ParPhi)*tan(ParTheta);
-	  x = x - halfz*cos(ParPhi)*tan(ParTheta) + y*tan(ParAlpha);
-	  // Cosine-law
-	  SideRefVec1 = Rotx;
-	  SideRefVec2 = -Roty;
-	  SideRefVec3 = -Rotz;
-	}
-      else
-	{
-	  G4cout << "Error: testrand out of range" << G4endl;
-	  if(verbosityLevel >= 1)
-	    G4cout << "testrand=" << testrand << " Probs[5]=" << Probs[5] <<G4endl;
-	}
-
-      RandPos.setX(x);
-      RandPos.setY(y);
-      RandPos.setZ(z);
-    }
-
-  // Apply Rotation Matrix
-  // x * Rotx, y * Roty and z * Rotz
-  if(verbosityLevel == 2)
-    G4cout << "Raw position " << RandPos << G4endl;
-
-  x=(RandPos.x()*Rotx.x())+(RandPos.y()*Roty.x())+(RandPos.z()*Rotz.x());
-  y=(RandPos.x()*Rotx.y())+(RandPos.y()*Roty.y())+(RandPos.z()*Rotz.y());
-  z=(RandPos.x()*Rotx.z())+(RandPos.y()*Roty.z())+(RandPos.z()*Rotz.z());
-  
-  RandPos.setX(x);
-  RandPos.setY(y);
-  RandPos.setZ(z);
-
-  // Translate
-  particle_position = CentreCoords + RandPos;
-
-  if(verbosityLevel >= 1)
-    {
-      if(verbosityLevel == 2)
-	G4cout << "Rotated position " << RandPos << G4endl;
-      G4cout << "Rotated and translated position " << particle_position << G4endl;
-    }
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::GeneratePointsInVolume()
-{
-  G4ThreeVector RandPos;
-  G4double tempx, tempy, tempz;
-  G4double x, y, z;
-
-  if(SourcePosType != "Volume" && verbosityLevel >= 1)
-    G4cout << "Error SourcePosType not Volume" << G4endl;
-  //Private method to create points in a volume
-  if(Shape == "Sphere")
-    {
-      x = Radius*2.;
-      y = Radius*2.;
-      z = Radius*2.;
-      while(((x*x)+(y*y)+(z*z)) > (Radius*Radius))
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-	  z = GenRandZ();
-
-	  x = (x*2.*Radius) - Radius;
-	  y = (y*2.*Radius) - Radius;
-	  z = (z*2.*Radius) - Radius;
-	}
-    }
-  else if(Shape == "Ellipsoid")
-    {
-      G4double temp;
-      temp = 100.;
-      while(temp > 1.)
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-	  z = GenRandZ();
-
-	  x = (x*2.*halfx) - halfx;
-	  y = (y*2.*halfy) - halfy;
-	  z = (z*2.*halfz) - halfz;
-	  
-	  temp = ((x*x)/(halfx*halfx)) + ((y*y)/(halfy*halfy))
-	    + ((z*z)/(halfz*halfz));
-	}
-    }
-  else if(Shape == "Cylinder")
-    {
-      x = Radius*2.;
-      y = Radius*2.;
-      while(((x*x)+(y*y)) > (Radius*Radius))
-	{
-	  x = GenRandX();
-	  y = GenRandY();
-	  z = GenRandZ();
-
-	  x = (x*2.*Radius) - Radius;
-	  y = (y*2.*Radius) - Radius;
-	  z = (z*2.*halfz) - halfz;
-	}
-    }
-  else if(Shape == "Para")
-    {
-      x = GenRandX();
-      y = GenRandY();
-      z = GenRandZ();
-      x = (x*2.*halfx) - halfx;
-      y = (y*2.*halfy) - halfy;
-      z = (z*2.*halfz) - halfz;
-      x = x + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
-      y = y + z*tan(ParTheta)*sin(ParPhi);
-      z = z;
-    }
-  else
-    G4cout << "Error: Volume Shape Doesnt Exist" << G4endl;
-
-  RandPos.setX(x);
-  RandPos.setY(y);
-  RandPos.setZ(z);
-
-  // Apply Rotation Matrix
-  // x * Rotx, y * Roty and z * Rotz
-  tempx = (x * Rotx.x()) + (y * Roty.x()) + (z * Rotz.x());
-  tempy = (x * Rotx.y()) + (y * Roty.y()) + (z * Rotz.y());
-  tempz = (x * Rotx.z()) + (y * Roty.z()) + (z * Rotz.z());
-
-  RandPos.setX(tempx);
-  RandPos.setY(tempy);
-  RandPos.setZ(tempz);
-
-  // Translate
-  particle_position = CentreCoords + RandPos;
-
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Raw position " << x << "," << y << "," << z << G4endl;
-      G4cout << "Rotated position " << RandPos << G4endl;
-    }
-  if(verbosityLevel >= 1)
-    G4cout << "Rotated and translated position " << particle_position << G4endl;
-
-  // Cosine-law (not a good idea to use this here)
-  G4ThreeVector zdash(tempx,tempy,tempz);
-  zdash = zdash.unit();
-  G4ThreeVector xdash = Rotz.cross(zdash);
-  G4ThreeVector ydash = xdash.cross(zdash);
-  SideRefVec1 = xdash;
-  SideRefVec2 = ydash;
-  SideRefVec3 = zdash;
-
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
-    } 
-}
-
-G4bool G4GeneralParticleSource::IsSourceConfined()
-{
-  // Method to check point is within the volume specified
-  if(Confine == false)
-    G4cout << "Error: Confine is false" << G4endl;
-  G4ThreeVector null(0.,0.,0.);
-  G4ThreeVector *ptr;
-  ptr = &null;
-
-  // Check particle_position is within VolName, if so true, 
-  // else false
-  G4VPhysicalVolume *theVolume;
-  theVolume=gNavigator->LocateGlobalPointAndSetup(particle_position,ptr,true);
-  G4String theVolName = theVolume->GetName();
-  if(theVolName == VolName)
-    {
-      if(verbosityLevel >= 1)
-	G4cout << "Particle is in volume " << VolName << G4endl;
-      return(true);
-    }
-  else
-    return(false);
-}
-
-// Now follows the angular distribution methods.
-
-void G4GeneralParticleSource::SetAngDistType(G4String atype)
-{
-  if(atype != "iso" && atype != "cos" && atype != "user")
-    G4cout << "Error, distribution must be iso, cos or user" << G4endl;
-  else
-    AngDistType = atype;
-}
-
-void G4GeneralParticleSource::DefineAngRefAxes(G4String refname, G4ThreeVector ref)
-{
-
-  if(refname == "angref1")
-    AngRef1 = ref; // x'
-  else if(refname == "angref2")
-    AngRef2 = ref; // vector in x'y' plane
-
-  // User defines x' (AngRef1) and a vector in the x'y'
-  // plane (AngRef2). Then, AngRef1 x AngRef2 = AngRef3
-  // the z' vector. Then, AngRef3 x AngRef1 = AngRef2
-  // which will now be y'.
-
-  AngRef3 = AngRef1.cross(AngRef2); // z'
-  AngRef2 = AngRef3.cross(AngRef1); // y'
-  if(verbosityLevel == 2)
-    {
-      G4cout << "Angular distribution rotation axes " << AngRef1 << " " << AngRef2 << " " << AngRef3 << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::SetMinTheta(G4double mint)
-{
-  MinTheta = mint;
-}
-
-void G4GeneralParticleSource::SetMinPhi(G4double minp)
-{
-  MinPhi = minp;
-}
-
-void G4GeneralParticleSource::SetMaxTheta(G4double maxt)
-{
-  MaxTheta = maxt;
-}
-
-void G4GeneralParticleSource::SetMaxPhi(G4double maxp)
-{
-  MaxPhi = maxp;
-}
-
-void G4GeneralParticleSource::UserDefAngTheta(G4ThreeVector input)
-{
-  if(UserDistType == "NULL") UserDistType = "theta";
-  if(UserDistType == "phi") UserDistType = "both";  
-  G4double thi, val;
-  thi = input.x();
-  val = input.y();
-  if(verbosityLevel >= 1)
-    G4cout << "In UserDefAngTheta" << G4endl;
-  UDefThetaH.InsertValues(thi, val);
-}
-
-void G4GeneralParticleSource::UserDefAngPhi(G4ThreeVector input)
-{
-  if(UserDistType == "NULL") UserDistType = "phi";
-  if(UserDistType == "theta") UserDistType = "both";  
-  G4double phhi, val;
-  phhi = input.x();
-  val = input.y();
-  if(verbosityLevel >= 1)
-    G4cout << "In UserDefAngPhi" << G4endl;
-  UDefPhiH.InsertValues(phhi, val); 
-}
-
-void G4GeneralParticleSource::SetUserWRTSurface(G4bool wrtSurf)
-{
-  // if UserWRTSurface = true then the user wants momenta with respect
-  // to the surface normals.
-  // When doing this theta has to be 0-90 only otherwise there will be
-  // errors, which currently are flagged anywhere.
-  UserWRTSurface = wrtSurf;
-}
-
-void G4GeneralParticleSource::GenerateIsotropicFlux()
-{
-  // generates isotropic flux.
-  // No vectors are needed.
-  G4double rndm, rndm2;
-  G4double px, py, pz, pmag;
-
-  // generate rand nos. but make sure in theta/phi limits
-  /*  Colin's old stuff
-  Theta = 10.;  // This is well above the pi upper limit.
-  Phi = 10.;    // Still well above 2pi upper limit.
-
-    while(Theta > MaxTheta || Theta < MinTheta)
-    {
-      rndm = GenRandTheta();
-      Theta = acos(1. - 2.*rndm);
-    }
-
-  while(Phi > MaxPhi || Phi < MinPhi)
-    {
-      rndm2 = GenRandPhi();
-      Phi = twopi * rndm2;
-    }
-
-  px = sin(Theta) * cos(Phi);
-  py = sin(Theta) * sin(Phi);
-  pz = cos(Theta);
-
-  */
-  // More efficient implementation by F. Lei
-  //
-  G4double sintheta, sinphi,costheta,cosphi;
-  rndm = GenRandTheta();
-  costheta = cos(MinTheta) - rndm * (cos(MinTheta) - cos(MaxTheta));
-  sintheta = sqrt(1. - costheta*costheta);
-  
-  rndm2 = GenRandPhi();
-  Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 
-  sinphi = sin(Phi);
-  cosphi = cos(Phi);
-
-  px = sintheta * cosphi;
-  py = sintheta * sinphi;
-  pz = costheta;
-
-  // end of F.Lei implementation
-
-  px = -px;
-  py = -py;
-  pz = -pz;
-
-  pmag = sqrt((px*px) + (py*py) + (pz*pz));
-
-  px = px/pmag;
-  py = py/pmag;
-  pz = pz/pmag;
-
-  //Need to rotate the particle_momentum_direction round such that the 
-  //start position is at the north pole, so that all particles go into
-  // the centre of the geomtries.
-  // particle_position stores the particle's position.
-  // use particle position to calculate theta and phi - posthe and posphi
-
-  G4double posthe, posphi;
-  //  G4cout << "particle_position " << particle_position << G4endl;
-  G4double tx, ty, tz, tt;
-  tx = particle_position.x();
-  ty = particle_position.y();
-  tz = particle_position.z();
-  tt = sqrt(tx*tx + ty*ty + tz*tz);
-  tx = tx/tt;
-  ty = ty/tt;
-  tz = tz/tt;
-  //  G4cout << "unit position " << tx << " " << ty << " " << tz << G4endl;
-  posthe = acos(tz);
-  if (posthe != 0. && posthe != pi) 
-  { posphi = acos(tx/sin(posthe)); }
-  else 
-  { posphi = 0.0;}
-  //  G4cout << "Posthe and posphi " << posthe << " " << posphi << G4endl;
-  G4double finx, finy, finz;
-  finx = (px*cos(posthe)*cos(posphi)) - (py*sin(posphi)) + (pz*sin(posthe)*cos(posphi));
-  finy = (px*cos(posthe)*sin(posphi)) + (py*cos(posphi)) + (pz*sin(posthe)*sin(posphi));
-  finz = (-px*sin(posthe)) + (pz*cos(posthe));
-  //  G4cout << "finx... " << finx << " " << finy << " " << finz << G4endl;
-
-  particle_momentum_direction.setX(finx);
-  particle_momentum_direction.setY(finy);
-  particle_momentum_direction.setZ(finz);
-
-  // particle_momentum_direction now holds unit momentum vector.
-  if(verbosityLevel >= 1)
-    G4cout << "Generating isotropic vector: " << particle_momentum_direction << G4endl;
-}
-
-void G4GeneralParticleSource::GenerateCosineLawFlux()
-{
-  // Method to generate flux distributed with a cosine law
-  // such as is in TIMM.
-  G4double px, py, pz, pmag;
-  G4double rndm, rndm2;
-  G4double resultx, resulty, resultz;
-
-  /*  Colin's old implementation which is very slow
-
-  Theta = 10.; // Well above MaxTheta
-  Phi = 10.;   // Well above MaxPhi
-
-  while(Theta > MaxTheta || Theta < MinTheta)
-    {
-      rndm = GenRandTheta();
-      Theta = asin(sqrt(MaxTheta*rndm));
-    }
-
-  while(Phi > MaxPhi || Phi < MinPhi)
-    {
-      rndm2 = GenRandPhi();
-      Phi = twopi * rndm2;
-    }
-
-  px = sin(Theta) * cos(Phi);
-  py = sin(Theta) * sin(Phi);
-  pz = cos(Theta);
-  */
-  // More efficient implementation by F. Lei
-  //
-  G4double sintheta, sinphi,costheta,cosphi;
-  rndm = GenRandTheta();
-  sintheta = sqrt( rndm * (sin(MaxTheta)*sin(MaxTheta) - sin(MinTheta)*sin(MinTheta) ) );
-  costheta = sqrt(1. -sintheta*sintheta);
-  
-  rndm2 = GenRandPhi();
-  Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 
-  sinphi = sin(Phi);
-  cosphi = cos(Phi);
-
-  px = sintheta * cosphi;
-  py = sintheta * sinphi;
-  pz = costheta;
-
-  // end of F.Lei implementation
-
-  px = -px;
-  py = -py;
-  pz = -pz;
-  pmag = sqrt((px*px) + (py*py) + (pz*pz));
-  G4double pxh = px/pmag;
-  G4double pyh = py/pmag;
-  G4double pzh = pz/pmag;
-
-  if(verbosityLevel == 2)
-    {
-      G4cout <<"SideRefVecs " <<SideRefVec1<<SideRefVec2<<SideRefVec3<<G4endl;
-      G4cout <<"Raw Unit vector "<<pxh<<","<<pyh<<","<<pzh<<G4endl;
-    }
-  resultx = (pxh*SideRefVec1.x()) + (pyh*SideRefVec2.x()) + 
-    (pzh*SideRefVec3.x());
-
-  resulty = (pxh*SideRefVec1.y()) + (pyh*SideRefVec2.y()) + 
-    (pzh*SideRefVec3.y());
-
-  resultz = (pxh*SideRefVec1.z()) + (pyh*SideRefVec2.z()) + 
-    (pzh*SideRefVec3.z());
-
-  G4double ResMag = sqrt((resultx*resultx) + (resulty*resulty) + (resultz*resultz));
-  resultx = resultx/ResMag;
-  resulty = resulty/ResMag;
-  resultz = resultz/ResMag;
-  
-  particle_momentum_direction.setX(resultx);
-  particle_momentum_direction.setY(resulty);
-  particle_momentum_direction.setZ(resultz);
-
-  // particle_momentum_direction now contains unit momentum vector.
-  if(verbosityLevel >= 1)
-    {
-      G4cout << "Resultant cosine-law unit momentum vector " << particle_momentum_direction << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::GenerateUserDefFlux()
-{
-  G4double rndm, px, py, pz, pmag;
-
-  if(UserDistType == "NULL")
-    G4cout << "Error: UserDistType undefined" << G4endl;
-  else if(UserDistType == "theta")
-    {
-      Theta = GenerateUserDefTheta();
-      Phi = 10.;
-      while(Phi > MaxPhi || Phi < MinPhi)
-	{
-	  rndm = GenRandPhi();
-	  Phi = twopi * rndm;
-	}
-    }
-  else if(UserDistType == "phi")
-    {
-      Theta = 10.;
-      while(Theta > MaxTheta || Theta < MinTheta)
-	{
-	  rndm = GenRandTheta();
-	  Theta = acos(1. - (2. * rndm));
-	}
-      Phi = GenerateUserDefPhi();
-    }
-  else if(UserDistType == "both")
-    {
-      Theta = GenerateUserDefTheta();
-      Phi = GenerateUserDefPhi();
-    }
-
-  px = -sin(Theta) * cos(Phi);
-  py = -sin(Theta) * sin(Phi);
-  pz = -cos(Theta);
-
-  pmag = sqrt((px*px) + (py*py) + (pz*pz));
-
-  if(UserWRTSurface == false)
-    {
-      particle_momentum_direction.setX(px/pmag);
-      particle_momentum_direction.setY(py/pmag);
-      particle_momentum_direction.setZ(pz/pmag);
-    }
-  else if(UserWRTSurface == true)
-    {
-      G4double pxh = px/pmag;
-      G4double pyh = py/pmag;
-      G4double pzh = pz/pmag;
-
-      if(verbosityLevel == 2)
-	{
-	  G4cout <<"SideRefVecs " <<SideRefVec1<<SideRefVec2<<SideRefVec3<<G4endl;
-	  G4cout <<"Raw Unit vector "<<pxh<<","<<pyh<<","<<pzh<<G4endl;
-	}
-      G4double resultx = (pxh*SideRefVec1.x()) + (pyh*SideRefVec2.x()) + 
-	(pzh*SideRefVec3.x());
-
-      G4double resulty = (pxh*SideRefVec1.y()) + (pyh*SideRefVec2.y()) + 
-	(pzh*SideRefVec3.y());
-
-      G4double resultz = (pxh*SideRefVec1.z()) + (pyh*SideRefVec2.z()) + 
-	(pzh*SideRefVec3.z());
-
-      G4double ResMag = sqrt((resultx*resultx) + (resulty*resulty) + (resultz*resultz));
-      resultx = resultx/ResMag;
-      resulty = resulty/ResMag;
-      resultz = resultz/ResMag;
-      
-      particle_momentum_direction.setX(resultx);
-      particle_momentum_direction.setY(resulty);
-      particle_momentum_direction.setZ(resultz);
-    }
-
-  // particle_momentum_direction now contains unit momentum vector.
-  if(verbosityLevel >= 1)
-    {
-      G4cout << "Final User Defined momentum vector " << particle_momentum_direction << G4endl;
-    }
-}
-
-G4double G4GeneralParticleSource::GenerateUserDefTheta()
-{
-  // Create cumulative histogram if not already done so. Then use RandFlat
-  //::shoot to generate the output Theta value.
-  if(UserDistType == "NULL" || UserDistType == "phi")
-    {
-      // No user defined theta distribution
-      G4cout << "Error ***********************" << G4endl;
-      G4cout << "UserDistType = " << UserDistType << G4endl;
-      return (0.);
-    }
-  else
-    {
-      // UserDistType = theta or both and so a theta distribution
-      // is defined. This should be integrated if not already done.
-      if(IPDFThetaExist == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(UDefThetaH.GetVectorLength());
-	  bins[0] = UDefThetaH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = UDefThetaH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = UDefThetaH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = UDefThetaH(size_t(ii)) + vals[ii-1];
-	      sum = sum + UDefThetaH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFThetaH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFThetaExist = true
-	  IPDFThetaExist = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      return(IPDFThetaH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenerateUserDefPhi()
-{
-  // Create cumulative histogram if not already done so. Then use RandFlat
-  //::shoot to generate the output Theta value.
-
-  if(UserDistType == "NULL" || UserDistType == "theta")
-    {
-      // No user defined phi distribution
-      G4cout << "Error ***********************" << G4endl;
-      G4cout << "UserDistType = " << UserDistType << G4endl;
-      return(0.);
-    }
-  else
-    {
-      // UserDistType = phi or both and so a phi distribution
-      // is defined. This should be integrated if not already done.
-      if(IPDFPhiExist == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(UDefPhiH.GetVectorLength());
-	  bins[0] = UDefPhiH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = UDefPhiH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = UDefPhiH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = UDefPhiH(size_t(ii)) + vals[ii-1];
-	      sum = sum + UDefPhiH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFPhiH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFPhiExist = true
-	  IPDFPhiExist = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      return(IPDFPhiH.GetEnergy(rndm));
-    }
-}
-
-// Now follows Energy distribution Methods
-
-void G4GeneralParticleSource::SetEnergyDisType(G4String DisType)
-{
-  EnergyDisType = DisType;
-}
-
-void G4GeneralParticleSource::SetEmin(G4double emi)
-{
-  Emin = emi;
-}
-
-void G4GeneralParticleSource::SetEmax(G4double ema)
-{
-  Emax = ema;
-}
-
-void G4GeneralParticleSource::SetMonoEnergy(G4double menergy)
-{
-  MonoEnergy = menergy;
-  Emin = menergy;
-  Emax = menergy;
-}
-
-void G4GeneralParticleSource::SetAlpha(G4double alp)
-{
-  alpha = alp;
-}
-
-void G4GeneralParticleSource::SetTemp(G4double tem)
-{
-  Temp = tem;
-}
-
-void G4GeneralParticleSource::SetEzero(G4double eze)
-{
-  Ezero = eze;
-}
-
-void G4GeneralParticleSource::SetGradient(G4double gr)
-{
-  grad = gr;
-}
-
-void G4GeneralParticleSource::SetInterCept(G4double c)
-{
-  cept = c;
-}
-
-void G4GeneralParticleSource::UserEnergyHisto(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  if(verbosityLevel == 2)
-    G4cout << " " << ehi << " " << val << G4endl;
-  if(verbosityLevel == 2)
-    G4cout << "In UserEnergyHisto" << G4endl;
-  UDefEnergyH.InsertValues(ehi, val);
-  Emax = ehi;
-}
-
-void G4GeneralParticleSource::ArbEnergyHisto(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  if(verbosityLevel == 2)
-    G4cout << "In ArbEnergyHisto" << G4endl;
-  ArbEnergyH.InsertValues(ehi, val);
-}
-
-void G4GeneralParticleSource::EpnEnergyHisto(G4ThreeVector input)
-{
-  G4double elo, ehi, val;
-  ehi = input.x();
-  val = input.y();
-  if(verbosityLevel == 2)
-    G4cout << "In EpnEnergyHisto" << G4endl;
-  EpnEnergyH.InsertValues(ehi, val);
-  Emax = ehi;
-  Epnflag = true;
-}
-
-void G4GeneralParticleSource::Calculate()
-{
-  if(EnergyDisType == "Cdg")
-    CalculateCdgSpectrum();
-  else if(EnergyDisType == "Bbody")
-    CalculateBbodySpectrum();
-}
-
-void G4GeneralParticleSource::CalculateCdgSpectrum()
-{
-  // This uses the spectrum from The INTEGRAL Mass Model (TIMM)
-  // to generate a Cosmic Diffuse X/gamma ray spectrum.
-  G4double pfact[2] = {8.5, 112};
-  G4double spind[2] = {1.4, 2.3};
-  G4double ene_line[3] = {1.*keV, 18.*keV, 1E6*keV};
-  G4int n_par;
-
-  ene_line[0] = Emin;
-  if(Emin < 18*keV)
-    {
-      n_par = 2;
-      ene_line[2] = Emax;
-      if(Emax < 18*keV)
-	{
-	  n_par = 1;
-	  ene_line[1] = Emax;
-	}
-    }
-  else
-    {
-      n_par = 1;
-      pfact[0] = 112.;
-      spind[0] = 2.3;
-      ene_line[1] = Emax;
-    }
-  
-  // Create a cumulative histogram.
-  CDGhist[0] = 0.;
-  G4double omalpha;
-  G4int i = 0;
-
-  while(i < n_par)
-    {
-      omalpha = 1. - spind[i];
-      CDGhist[i+1] = CDGhist[i] + (pfact[i]/omalpha)*
-	(pow(ene_line[i+1],omalpha)-pow(ene_line[i],omalpha));
-      i++;
-    }
-  
-  // Normalise histo and divide by 1000 to make MeV.
-  i = 0;
-  while(i < n_par)
-    {
-      CDGhist[i+1] = CDGhist[i+1]/CDGhist[n_par];
-      //      G4cout << CDGhist[i] << CDGhist[n_par] << G4endl;
-      i++;
-    }
-}
-
-void G4GeneralParticleSource::CalculateBbodySpectrum()
-{
-  // create bbody spectrum
-  // Proved very hard to integrate indefinitely, so different
-  // method. User inputs emin, emax and T. These are used to
-  // create a 10,000 bin histogram.
-  // Use photon density spectrum = 2 nu**2/c**2 * (exp(h nu/kT)-1)
-  // = 2 E**2/h**2c**2 times the exponential
-  G4double erange = Emax - Emin;
-  G4double steps = erange/10000.;
-  G4double Bbody_y[10000];
-  G4double k = 8.6181e-11; //Boltzmann const in MeV/K
-  G4double h = 4.1362e-21; // Plancks const in MeV s
-  G4double c = 3e8; // Speed of light
-  G4double h2 = h*h;
-  G4double c2 = c*c;
-  G4int count = 0;
-  G4double sum = 0.;
-  BBHist[0] = 0.;
-  while(count < 10000)
-    {
-      Bbody_x[count] = Emin + G4double(count*steps);
-      Bbody_y[count] = (2.*pow(Bbody_x[count],2.))/
-      	(h2*c2*(exp(Bbody_x[count]/(k*Temp)) - 1.));
-      sum = sum + Bbody_y[count];
-      BBHist[count+1] = BBHist[count] + Bbody_y[count];
-      count++;
-    }
-
-  Bbody_x[10000] = Emax;
-  // Normalise cumulative histo.
-  count = 0;
-  while(count<10001)
-    {
-      BBHist[count] = BBHist[count]/sum;
-      count++;
-    }
-}
-
-void G4GeneralParticleSource::InputEnergySpectra(G4bool value)
-{
-  // Allows user to specifiy spectrum is momentum
-  EnergySpec = value; // false if momentum
-  if(verbosityLevel == 2)
-    G4cout << "EnergySpec has value " << EnergySpec << G4endl;
-}
-
-void G4GeneralParticleSource::InputDifferentialSpectra(G4bool value)
-{
-  // Allows user to specify integral or differential spectra
-  DiffSpec = value; // true = differential, false = integral
-  if(verbosityLevel == 2)
-    G4cout << "Diffspec has value " << DiffSpec << G4endl;
-}
-
-void G4GeneralParticleSource::ArbInterpolate(G4String IType)
-{
-  if(EnergyDisType != "Arb")
-    G4cout << "Error: this is for arbitrary distributions" << G4endl;
-  IntType = IType;
-  G4int i=0;
-
-  // Calcuate Emin and Emax, mainly for use in debugging
-  G4int len = G4int(ArbEnergyH.GetVectorLength());
-  ArbEmax = ArbEnergyH.GetLowEdgeEnergy(size_t(len-1));
-  ArbEmin = ArbEnergyH.GetLowEdgeEnergy(size_t(0));
-  G4cout << "ArbEmin, ArbEmax " << ArbEmin << " " << ArbEmax << G4endl;
-  
-  // Now interpolate points
-  if(IntType == "Lin")
-    LinearInterpolation();
-  if(IntType == "Log")
-    LogInterpolation();
-  if(IntType == "Exp")
-    ExpInterpolation();
-  if(IntType == "Spline")
-    SplineInterpolation();  
-}
-
-void G4GeneralParticleSource::LinearInterpolation()
-{
-  // Method to do linear interpolation on the Arb points
-  // Calculate equation of each line segment, max 256.
-  // Calculate Area under each segment
-  // Create a cumulative array which is then normalised Arb_Cum_Area
-  G4double Area_seg[256]; // Stores area under each segment
-  G4double sum = 0., Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
-  G4int i, count;
-  G4int maxi = ArbEnergyH.GetVectorLength();
-  for(i=0;i<maxi;i++)
-    {
-      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
-      Arb_y[i] = ArbEnergyH(size_t(i));
-    }
-  // Points are now in x,y arrays. If the spectrum is integral it has to be
-  // made differential and if momentum it has to be made energy.
-  if(EnergySpec == false)
-    {
-      // change currently stored values (emin etc) which are actually momenta
-      // to energies.
-      if(particle_definition == NULL)
-	G4cout << "Error: particle not defined" << G4endl;
-      else
-	{
-      // Apply Energy**2 = p**2c**2 + m0**2c**4
-      // p should be entered as E/c i.e. without the division by c
-      // being done - energy equivalent.
-	  G4double mass = particle_definition->GetPDGMass();
-
-	  // multiply the function (Arb_y) up by the bin width
-	  // to make the function counts/s (i.e. get rid of momentum
-	  // dependence).
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
-	    }
-	  // Change Arb_x to energy, plus divide by energy bin width
-	  // to make Arb_y counts/s/energy
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
-				  + (mass*mass));
-	    }
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
-	    }
-	}  
-    }
-  if(DiffSpec == false)
-    {
-      // Converts integral point-wise spectra to Differential
-      for( count=1;count<=maxi;count++)
-	{
-	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
-	}
-    }
-
-  i=1;
-  Arb_grad[0] = 0.;
-  Arb_cept[0] = 0.;
-  Area_seg[0] = 0.;
-  Arb_Cum_Area[0] = 0.;
-  while(i < maxi)
-    {
-      // calc gradient and intercept for each segment
-      Arb_grad[i] = (Arb_y[i] - Arb_y[i-1]) / (Arb_x[i] - Arb_x[i-1]);
-      if(verbosityLevel == 2)
-	G4cout << Arb_grad[i] << G4endl;
-      if(Arb_grad[i] > 0.)
-	{
-	  if(verbosityLevel == 2)
-	    G4cout << "Arb_grad is positive" << G4endl;
-	  Arb_cept[i] = Arb_y[i] - (Arb_grad[i] * Arb_x[i]);
-	}
-      else if(Arb_grad[i] < 0.)
-	{
-	  if(verbosityLevel == 2)
-	    G4cout << "Arb_grad is negative" << G4endl;
-	  Arb_cept[i] = Arb_y[i] + (-Arb_grad[i] * Arb_x[i]);
-	}
-      else
-	{
-	  if(verbosityLevel == 2)
-	    G4cout << "Arb_grad is 0." << G4endl;
-	  Arb_cept[i] = Arb_y[i];
-	}
-
-      Area_seg[i] = ((Arb_grad[i]/2)*(Arb_x[i]*Arb_x[i] - Arb_x[i-1]*Arb_x[i-1]) + Arb_cept[i]*(Arb_x[i] - Arb_x[i-1]));
-      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
-      sum = sum + Area_seg[i];
-      if(verbosityLevel == 2)
-	G4cout << Arb_x[i] << Arb_y[i] << Area_seg[i] << sum << Arb_grad[i] << G4endl;
-      i++;
-    }
-
-  i=0;
-  while(i < maxi)
-    {
-      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum; // normalisation
-      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
-      i++;
-    }
-
-  if(verbosityLevel >= 1)
-    {
-      G4cout << "Leaving LinearInterpolation" << G4endl;
-      ArbEnergyH.DumpValues();
-      IPDFArbEnergyH.DumpValues();
-    }
-}
-
-void G4GeneralParticleSource::LogInterpolation()
-{
-  // Interpolation based on Logarithmic equations
-  // Generate equations of line segments
-  // y = Ax**alpha => log y = alpha*logx + logA
-  // Find area under line segments
-  // create normalised, cumulative array Arb_Cum_Area
-  G4double Area_seg[256], Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
-  G4double alp, sum=0.;
-  Arb_Cum_Area[0] = 0.;
-  if(verbosityLevel == 2)
-    ArbEnergyH.DumpValues();
-
-  G4int i, count;
-  G4int maxi = ArbEnergyH.GetVectorLength();
-  for(i=0;i<maxi;i++)
-    {
-      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
-      Arb_y[i] = ArbEnergyH(size_t(i));
-    }
-  // Points are now in x,y arrays. If the spectrum is integral it has to be
-  // made differential and if momentum it has to be made energy.
-  if(EnergySpec == false)
-    {
-      // change currently stored values (emin etc) which are actually momenta
-      // to energies.
-      if(particle_definition == NULL)
-	G4cout << "Error: particle not defined" << G4endl;
-      else
-	{
-      // Apply Energy**2 = p**2c**2 + m0**2c**4
-      // p should be entered as E/c i.e. without the division by c
-      // being done - energy equivalent.
-	  G4double mass = particle_definition->GetPDGMass();
-
-	  // multiply the function (Arb_y) up by the bin width
-	  // to make the function counts/s (i.e. get rid of momentum
-	  // dependence).
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
-	    }
-	  // Change Arb_x to energy, plus divide by energy bin width
-	  // to make Arb_y counts/s/energy
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
-				  + (mass*mass));
-	    }
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
-	    }
-	}  
-    }
-  if(DiffSpec == false)
-    {
-      // Converts integral point-wise spectra to Differential
-      for(count=1;count<=maxi;count++)
-	{
-	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
-	}
-    }
-
-  i=1;
-  Arb_alpha[0] = 0.;
-  Arb_Const[0] = 0.;
-  Area_seg[0] = 0.;
-  if(Arb_x[0] <= 0. || Arb_y[0] <= 0.)
-    {
-      G4cout << "You should not use log interpolation with points <= 0." << G4endl;
-      G4cout << "These will be changed to 1e-20, which may cause problems" << G4endl;
-      if(Arb_x[0] <= 0.)
-	Arb_x[0] = 1e-20;
-      if(Arb_y[0] <= 0.)
-	Arb_y[0] = 1e-20;
-    }
-  
-  while(i <maxi)
-    {
-      // Incase points are negative or zero
-      if(Arb_x[i] <= 0. || Arb_y[i] <= 0.)
-	{
-	  G4cout << "You should not use log interpolation with points <= 0." << G4endl;
-	  G4cout << "These will be changed to 1e-20, which may cause problems" << G4endl;
-	  if(Arb_x[i] <= 0.)
-	    Arb_x[i] = 1e-20;
-	  if(Arb_y[i] <= 0.)
-	    Arb_y[i] = 1e-20;
-	}
-
-      Arb_alpha[i] = (log10(Arb_y[i])-log10(Arb_y[i-1]))/(log10(Arb_x[i])-log10(Arb_x[i-1]));
-      Arb_Const[i] = Arb_y[i]/(pow(Arb_x[i],Arb_alpha[i]));
-      alp = Arb_alpha[i] + 1;
-      Area_seg[i] = (Arb_Const[i]/alp) * (pow(Arb_x[i],alp) - pow(Arb_x[i-1],alp));
-      sum = sum + Area_seg[i];
-      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
-      if(verbosityLevel == 2)
-	G4cout << Arb_alpha[i] << Arb_Const[i] << Area_seg[i] << G4endl;
-      i++;
-    }
-  
-  i=0;
-  while(i<maxi)
-    {
-      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum;
-      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
-      i++;
-    }
-  if(verbosityLevel >= 1)
-    G4cout << "Leaving LogInterpolation " << G4endl;
-}
-
-void G4GeneralParticleSource::ExpInterpolation()
-{
-  // Interpolation based on Exponential equations
-  // Generate equations of line segments
-  // y = Ae**-(x/e0) => ln y = -x/e0 + lnA
-  // Find area under line segments
-  // create normalised, cumulative array Arb_Cum_Area
-  G4double Area_seg[256], Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
-  G4double sum=0.;
-  Arb_Cum_Area[0] = 0.;
-  if(verbosityLevel == 2)
-    ArbEnergyH.DumpValues();
-
-  G4int i, count;
-  G4int maxi = ArbEnergyH.GetVectorLength();
-  for(i=0;i<maxi;i++)
-    {
-      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
-      Arb_y[i] = ArbEnergyH(size_t(i));
-    }
-  // Points are now in x,y arrays. If the spectrum is integral it has to be
-  // made differential and if momentum it has to be made energy.
-  if(EnergySpec == false)
-    {
-      // change currently stored values (emin etc) which are actually momenta
-      // to energies.
-      if(particle_definition == NULL)
-	G4cout << "Error: particle not defined" << G4endl;
-      else
-	{
-      // Apply Energy**2 = p**2c**2 + m0**2c**4
-      // p should be entered as E/c i.e. without the division by c
-      // being done - energy equivalent.
-	  G4double mass = particle_definition->GetPDGMass();
-
-	  // multiply the function (Arb_y) up by the bin width
-	  // to make the function counts/s (i.e. get rid of momentum
-	  // dependence).
-	  for( count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
-	    }
-	  // Change Arb_x to energy, plus divide by energy bin width
-	  // to make Arb_y counts/s/energy
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
-				  + (mass*mass));
-	    }
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
-	    }
-	}  
-    }
-  if(DiffSpec == false)
-    {
-      // Converts integral point-wise spectra to Differential
-      for(count=1;count<=maxi;count++)
-	{
-	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
-	}
-    }
-
-  i=1;
-  Arb_ezero[0] = 0.;
-  Arb_Const[0] = 0.;
-  Area_seg[0] = 0.;
-  while(i < maxi)
-    {
-      G4double test = log(Arb_y[i]) - log(Arb_y[i-1]);
-      if(test > 0. || test < 0.)
-	{
-	  Arb_ezero[i] = -(Arb_x[i] - Arb_x[i-1])/(log(Arb_y[i]) - log(Arb_y[i-1]));
-	  Arb_Const[i] = Arb_y[i]/(exp(-Arb_x[i]/Arb_ezero[i]));
-	  Area_seg[i]=-(Arb_Const[i]*Arb_ezero[i])*(exp(-Arb_x[i]/Arb_ezero[i])
-						    -exp(-Arb_x[i-1]/Arb_ezero[i]));
-	}
-      else 
-	{
-	  G4cout << "Flat line segment: problem" << G4endl;
-	  Arb_ezero[i] = 0.;
-	  Arb_Const[i] = 0.;
-	  Area_seg[i] = 0.;
-	}
-      sum = sum + Area_seg[i];
-      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
-      if(verbosityLevel == 2)
-	G4cout << Arb_ezero[i] << Arb_Const[i] << Area_seg[i] << G4endl;
-      i++;
-    }
-  
-  i=0;
-  while(i<maxi)
-    {
-      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum;
-      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
-      i++;
-    }
-  if(verbosityLevel >= 1)
-    G4cout << "Leaving ExpInterpolation " << G4endl;
-}
-
-void G4GeneralParticleSource::SplineInterpolation()
-{
-  // Interpolation using Splines.
-  // Create Normalised arrays, make x 0->1 and y hold
-  // the function (Energy)
-  G4double Arb_x[256], Arb_y[256];
-  G4double sum = 0.;
-  G4int i, count;
-  if(verbosityLevel == 2)
-    ArbEnergyH.DumpValues();
-
-  G4int maxi = ArbEnergyH.GetVectorLength();
-  for(i=0;i<maxi;i++)
-    {
-      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
-      //      if(i == 0)
-      Arb_y[i] = ArbEnergyH(size_t(i));
-	//      else
-	//	Arb_y[i] = Arb_y[i-1] + ArbEnergyH(size_t(i));
-	//      sum = sum + ArbEnergyH(size_t(i));
-    }
-  // Points are now in x,y arrays. If the spectrum is integral it has to be
-  // made differential and if momentum it has to be made energy.
-  if(EnergySpec == false)
-    {
-      // change currently stored values (emin etc) which are actually momenta
-      // to energies.
-      if(particle_definition == NULL)
-	G4cout << "Error: particle not defined" << G4endl;
-      else
-	{
-      // Apply Energy**2 = p**2c**2 + m0**2c**4
-      // p should be entered as E/c i.e. without the division by c
-      // being done - energy equivalent.
-	  G4double mass = particle_definition->GetPDGMass();
-
-	  // multiply the function (Arb_y) up by the bin width
-	  // to make the function counts/s (i.e. get rid of momentum
-	  // dependence).
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
-	    }
-	  // Change Arb_x to energy, plus divide by energy bin width
-	  // to make Arb_y counts/s/energy
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
-				  + (mass*mass));
-	    }
-	  for(count=0;count<maxi;count++)
-	    {
-	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
-	    }
-	}  
-    }
-  if(DiffSpec == false)
-    {
-      // Converts integral point-wise spectra to Differential
-      for(count=1;count<=maxi;count++)
-	{
-	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
-	}
-    }
-
-  for(i=1;i<maxi;i++)
-    {
-      //      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
-      //      if(i == 0)
-      //	Arb_y[i] = ArbEnergyH(size_t(i));
-      //      else
-      Arb_y[i] = Arb_y[i-1] + ArbEnergyH(size_t(i));
-      sum = sum + ArbEnergyH(size_t(i));
-    }
-
-  for(i=0;i<maxi;i++)
-    {
-      Arb_y[i] = Arb_y[i]/sum;
-    }
-
-  if((Arb_x[0] != 0.) || (Arb_y[0] != 0.))
-    {
-      for(i=maxi;i>=0;i--)
-	{
-	  if(i == 0)
-	    {
-	      Arb_x[0] = 0.;
-	      Arb_y[0] = 0.;
-	    }
-	  else
-	    {
-	      Arb_x[i] = Arb_x[i-1];
-	      Arb_y[i] = Arb_y[i-1];
-	    }
-	}
-    }
-
-  for(i=0;i<=maxi;i++)
-    {
-      if(verbosityLevel == 2)
-	G4cout << i <<" "<< Arb_x[i] << " " << Arb_y[i] << G4endl;
-      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_y[i]);
-    }
-
-  // Should now have normalised cumulative probabilities in Arb_y
-  // and energy values in Arb_x.
-  maxi = maxi + 1;
-  // Put y into x and x into y. The spline interpolation will then
-  // go through x-axis to find where to interpolate (cum probability)
-  // then generate a y (which will now be energy).
-  SplineInt = new G4DataInterpolation(Arb_y,Arb_x,maxi,1e30,1e30);
-  if(verbosityLevel == 2)
-    {
-      G4cout << SplineInt << G4endl;
-      G4cout << SplineInt->LocateArgument(1.0) << G4endl;
-    }
-  if(verbosityLevel >= 1)
-    G4cout << "Leaving SplineInterpolation " << G4endl;
-}
-
-void G4GeneralParticleSource::GenerateMonoEnergetic()
-{
-  // Method to generate MonoEnergetic particles.
-  particle_energy = MonoEnergy;
-}
-
-void G4GeneralParticleSource::GenerateLinearEnergies()
-{
-  G4double energy, rndm;
-  G4double emaxsq = pow(Emax,2.); //Emax squared
-  G4double eminsq = pow(Emin,2.); //Emin squared
-  G4double intersq = pow(cept,2.); //cept squared
-
-  rndm = GenRandEnergy();
-  
-  G4double bracket = ((grad/2.)*(emaxsq - eminsq) + cept*(Emax-Emin));
-  bracket = bracket * rndm;
-  bracket = bracket + (grad/2.)*eminsq + cept*Emin;
-  // Now have a quad of form m/2 E**2 + cE - bracket = 0
-  bracket = -bracket;
-  //  G4cout << "BRACKET" << bracket << G4endl;
-  if(grad != 0.)
-    {
-      G4double sqbrack = (intersq - 4*(grad/2.)*(bracket));
-      //      G4cout << "SQBRACK" << sqbrack << G4endl;
-      sqbrack = sqrt(sqbrack);
-      G4double root1 = -cept + sqbrack; 
-      root1 = root1/(2.*(grad/2.));
-      
-      G4double root2 = -cept - sqbrack;
-      root2 = root2/(2.*(grad/2.));
-
-      //      G4cout << root1 << " roots " << root2 << G4endl;
-
-      if(root1 > Emin && root1 < Emax)
-	particle_energy = root1;
-      if(root2 > Emin && root2 < Emax)
-	particle_energy = root2;
-    }
-  else if(grad == 0.)
-    // have equation of form cE - bracket =0
-    particle_energy = bracket/cept;
-
-  if(particle_energy < 0.)
-    particle_energy = -particle_energy;
-  
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GeneratePowEnergies()
-{
-  // Method to generate particle energies distributed as
-  // a powerlaw
-
-  G4double rndm;
-  G4double emina, emaxa;
-
-  emina = pow(Emin,alpha+1);
-  emaxa = pow(Emax,alpha+1);
-
-  rndm = GenRandEnergy();
-
-  if(alpha != -1.)
-    {
-      particle_energy = ((rndm*(emaxa - emina)) + emina);
-      particle_energy = pow(particle_energy,(1./(alpha+1.)));
-    }
-  else if(alpha == -1.)
-    {
-      particle_energy = (log(Emin) + rndm*(log(Emax) - log(Emin)));
-      particle_energy = exp(particle_energy);
-    }
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GenerateExpEnergies()
-{
-  // Method to generate particle energies distributed according
-  // to an exponential curve.
-  G4double rndm;
-  rndm = GenRandEnergy();
-
-  particle_energy = -Ezero*(log(rndm*(exp(-Emax/Ezero) - exp(-Emin/Ezero)) + 
-				exp(-Emin/Ezero)));
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GenerateBremEnergies()
-{
-  // Method to generate particle energies distributed according 
-  // to a Bremstrahlung equation of 
-  // form I = const*((kT)**1/2)*E*(e**(-E/kT))
-  
-  G4double rndm;
-  rndm = GenRandEnergy();
-  G4double expmax, expmin, k;
-
-  k = 8.6181e-11; // Boltzmann's const in MeV/K
-  G4double ksq = pow(k,2.); // k squared
-  G4double Tsq = pow(Temp,2.); // Temp squared
-
-  expmax = exp(-Emax/(k*Temp));
-  expmin = exp(-Emin/(k*Temp));
-
-  // If either expmax or expmin are zero then this will cause problems
-  // Most probably this will be because T is too low or E is too high
-
-  if(expmax == 0.)
-    G4cout << "*****EXPMAX=0. Choose different E's or Temp" << G4endl;
-  if(expmin == 0.)
-    G4cout << "*****EXPMIN=0. Choose different E's or Temp" << G4endl;
-
-  G4double tempvar = rndm *((-k)*Temp*(Emax*expmax - Emin*expmin) -
-    (ksq*Tsq*(expmax-expmin)));
-
-  G4double bigc = (tempvar - k*Temp*Emin*expmin - ksq*Tsq*expmin)/(-k*Temp);
-
-  // This gives an equation of form: Ee(-E/kT) + kTe(-E/kT) - C =0
-  // Solve this iteratively, step from Emin to Emax in 1000 steps
-  // and take the best solution.
-
-  G4double erange = Emax - Emin;
-  G4double steps = erange/1000.;
-  G4int i;
-  G4double etest, diff, err;
-  
-  err = 100000.;
-
-  for(i=1; i<1000; i++)
-    {
-      etest = Emin + (i-1)*steps;
-      
-      diff = etest*(exp(-etest/(k*Temp))) + k*Temp*(exp(-etest/(k*Temp))) - bigc;
-
-      if(diff < 0.)
-	diff = -diff;
-
-      if(diff < err)
-	{
-	  err = diff;
-	  particle_energy = etest;
-	}
-    }  
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GenerateBbodyEnergies()
-{
-  // BBody_x holds Energies, and BBHist holds the cumulative histo.
-  // binary search to find correct bin then lin interpolation.
-  // Use the earlier defined histogram + RandGeneral method to generate
-  // random numbers following the histos distribution.
-  G4double rndm;
-  G4int nabove, nbelow = 0, middle;
-  nabove = 10001;
-  rndm = GenRandEnergy();
-
-  // Binary search to find bin that rndm is in
-  while(nabove-nbelow > 1)
-    {
-      middle = (nabove + nbelow)/2;
-      if(rndm == BBHist[middle]) break;
-      if(rndm < BBHist[middle]) nabove = middle;
-      else nbelow = middle;
-    }
-  
-  // Now interpolate in that bin to find the correct output value.
-  G4double x1, x2, y1, y2, m, q;
-  x1 = Bbody_x[nbelow];
-  x2 = Bbody_x[nbelow+1];
-  y1 = BBHist[nbelow];
-  y2 = BBHist[nbelow+1];
-  m = (y2-y1)/(x2-x1);
-  q = y1 - m*x1;
-  
-  particle_energy = (rndm - q)/m;
-
-  if(verbosityLevel >= 1)
-    {
-      G4cout << "Energy is " << particle_energy << G4endl;
-    }
-}
-
-void G4GeneralParticleSource::GenerateCdgEnergies()
-{
-  // Gen random numbers, compare with values in cumhist
-  // to find appropriate part of spectrum and then 
-  // generate energy in the usual inversion way.
-  //  G4double pfact[2] = {8.5, 112};
-  // G4double spind[2] = {1.4, 2.3};
-  // G4double ene_line[3] = {1., 18., 1E6};
-  G4double rndm, rndm2;
-  G4double ene_line[3];
-  G4double omalpha[2];
-  if(Emin < 18*keV && Emax < 18*keV)
-    {
-      omalpha[0] = 1. - 1.4;
-      ene_line[0] = Emin;
-      ene_line[1] = Emax;
-    }
-  if(Emin < 18*keV && Emax > 18*keV)
-    {
-      omalpha[0] = 1. - 1.4;
-      omalpha[1] = 1. - 2.3;
-      ene_line[0] = Emin;
-      ene_line[1] = 18.;
-      ene_line[2] = Emax;
-    }
-  if(Emin > 18*keV)
-    {
-      omalpha[0] = 1. - 2.3;
-      ene_line[0] = Emin;
-      ene_line[1] = Emax;
-    }
-  rndm = GenRandEnergy();
-  rndm2 = GenRandEnergy();
-
-  G4int i = 0;
-  while( rndm >= CDGhist[i])
-    {
-      i++;
-    }
-  // Generate final energy.
-  particle_energy = (pow(ene_line[i-1],omalpha[i-1]) + (pow(ene_line[i],omalpha[i-1])
-					- pow(ene_line[i-1],omalpha[i-1]))*rndm2);
-  particle_energy = pow(particle_energy,(1./omalpha[i-1]));
-
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GenUserHistEnergies()
-{
-  // Histograms are DIFFERENTIAL.
-  //  G4cout << "In GenUserHistEnergies " << G4endl;
-  if(IPDFEnergyExist == false)
-    {
-      G4int ii;
-      G4int maxbin = G4int(UDefEnergyH.GetVectorLength());
-      G4double bins[256], vals[256], sum;
-      //      UDefEnergyH.DumpValues();
-      G4double mass = particle_definition->GetPDGMass();
-      //      G4cout << mass << G4endl;
-      //      G4cout << EnergySpec << " " << DiffSpec << G4endl;
-      if((EnergySpec == false) && (particle_definition == NULL))
-	G4cout << "Error: particle definition is NULL" << G4endl;
-      
-      if(maxbin > 256)
-	{
-	  G4cout << "Maxbin > 256" << G4endl;
-	  G4cout << "Setting maxbin to 256, other bins are lost" << G4endl;
-	}
-
-      if(DiffSpec == false)
-	G4cout << "Histograms are Differential!!! " << G4endl;
-      else
-	{
-	  //	  G4cout << "Here 2" << G4endl;
-	  bins[0] = UDefEnergyH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = UDefEnergyH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = UDefEnergyH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = UDefEnergyH(size_t(ii)) + vals[ii-1];
-	      sum = sum + UDefEnergyH(size_t(ii));
-	    }
-	}
-
-      if(EnergySpec == false)
-	{
-	  // multiply the function (vals) up by the bin width
-	  // to make the function counts/s (i.e. get rid of momentum
-	  // dependence).
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      //	      G4cout << vals[ii] << " " << bins[ii] << " " << bins[ii-1] << G4endl;
-	      vals[ii] = vals[ii] * (bins[ii] - bins[ii-1]);
-	    }
-	  // Put energy bins into new histo, plus divide by energy bin width
-	  // to make evals counts/s/energy
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      bins[ii] = sqrt((bins[ii]*bins[ii]) + (mass*mass));
-	      //	      G4cout << bins[ii] << " " << mass << G4endl;
-	    }
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      //	      G4cout << vals[ii] << " " << bins[ii] << " " << bins[ii-1] << G4endl;
-	      vals[ii] = vals[ii]/(bins[ii] - bins[ii-1]);
-	    }
-	  sum = vals[maxbin-1];
-	}
-
-      for(ii=0;ii<maxbin;ii++)
-	{
-	  vals[ii] = vals[ii]/sum;
-	  IPDFEnergyH.InsertValues(bins[ii], vals[ii]);
-	}
-
-      // Make IPDFEnergyExist = true
-      IPDFEnergyExist = true;
-      if(verbosityLevel == 2)
-	IPDFEnergyH.DumpValues();
-      
-    }
-
-  // IPDF has been create so carry on
-  G4double rndm = GenRandEnergy();
-  particle_energy = IPDFEnergyH.GetEnergy(rndm);
-  
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::GenArbPointEnergies()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenArbPointEnergies" << G4endl;
-  G4double rndm;
-  rndm = GenRandEnergy();
-
-  if(IntType != "Spline")
-    {
-      //      IPDFArbEnergyH.DumpValues();
-      // Find the Bin
-      // have x, y, no of points, and cumulative area distribution
-      G4int nabove, nbelow = 0, middle;
-      nabove = IPDFArbEnergyH.GetVectorLength();
-      //      G4cout << nabove << G4endl;
-      // Binary search to find bin that rndm is in
-      while(nabove-nbelow > 1)
-	{
-	  middle = (nabove + nbelow)/2;
-	  if(rndm == IPDFArbEnergyH(size_t(middle))) break;
-	  if(rndm < IPDFArbEnergyH(size_t(middle))) nabove = middle;
-	  else nbelow = middle;
-	}
-      if(IntType == "Lin")
-	{
-	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
-	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
-	  grad = Arb_grad[nbelow+1];
-	  cept = Arb_cept[nbelow+1];
-	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << grad << " " << cept << G4endl;
-	  GenerateLinearEnergies();
-	}
-      else if(IntType == "Log")
-	{
-	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
-	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
-	  alpha = Arb_alpha[nbelow+1];
-	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << alpha << G4endl;
-	  GeneratePowEnergies();
-	}
-      else if(IntType == "Exp")
-	{
-	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
-	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
-	  Ezero = Arb_ezero[nbelow+1];
-	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << Ezero << G4endl;
-	  GenerateExpEnergies();
-	}
-    }
-  else if(IntType == "Spline")
-    {
-      if(verbosityLevel == 2)
-	G4cout << "IntType = Spline " << rndm << G4endl;
-      // in SplineInterpolation created SplineInt
-      // Now generate a random number put it into CubicSplineInterpolation
-      // and you should get out an energy!?!
-      particle_energy = SplineInt->CubicSplineInterpolation(rndm);
-      if(verbosityLevel >= 1)
-	G4cout << "Energy is " << particle_energy << G4endl;
-    }
-  else
-    G4cout << "Error: IntType unknown type" << G4endl;
-}
-
-void G4GeneralParticleSource::GenEpnHistEnergies()
-{
-  //  G4cout << "In GenEpnHistEnergies " << Epnflag << G4endl;
-  
-  // Firstly convert to energy if not already done.
-  if(Epnflag == true)
-    // epnflag = true means spectrum is epn, false means e.
-    {
-      // convert to energy by multiplying by A number
-      ConvertEPNToEnergy();
-      // EpnEnergyH will be replace by UDefEnergyH.
-      //      UDefEnergyH.DumpValues();
-    }
-
-  //  G4cout << "Creating IPDFEnergy if not already done so" << G4endl;
-  if(IPDFEnergyExist == false)
-    {
-      // IPDF has not been created, so create it
-      G4double bins[256],vals[256], sum;
-      G4int ii;
-      G4int maxbin = G4int(UDefEnergyH.GetVectorLength());
-      bins[0] = UDefEnergyH.GetLowEdgeEnergy(size_t(0));
-      vals[0] = UDefEnergyH(size_t(0));
-      sum = vals[0];
-      for(ii=1;ii<maxbin;ii++)
-	{
-	  bins[ii] = UDefEnergyH.GetLowEdgeEnergy(size_t(ii));
-	  vals[ii] = UDefEnergyH(size_t(ii)) + vals[ii-1];
-	  sum = sum + UDefEnergyH(size_t(ii));
-	}
-      
-      for(ii=0;ii<maxbin;ii++)
-	{
-	  vals[ii] = vals[ii]/sum;
-	  IPDFEnergyH.InsertValues(bins[ii], vals[ii]);
-	}
-      // Make IPDFEpnExist = true
-      IPDFEnergyExist = true;
-    }
-  //  IPDFEnergyH.DumpValues();
-  // IPDF has been create so carry on
-  G4double rndm = GenRandEnergy();
-  particle_energy = IPDFEnergyH.GetEnergy(rndm);
-
-  if(verbosityLevel >= 1)
-    G4cout << "Energy is " << particle_energy << G4endl;
-}
-
-void G4GeneralParticleSource::ConvertEPNToEnergy()
-{
-  // Use this before particle generation to convert  the
-  // currently stored histogram from energy/nucleon 
-  // to energy.
-  //  G4cout << "In ConvertEpntoEnergy " << G4endl;
-  if(particle_definition==NULL)
-    G4cout << "Error: particle not defined" << G4endl;
-  else
-    {
-      // Need to multiply histogram by the number of nucleons.
-      // Baryon Number looks to hold the no. of nucleons.
-      G4int Bary = particle_definition->GetBaryonNumber();
-      //      G4cout << "Baryon No. " << Bary << G4endl;
-      // Change values in histogram, Read it out, delete it, re-create it
-      G4int count, maxcount;
-      maxcount = G4int(EpnEnergyH.GetVectorLength());
-      //      G4cout << maxcount << G4endl;
-      G4double ebins[256],evals[256];
-      if(maxcount > 256)
-	{
-	  G4cout << "Histogram contains more than 256 bins!" << G4endl;
-	  G4cout << "Those above 256 will be ignored" << G4endl;
-	  maxcount = 256;
-	}
-      for(count=0;count<maxcount;count++)
-	{
-	  // Read out
-	  ebins[count] = EpnEnergyH.GetLowEdgeEnergy(size_t(count));
-	  evals[count] = EpnEnergyH(size_t(count));
-	}
-
-      // Multiply the channels by the nucleon number to give energies
-      for(count=0;count<maxcount;count++)
-	{
-	  ebins[count] = ebins[count] * Bary;
-	}
-
-      // Set Emin and Emax
-      Emin = ebins[0];
-      Emax = ebins[maxcount-1];
-
-      // Put energy bins into new histogram - UDefEnergyH.
-      for(count=0;count<maxcount;count++)
-	{
-	  UDefEnergyH.InsertValues(ebins[count], evals[count]);
-	}
-      Epnflag = false; //so that you dont repeat this method.
-    }  
-}
-
-// Biasing methods
-
-void G4GeneralParticleSource::SetXBias(G4ThreeVector input)
-{  
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  XBiasH.InsertValues(ehi, val);
-  XBias = true;
-}
-
-void G4GeneralParticleSource::SetYBias(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  YBiasH.InsertValues(ehi, val);
-  YBias = true;
-}
-
-void G4GeneralParticleSource::SetZBias(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  ZBiasH.InsertValues(ehi, val);
-  ZBias = true;
-}
-
-void G4GeneralParticleSource::SetThetaBias(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  ThetaBiasH.InsertValues(ehi, val);
-  ThetaBias = true;
-}
-
-void G4GeneralParticleSource::SetPhiBias(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  PhiBiasH.InsertValues(ehi, val);
-  PhiBias = true;
-}
-
-void G4GeneralParticleSource::SetEnergyBias(G4ThreeVector input)
-{
-  G4double ehi, val;
-  ehi = input.x();
-  val = input.y();
-  EnergyBiasH.InsertValues(ehi, val);
-  EnergyBias = true;
-}
-
-G4double G4GeneralParticleSource::GenRandX()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenRandX" << G4endl;
-  if(XBias == false)
-    {
-      // X is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // X is biased
-      if(IPDFXBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(XBiasH.GetVectorLength());
-	  bins[0] = XBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = XBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = XBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = XBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + XBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFXBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFXBias = true
-	  IPDFXBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-
-      // Calculate the weighting: Find the bin that the determined
-      // rndm is in and the weigthing will be the difference in the
-      // natural probability (from the x-axis) divided by the 
-      // difference in the biased probability (the area).
-      size_t numberOfBin = IPDFXBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFXBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      // retrieve the areas and then the x-axis values
-      bweights[0] = IPDFXBiasH(biasn2) - IPDFXBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFXBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFXBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      //G4cout << "X Bin weight " << bweights[0] << " " << rndm << G4endl;
-      //G4cout << "lower and upper xaxis vals "<<xaxisl<<" "<<xaxisu<<G4endl;
-      bweights[0] = NatProb/bweights[0];
-      if(verbosityLevel >= 1)
-	G4cout << "X bin weight " << bweights[0] << " " << rndm << G4endl;
-      return(IPDFXBiasH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenRandY()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenRandY" << G4endl;
-  if(YBias == false)
-    {
-      // Y is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // Y is biased
-      if(IPDFYBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(YBiasH.GetVectorLength());
-	  bins[0] = YBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = YBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = YBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = YBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + YBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFYBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFYBias = true
-	  IPDFYBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      size_t numberOfBin = IPDFYBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFYBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      bweights[1] =  IPDFYBiasH(biasn2) - IPDFYBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFYBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFYBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      bweights[1] = NatProb/bweights[1];
-      if(verbosityLevel >= 1)
-	G4cout << "Y bin weight " << bweights[1] << " " << rndm << G4endl;
-      return(IPDFYBiasH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenRandZ()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenRandZ" << G4endl;
-  if(ZBias == false)
-    {
-      // Z is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // Z is biased
-      if(IPDFZBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(ZBiasH.GetVectorLength());
-	  bins[0] = ZBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = ZBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = ZBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = ZBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + ZBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFZBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFZBias = true
-	  IPDFZBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      //      size_t weight_bin_no = IPDFZBiasH.FindValueBinLocation(rndm);
-      size_t numberOfBin = IPDFZBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFZBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      bweights[2] =  IPDFZBiasH(biasn2) - IPDFZBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFZBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFZBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      bweights[2] = NatProb/bweights[2];
-      if(verbosityLevel >= 1)
-	G4cout << "Z bin weight " << bweights[2] << " " << rndm << G4endl;
-      return(IPDFZBiasH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenRandTheta()
-{
-  if(verbosityLevel >= 1)
-    {
-      G4cout << "In GenRandTheta" << G4endl;
-      G4cout << "Verbosity " << verbosityLevel << G4endl;
-    }
-  if(ThetaBias == false)
-    {
-      // Theta is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // Theta is biased
-      if(IPDFThetaBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(ThetaBiasH.GetVectorLength());
-	  bins[0] = ThetaBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = ThetaBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = ThetaBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = ThetaBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + ThetaBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFThetaBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFThetaBias = true
-	  IPDFThetaBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      //      size_t weight_bin_no = IPDFThetaBiasH.FindValueBinLocation(rndm);
-      size_t numberOfBin = IPDFThetaBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFThetaBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      bweights[3] =  IPDFThetaBiasH(biasn2) - IPDFThetaBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFThetaBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFThetaBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      bweights[3] = NatProb/bweights[3];
-      if(verbosityLevel >= 1)
-	G4cout << "Theta bin weight " << bweights[3] << " " << rndm << G4endl;
-      return(IPDFThetaBiasH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenRandPhi()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenRandPhi" << G4endl;
-  if(PhiBias == false)
-    {
-      // Phi is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // Phi is biased
-      if(IPDFPhiBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(PhiBiasH.GetVectorLength());
-	  bins[0] = PhiBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = PhiBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = PhiBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = PhiBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + PhiBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFPhiBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFPhiBias = true
-	  IPDFPhiBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      //      size_t weight_bin_no = IPDFPhiBiasH.FindValueBinLocation(rndm);
-      size_t numberOfBin = IPDFPhiBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFPhiBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      bweights[4] =  IPDFPhiBiasH(biasn2) - IPDFPhiBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFPhiBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFPhiBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      bweights[4] = NatProb/bweights[4];
-      if(verbosityLevel >= 1)
-	G4cout << "Phi bin weight " << bweights[4] << " " << rndm << G4endl;
-      return(IPDFPhiBiasH.GetEnergy(rndm));
-    }
-}
-
-G4double G4GeneralParticleSource::GenRandEnergy()
-{
-  if(verbosityLevel >= 1)
-    G4cout << "In GenRandEnergy" << G4endl;
-  if(EnergyBias == false)
-    {
-      // Energy is not biased
-      G4double rndm = G4UniformRand();
-      return(rndm);
-    }
-  else
-    {
-      // ENERGY is biased
-      if(IPDFEnergyBias == false)
-	{
-	  // IPDF has not been created, so create it
-	  G4double bins[256],vals[256], sum;
-	  G4int ii;
-	  G4int maxbin = G4int(EnergyBiasH.GetVectorLength());
-	  bins[0] = EnergyBiasH.GetLowEdgeEnergy(size_t(0));
-	  vals[0] = EnergyBiasH(size_t(0));
-	  sum = vals[0];
-	  for(ii=1;ii<maxbin;ii++)
-	    {
-	      bins[ii] = EnergyBiasH.GetLowEdgeEnergy(size_t(ii));
-	      vals[ii] = EnergyBiasH(size_t(ii)) + vals[ii-1];
-	      sum = sum + EnergyBiasH(size_t(ii));
-	    }
-
-	  for(ii=0;ii<maxbin;ii++)
-	    {
-	      vals[ii] = vals[ii]/sum;
-	      IPDFEnergyBiasH.InsertValues(bins[ii], vals[ii]);
-	    }
-	  // Make IPDFEnergyBias = true
-	  IPDFEnergyBias = true;
-	}
-      // IPDF has been create so carry on
-      G4double rndm = G4UniformRand();
-      //  size_t weight_bin_no = IPDFEnergyBiasH.FindValueBinLocation(rndm);
-      size_t numberOfBin = IPDFEnergyBiasH.GetVectorLength();
-      G4int biasn1 = 0;
-      G4int biasn2 = numberOfBin/2;
-      G4int biasn3 = numberOfBin - 1;
-      while (biasn1 != biasn3 - 1) {
-      if (rndm > IPDFEnergyBiasH(biasn2))
-         biasn1 = biasn2;
-      else
-         biasn3 = biasn2;
-      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
-      }
-      bweights[5] =  IPDFEnergyBiasH(biasn2) - IPDFEnergyBiasH(biasn2 - 1);
-      G4double xaxisl = IPDFEnergyBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
-      G4double xaxisu = IPDFEnergyBiasH.GetLowEdgeEnergy(size_t(biasn2));
-      G4double NatProb = xaxisu - xaxisl;
-      bweights[5] = NatProb/bweights[5];
-      if(verbosityLevel >= 1)
-	G4cout << "Energy bin weight " << bweights[5] << " " << rndm << G4endl;
-      return(IPDFEnergyBiasH.GetEnergy(rndm));
-    }
-}
-
-// Verbosity
-void G4GeneralParticleSource::SetVerbosity(int vL)
-{
-  verbosityLevel = vL;
-  G4cout << "Verbosity Set to: " << verbosityLevel << G4endl;
-}
-
-void G4GeneralParticleSource::SetParticleDefinition
-  (G4ParticleDefinition* aParticleDefinition)
-{
-  particle_definition = aParticleDefinition;
-  particle_charge = particle_definition->GetPDGCharge();
-}
-
-// SR1.3
-//void G4GeneralParticleSource::SetNucleus (Nucleus theIon1)
-//{
-//  theIon = theIon1;
-
-//  G4IonTable *theIonTable = (G4IonTable *)(G4ParticleTable::GetParticleTable()->GetIonTable());
-//  G4ParticleDefinition *aIon = NULL;
-
-//  G4int A = theIon.GetA();
-//  G4int Z = theIon.GetZ();
-//  G4double E = theIon.GetE();
-
-//  aIon = theIonTable->GetIon (Z, A, E);
-
-//  SetParticleDefinition(aIon);
-//}
-
-
-void G4GeneralParticleSource::GeneratePrimaryVertex(G4Event *evt)
-{
-  if(particle_definition==NULL) return;
-
-  // Position stuff
-  G4bool srcconf = false;
-  G4int LoopCount = 0;
-  while(srcconf == false)
-    {
-      if(SourcePosType == "Point")
-	GeneratePointSource();
-      else if(SourcePosType == "Plane")
-	GeneratePointsInPlane();
-      else if(SourcePosType == "Surface")
-	GeneratePointsOnSurface();
-      else if(SourcePosType == "Volume")
-	GeneratePointsInVolume();
-      else
-	{
-	  G4cout << "Error: SourcePosType undefined" << G4endl;
-	  G4cout << "Generating point source" << G4endl;
-	  GeneratePointSource();
-	}
-      if(Confine == true)
-	{
-	  srcconf = IsSourceConfined();
-	  // if source in confined srcconf = true terminating the loop
-	  // if source isnt confined srcconf = false and loop continues
-	}
-      else if(Confine == false)
-	srcconf = true; // terminate loop
-
-      LoopCount++;
-      if(LoopCount == 100000)
-	{
-	  G4cout << "*************************************" << G4endl;
-	  G4cout << "LoopCount = 100000" << G4endl;
-	  G4cout << "Either the source distribution >> confinement" << G4endl;
-	  G4cout << "or any confining volume may not overlap with" << G4endl;
-	  G4cout << "the source distribution or any confining volumes" << G4endl;
-	  G4cout << "may not exist"<< G4endl;
-	  G4cout << "If you have set confine then this will be ignored" <<G4endl;
-	  G4cout << "for this event." << G4endl;
-	  G4cout << "*************************************" << G4endl;
-	  srcconf = true; //Avoids an infinite loop
-	}
-    }
-  // Angular stuff
-  if(AngDistType == "iso")
-    GenerateIsotropicFlux();
-  else if(AngDistType == "cos")
-    GenerateCosineLawFlux();
-  else if(AngDistType == "user")
-    GenerateUserDefFlux();
-  else
-    G4cout << "Error: AngDistType has unusual value" << G4endl;
-  // Energy stuff
-  if(EnergyDisType == "Mono")
-    GenerateMonoEnergetic();
-  else if(EnergyDisType == "Lin")
-    GenerateLinearEnergies();
-  else if(EnergyDisType == "Pow")
-    GeneratePowEnergies();
-  else if(EnergyDisType == "Exp")
-    GenerateExpEnergies();
-  else if(EnergyDisType == "Brem")
-    GenerateBremEnergies();
-  else if(EnergyDisType == "Bbody")
-    GenerateBbodyEnergies();
-  else if(EnergyDisType == "Cdg")
-    GenerateCdgEnergies();
-  else if(EnergyDisType == "User")
-    GenUserHistEnergies();
-  else if(EnergyDisType == "Arb")
-    GenArbPointEnergies();
-  else if(EnergyDisType == "Epn")
-    GenEpnHistEnergies();
-  else
-    G4cout << "Error: EnergyDisType has unusual value" << G4endl;
-
-  // create a new vertex
-  G4PrimaryVertex* vertex = 
-    new G4PrimaryVertex(particle_position,particle_time);
-
-  if(verbosityLevel == 2)
-    G4cout << "Creating primaries and assigning to vertex" << G4endl;
-  // create new primaries and set them to the vertex
-  G4double mass =  particle_definition->GetPDGMass();
-  G4double energy = particle_energy + mass;
-  G4double pmom = sqrt(energy*energy-mass*mass);
-  G4double px = pmom*particle_momentum_direction.x();
-  G4double py = pmom*particle_momentum_direction.y();
-  G4double pz = pmom*particle_momentum_direction.z();
-
-  for( G4int i=0; i<NumberOfParticlesToBeGenerated; i++ )
-  {
-    G4PrimaryParticle* particle =
-      new G4PrimaryParticle(particle_definition,px,py,pz);
-    particle->SetMass( mass );
-    particle->SetCharge( particle_charge );
-    particle->SetPolarization(particle_polarization.x(),
-                               particle_polarization.y(),
-                               particle_polarization.z());
-    vertex->SetPrimary( particle );
-
-    // Set bweight equal to the multiple of all non-zero weights
-    bweight = 0.;
-    for(int bib=0; bib<6; bib++)
-      {
-	if(bweights[bib] > 0. && bweight == 0.)
-	  bweight = bweight + bweights[bib];
-	else if(bweights[bib] > 0.)
-	  bweight = bweight * bweights[bib];
-      }
-    // bweight will now contain the events final weighting.
-    // now pass it to the primary vertex
-    vertex->SetWeight(bweight);
-  }
-
-  evt->AddPrimaryVertex( vertex );
-}
-
-
-
-
-
-
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+// MODULE:       G4GeneralParticleSource.cc
+//
+// Version:      1.1
+// Date:         18/10/00
+// Author:       C Ferguson, F Lei, P Truscott
+// Organisation: University of Southampton / DERA
+// Customer:     ESA/ESTEC
+//
+// Documentation available at http://www.space.dera.gov.uk/space_env/gspm.html
+//   These include:
+//       User Requirement Document (URD)
+//       Software Specification Documents (SSD)
+//       Software User Manual (SUM)
+//       Technical Note (TN) on the physics and algorithms
+//
+///////////////////////////////////////////////////////////////////////////////
+// $Id: G4GeneralParticleSource.cc,v 1.9 2001/06/29 08:06:03 gcosmo Exp $
+// GEANT4 tag $Name: event-V03-01-01 $
+///////////////////////////////////////////////////////////////////////////////
+//
+// CHANGE HISTORY
+// --------------
+//
+// 26-01-2001, F. Lei
+// replace: 
+//          posphi = acos(tx/sin(posthe));
+// 
+// with:
+//          if (posthe != 0. && posthe != pi) 
+//           { posphi = acos(tx/sin(posthe)); }
+//          else 
+//           { posphi = 0.0;}
+//          endif
+//
+// 10-Nov-2000, F. Lei
+//    some bug fixing:
+//          i) dclared ' G4int count' in all ****Interpolation functions
+//          ii) added ' return (0.) ' to GenerateUserDefTheta and GenerateUserDefPhi 
+//              as default.
+//
+// 09-Nov-2000, F Lei
+//    Changed to a fast implementation for generating iso and cos angular directions 
+//
+// Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
+// New name at the request of M. Asai.
+//
+//
+// Version 1.0, 28 February 2000, C Ferguson, Created.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+#include "G4PrimaryParticle.hh"
+#include "G4Event.hh"
+#include "Randomize.hh"
+#include <math.h>
+#include "G4TransportationManager.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4PhysicalVolumeStore.hh"
+#include "G4ParticleTable.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4IonTable.hh"
+#include "G4Ions.hh"
+#include "G4TrackingManager.hh"
+#include "G4Track.hh"
+#include "G4GeneralParticleSource.hh"
+
+G4GeneralParticleSource::G4GeneralParticleSource()
+{
+  // Initialise all variables
+  // Position distribution Variables
+
+  NumberOfParticlesToBeGenerated = 1;
+  particle_definition = NULL;
+  G4ThreeVector zero;
+  particle_momentum_direction = (G4ParticleMomentum)zero;
+  particle_energy = 0.0;
+  particle_position = zero;
+  particle_time = 0.0;
+  particle_polarization = zero;
+  particle_charge = 0.0;
+
+  SourcePosType = "Point";
+  Shape = "NULL";
+  halfx = 0.;
+  halfy = 0.;
+  halfz = 0.;
+  Radius = 0.;
+  Radius0 = 0.;
+  ParAlpha = 0.;
+  ParTheta = 0.;
+  ParPhi = 0.;
+  CentreCoords = (0.,0.,0.);
+  Rotx = HepXHat;
+  Roty = HepYHat;
+  Rotz = HepZHat;
+  Confine = false; //If true confines source distribution to VolName
+  VolName = "NULL";
+  SideRefVec1 = HepXHat; // x-axis
+  SideRefVec2 = HepYHat; // y-axis
+  SideRefVec3 = HepZHat; // z-axis
+  UserWRTSurface = false; // Any user-defined distribution is wrt co-ordinate
+  // axes.
+
+  // Angular distribution variables.
+  AngDistType = "iso"; 
+  AngRef1 = (1.,0.,0.);
+  AngRef2 = (0.,1.,0.);
+  AngRef3 = (0.,0.,1.);
+  MinTheta = 0.;
+  MaxTheta = pi;
+  MinPhi = 0.;
+  MaxPhi = twopi;
+  UserDistType = "NULL";
+  IPDFThetaExist = false;
+  IPDFPhiExist = false;
+
+  // Energy Distribution variables
+  EnergyDisType = "Mono";
+  MonoEnergy = 1*MeV;
+  Emin = 0.;
+  Emax = 0.;
+  alpha = 0.;
+  Ezero = 0.;
+  Temp = 0.;
+  grad = 0.;
+  cept = 0.;
+  EnergySpec = true; // true - energy spectra, false - momentum spectra
+  DiffSpec = true;  // true - differential spec, false integral spec
+  IntType = "NULL"; // Interpolation type
+  IPDFEnergyExist = false;
+  IPDFArbExist = false;
+
+  // Bias variables
+  XBias = false;
+  IPDFXBias = false;
+  YBias = false;
+  IPDFYBias = false;
+  ZBias = false;
+  IPDFZBias = false;
+  ThetaBias = false;
+  IPDFThetaBias = false;
+  PhiBias = false;
+  IPDFPhiBias = false;
+  EnergyBias = false;
+  IPDFEnergyBias = false;
+
+  ArbEmin = 0.;
+  ArbEmax = 0.;
+
+  // verbosity
+  verbosityLevel = 0;
+
+  theMessenger = new G4GeneralParticleSourceMessenger(this);
+  gNavigator = G4TransportationManager::GetTransportationManager()
+    ->GetNavigatorForTracking();
+}
+
+G4GeneralParticleSource::~G4GeneralParticleSource()
+{
+  delete theMessenger;
+}
+
+void G4GeneralParticleSource::SetPosDisType(G4String PosType)
+{
+  SourcePosType = PosType;
+}
+
+void G4GeneralParticleSource::SetPosDisShape(G4String shapeType)
+{
+  Shape = shapeType;
+}
+
+void G4GeneralParticleSource::SetCentreCoords(G4ThreeVector coordsOfCentre)
+{
+  CentreCoords = coordsOfCentre;
+}
+
+void G4GeneralParticleSource::SetPosRot1(G4ThreeVector posrot1)
+{
+  // This should be x'
+  Rotx = posrot1;
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Vector x' " << Rotx << G4endl;
+    }
+  GenerateRotationMatrices();
+}
+
+void G4GeneralParticleSource::SetPosRot2(G4ThreeVector posrot2)
+{
+  // This is a vector in the plane x'y' but need not
+  // be y'
+  Roty = posrot2;
+  if(verbosityLevel == 2)
+    {
+      G4cout << "The vector in the x'-y' plane " << Roty << G4endl;
+    }
+  GenerateRotationMatrices();
+}
+
+void G4GeneralParticleSource::SetHalfX(G4double xhalf)
+{
+  halfx = xhalf;
+}
+
+void G4GeneralParticleSource::SetHalfY(G4double yhalf)
+{
+  halfy = yhalf;
+}
+
+void G4GeneralParticleSource::SetHalfZ(G4double zhalf)
+{
+  halfz = zhalf;
+}
+
+void G4GeneralParticleSource::SetRadius(G4double rad)
+{
+  Radius = rad;
+}
+
+void G4GeneralParticleSource::SetRadius0(G4double rad)
+{
+  Radius0 = rad;
+}
+
+void G4GeneralParticleSource::SetParAlpha(G4double paralp)
+{
+  ParAlpha = paralp;
+}
+
+void G4GeneralParticleSource::SetParTheta(G4double parthe)
+{
+  ParTheta = parthe;
+}
+
+void G4GeneralParticleSource::SetParPhi(G4double parphi)
+{
+  ParPhi = parphi;
+}
+
+void G4GeneralParticleSource::GenerateRotationMatrices()
+{
+  // This takes in 2 vectors, x' and one in the plane x'-y',
+  // and from these takes a cross product to calculate z'.
+  // Then a cross product is taken between x' and z' to give
+  // y'.
+  Rotx = Rotx.unit(); // x'
+  Roty = Roty.unit(); // vector in x'y' plane
+  Rotz = Rotx.cross(Roty); // z'
+  Roty = Rotz.cross(Rotx); // y'
+  if(verbosityLevel == 2)
+    {
+      G4cout << "The new axes, x', y', z' " << Rotx << " " << Roty << " " << Rotz << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::ConfineSourceToVolume(G4String Vname)
+{
+  VolName = Vname;
+  if(verbosityLevel == 2)
+    G4cout << VolName << G4endl;
+  G4VPhysicalVolume *tempPV      = NULL;
+  G4PhysicalVolumeStore *PVStore = 0;
+  G4String theRequiredVolumeName = VolName;
+  PVStore      = G4PhysicalVolumeStore::GetInstance();
+  G4int      i = 0;
+  G4bool found = false;
+  if(verbosityLevel == 2)
+    G4cout << PVStore->size() << G4endl;
+  while (!found && i<PVStore->size()) {
+    tempPV = (*PVStore)[i];
+    found  = tempPV->GetName() == theRequiredVolumeName;
+    if(verbosityLevel == 2)
+      G4cout << i << " " << " " << tempPV->GetName() << " " << theRequiredVolumeName << " " << found << G4endl;
+    if (!found)
+      {i++;}
+  }
+  // found = true then the volume exists else it doesnt.
+  if(found == true)
+    {
+      if(verbosityLevel >= 1)
+	G4cout << "Volume " << VolName << " exists" << G4endl;
+      Confine = true;
+    }
+  else
+    {
+      G4cout << " **** Error: Volume does not exist **** " << G4endl;
+      G4cout << " Ignoring confine condition" << G4endl;
+      Confine = false;
+      VolName = "NULL";
+    }
+
+}
+
+void G4GeneralParticleSource::GeneratePointSource()
+{
+  // Generates Points given the point source.
+  if(SourcePosType == "Point")
+    particle_position = CentreCoords;
+  else
+    if(verbosityLevel >= 1)
+      G4cout << "Error SourcePosType is not set to Point" << G4endl;
+}
+
+void G4GeneralParticleSource::GeneratePointsInPlane()
+{
+  G4double x, y, z;
+  G4double expression;
+  G4ThreeVector RandPos;
+  G4double tempx, tempy, tempz;
+  z = 0.;
+
+  if(SourcePosType != "Plane" && verbosityLevel >= 1)
+    G4cout << "Error: SourcePosType is not Plane" << G4endl;
+
+  // Private Method to create points in a plane
+  if(Shape == "Circle")
+    {
+      x = Radius + 100.;
+      y = Radius + 100.;
+      while(sqrt((x*x) + (y*y)) > Radius)
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+
+	  x = (x*2.*Radius) - Radius;
+	  y = (y*2.*Radius) - Radius;
+	}
+    }
+  else if(Shape == "Annulus")
+    {
+      x = Radius + 100.;
+      y = Radius + 100.;
+      while(sqrt((x*x) + (y*y)) > Radius || sqrt((x*x) + (y*y)) < Radius0 )
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+
+	  x = (x*2.*Radius) - Radius;
+	  y = (y*2.*Radius) - Radius;
+	}
+    }
+  else if(Shape == "Ellipse")
+    {
+      expression = 20.;
+      while(expression > 1.)
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+
+	  x = (x*2.*halfx) - halfx;
+	  y = (y*2.*halfy) - halfy;
+
+	  expression = ((x*x)/(halfx*halfx)) + ((y*y)/(halfy*halfy));
+	}
+    }
+  else if(Shape == "Square")
+    {
+      x = GenRandX();
+      y = GenRandY();
+      x = (x*2.*halfx) - halfx;
+      y = (y*2.*halfy) - halfy;
+    }
+  else if(Shape == "Rectangle")
+    {
+      x = GenRandX();
+      y = GenRandY();
+      x = (x*2.*halfx) - halfx;
+      y = (y*2.*halfy) - halfy;
+    }
+  else
+    G4cout << "Shape not one of the plane types" << G4endl;
+
+  // Apply Rotation Matrix
+  // x * Rotx, y * Roty and z * Rotz
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Raw position " << x << "," << y << "," << z << G4endl;
+    }
+  tempx = (x * Rotx.x()) + (y * Roty.x()) + (z * Rotz.x());
+  tempy = (x * Rotx.y()) + (y * Roty.y()) + (z * Rotz.y());
+  tempz = (x * Rotx.z()) + (y * Roty.z()) + (z * Rotz.z());
+
+  RandPos.setX(tempx);
+  RandPos.setY(tempy);
+  RandPos.setZ(tempz);
+
+  // Translate
+  particle_position = CentreCoords + RandPos;
+  if(verbosityLevel >= 1)
+    {
+      if(verbosityLevel == 2)
+	{
+	  G4cout << "Rotated Position " << RandPos << G4endl;
+	}
+      G4cout << "Rotated and Translated position " << particle_position << G4endl;
+    }
+
+  // For Cosine-Law make SideRefVecs = to Rotation matrix vectors
+  SideRefVec1 = Rotx;
+  SideRefVec2 = Roty;
+  SideRefVec3 = Rotz;
+  // If rotation matrix z' point to origin then invert the matrix
+  // So that SideRefVecs point away.
+  if((CentreCoords.x() > 0. && Rotz.x() < 0.)
+     || (CentreCoords.x() < 0. && Rotz.x() > 0.)
+     || (CentreCoords.y() > 0. && Rotz.y() < 0.)
+     || (CentreCoords.y() < 0. && Rotz.y() > 0.)
+     || (CentreCoords.z() > 0. && Rotz.z() < 0.)
+     || (CentreCoords.z() < 0. && Rotz.z() > 0.))
+    {
+      // Invert y and z.
+      SideRefVec2 = -SideRefVec2;
+      SideRefVec3 = -SideRefVec3;
+    }
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::GeneratePointsOnSurface()
+{
+  //Private method to create points on a surface
+  G4double theta, phi;
+  G4double x, y, z;
+  G4ThreeVector RandPos;
+  G4double tempx, tempy, tempz;
+
+  if(SourcePosType != "Surface" && verbosityLevel >= 1)
+    G4cout << "Error SourcePosType not Surface" << G4endl;
+
+  if(Shape == "Sphere")
+    {
+      G4double tantheta, tanphi;
+      theta = GenRandTheta();
+      phi = GenRandPhi();
+
+      theta = acos(1. - 2.*theta); // theta isotropic
+      phi = phi * 2. * pi;
+      tantheta = tan(theta);
+      
+      x = Radius * sin(theta) * cos(phi);
+      y = Radius * sin(theta) * sin(phi);
+      z = Radius * cos(theta);
+      
+      RandPos.setX(x);
+      RandPos.setY(y);
+      RandPos.setZ(z);
+
+      // Cosine-law (not a good idea to use this here)
+      G4ThreeVector zdash(x,y,z);
+      zdash = zdash.unit();
+      G4ThreeVector xdash = Rotz.cross(zdash);
+      G4ThreeVector ydash = xdash.cross(zdash);
+      SideRefVec1 = xdash;
+      SideRefVec2 = ydash;
+      SideRefVec3 = zdash;
+    }
+  else if(Shape == "Ellipsoid")
+    {
+      G4double testrand, theta, phi, minphi, maxphi, middlephi;
+      G4double answer, constant;
+
+      constant = pi/(halfx*halfx) + pi/(halfy*halfy) + 
+	twopi/(halfz*halfz);
+      
+      // simplified approach
+      theta = GenRandTheta();
+      phi = GenRandPhi();
+
+      theta = acos(1. - 2.*theta);
+      minphi = 0.;
+      maxphi = twopi;
+      while(maxphi-minphi > 0.)
+	{
+	  middlephi = (maxphi+minphi)/2.;
+	  answer = (1./(halfx*halfx))*(middlephi/2. + sin(2*middlephi)/4.)
+	    + (1./(halfy*halfy))*(middlephi/2. - sin(2*middlephi)/4.)
+	       + middlephi/(halfz*halfz);
+	  answer = answer/constant;
+	  if(answer > phi) maxphi = middlephi;
+	  if(answer < phi) minphi = middlephi;
+	  if(fabs(answer-phi) <= 0.00001)
+	    {
+	      minphi = maxphi +1;
+	      phi = middlephi;
+	    }
+	}
+
+      x = sin(theta)*cos(phi);
+      y = sin(theta)*sin(phi);
+      z = cos(theta);
+      // x,y and z form a unit vector. Put this onto the ellipse.
+      G4double lhs;
+      // solve for x
+      G4double numYinX = y/x;
+      G4double numZinX = z/x;
+      G4double tempxvar;	  
+      tempxvar= 1./(halfx*halfx)+(numYinX*numYinX)/(halfy*halfy)
+	+ (numZinX*numZinX)/(halfz*halfz);
+
+      tempxvar = 1./tempxvar;
+      G4double coordx = sqrt(tempxvar);
+  
+      //solve for y
+      G4double numXinY = x/y;
+      G4double numZinY = z/y;
+      G4double tempyvar;
+      tempyvar=(numXinY*numXinY)/(halfx*halfx)+1./(halfy*halfy)
+	+(numZinY*numZinY)/(halfz*halfz);
+      tempyvar = 1./tempyvar;
+      G4double coordy = sqrt(tempyvar);
+      
+      //solve for z
+      G4double numXinZ = x/z;
+      G4double numYinZ = y/z;
+      G4double tempzvar;
+      tempzvar=(numXinZ*numXinZ)/(halfx*halfx)
+	+(numYinZ*numYinZ)/(halfy*halfy)+1./(halfz*halfz);
+      tempzvar = 1./tempzvar;
+      G4double coordz = sqrt(tempzvar);
+
+      lhs = sqrt((coordx*coordx)/(halfx*halfx) + 
+		 (coordy*coordy)/(halfy*halfy) + 
+		 (coordz*coordz)/(halfz*halfz));
+      
+      if(fabs(lhs-1.) > 0.001 && verbosityLevel >= 1)
+	G4cout << "Error: theta, phi not really on ellipsoid" << G4endl;
+
+      // coordx, coordy and coordz are all positive
+      G4double TestRandVar = G4UniformRand();
+      if(TestRandVar > 0.5)
+	{
+	  coordx = -coordx;
+	}
+      TestRandVar = G4UniformRand();
+      if(TestRandVar > 0.5)
+	{
+	  coordy = -coordy;
+	}
+      TestRandVar = G4UniformRand();
+      if(TestRandVar > 0.5)
+	{
+	  coordz = -coordz;
+	}
+
+      RandPos.setX(coordx);
+      RandPos.setY(coordy);
+      RandPos.setZ(coordz);
+
+      // Cosine-law (not a good idea to use this here)
+      G4ThreeVector zdash(coordx,coordy,coordz);
+      zdash = zdash.unit();
+      G4ThreeVector xdash = Rotz.cross(zdash);
+      G4ThreeVector ydash = xdash.cross(zdash);
+      SideRefVec1 = xdash;
+      SideRefVec2 = ydash;
+      SideRefVec3 = zdash;
+    }
+  else if(Shape == "Cylinder")
+    {
+      G4double AreaTop, AreaBot, AreaLat;
+      G4double AreaTotal, prob1, prob2, prob3;
+      G4double testrand;
+
+      // User giver Radius and z-half length
+      // Calculate surface areas, maybe move this to 
+      // a different routine.
+
+      AreaTop = pi * Radius * Radius;
+      AreaBot = AreaTop;
+      AreaLat = 2. * pi * Radius * 2. * halfz;
+      AreaTotal = AreaTop + AreaBot + AreaLat;
+      
+      prob1 = AreaTop / AreaTotal;
+      prob2 = AreaBot / AreaTotal;
+      prob3 = 1.00 - prob1 - prob2;
+      if(fabs(prob3 - (AreaLat/AreaTotal)) >= 0.001)
+	{
+	  if(verbosityLevel >= 1)
+	    G4cout << AreaLat/AreaTotal << " " << prob3<<G4endl;
+	  G4cout << "Error in prob3" << G4endl;
+	}
+
+      // Decide surface to calculate point on.
+
+      testrand = G4UniformRand();
+      if(testrand <= prob1)
+	{
+	  //Point on Top surface
+	  z = halfz;
+	  x = Radius + 100.;
+	  y = Radius + 100.;
+	  while(((x*x)+(y*y)) > (Radius*Radius))
+	    {
+	      x = GenRandX();
+	      y = GenRandY();
+
+	      x = x * 2. * Radius;
+	      y = y * 2. * Radius;
+	      x = x - Radius;
+	      y = y - Radius;
+	    }
+	  // Cosine law
+	  SideRefVec1 = Rotx;
+	  SideRefVec2 = Roty;
+	  SideRefVec3 = Rotz;
+	}
+      else if((testrand > prob1) && (testrand <= (prob1 + prob2)))
+	{
+	  //Point on Bottom surface
+	  z = -halfz;
+	  x = Radius + 100.;
+	  y = Radius + 100.;
+	  while(((x*x)+(y*y)) > (Radius*Radius))
+	    {
+	      x = GenRandX();
+	      y = GenRandY();
+
+	      x = x * 2. * Radius;
+	      y = y * 2. * Radius;
+	      x = x - Radius;
+	      y = y - Radius;
+	    }
+	  // Cosine law
+	  SideRefVec1 = Rotx;
+	  SideRefVec2 = -Roty;
+	  SideRefVec3 = -Rotz;
+	}
+      else if(testrand > (prob1+prob2))
+	{
+	  G4double rand;
+	  //Point on Lateral Surface
+
+	  rand = G4UniformRand();
+	  rand = rand * 2. * pi;
+
+	  x = Radius * cos(rand);
+	  y = Radius * sin(rand);
+
+	  z = GenRandZ();
+
+	  z = z * 2. * halfz;
+	  z = z - halfz;
+	  
+	  // Cosine law
+	  G4ThreeVector zdash(x,y,0.);
+	  zdash = zdash.unit();
+	  G4ThreeVector xdash = Rotz.cross(zdash);
+	  G4ThreeVector ydash = xdash.cross(zdash);
+	  SideRefVec1 = xdash;
+	  SideRefVec2 = ydash;
+	  SideRefVec3 = zdash;
+	}
+      else
+	G4cout << "Error: testrand " << testrand << G4endl;
+
+      RandPos.setX(x);
+      RandPos.setY(y);
+      RandPos.setZ(z);
+
+    }
+  else if(Shape == "Para")
+    {
+      G4double testrand;
+      //Right Parallelepiped.
+      // User gives x,y,z half lengths and ParAlpha
+      // ParTheta and ParPhi
+      // +x = <1, -x >1 & <2, +y >2 & <3, -y >3 &<4
+      // +z >4 & < 5, -z >5 &<6.
+      testrand = G4UniformRand();
+      G4double AreaX = halfy * halfz * 4.;
+      G4double AreaY = halfx * halfz * 4.;
+      G4double AreaZ = halfx * halfy * 4.;
+      G4double AreaTotal = 2*(AreaX + AreaY + AreaZ);
+      G4double Probs[6];
+      Probs[0] = AreaX/AreaTotal;
+      Probs[1] = Probs[0] + AreaX/AreaTotal;
+      Probs[2] = Probs[1] + AreaY/AreaTotal;
+      Probs[3] = Probs[2] + AreaY/AreaTotal;
+      Probs[4] = Probs[3] + AreaZ/AreaTotal;
+      Probs[5] = Probs[4] + AreaZ/AreaTotal;
+      
+      x = GenRandX();
+      y = GenRandY();
+      z = GenRandZ();
+      
+      x = x * halfx * 2.;
+      x = x - halfx;
+      y = y * halfy * 2.;
+      y = y - halfy;
+      z = z * halfz * 2.;
+      z = z - halfz;
+      // Pick a side first
+      if(testrand < Probs[0])
+	{
+	  // side is +x
+	  x = halfx + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
+	  y = y + z*tan(ParTheta)*sin(ParPhi);
+	  z = z;
+	  // Cosine-law
+	  G4ThreeVector xdash(halfz*tan(ParTheta)*cos(ParPhi),
+			      halfz*tan(ParTheta)*sin(ParPhi), 
+			      halfz/cos(ParPhi));
+	  G4ThreeVector ydash(halfy*tan(ParAlpha), halfy, 0.0);
+	  xdash = xdash.unit();
+	  ydash = ydash.unit();
+	  G4ThreeVector zdash = xdash.cross(ydash);
+	  SideRefVec1 = xdash;
+	  SideRefVec2 = ydash;
+	  SideRefVec3 = zdash;
+	}
+      else if(testrand >= Probs[0] && testrand < Probs[1])
+	{
+	  // side is -x
+	  x = -halfx + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
+	  y = y + z*tan(ParTheta)*sin(ParPhi);
+	  z = z;
+	  // Cosine-law
+	  G4ThreeVector xdash(halfz*tan(ParTheta)*cos(ParPhi),
+			      halfz*tan(ParTheta)*sin(ParPhi), 
+			      halfz/cos(ParPhi));
+	  G4ThreeVector ydash(halfy*tan(ParAlpha), halfy, 0.0);
+	  xdash = xdash.unit();
+	  ydash = ydash.unit();
+	  G4ThreeVector zdash = xdash.cross(ydash);
+	  SideRefVec1 = xdash;
+	  SideRefVec2 = -ydash;
+	  SideRefVec3 = -zdash;
+	}
+      else if(testrand >= Probs[1] && testrand < Probs[2])
+	{
+	  // side is +y
+	  x = x + z*tan(ParTheta)*cos(ParPhi) + halfy*tan(ParAlpha);
+	  y = halfy + z*tan(ParTheta)*sin(ParPhi);
+	  z = z;
+	  // Cosine-law
+	  G4ThreeVector ydash(halfz*tan(ParTheta)*cos(ParPhi),
+			      halfz*tan(ParTheta)*sin(ParPhi), 
+			      halfz/cos(ParPhi));
+	  ydash = ydash.unit();
+	  G4ThreeVector xdash = Roty.cross(ydash);
+	  G4ThreeVector zdash = xdash.cross(ydash);
+	  SideRefVec1 = xdash;
+	  SideRefVec2 = ydash;
+	  SideRefVec3 = zdash;
+	}
+      else if(testrand >= Probs[2] && testrand < Probs[3])
+	{
+	  // side is -y
+	  x = x + z*tan(ParTheta)*cos(ParPhi) - halfy*tan(ParAlpha);
+	  y = -halfy + z*tan(ParTheta)*sin(ParPhi);
+	  z = z;
+	  // Cosine-law
+	  G4ThreeVector ydash(halfz*tan(ParTheta)*cos(ParPhi),
+			      halfz*tan(ParTheta)*sin(ParPhi), 
+			      halfz/cos(ParPhi));
+	  ydash = ydash.unit();
+	  G4ThreeVector xdash = Roty.cross(ydash);
+	  G4ThreeVector zdash = xdash.cross(ydash);
+	  SideRefVec1 = xdash;
+	  SideRefVec2 = -ydash;
+	  SideRefVec3 = -zdash;
+	}
+      else if(testrand >= Probs[3] && testrand < Probs[4])
+	{
+	  // side is +z
+	  z = halfz;
+	  y = y + halfz*sin(ParPhi)*tan(ParTheta);
+	  x = x + halfz*cos(ParPhi)*tan(ParTheta) + y*tan(ParAlpha);
+	  // Cosine-law
+	  SideRefVec1 = Rotx;
+	  SideRefVec2 = Roty;
+	  SideRefVec3 = Rotz;
+	}
+      else if(testrand >= Probs[4] && testrand < Probs[5])
+	{
+	  // side is -z
+	  z = -halfz;
+	  y = y - halfz*sin(ParPhi)*tan(ParTheta);
+	  x = x - halfz*cos(ParPhi)*tan(ParTheta) + y*tan(ParAlpha);
+	  // Cosine-law
+	  SideRefVec1 = Rotx;
+	  SideRefVec2 = -Roty;
+	  SideRefVec3 = -Rotz;
+	}
+      else
+	{
+	  G4cout << "Error: testrand out of range" << G4endl;
+	  if(verbosityLevel >= 1)
+	    G4cout << "testrand=" << testrand << " Probs[5]=" << Probs[5] <<G4endl;
+	}
+
+      RandPos.setX(x);
+      RandPos.setY(y);
+      RandPos.setZ(z);
+    }
+
+  // Apply Rotation Matrix
+  // x * Rotx, y * Roty and z * Rotz
+  if(verbosityLevel == 2)
+    G4cout << "Raw position " << RandPos << G4endl;
+
+  x=(RandPos.x()*Rotx.x())+(RandPos.y()*Roty.x())+(RandPos.z()*Rotz.x());
+  y=(RandPos.x()*Rotx.y())+(RandPos.y()*Roty.y())+(RandPos.z()*Rotz.y());
+  z=(RandPos.x()*Rotx.z())+(RandPos.y()*Roty.z())+(RandPos.z()*Rotz.z());
+  
+  RandPos.setX(x);
+  RandPos.setY(y);
+  RandPos.setZ(z);
+
+  // Translate
+  particle_position = CentreCoords + RandPos;
+
+  if(verbosityLevel >= 1)
+    {
+      if(verbosityLevel == 2)
+	G4cout << "Rotated position " << RandPos << G4endl;
+      G4cout << "Rotated and translated position " << particle_position << G4endl;
+    }
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::GeneratePointsInVolume()
+{
+  G4ThreeVector RandPos;
+  G4double tempx, tempy, tempz;
+  G4double x, y, z;
+
+  if(SourcePosType != "Volume" && verbosityLevel >= 1)
+    G4cout << "Error SourcePosType not Volume" << G4endl;
+  //Private method to create points in a volume
+  if(Shape == "Sphere")
+    {
+      x = Radius*2.;
+      y = Radius*2.;
+      z = Radius*2.;
+      while(((x*x)+(y*y)+(z*z)) > (Radius*Radius))
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+	  z = GenRandZ();
+
+	  x = (x*2.*Radius) - Radius;
+	  y = (y*2.*Radius) - Radius;
+	  z = (z*2.*Radius) - Radius;
+	}
+    }
+  else if(Shape == "Ellipsoid")
+    {
+      G4double temp;
+      temp = 100.;
+      while(temp > 1.)
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+	  z = GenRandZ();
+
+	  x = (x*2.*halfx) - halfx;
+	  y = (y*2.*halfy) - halfy;
+	  z = (z*2.*halfz) - halfz;
+	  
+	  temp = ((x*x)/(halfx*halfx)) + ((y*y)/(halfy*halfy))
+	    + ((z*z)/(halfz*halfz));
+	}
+    }
+  else if(Shape == "Cylinder")
+    {
+      x = Radius*2.;
+      y = Radius*2.;
+      while(((x*x)+(y*y)) > (Radius*Radius))
+	{
+	  x = GenRandX();
+	  y = GenRandY();
+	  z = GenRandZ();
+
+	  x = (x*2.*Radius) - Radius;
+	  y = (y*2.*Radius) - Radius;
+	  z = (z*2.*halfz) - halfz;
+	}
+    }
+  else if(Shape == "Para")
+    {
+      x = GenRandX();
+      y = GenRandY();
+      z = GenRandZ();
+      x = (x*2.*halfx) - halfx;
+      y = (y*2.*halfy) - halfy;
+      z = (z*2.*halfz) - halfz;
+      x = x + z*tan(ParTheta)*cos(ParPhi) + y*tan(ParAlpha);
+      y = y + z*tan(ParTheta)*sin(ParPhi);
+      z = z;
+    }
+  else
+    G4cout << "Error: Volume Shape Doesnt Exist" << G4endl;
+
+  RandPos.setX(x);
+  RandPos.setY(y);
+  RandPos.setZ(z);
+
+  // Apply Rotation Matrix
+  // x * Rotx, y * Roty and z * Rotz
+  tempx = (x * Rotx.x()) + (y * Roty.x()) + (z * Rotz.x());
+  tempy = (x * Rotx.y()) + (y * Roty.y()) + (z * Rotz.y());
+  tempz = (x * Rotx.z()) + (y * Roty.z()) + (z * Rotz.z());
+
+  RandPos.setX(tempx);
+  RandPos.setY(tempy);
+  RandPos.setZ(tempz);
+
+  // Translate
+  particle_position = CentreCoords + RandPos;
+
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Raw position " << x << "," << y << "," << z << G4endl;
+      G4cout << "Rotated position " << RandPos << G4endl;
+    }
+  if(verbosityLevel >= 1)
+    G4cout << "Rotated and translated position " << particle_position << G4endl;
+
+  // Cosine-law (not a good idea to use this here)
+  G4ThreeVector zdash(tempx,tempy,tempz);
+  zdash = zdash.unit();
+  G4ThreeVector xdash = Rotz.cross(zdash);
+  G4ThreeVector ydash = xdash.cross(zdash);
+  SideRefVec1 = xdash;
+  SideRefVec2 = ydash;
+  SideRefVec3 = zdash;
+
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Reference vectors for cosine-law " << SideRefVec1 << " " << SideRefVec2 << " " << SideRefVec3 << G4endl;
+    } 
+}
+
+G4bool G4GeneralParticleSource::IsSourceConfined()
+{
+  // Method to check point is within the volume specified
+  if(Confine == false)
+    G4cout << "Error: Confine is false" << G4endl;
+  G4ThreeVector null(0.,0.,0.);
+  G4ThreeVector *ptr;
+  ptr = &null;
+
+  // Check particle_position is within VolName, if so true, 
+  // else false
+  G4VPhysicalVolume *theVolume;
+  theVolume=gNavigator->LocateGlobalPointAndSetup(particle_position,ptr,true);
+  G4String theVolName = theVolume->GetName();
+  if(theVolName == VolName)
+    {
+      if(verbosityLevel >= 1)
+	G4cout << "Particle is in volume " << VolName << G4endl;
+      return(true);
+    }
+  else
+    return(false);
+}
+
+// Now follows the angular distribution methods.
+
+void G4GeneralParticleSource::SetAngDistType(G4String atype)
+{
+  if(atype != "iso" && atype != "cos" && atype != "user")
+    G4cout << "Error, distribution must be iso, cos or user" << G4endl;
+  else
+    AngDistType = atype;
+}
+
+void G4GeneralParticleSource::DefineAngRefAxes(G4String refname, G4ThreeVector ref)
+{
+
+  if(refname == "angref1")
+    AngRef1 = ref; // x'
+  else if(refname == "angref2")
+    AngRef2 = ref; // vector in x'y' plane
+
+  // User defines x' (AngRef1) and a vector in the x'y'
+  // plane (AngRef2). Then, AngRef1 x AngRef2 = AngRef3
+  // the z' vector. Then, AngRef3 x AngRef1 = AngRef2
+  // which will now be y'.
+
+  AngRef3 = AngRef1.cross(AngRef2); // z'
+  AngRef2 = AngRef3.cross(AngRef1); // y'
+  if(verbosityLevel == 2)
+    {
+      G4cout << "Angular distribution rotation axes " << AngRef1 << " " << AngRef2 << " " << AngRef3 << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::SetMinTheta(G4double mint)
+{
+  MinTheta = mint;
+}
+
+void G4GeneralParticleSource::SetMinPhi(G4double minp)
+{
+  MinPhi = minp;
+}
+
+void G4GeneralParticleSource::SetMaxTheta(G4double maxt)
+{
+  MaxTheta = maxt;
+}
+
+void G4GeneralParticleSource::SetMaxPhi(G4double maxp)
+{
+  MaxPhi = maxp;
+}
+
+void G4GeneralParticleSource::UserDefAngTheta(G4ThreeVector input)
+{
+  if(UserDistType == "NULL") UserDistType = "theta";
+  if(UserDistType == "phi") UserDistType = "both";  
+  G4double thi, val;
+  thi = input.x();
+  val = input.y();
+  if(verbosityLevel >= 1)
+    G4cout << "In UserDefAngTheta" << G4endl;
+  UDefThetaH.InsertValues(thi, val);
+}
+
+void G4GeneralParticleSource::UserDefAngPhi(G4ThreeVector input)
+{
+  if(UserDistType == "NULL") UserDistType = "phi";
+  if(UserDistType == "theta") UserDistType = "both";  
+  G4double phhi, val;
+  phhi = input.x();
+  val = input.y();
+  if(verbosityLevel >= 1)
+    G4cout << "In UserDefAngPhi" << G4endl;
+  UDefPhiH.InsertValues(phhi, val); 
+}
+
+void G4GeneralParticleSource::SetUserWRTSurface(G4bool wrtSurf)
+{
+  // if UserWRTSurface = true then the user wants momenta with respect
+  // to the surface normals.
+  // When doing this theta has to be 0-90 only otherwise there will be
+  // errors, which currently are flagged anywhere.
+  UserWRTSurface = wrtSurf;
+}
+
+void G4GeneralParticleSource::GenerateIsotropicFlux()
+{
+  // generates isotropic flux.
+  // No vectors are needed.
+  G4double rndm, rndm2;
+  G4double px, py, pz, pmag;
+
+  // generate rand nos. but make sure in theta/phi limits
+  /*  Colin's old stuff
+  Theta = 10.;  // This is well above the pi upper limit.
+  Phi = 10.;    // Still well above 2pi upper limit.
+
+    while(Theta > MaxTheta || Theta < MinTheta)
+    {
+      rndm = GenRandTheta();
+      Theta = acos(1. - 2.*rndm);
+    }
+
+  while(Phi > MaxPhi || Phi < MinPhi)
+    {
+      rndm2 = GenRandPhi();
+      Phi = twopi * rndm2;
+    }
+
+  px = sin(Theta) * cos(Phi);
+  py = sin(Theta) * sin(Phi);
+  pz = cos(Theta);
+
+  */
+  // More efficient implementation by F. Lei
+  //
+  G4double sintheta, sinphi,costheta,cosphi;
+  rndm = GenRandTheta();
+  costheta = cos(MinTheta) - rndm * (cos(MinTheta) - cos(MaxTheta));
+  sintheta = sqrt(1. - costheta*costheta);
+  
+  rndm2 = GenRandPhi();
+  Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 
+  sinphi = sin(Phi);
+  cosphi = cos(Phi);
+
+  px = sintheta * cosphi;
+  py = sintheta * sinphi;
+  pz = costheta;
+
+  // end of F.Lei implementation
+
+  px = -px;
+  py = -py;
+  pz = -pz;
+
+  pmag = sqrt((px*px) + (py*py) + (pz*pz));
+
+  px = px/pmag;
+  py = py/pmag;
+  pz = pz/pmag;
+
+  //Need to rotate the particle_momentum_direction round such that the 
+  //start position is at the north pole, so that all particles go into
+  // the centre of the geomtries.
+  // particle_position stores the particle's position.
+  // use particle position to calculate theta and phi - posthe and posphi
+
+  G4double posthe, posphi;
+  //  G4cout << "particle_position " << particle_position << G4endl;
+  G4double tx, ty, tz, tt;
+  tx = particle_position.x();
+  ty = particle_position.y();
+  tz = particle_position.z();
+  tt = sqrt(tx*tx + ty*ty + tz*tz);
+  tx = tx/tt;
+  ty = ty/tt;
+  tz = tz/tt;
+  //  G4cout << "unit position " << tx << " " << ty << " " << tz << G4endl;
+  posthe = acos(tz);
+  if (posthe != 0. && posthe != pi) 
+  { posphi = acos(tx/sin(posthe)); }
+  else 
+  { posphi = 0.0;}
+  //  G4cout << "Posthe and posphi " << posthe << " " << posphi << G4endl;
+  G4double finx, finy, finz;
+  finx = (px*cos(posthe)*cos(posphi)) - (py*sin(posphi)) + (pz*sin(posthe)*cos(posphi));
+  finy = (px*cos(posthe)*sin(posphi)) + (py*cos(posphi)) + (pz*sin(posthe)*sin(posphi));
+  finz = (-px*sin(posthe)) + (pz*cos(posthe));
+  //  G4cout << "finx... " << finx << " " << finy << " " << finz << G4endl;
+
+  particle_momentum_direction.setX(finx);
+  particle_momentum_direction.setY(finy);
+  particle_momentum_direction.setZ(finz);
+
+  // particle_momentum_direction now holds unit momentum vector.
+  if(verbosityLevel >= 1)
+    G4cout << "Generating isotropic vector: " << particle_momentum_direction << G4endl;
+}
+
+void G4GeneralParticleSource::GenerateCosineLawFlux()
+{
+  // Method to generate flux distributed with a cosine law
+  // such as is in TIMM.
+  G4double px, py, pz, pmag;
+  G4double rndm, rndm2;
+  G4double resultx, resulty, resultz;
+
+  /*  Colin's old implementation which is very slow
+
+  Theta = 10.; // Well above MaxTheta
+  Phi = 10.;   // Well above MaxPhi
+
+  while(Theta > MaxTheta || Theta < MinTheta)
+    {
+      rndm = GenRandTheta();
+      Theta = asin(sqrt(MaxTheta*rndm));
+    }
+
+  while(Phi > MaxPhi || Phi < MinPhi)
+    {
+      rndm2 = GenRandPhi();
+      Phi = twopi * rndm2;
+    }
+
+  px = sin(Theta) * cos(Phi);
+  py = sin(Theta) * sin(Phi);
+  pz = cos(Theta);
+  */
+  // More efficient implementation by F. Lei
+  //
+  G4double sintheta, sinphi,costheta,cosphi;
+  rndm = GenRandTheta();
+  sintheta = sqrt( rndm * (sin(MaxTheta)*sin(MaxTheta) - sin(MinTheta)*sin(MinTheta) ) );
+  costheta = sqrt(1. -sintheta*sintheta);
+  
+  rndm2 = GenRandPhi();
+  Phi = MinPhi + (MaxPhi - MinPhi) * rndm2; 
+  sinphi = sin(Phi);
+  cosphi = cos(Phi);
+
+  px = sintheta * cosphi;
+  py = sintheta * sinphi;
+  pz = costheta;
+
+  // end of F.Lei implementation
+
+  px = -px;
+  py = -py;
+  pz = -pz;
+  pmag = sqrt((px*px) + (py*py) + (pz*pz));
+  G4double pxh = px/pmag;
+  G4double pyh = py/pmag;
+  G4double pzh = pz/pmag;
+
+  if(verbosityLevel == 2)
+    {
+      G4cout <<"SideRefVecs " <<SideRefVec1<<SideRefVec2<<SideRefVec3<<G4endl;
+      G4cout <<"Raw Unit vector "<<pxh<<","<<pyh<<","<<pzh<<G4endl;
+    }
+  resultx = (pxh*SideRefVec1.x()) + (pyh*SideRefVec2.x()) + 
+    (pzh*SideRefVec3.x());
+
+  resulty = (pxh*SideRefVec1.y()) + (pyh*SideRefVec2.y()) + 
+    (pzh*SideRefVec3.y());
+
+  resultz = (pxh*SideRefVec1.z()) + (pyh*SideRefVec2.z()) + 
+    (pzh*SideRefVec3.z());
+
+  G4double ResMag = sqrt((resultx*resultx) + (resulty*resulty) + (resultz*resultz));
+  resultx = resultx/ResMag;
+  resulty = resulty/ResMag;
+  resultz = resultz/ResMag;
+  
+  particle_momentum_direction.setX(resultx);
+  particle_momentum_direction.setY(resulty);
+  particle_momentum_direction.setZ(resultz);
+
+  // particle_momentum_direction now contains unit momentum vector.
+  if(verbosityLevel >= 1)
+    {
+      G4cout << "Resultant cosine-law unit momentum vector " << particle_momentum_direction << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::GenerateUserDefFlux()
+{
+  G4double rndm, px, py, pz, pmag;
+
+  if(UserDistType == "NULL")
+    G4cout << "Error: UserDistType undefined" << G4endl;
+  else if(UserDistType == "theta")
+    {
+      Theta = GenerateUserDefTheta();
+      Phi = 10.;
+      while(Phi > MaxPhi || Phi < MinPhi)
+	{
+	  rndm = GenRandPhi();
+	  Phi = twopi * rndm;
+	}
+    }
+  else if(UserDistType == "phi")
+    {
+      Theta = 10.;
+      while(Theta > MaxTheta || Theta < MinTheta)
+	{
+	  rndm = GenRandTheta();
+	  Theta = acos(1. - (2. * rndm));
+	}
+      Phi = GenerateUserDefPhi();
+    }
+  else if(UserDistType == "both")
+    {
+      Theta = GenerateUserDefTheta();
+      Phi = GenerateUserDefPhi();
+    }
+
+  px = -sin(Theta) * cos(Phi);
+  py = -sin(Theta) * sin(Phi);
+  pz = -cos(Theta);
+
+  pmag = sqrt((px*px) + (py*py) + (pz*pz));
+
+  if(UserWRTSurface == false)
+    {
+      particle_momentum_direction.setX(px/pmag);
+      particle_momentum_direction.setY(py/pmag);
+      particle_momentum_direction.setZ(pz/pmag);
+    }
+  else if(UserWRTSurface == true)
+    {
+      G4double pxh = px/pmag;
+      G4double pyh = py/pmag;
+      G4double pzh = pz/pmag;
+
+      if(verbosityLevel == 2)
+	{
+	  G4cout <<"SideRefVecs " <<SideRefVec1<<SideRefVec2<<SideRefVec3<<G4endl;
+	  G4cout <<"Raw Unit vector "<<pxh<<","<<pyh<<","<<pzh<<G4endl;
+	}
+      G4double resultx = (pxh*SideRefVec1.x()) + (pyh*SideRefVec2.x()) + 
+	(pzh*SideRefVec3.x());
+
+      G4double resulty = (pxh*SideRefVec1.y()) + (pyh*SideRefVec2.y()) + 
+	(pzh*SideRefVec3.y());
+
+      G4double resultz = (pxh*SideRefVec1.z()) + (pyh*SideRefVec2.z()) + 
+	(pzh*SideRefVec3.z());
+
+      G4double ResMag = sqrt((resultx*resultx) + (resulty*resulty) + (resultz*resultz));
+      resultx = resultx/ResMag;
+      resulty = resulty/ResMag;
+      resultz = resultz/ResMag;
+      
+      particle_momentum_direction.setX(resultx);
+      particle_momentum_direction.setY(resulty);
+      particle_momentum_direction.setZ(resultz);
+    }
+
+  // particle_momentum_direction now contains unit momentum vector.
+  if(verbosityLevel >= 1)
+    {
+      G4cout << "Final User Defined momentum vector " << particle_momentum_direction << G4endl;
+    }
+}
+
+G4double G4GeneralParticleSource::GenerateUserDefTheta()
+{
+  // Create cumulative histogram if not already done so. Then use RandFlat
+  //::shoot to generate the output Theta value.
+  if(UserDistType == "NULL" || UserDistType == "phi")
+    {
+      // No user defined theta distribution
+      G4cout << "Error ***********************" << G4endl;
+      G4cout << "UserDistType = " << UserDistType << G4endl;
+      return (0.);
+    }
+  else
+    {
+      // UserDistType = theta or both and so a theta distribution
+      // is defined. This should be integrated if not already done.
+      if(IPDFThetaExist == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(UDefThetaH.GetVectorLength());
+	  bins[0] = UDefThetaH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = UDefThetaH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = UDefThetaH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = UDefThetaH(size_t(ii)) + vals[ii-1];
+	      sum = sum + UDefThetaH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFThetaH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFThetaExist = true
+	  IPDFThetaExist = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      return(IPDFThetaH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenerateUserDefPhi()
+{
+  // Create cumulative histogram if not already done so. Then use RandFlat
+  //::shoot to generate the output Theta value.
+
+  if(UserDistType == "NULL" || UserDistType == "theta")
+    {
+      // No user defined phi distribution
+      G4cout << "Error ***********************" << G4endl;
+      G4cout << "UserDistType = " << UserDistType << G4endl;
+      return(0.);
+    }
+  else
+    {
+      // UserDistType = phi or both and so a phi distribution
+      // is defined. This should be integrated if not already done.
+      if(IPDFPhiExist == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(UDefPhiH.GetVectorLength());
+	  bins[0] = UDefPhiH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = UDefPhiH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = UDefPhiH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = UDefPhiH(size_t(ii)) + vals[ii-1];
+	      sum = sum + UDefPhiH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFPhiH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFPhiExist = true
+	  IPDFPhiExist = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      return(IPDFPhiH.GetEnergy(rndm));
+    }
+}
+
+// Now follows Energy distribution Methods
+
+void G4GeneralParticleSource::SetEnergyDisType(G4String DisType)
+{
+  EnergyDisType = DisType;
+}
+
+void G4GeneralParticleSource::SetEmin(G4double emi)
+{
+  Emin = emi;
+}
+
+void G4GeneralParticleSource::SetEmax(G4double ema)
+{
+  Emax = ema;
+}
+
+void G4GeneralParticleSource::SetMonoEnergy(G4double menergy)
+{
+  MonoEnergy = menergy;
+  Emin = menergy;
+  Emax = menergy;
+}
+
+void G4GeneralParticleSource::SetAlpha(G4double alp)
+{
+  alpha = alp;
+}
+
+void G4GeneralParticleSource::SetTemp(G4double tem)
+{
+  Temp = tem;
+}
+
+void G4GeneralParticleSource::SetEzero(G4double eze)
+{
+  Ezero = eze;
+}
+
+void G4GeneralParticleSource::SetGradient(G4double gr)
+{
+  grad = gr;
+}
+
+void G4GeneralParticleSource::SetInterCept(G4double c)
+{
+  cept = c;
+}
+
+void G4GeneralParticleSource::UserEnergyHisto(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  if(verbosityLevel == 2)
+    G4cout << " " << ehi << " " << val << G4endl;
+  if(verbosityLevel == 2)
+    G4cout << "In UserEnergyHisto" << G4endl;
+  UDefEnergyH.InsertValues(ehi, val);
+  Emax = ehi;
+}
+
+void G4GeneralParticleSource::ArbEnergyHisto(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  if(verbosityLevel == 2)
+    G4cout << "In ArbEnergyHisto" << G4endl;
+  ArbEnergyH.InsertValues(ehi, val);
+}
+
+void G4GeneralParticleSource::EpnEnergyHisto(G4ThreeVector input)
+{
+  G4double elo, ehi, val;
+  ehi = input.x();
+  val = input.y();
+  if(verbosityLevel == 2)
+    G4cout << "In EpnEnergyHisto" << G4endl;
+  EpnEnergyH.InsertValues(ehi, val);
+  Emax = ehi;
+  Epnflag = true;
+}
+
+void G4GeneralParticleSource::Calculate()
+{
+  if(EnergyDisType == "Cdg")
+    CalculateCdgSpectrum();
+  else if(EnergyDisType == "Bbody")
+    CalculateBbodySpectrum();
+}
+
+void G4GeneralParticleSource::CalculateCdgSpectrum()
+{
+  // This uses the spectrum from The INTEGRAL Mass Model (TIMM)
+  // to generate a Cosmic Diffuse X/gamma ray spectrum.
+  G4double pfact[2] = {8.5, 112};
+  G4double spind[2] = {1.4, 2.3};
+  G4double ene_line[3] = {1.*keV, 18.*keV, 1E6*keV};
+  G4int n_par;
+
+  ene_line[0] = Emin;
+  if(Emin < 18*keV)
+    {
+      n_par = 2;
+      ene_line[2] = Emax;
+      if(Emax < 18*keV)
+	{
+	  n_par = 1;
+	  ene_line[1] = Emax;
+	}
+    }
+  else
+    {
+      n_par = 1;
+      pfact[0] = 112.;
+      spind[0] = 2.3;
+      ene_line[1] = Emax;
+    }
+  
+  // Create a cumulative histogram.
+  CDGhist[0] = 0.;
+  G4double omalpha;
+  G4int i = 0;
+
+  while(i < n_par)
+    {
+      omalpha = 1. - spind[i];
+      CDGhist[i+1] = CDGhist[i] + (pfact[i]/omalpha)*
+	(pow(ene_line[i+1],omalpha)-pow(ene_line[i],omalpha));
+      i++;
+    }
+  
+  // Normalise histo and divide by 1000 to make MeV.
+  i = 0;
+  while(i < n_par)
+    {
+      CDGhist[i+1] = CDGhist[i+1]/CDGhist[n_par];
+      //      G4cout << CDGhist[i] << CDGhist[n_par] << G4endl;
+      i++;
+    }
+}
+
+void G4GeneralParticleSource::CalculateBbodySpectrum()
+{
+  // create bbody spectrum
+  // Proved very hard to integrate indefinitely, so different
+  // method. User inputs emin, emax and T. These are used to
+  // create a 10,000 bin histogram.
+  // Use photon density spectrum = 2 nu**2/c**2 * (exp(h nu/kT)-1)
+  // = 2 E**2/h**2c**2 times the exponential
+  G4double erange = Emax - Emin;
+  G4double steps = erange/10000.;
+  G4double Bbody_y[10000];
+  G4double k = 8.6181e-11; //Boltzmann const in MeV/K
+  G4double h = 4.1362e-21; // Plancks const in MeV s
+  G4double c = 3e8; // Speed of light
+  G4double h2 = h*h;
+  G4double c2 = c*c;
+  G4int count = 0;
+  G4double sum = 0.;
+  BBHist[0] = 0.;
+  while(count < 10000)
+    {
+      Bbody_x[count] = Emin + G4double(count*steps);
+      Bbody_y[count] = (2.*pow(Bbody_x[count],2.))/
+      	(h2*c2*(exp(Bbody_x[count]/(k*Temp)) - 1.));
+      sum = sum + Bbody_y[count];
+      BBHist[count+1] = BBHist[count] + Bbody_y[count];
+      count++;
+    }
+
+  Bbody_x[10000] = Emax;
+  // Normalise cumulative histo.
+  count = 0;
+  while(count<10001)
+    {
+      BBHist[count] = BBHist[count]/sum;
+      count++;
+    }
+}
+
+void G4GeneralParticleSource::InputEnergySpectra(G4bool value)
+{
+  // Allows user to specifiy spectrum is momentum
+  EnergySpec = value; // false if momentum
+  if(verbosityLevel == 2)
+    G4cout << "EnergySpec has value " << EnergySpec << G4endl;
+}
+
+void G4GeneralParticleSource::InputDifferentialSpectra(G4bool value)
+{
+  // Allows user to specify integral or differential spectra
+  DiffSpec = value; // true = differential, false = integral
+  if(verbosityLevel == 2)
+    G4cout << "Diffspec has value " << DiffSpec << G4endl;
+}
+
+void G4GeneralParticleSource::ArbInterpolate(G4String IType)
+{
+  if(EnergyDisType != "Arb")
+    G4cout << "Error: this is for arbitrary distributions" << G4endl;
+  IntType = IType;
+  G4int i=0;
+
+  // Calcuate Emin and Emax, mainly for use in debugging
+  G4int len = G4int(ArbEnergyH.GetVectorLength());
+  ArbEmax = ArbEnergyH.GetLowEdgeEnergy(size_t(len-1));
+  ArbEmin = ArbEnergyH.GetLowEdgeEnergy(size_t(0));
+  G4cout << "ArbEmin, ArbEmax " << ArbEmin << " " << ArbEmax << G4endl;
+  
+  // Now interpolate points
+  if(IntType == "Lin")
+    LinearInterpolation();
+  if(IntType == "Log")
+    LogInterpolation();
+  if(IntType == "Exp")
+    ExpInterpolation();
+  if(IntType == "Spline")
+    SplineInterpolation();  
+}
+
+void G4GeneralParticleSource::LinearInterpolation()
+{
+  // Method to do linear interpolation on the Arb points
+  // Calculate equation of each line segment, max 256.
+  // Calculate Area under each segment
+  // Create a cumulative array which is then normalised Arb_Cum_Area
+  G4double Area_seg[256]; // Stores area under each segment
+  G4double sum = 0., Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
+  G4int i, count;
+  G4int maxi = ArbEnergyH.GetVectorLength();
+  for(i=0;i<maxi;i++)
+    {
+      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
+      Arb_y[i] = ArbEnergyH(size_t(i));
+    }
+  // Points are now in x,y arrays. If the spectrum is integral it has to be
+  // made differential and if momentum it has to be made energy.
+  if(EnergySpec == false)
+    {
+      // change currently stored values (emin etc) which are actually momenta
+      // to energies.
+      if(particle_definition == NULL)
+	G4cout << "Error: particle not defined" << G4endl;
+      else
+	{
+      // Apply Energy**2 = p**2c**2 + m0**2c**4
+      // p should be entered as E/c i.e. without the division by c
+      // being done - energy equivalent.
+	  G4double mass = particle_definition->GetPDGMass();
+
+	  // multiply the function (Arb_y) up by the bin width
+	  // to make the function counts/s (i.e. get rid of momentum
+	  // dependence).
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
+	    }
+	  // Change Arb_x to energy, plus divide by energy bin width
+	  // to make Arb_y counts/s/energy
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
+				  + (mass*mass));
+	    }
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
+	    }
+	}  
+    }
+  if(DiffSpec == false)
+    {
+      // Converts integral point-wise spectra to Differential
+      for( count=1;count<=maxi;count++)
+	{
+	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
+	}
+    }
+
+  i=1;
+  Arb_grad[0] = 0.;
+  Arb_cept[0] = 0.;
+  Area_seg[0] = 0.;
+  Arb_Cum_Area[0] = 0.;
+  while(i < maxi)
+    {
+      // calc gradient and intercept for each segment
+      Arb_grad[i] = (Arb_y[i] - Arb_y[i-1]) / (Arb_x[i] - Arb_x[i-1]);
+      if(verbosityLevel == 2)
+	G4cout << Arb_grad[i] << G4endl;
+      if(Arb_grad[i] > 0.)
+	{
+	  if(verbosityLevel == 2)
+	    G4cout << "Arb_grad is positive" << G4endl;
+	  Arb_cept[i] = Arb_y[i] - (Arb_grad[i] * Arb_x[i]);
+	}
+      else if(Arb_grad[i] < 0.)
+	{
+	  if(verbosityLevel == 2)
+	    G4cout << "Arb_grad is negative" << G4endl;
+	  Arb_cept[i] = Arb_y[i] + (-Arb_grad[i] * Arb_x[i]);
+	}
+      else
+	{
+	  if(verbosityLevel == 2)
+	    G4cout << "Arb_grad is 0." << G4endl;
+	  Arb_cept[i] = Arb_y[i];
+	}
+
+      Area_seg[i] = ((Arb_grad[i]/2)*(Arb_x[i]*Arb_x[i] - Arb_x[i-1]*Arb_x[i-1]) + Arb_cept[i]*(Arb_x[i] - Arb_x[i-1]));
+      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
+      sum = sum + Area_seg[i];
+      if(verbosityLevel == 2)
+	G4cout << Arb_x[i] << Arb_y[i] << Area_seg[i] << sum << Arb_grad[i] << G4endl;
+      i++;
+    }
+
+  i=0;
+  while(i < maxi)
+    {
+      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum; // normalisation
+      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
+      i++;
+    }
+
+  if(verbosityLevel >= 1)
+    {
+      G4cout << "Leaving LinearInterpolation" << G4endl;
+      ArbEnergyH.DumpValues();
+      IPDFArbEnergyH.DumpValues();
+    }
+}
+
+void G4GeneralParticleSource::LogInterpolation()
+{
+  // Interpolation based on Logarithmic equations
+  // Generate equations of line segments
+  // y = Ax**alpha => log y = alpha*logx + logA
+  // Find area under line segments
+  // create normalised, cumulative array Arb_Cum_Area
+  G4double Area_seg[256], Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
+  G4double alp, sum=0.;
+  Arb_Cum_Area[0] = 0.;
+  if(verbosityLevel == 2)
+    ArbEnergyH.DumpValues();
+
+  G4int i, count;
+  G4int maxi = ArbEnergyH.GetVectorLength();
+  for(i=0;i<maxi;i++)
+    {
+      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
+      Arb_y[i] = ArbEnergyH(size_t(i));
+    }
+  // Points are now in x,y arrays. If the spectrum is integral it has to be
+  // made differential and if momentum it has to be made energy.
+  if(EnergySpec == false)
+    {
+      // change currently stored values (emin etc) which are actually momenta
+      // to energies.
+      if(particle_definition == NULL)
+	G4cout << "Error: particle not defined" << G4endl;
+      else
+	{
+      // Apply Energy**2 = p**2c**2 + m0**2c**4
+      // p should be entered as E/c i.e. without the division by c
+      // being done - energy equivalent.
+	  G4double mass = particle_definition->GetPDGMass();
+
+	  // multiply the function (Arb_y) up by the bin width
+	  // to make the function counts/s (i.e. get rid of momentum
+	  // dependence).
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
+	    }
+	  // Change Arb_x to energy, plus divide by energy bin width
+	  // to make Arb_y counts/s/energy
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
+				  + (mass*mass));
+	    }
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
+	    }
+	}  
+    }
+  if(DiffSpec == false)
+    {
+      // Converts integral point-wise spectra to Differential
+      for(count=1;count<=maxi;count++)
+	{
+	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
+	}
+    }
+
+  i=1;
+  Arb_alpha[0] = 0.;
+  Arb_Const[0] = 0.;
+  Area_seg[0] = 0.;
+  if(Arb_x[0] <= 0. || Arb_y[0] <= 0.)
+    {
+      G4cout << "You should not use log interpolation with points <= 0." << G4endl;
+      G4cout << "These will be changed to 1e-20, which may cause problems" << G4endl;
+      if(Arb_x[0] <= 0.)
+	Arb_x[0] = 1e-20;
+      if(Arb_y[0] <= 0.)
+	Arb_y[0] = 1e-20;
+    }
+  
+  while(i <maxi)
+    {
+      // Incase points are negative or zero
+      if(Arb_x[i] <= 0. || Arb_y[i] <= 0.)
+	{
+	  G4cout << "You should not use log interpolation with points <= 0." << G4endl;
+	  G4cout << "These will be changed to 1e-20, which may cause problems" << G4endl;
+	  if(Arb_x[i] <= 0.)
+	    Arb_x[i] = 1e-20;
+	  if(Arb_y[i] <= 0.)
+	    Arb_y[i] = 1e-20;
+	}
+
+      Arb_alpha[i] = (log10(Arb_y[i])-log10(Arb_y[i-1]))/(log10(Arb_x[i])-log10(Arb_x[i-1]));
+      Arb_Const[i] = Arb_y[i]/(pow(Arb_x[i],Arb_alpha[i]));
+      alp = Arb_alpha[i] + 1;
+      Area_seg[i] = (Arb_Const[i]/alp) * (pow(Arb_x[i],alp) - pow(Arb_x[i-1],alp));
+      sum = sum + Area_seg[i];
+      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
+      if(verbosityLevel == 2)
+	G4cout << Arb_alpha[i] << Arb_Const[i] << Area_seg[i] << G4endl;
+      i++;
+    }
+  
+  i=0;
+  while(i<maxi)
+    {
+      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum;
+      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
+      i++;
+    }
+  if(verbosityLevel >= 1)
+    G4cout << "Leaving LogInterpolation " << G4endl;
+}
+
+void G4GeneralParticleSource::ExpInterpolation()
+{
+  // Interpolation based on Exponential equations
+  // Generate equations of line segments
+  // y = Ae**-(x/e0) => ln y = -x/e0 + lnA
+  // Find area under line segments
+  // create normalised, cumulative array Arb_Cum_Area
+  G4double Area_seg[256], Arb_x[256], Arb_y[256], Arb_Cum_Area[256];
+  G4double sum=0.;
+  Arb_Cum_Area[0] = 0.;
+  if(verbosityLevel == 2)
+    ArbEnergyH.DumpValues();
+
+  G4int i, count;
+  G4int maxi = ArbEnergyH.GetVectorLength();
+  for(i=0;i<maxi;i++)
+    {
+      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
+      Arb_y[i] = ArbEnergyH(size_t(i));
+    }
+  // Points are now in x,y arrays. If the spectrum is integral it has to be
+  // made differential and if momentum it has to be made energy.
+  if(EnergySpec == false)
+    {
+      // change currently stored values (emin etc) which are actually momenta
+      // to energies.
+      if(particle_definition == NULL)
+	G4cout << "Error: particle not defined" << G4endl;
+      else
+	{
+      // Apply Energy**2 = p**2c**2 + m0**2c**4
+      // p should be entered as E/c i.e. without the division by c
+      // being done - energy equivalent.
+	  G4double mass = particle_definition->GetPDGMass();
+
+	  // multiply the function (Arb_y) up by the bin width
+	  // to make the function counts/s (i.e. get rid of momentum
+	  // dependence).
+	  for( count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
+	    }
+	  // Change Arb_x to energy, plus divide by energy bin width
+	  // to make Arb_y counts/s/energy
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
+				  + (mass*mass));
+	    }
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
+	    }
+	}  
+    }
+  if(DiffSpec == false)
+    {
+      // Converts integral point-wise spectra to Differential
+      for(count=1;count<=maxi;count++)
+	{
+	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
+	}
+    }
+
+  i=1;
+  Arb_ezero[0] = 0.;
+  Arb_Const[0] = 0.;
+  Area_seg[0] = 0.;
+  while(i < maxi)
+    {
+      G4double test = log(Arb_y[i]) - log(Arb_y[i-1]);
+      if(test > 0. || test < 0.)
+	{
+	  Arb_ezero[i] = -(Arb_x[i] - Arb_x[i-1])/(log(Arb_y[i]) - log(Arb_y[i-1]));
+	  Arb_Const[i] = Arb_y[i]/(exp(-Arb_x[i]/Arb_ezero[i]));
+	  Area_seg[i]=-(Arb_Const[i]*Arb_ezero[i])*(exp(-Arb_x[i]/Arb_ezero[i])
+						    -exp(-Arb_x[i-1]/Arb_ezero[i]));
+	}
+      else 
+	{
+	  G4cout << "Flat line segment: problem" << G4endl;
+	  Arb_ezero[i] = 0.;
+	  Arb_Const[i] = 0.;
+	  Area_seg[i] = 0.;
+	}
+      sum = sum + Area_seg[i];
+      Arb_Cum_Area[i] = Arb_Cum_Area[i-1] + Area_seg[i];
+      if(verbosityLevel == 2)
+	G4cout << Arb_ezero[i] << Arb_Const[i] << Area_seg[i] << G4endl;
+      i++;
+    }
+  
+  i=0;
+  while(i<maxi)
+    {
+      Arb_Cum_Area[i] = Arb_Cum_Area[i]/sum;
+      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_Cum_Area[i]);
+      i++;
+    }
+  if(verbosityLevel >= 1)
+    G4cout << "Leaving ExpInterpolation " << G4endl;
+}
+
+void G4GeneralParticleSource::SplineInterpolation()
+{
+  // Interpolation using Splines.
+  // Create Normalised arrays, make x 0->1 and y hold
+  // the function (Energy)
+  G4double Arb_x[256], Arb_y[256];
+  G4double sum = 0.;
+  G4int i, count;
+  if(verbosityLevel == 2)
+    ArbEnergyH.DumpValues();
+
+  G4int maxi = ArbEnergyH.GetVectorLength();
+  for(i=0;i<maxi;i++)
+    {
+      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
+      //      if(i == 0)
+      Arb_y[i] = ArbEnergyH(size_t(i));
+	//      else
+	//	Arb_y[i] = Arb_y[i-1] + ArbEnergyH(size_t(i));
+	//      sum = sum + ArbEnergyH(size_t(i));
+    }
+  // Points are now in x,y arrays. If the spectrum is integral it has to be
+  // made differential and if momentum it has to be made energy.
+  if(EnergySpec == false)
+    {
+      // change currently stored values (emin etc) which are actually momenta
+      // to energies.
+      if(particle_definition == NULL)
+	G4cout << "Error: particle not defined" << G4endl;
+      else
+	{
+      // Apply Energy**2 = p**2c**2 + m0**2c**4
+      // p should be entered as E/c i.e. without the division by c
+      // being done - energy equivalent.
+	  G4double mass = particle_definition->GetPDGMass();
+
+	  // multiply the function (Arb_y) up by the bin width
+	  // to make the function counts/s (i.e. get rid of momentum
+	  // dependence).
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count] * (Arb_x[count+1] - Arb_x[count]);
+	    }
+	  // Change Arb_x to energy, plus divide by energy bin width
+	  // to make Arb_y counts/s/energy
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_x[count] = sqrt((Arb_x[count]*Arb_x[count]) 
+				  + (mass*mass));
+	    }
+	  for(count=0;count<maxi;count++)
+	    {
+	      Arb_y[count] = Arb_y[count]/(Arb_x[count+1] - Arb_x[count]);
+	    }
+	}  
+    }
+  if(DiffSpec == false)
+    {
+      // Converts integral point-wise spectra to Differential
+      for(count=1;count<=maxi;count++)
+	{
+	  Arb_y[count] = Arb_y[count] - Arb_y[count-1];
+	}
+    }
+
+  for(i=1;i<maxi;i++)
+    {
+      //      Arb_x[i] = ArbEnergyH.GetLowEdgeEnergy(size_t(i));
+      //      if(i == 0)
+      //	Arb_y[i] = ArbEnergyH(size_t(i));
+      //      else
+      Arb_y[i] = Arb_y[i-1] + ArbEnergyH(size_t(i));
+      sum = sum + ArbEnergyH(size_t(i));
+    }
+
+  for(i=0;i<maxi;i++)
+    {
+      Arb_y[i] = Arb_y[i]/sum;
+    }
+
+  if((Arb_x[0] != 0.) || (Arb_y[0] != 0.))
+    {
+      for(i=maxi;i>=0;i--)
+	{
+	  if(i == 0)
+	    {
+	      Arb_x[0] = 0.;
+	      Arb_y[0] = 0.;
+	    }
+	  else
+	    {
+	      Arb_x[i] = Arb_x[i-1];
+	      Arb_y[i] = Arb_y[i-1];
+	    }
+	}
+    }
+
+  for(i=0;i<=maxi;i++)
+    {
+      if(verbosityLevel == 2)
+	G4cout << i <<" "<< Arb_x[i] << " " << Arb_y[i] << G4endl;
+      IPDFArbEnergyH.InsertValues(Arb_x[i], Arb_y[i]);
+    }
+
+  // Should now have normalised cumulative probabilities in Arb_y
+  // and energy values in Arb_x.
+  maxi = maxi + 1;
+  // Put y into x and x into y. The spline interpolation will then
+  // go through x-axis to find where to interpolate (cum probability)
+  // then generate a y (which will now be energy).
+  SplineInt = new G4DataInterpolation(Arb_y,Arb_x,maxi,1e30,1e30);
+  if(verbosityLevel == 2)
+    {
+      G4cout << SplineInt << G4endl;
+      G4cout << SplineInt->LocateArgument(1.0) << G4endl;
+    }
+  if(verbosityLevel >= 1)
+    G4cout << "Leaving SplineInterpolation " << G4endl;
+}
+
+void G4GeneralParticleSource::GenerateMonoEnergetic()
+{
+  // Method to generate MonoEnergetic particles.
+  particle_energy = MonoEnergy;
+}
+
+void G4GeneralParticleSource::GenerateLinearEnergies()
+{
+  G4double energy, rndm;
+  G4double emaxsq = pow(Emax,2.); //Emax squared
+  G4double eminsq = pow(Emin,2.); //Emin squared
+  G4double intersq = pow(cept,2.); //cept squared
+
+  rndm = GenRandEnergy();
+  
+  G4double bracket = ((grad/2.)*(emaxsq - eminsq) + cept*(Emax-Emin));
+  bracket = bracket * rndm;
+  bracket = bracket + (grad/2.)*eminsq + cept*Emin;
+  // Now have a quad of form m/2 E**2 + cE - bracket = 0
+  bracket = -bracket;
+  //  G4cout << "BRACKET" << bracket << G4endl;
+  if(grad != 0.)
+    {
+      G4double sqbrack = (intersq - 4*(grad/2.)*(bracket));
+      //      G4cout << "SQBRACK" << sqbrack << G4endl;
+      sqbrack = sqrt(sqbrack);
+      G4double root1 = -cept + sqbrack; 
+      root1 = root1/(2.*(grad/2.));
+      
+      G4double root2 = -cept - sqbrack;
+      root2 = root2/(2.*(grad/2.));
+
+      //      G4cout << root1 << " roots " << root2 << G4endl;
+
+      if(root1 > Emin && root1 < Emax)
+	particle_energy = root1;
+      if(root2 > Emin && root2 < Emax)
+	particle_energy = root2;
+    }
+  else if(grad == 0.)
+    // have equation of form cE - bracket =0
+    particle_energy = bracket/cept;
+
+  if(particle_energy < 0.)
+    particle_energy = -particle_energy;
+  
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GeneratePowEnergies()
+{
+  // Method to generate particle energies distributed as
+  // a powerlaw
+
+  G4double rndm;
+  G4double emina, emaxa;
+
+  emina = pow(Emin,alpha+1);
+  emaxa = pow(Emax,alpha+1);
+
+  rndm = GenRandEnergy();
+
+  if(alpha != -1.)
+    {
+      particle_energy = ((rndm*(emaxa - emina)) + emina);
+      particle_energy = pow(particle_energy,(1./(alpha+1.)));
+    }
+  else if(alpha == -1.)
+    {
+      particle_energy = (log(Emin) + rndm*(log(Emax) - log(Emin)));
+      particle_energy = exp(particle_energy);
+    }
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GenerateExpEnergies()
+{
+  // Method to generate particle energies distributed according
+  // to an exponential curve.
+  G4double rndm;
+  rndm = GenRandEnergy();
+
+  particle_energy = -Ezero*(log(rndm*(exp(-Emax/Ezero) - exp(-Emin/Ezero)) + 
+				exp(-Emin/Ezero)));
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GenerateBremEnergies()
+{
+  // Method to generate particle energies distributed according 
+  // to a Bremstrahlung equation of 
+  // form I = const*((kT)**1/2)*E*(e**(-E/kT))
+  
+  G4double rndm;
+  rndm = GenRandEnergy();
+  G4double expmax, expmin, k;
+
+  k = 8.6181e-11; // Boltzmann's const in MeV/K
+  G4double ksq = pow(k,2.); // k squared
+  G4double Tsq = pow(Temp,2.); // Temp squared
+
+  expmax = exp(-Emax/(k*Temp));
+  expmin = exp(-Emin/(k*Temp));
+
+  // If either expmax or expmin are zero then this will cause problems
+  // Most probably this will be because T is too low or E is too high
+
+  if(expmax == 0.)
+    G4cout << "*****EXPMAX=0. Choose different E's or Temp" << G4endl;
+  if(expmin == 0.)
+    G4cout << "*****EXPMIN=0. Choose different E's or Temp" << G4endl;
+
+  G4double tempvar = rndm *((-k)*Temp*(Emax*expmax - Emin*expmin) -
+    (ksq*Tsq*(expmax-expmin)));
+
+  G4double bigc = (tempvar - k*Temp*Emin*expmin - ksq*Tsq*expmin)/(-k*Temp);
+
+  // This gives an equation of form: Ee(-E/kT) + kTe(-E/kT) - C =0
+  // Solve this iteratively, step from Emin to Emax in 1000 steps
+  // and take the best solution.
+
+  G4double erange = Emax - Emin;
+  G4double steps = erange/1000.;
+  G4int i;
+  G4double etest, diff, err;
+  
+  err = 100000.;
+
+  for(i=1; i<1000; i++)
+    {
+      etest = Emin + (i-1)*steps;
+      
+      diff = etest*(exp(-etest/(k*Temp))) + k*Temp*(exp(-etest/(k*Temp))) - bigc;
+
+      if(diff < 0.)
+	diff = -diff;
+
+      if(diff < err)
+	{
+	  err = diff;
+	  particle_energy = etest;
+	}
+    }  
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GenerateBbodyEnergies()
+{
+  // BBody_x holds Energies, and BBHist holds the cumulative histo.
+  // binary search to find correct bin then lin interpolation.
+  // Use the earlier defined histogram + RandGeneral method to generate
+  // random numbers following the histos distribution.
+  G4double rndm;
+  G4int nabove, nbelow = 0, middle;
+  nabove = 10001;
+  rndm = GenRandEnergy();
+
+  // Binary search to find bin that rndm is in
+  while(nabove-nbelow > 1)
+    {
+      middle = (nabove + nbelow)/2;
+      if(rndm == BBHist[middle]) break;
+      if(rndm < BBHist[middle]) nabove = middle;
+      else nbelow = middle;
+    }
+  
+  // Now interpolate in that bin to find the correct output value.
+  G4double x1, x2, y1, y2, m, q;
+  x1 = Bbody_x[nbelow];
+  x2 = Bbody_x[nbelow+1];
+  y1 = BBHist[nbelow];
+  y2 = BBHist[nbelow+1];
+  m = (y2-y1)/(x2-x1);
+  q = y1 - m*x1;
+  
+  particle_energy = (rndm - q)/m;
+
+  if(verbosityLevel >= 1)
+    {
+      G4cout << "Energy is " << particle_energy << G4endl;
+    }
+}
+
+void G4GeneralParticleSource::GenerateCdgEnergies()
+{
+  // Gen random numbers, compare with values in cumhist
+  // to find appropriate part of spectrum and then 
+  // generate energy in the usual inversion way.
+  //  G4double pfact[2] = {8.5, 112};
+  // G4double spind[2] = {1.4, 2.3};
+  // G4double ene_line[3] = {1., 18., 1E6};
+  G4double rndm, rndm2;
+  G4double ene_line[3];
+  G4double omalpha[2];
+  if(Emin < 18*keV && Emax < 18*keV)
+    {
+      omalpha[0] = 1. - 1.4;
+      ene_line[0] = Emin;
+      ene_line[1] = Emax;
+    }
+  if(Emin < 18*keV && Emax > 18*keV)
+    {
+      omalpha[0] = 1. - 1.4;
+      omalpha[1] = 1. - 2.3;
+      ene_line[0] = Emin;
+      ene_line[1] = 18.;
+      ene_line[2] = Emax;
+    }
+  if(Emin > 18*keV)
+    {
+      omalpha[0] = 1. - 2.3;
+      ene_line[0] = Emin;
+      ene_line[1] = Emax;
+    }
+  rndm = GenRandEnergy();
+  rndm2 = GenRandEnergy();
+
+  G4int i = 0;
+  while( rndm >= CDGhist[i])
+    {
+      i++;
+    }
+  // Generate final energy.
+  particle_energy = (pow(ene_line[i-1],omalpha[i-1]) + (pow(ene_line[i],omalpha[i-1])
+					- pow(ene_line[i-1],omalpha[i-1]))*rndm2);
+  particle_energy = pow(particle_energy,(1./omalpha[i-1]));
+
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GenUserHistEnergies()
+{
+  // Histograms are DIFFERENTIAL.
+  //  G4cout << "In GenUserHistEnergies " << G4endl;
+  if(IPDFEnergyExist == false)
+    {
+      G4int ii;
+      G4int maxbin = G4int(UDefEnergyH.GetVectorLength());
+      G4double bins[256], vals[256], sum;
+      //      UDefEnergyH.DumpValues();
+      G4double mass = particle_definition->GetPDGMass();
+      //      G4cout << mass << G4endl;
+      //      G4cout << EnergySpec << " " << DiffSpec << G4endl;
+      if((EnergySpec == false) && (particle_definition == NULL))
+	G4cout << "Error: particle definition is NULL" << G4endl;
+      
+      if(maxbin > 256)
+	{
+	  G4cout << "Maxbin > 256" << G4endl;
+	  G4cout << "Setting maxbin to 256, other bins are lost" << G4endl;
+	}
+
+      if(DiffSpec == false)
+	G4cout << "Histograms are Differential!!! " << G4endl;
+      else
+	{
+	  //	  G4cout << "Here 2" << G4endl;
+	  bins[0] = UDefEnergyH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = UDefEnergyH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = UDefEnergyH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = UDefEnergyH(size_t(ii)) + vals[ii-1];
+	      sum = sum + UDefEnergyH(size_t(ii));
+	    }
+	}
+
+      if(EnergySpec == false)
+	{
+	  // multiply the function (vals) up by the bin width
+	  // to make the function counts/s (i.e. get rid of momentum
+	  // dependence).
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      //	      G4cout << vals[ii] << " " << bins[ii] << " " << bins[ii-1] << G4endl;
+	      vals[ii] = vals[ii] * (bins[ii] - bins[ii-1]);
+	    }
+	  // Put energy bins into new histo, plus divide by energy bin width
+	  // to make evals counts/s/energy
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      bins[ii] = sqrt((bins[ii]*bins[ii]) + (mass*mass));
+	      //	      G4cout << bins[ii] << " " << mass << G4endl;
+	    }
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      //	      G4cout << vals[ii] << " " << bins[ii] << " " << bins[ii-1] << G4endl;
+	      vals[ii] = vals[ii]/(bins[ii] - bins[ii-1]);
+	    }
+	  sum = vals[maxbin-1];
+	}
+
+      for(ii=0;ii<maxbin;ii++)
+	{
+	  vals[ii] = vals[ii]/sum;
+	  IPDFEnergyH.InsertValues(bins[ii], vals[ii]);
+	}
+
+      // Make IPDFEnergyExist = true
+      IPDFEnergyExist = true;
+      if(verbosityLevel == 2)
+	IPDFEnergyH.DumpValues();
+      
+    }
+
+  // IPDF has been create so carry on
+  G4double rndm = GenRandEnergy();
+  particle_energy = IPDFEnergyH.GetEnergy(rndm);
+  
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::GenArbPointEnergies()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenArbPointEnergies" << G4endl;
+  G4double rndm;
+  rndm = GenRandEnergy();
+
+  if(IntType != "Spline")
+    {
+      //      IPDFArbEnergyH.DumpValues();
+      // Find the Bin
+      // have x, y, no of points, and cumulative area distribution
+      G4int nabove, nbelow = 0, middle;
+      nabove = IPDFArbEnergyH.GetVectorLength();
+      //      G4cout << nabove << G4endl;
+      // Binary search to find bin that rndm is in
+      while(nabove-nbelow > 1)
+	{
+	  middle = (nabove + nbelow)/2;
+	  if(rndm == IPDFArbEnergyH(size_t(middle))) break;
+	  if(rndm < IPDFArbEnergyH(size_t(middle))) nabove = middle;
+	  else nbelow = middle;
+	}
+      if(IntType == "Lin")
+	{
+	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
+	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
+	  grad = Arb_grad[nbelow+1];
+	  cept = Arb_cept[nbelow+1];
+	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << grad << " " << cept << G4endl;
+	  GenerateLinearEnergies();
+	}
+      else if(IntType == "Log")
+	{
+	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
+	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
+	  alpha = Arb_alpha[nbelow+1];
+	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << alpha << G4endl;
+	  GeneratePowEnergies();
+	}
+      else if(IntType == "Exp")
+	{
+	  Emax = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow+1));
+	  Emin = IPDFArbEnergyH.GetLowEdgeEnergy(size_t(nbelow));
+	  Ezero = Arb_ezero[nbelow+1];
+	  //	  G4cout << rndm << " " << Emax << " " << Emin << " " << Ezero << G4endl;
+	  GenerateExpEnergies();
+	}
+    }
+  else if(IntType == "Spline")
+    {
+      if(verbosityLevel == 2)
+	G4cout << "IntType = Spline " << rndm << G4endl;
+      // in SplineInterpolation created SplineInt
+      // Now generate a random number put it into CubicSplineInterpolation
+      // and you should get out an energy!?!
+      particle_energy = SplineInt->CubicSplineInterpolation(rndm);
+      if(verbosityLevel >= 1)
+	G4cout << "Energy is " << particle_energy << G4endl;
+    }
+  else
+    G4cout << "Error: IntType unknown type" << G4endl;
+}
+
+void G4GeneralParticleSource::GenEpnHistEnergies()
+{
+  //  G4cout << "In GenEpnHistEnergies " << Epnflag << G4endl;
+  
+  // Firstly convert to energy if not already done.
+  if(Epnflag == true)
+    // epnflag = true means spectrum is epn, false means e.
+    {
+      // convert to energy by multiplying by A number
+      ConvertEPNToEnergy();
+      // EpnEnergyH will be replace by UDefEnergyH.
+      //      UDefEnergyH.DumpValues();
+    }
+
+  //  G4cout << "Creating IPDFEnergy if not already done so" << G4endl;
+  if(IPDFEnergyExist == false)
+    {
+      // IPDF has not been created, so create it
+      G4double bins[256],vals[256], sum;
+      G4int ii;
+      G4int maxbin = G4int(UDefEnergyH.GetVectorLength());
+      bins[0] = UDefEnergyH.GetLowEdgeEnergy(size_t(0));
+      vals[0] = UDefEnergyH(size_t(0));
+      sum = vals[0];
+      for(ii=1;ii<maxbin;ii++)
+	{
+	  bins[ii] = UDefEnergyH.GetLowEdgeEnergy(size_t(ii));
+	  vals[ii] = UDefEnergyH(size_t(ii)) + vals[ii-1];
+	  sum = sum + UDefEnergyH(size_t(ii));
+	}
+      
+      for(ii=0;ii<maxbin;ii++)
+	{
+	  vals[ii] = vals[ii]/sum;
+	  IPDFEnergyH.InsertValues(bins[ii], vals[ii]);
+	}
+      // Make IPDFEpnExist = true
+      IPDFEnergyExist = true;
+    }
+  //  IPDFEnergyH.DumpValues();
+  // IPDF has been create so carry on
+  G4double rndm = GenRandEnergy();
+  particle_energy = IPDFEnergyH.GetEnergy(rndm);
+
+  if(verbosityLevel >= 1)
+    G4cout << "Energy is " << particle_energy << G4endl;
+}
+
+void G4GeneralParticleSource::ConvertEPNToEnergy()
+{
+  // Use this before particle generation to convert  the
+  // currently stored histogram from energy/nucleon 
+  // to energy.
+  //  G4cout << "In ConvertEpntoEnergy " << G4endl;
+  if(particle_definition==NULL)
+    G4cout << "Error: particle not defined" << G4endl;
+  else
+    {
+      // Need to multiply histogram by the number of nucleons.
+      // Baryon Number looks to hold the no. of nucleons.
+      G4int Bary = particle_definition->GetBaryonNumber();
+      //      G4cout << "Baryon No. " << Bary << G4endl;
+      // Change values in histogram, Read it out, delete it, re-create it
+      G4int count, maxcount;
+      maxcount = G4int(EpnEnergyH.GetVectorLength());
+      //      G4cout << maxcount << G4endl;
+      G4double ebins[256],evals[256];
+      if(maxcount > 256)
+	{
+	  G4cout << "Histogram contains more than 256 bins!" << G4endl;
+	  G4cout << "Those above 256 will be ignored" << G4endl;
+	  maxcount = 256;
+	}
+      for(count=0;count<maxcount;count++)
+	{
+	  // Read out
+	  ebins[count] = EpnEnergyH.GetLowEdgeEnergy(size_t(count));
+	  evals[count] = EpnEnergyH(size_t(count));
+	}
+
+      // Multiply the channels by the nucleon number to give energies
+      for(count=0;count<maxcount;count++)
+	{
+	  ebins[count] = ebins[count] * Bary;
+	}
+
+      // Set Emin and Emax
+      Emin = ebins[0];
+      Emax = ebins[maxcount-1];
+
+      // Put energy bins into new histogram - UDefEnergyH.
+      for(count=0;count<maxcount;count++)
+	{
+	  UDefEnergyH.InsertValues(ebins[count], evals[count]);
+	}
+      Epnflag = false; //so that you dont repeat this method.
+    }  
+}
+
+// Biasing methods
+
+void G4GeneralParticleSource::SetXBias(G4ThreeVector input)
+{  
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  XBiasH.InsertValues(ehi, val);
+  XBias = true;
+}
+
+void G4GeneralParticleSource::SetYBias(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  YBiasH.InsertValues(ehi, val);
+  YBias = true;
+}
+
+void G4GeneralParticleSource::SetZBias(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  ZBiasH.InsertValues(ehi, val);
+  ZBias = true;
+}
+
+void G4GeneralParticleSource::SetThetaBias(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  ThetaBiasH.InsertValues(ehi, val);
+  ThetaBias = true;
+}
+
+void G4GeneralParticleSource::SetPhiBias(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  PhiBiasH.InsertValues(ehi, val);
+  PhiBias = true;
+}
+
+void G4GeneralParticleSource::SetEnergyBias(G4ThreeVector input)
+{
+  G4double ehi, val;
+  ehi = input.x();
+  val = input.y();
+  EnergyBiasH.InsertValues(ehi, val);
+  EnergyBias = true;
+}
+
+G4double G4GeneralParticleSource::GenRandX()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenRandX" << G4endl;
+  if(XBias == false)
+    {
+      // X is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // X is biased
+      if(IPDFXBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(XBiasH.GetVectorLength());
+	  bins[0] = XBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = XBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = XBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = XBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + XBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFXBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFXBias = true
+	  IPDFXBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+
+      // Calculate the weighting: Find the bin that the determined
+      // rndm is in and the weigthing will be the difference in the
+      // natural probability (from the x-axis) divided by the 
+      // difference in the biased probability (the area).
+      size_t numberOfBin = IPDFXBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFXBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      // retrieve the areas and then the x-axis values
+      bweights[0] = IPDFXBiasH(biasn2) - IPDFXBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFXBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFXBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      //G4cout << "X Bin weight " << bweights[0] << " " << rndm << G4endl;
+      //G4cout << "lower and upper xaxis vals "<<xaxisl<<" "<<xaxisu<<G4endl;
+      bweights[0] = NatProb/bweights[0];
+      if(verbosityLevel >= 1)
+	G4cout << "X bin weight " << bweights[0] << " " << rndm << G4endl;
+      return(IPDFXBiasH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenRandY()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenRandY" << G4endl;
+  if(YBias == false)
+    {
+      // Y is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // Y is biased
+      if(IPDFYBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(YBiasH.GetVectorLength());
+	  bins[0] = YBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = YBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = YBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = YBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + YBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFYBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFYBias = true
+	  IPDFYBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      size_t numberOfBin = IPDFYBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFYBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      bweights[1] =  IPDFYBiasH(biasn2) - IPDFYBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFYBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFYBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      bweights[1] = NatProb/bweights[1];
+      if(verbosityLevel >= 1)
+	G4cout << "Y bin weight " << bweights[1] << " " << rndm << G4endl;
+      return(IPDFYBiasH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenRandZ()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenRandZ" << G4endl;
+  if(ZBias == false)
+    {
+      // Z is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // Z is biased
+      if(IPDFZBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(ZBiasH.GetVectorLength());
+	  bins[0] = ZBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = ZBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = ZBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = ZBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + ZBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFZBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFZBias = true
+	  IPDFZBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      //      size_t weight_bin_no = IPDFZBiasH.FindValueBinLocation(rndm);
+      size_t numberOfBin = IPDFZBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFZBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      bweights[2] =  IPDFZBiasH(biasn2) - IPDFZBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFZBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFZBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      bweights[2] = NatProb/bweights[2];
+      if(verbosityLevel >= 1)
+	G4cout << "Z bin weight " << bweights[2] << " " << rndm << G4endl;
+      return(IPDFZBiasH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenRandTheta()
+{
+  if(verbosityLevel >= 1)
+    {
+      G4cout << "In GenRandTheta" << G4endl;
+      G4cout << "Verbosity " << verbosityLevel << G4endl;
+    }
+  if(ThetaBias == false)
+    {
+      // Theta is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // Theta is biased
+      if(IPDFThetaBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(ThetaBiasH.GetVectorLength());
+	  bins[0] = ThetaBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = ThetaBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = ThetaBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = ThetaBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + ThetaBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFThetaBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFThetaBias = true
+	  IPDFThetaBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      //      size_t weight_bin_no = IPDFThetaBiasH.FindValueBinLocation(rndm);
+      size_t numberOfBin = IPDFThetaBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFThetaBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      bweights[3] =  IPDFThetaBiasH(biasn2) - IPDFThetaBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFThetaBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFThetaBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      bweights[3] = NatProb/bweights[3];
+      if(verbosityLevel >= 1)
+	G4cout << "Theta bin weight " << bweights[3] << " " << rndm << G4endl;
+      return(IPDFThetaBiasH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenRandPhi()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenRandPhi" << G4endl;
+  if(PhiBias == false)
+    {
+      // Phi is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // Phi is biased
+      if(IPDFPhiBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(PhiBiasH.GetVectorLength());
+	  bins[0] = PhiBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = PhiBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = PhiBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = PhiBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + PhiBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFPhiBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFPhiBias = true
+	  IPDFPhiBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      //      size_t weight_bin_no = IPDFPhiBiasH.FindValueBinLocation(rndm);
+      size_t numberOfBin = IPDFPhiBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFPhiBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      bweights[4] =  IPDFPhiBiasH(biasn2) - IPDFPhiBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFPhiBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFPhiBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      bweights[4] = NatProb/bweights[4];
+      if(verbosityLevel >= 1)
+	G4cout << "Phi bin weight " << bweights[4] << " " << rndm << G4endl;
+      return(IPDFPhiBiasH.GetEnergy(rndm));
+    }
+}
+
+G4double G4GeneralParticleSource::GenRandEnergy()
+{
+  if(verbosityLevel >= 1)
+    G4cout << "In GenRandEnergy" << G4endl;
+  if(EnergyBias == false)
+    {
+      // Energy is not biased
+      G4double rndm = G4UniformRand();
+      return(rndm);
+    }
+  else
+    {
+      // ENERGY is biased
+      if(IPDFEnergyBias == false)
+	{
+	  // IPDF has not been created, so create it
+	  G4double bins[256],vals[256], sum;
+	  G4int ii;
+	  G4int maxbin = G4int(EnergyBiasH.GetVectorLength());
+	  bins[0] = EnergyBiasH.GetLowEdgeEnergy(size_t(0));
+	  vals[0] = EnergyBiasH(size_t(0));
+	  sum = vals[0];
+	  for(ii=1;ii<maxbin;ii++)
+	    {
+	      bins[ii] = EnergyBiasH.GetLowEdgeEnergy(size_t(ii));
+	      vals[ii] = EnergyBiasH(size_t(ii)) + vals[ii-1];
+	      sum = sum + EnergyBiasH(size_t(ii));
+	    }
+
+	  for(ii=0;ii<maxbin;ii++)
+	    {
+	      vals[ii] = vals[ii]/sum;
+	      IPDFEnergyBiasH.InsertValues(bins[ii], vals[ii]);
+	    }
+	  // Make IPDFEnergyBias = true
+	  IPDFEnergyBias = true;
+	}
+      // IPDF has been create so carry on
+      G4double rndm = G4UniformRand();
+      //  size_t weight_bin_no = IPDFEnergyBiasH.FindValueBinLocation(rndm);
+      size_t numberOfBin = IPDFEnergyBiasH.GetVectorLength();
+      G4int biasn1 = 0;
+      G4int biasn2 = numberOfBin/2;
+      G4int biasn3 = numberOfBin - 1;
+      while (biasn1 != biasn3 - 1) {
+      if (rndm > IPDFEnergyBiasH(biasn2))
+         biasn1 = biasn2;
+      else
+         biasn3 = biasn2;
+      biasn2 = biasn1 + (biasn3 - biasn1 + 1)/2;
+      }
+      bweights[5] =  IPDFEnergyBiasH(biasn2) - IPDFEnergyBiasH(biasn2 - 1);
+      G4double xaxisl = IPDFEnergyBiasH.GetLowEdgeEnergy(size_t(biasn2-1));
+      G4double xaxisu = IPDFEnergyBiasH.GetLowEdgeEnergy(size_t(biasn2));
+      G4double NatProb = xaxisu - xaxisl;
+      bweights[5] = NatProb/bweights[5];
+      if(verbosityLevel >= 1)
+	G4cout << "Energy bin weight " << bweights[5] << " " << rndm << G4endl;
+      return(IPDFEnergyBiasH.GetEnergy(rndm));
+    }
+}
+
+// Verbosity
+void G4GeneralParticleSource::SetVerbosity(int vL)
+{
+  verbosityLevel = vL;
+  G4cout << "Verbosity Set to: " << verbosityLevel << G4endl;
+}
+
+void G4GeneralParticleSource::SetParticleDefinition
+  (G4ParticleDefinition* aParticleDefinition)
+{
+  particle_definition = aParticleDefinition;
+  particle_charge = particle_definition->GetPDGCharge();
+}
+
+// SR1.3
+//void G4GeneralParticleSource::SetNucleus (Nucleus theIon1)
+//{
+//  theIon = theIon1;
+
+//  G4IonTable *theIonTable = (G4IonTable *)(G4ParticleTable::GetParticleTable()->GetIonTable());
+//  G4ParticleDefinition *aIon = NULL;
+
+//  G4int A = theIon.GetA();
+//  G4int Z = theIon.GetZ();
+//  G4double E = theIon.GetE();
+
+//  aIon = theIonTable->GetIon (Z, A, E);
+
+//  SetParticleDefinition(aIon);
+//}
+
+
+void G4GeneralParticleSource::GeneratePrimaryVertex(G4Event *evt)
+{
+  if(particle_definition==NULL) return;
+
+  // Position stuff
+  G4bool srcconf = false;
+  G4int LoopCount = 0;
+  while(srcconf == false)
+    {
+      if(SourcePosType == "Point")
+	GeneratePointSource();
+      else if(SourcePosType == "Plane")
+	GeneratePointsInPlane();
+      else if(SourcePosType == "Surface")
+	GeneratePointsOnSurface();
+      else if(SourcePosType == "Volume")
+	GeneratePointsInVolume();
+      else
+	{
+	  G4cout << "Error: SourcePosType undefined" << G4endl;
+	  G4cout << "Generating point source" << G4endl;
+	  GeneratePointSource();
+	}
+      if(Confine == true)
+	{
+	  srcconf = IsSourceConfined();
+	  // if source in confined srcconf = true terminating the loop
+	  // if source isnt confined srcconf = false and loop continues
+	}
+      else if(Confine == false)
+	srcconf = true; // terminate loop
+
+      LoopCount++;
+      if(LoopCount == 100000)
+	{
+	  G4cout << "*************************************" << G4endl;
+	  G4cout << "LoopCount = 100000" << G4endl;
+	  G4cout << "Either the source distribution >> confinement" << G4endl;
+	  G4cout << "or any confining volume may not overlap with" << G4endl;
+	  G4cout << "the source distribution or any confining volumes" << G4endl;
+	  G4cout << "may not exist"<< G4endl;
+	  G4cout << "If you have set confine then this will be ignored" <<G4endl;
+	  G4cout << "for this event." << G4endl;
+	  G4cout << "*************************************" << G4endl;
+	  srcconf = true; //Avoids an infinite loop
+	}
+    }
+  // Angular stuff
+  if(AngDistType == "iso")
+    GenerateIsotropicFlux();
+  else if(AngDistType == "cos")
+    GenerateCosineLawFlux();
+  else if(AngDistType == "user")
+    GenerateUserDefFlux();
+  else
+    G4cout << "Error: AngDistType has unusual value" << G4endl;
+  // Energy stuff
+  if(EnergyDisType == "Mono")
+    GenerateMonoEnergetic();
+  else if(EnergyDisType == "Lin")
+    GenerateLinearEnergies();
+  else if(EnergyDisType == "Pow")
+    GeneratePowEnergies();
+  else if(EnergyDisType == "Exp")
+    GenerateExpEnergies();
+  else if(EnergyDisType == "Brem")
+    GenerateBremEnergies();
+  else if(EnergyDisType == "Bbody")
+    GenerateBbodyEnergies();
+  else if(EnergyDisType == "Cdg")
+    GenerateCdgEnergies();
+  else if(EnergyDisType == "User")
+    GenUserHistEnergies();
+  else if(EnergyDisType == "Arb")
+    GenArbPointEnergies();
+  else if(EnergyDisType == "Epn")
+    GenEpnHistEnergies();
+  else
+    G4cout << "Error: EnergyDisType has unusual value" << G4endl;
+
+  // create a new vertex
+  G4PrimaryVertex* vertex = 
+    new G4PrimaryVertex(particle_position,particle_time);
+
+  if(verbosityLevel == 2)
+    G4cout << "Creating primaries and assigning to vertex" << G4endl;
+  // create new primaries and set them to the vertex
+  G4double mass =  particle_definition->GetPDGMass();
+  G4double energy = particle_energy + mass;
+  G4double pmom = sqrt(energy*energy-mass*mass);
+  G4double px = pmom*particle_momentum_direction.x();
+  G4double py = pmom*particle_momentum_direction.y();
+  G4double pz = pmom*particle_momentum_direction.z();
+
+  for( G4int i=0; i<NumberOfParticlesToBeGenerated; i++ )
+  {
+    G4PrimaryParticle* particle =
+      new G4PrimaryParticle(particle_definition,px,py,pz);
+    particle->SetMass( mass );
+    particle->SetCharge( particle_charge );
+    particle->SetPolarization(particle_polarization.x(),
+                               particle_polarization.y(),
+                               particle_polarization.z());
+    vertex->SetPrimary( particle );
+
+    // Set bweight equal to the multiple of all non-zero weights
+    bweight = 0.;
+    for(int bib=0; bib<6; bib++)
+      {
+	if(bweights[bib] > 0. && bweight == 0.)
+	  bweight = bweight + bweights[bib];
+	else if(bweights[bib] > 0.)
+	  bweight = bweight * bweights[bib];
+      }
+    // bweight will now contain the events final weighting.
+    // now pass it to the primary vertex
+    vertex->SetWeight(bweight);
+  }
+
+  evt->AddPrimaryVertex( vertex );
+}
+
diff --git a/source/event/src/G4GeneralParticleSourceMessenger.cc b/source/event/src/G4GeneralParticleSourceMessenger.cc
index a921a8360c..e3bf528131 100644
--- a/source/event/src/G4GeneralParticleSourceMessenger.cc
+++ b/source/event/src/G4GeneralParticleSourceMessenger.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 ///////////////////////////////////////////////////////////////////////////////
 // 
 // MODULE:           G4GeneralParticleSourceMessenger.cc
@@ -9,6 +31,9 @@
 // Customer:         ESA/ESTEC
 //
 ///////////////////////////////////////////////////////////////////////////////
+// $Id: G4GeneralParticleSourceMessenger.cc,v 1.4 2001/06/29 08:06:04 gcosmo Exp $
+// GEANT4 tag $Name: event-V03-01-01 $
+///////////////////////////////////////////////////////////////////////////////
 //
 // CHANGE HISTORY
 // --------------
@@ -41,7 +66,6 @@
 #include "G4UIcmdWithABool.hh"
 #include "G4ios.hh"
 
-//#include <iostream.h>
 #include "g4std/fstream"
 
 #include "g4std/iomanip"               
diff --git a/source/event/src/G4HEPEvtInterface.cc b/source/event/src/G4HEPEvtInterface.cc
index bbb355254a..995208b240 100644
--- a/source/event/src/G4HEPEvtInterface.cc
+++ b/source/event/src/G4HEPEvtInterface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPEvtInterface.cc,v 1.4 2001/02/08 06:07:17 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPEvtInterface.cc,v 1.4.2.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/event/src/G4HEPEvtParticle.cc b/source/event/src/G4HEPEvtParticle.cc
index 8cde3ff566..e777f62e19 100644
--- a/source/event/src/G4HEPEvtParticle.cc
+++ b/source/event/src/G4HEPEvtParticle.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPEvtParticle.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPEvtParticle.cc,v 1.2.4.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/event/src/G4ParticleGun.cc b/source/event/src/G4ParticleGun.cc
index 860aa67e7e..9014357945 100644
--- a/source/event/src/G4ParticleGun.cc
+++ b/source/event/src/G4ParticleGun.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleGun.cc,v 1.3 2000/10/18 12:41:25 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleGun.cc,v 1.3.4.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4ParticleGun
diff --git a/source/event/src/G4ParticleGunMessenger.cc b/source/event/src/G4ParticleGunMessenger.cc
index ab4e9159ba..5f2a359979 100644
--- a/source/event/src/G4ParticleGunMessenger.cc
+++ b/source/event/src/G4ParticleGunMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleGunMessenger.cc,v 1.4 2000/10/19 13:29:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleGunMessenger.cc,v 1.4.4.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4ParticleGunMessenger.hh"
diff --git a/source/event/src/G4PrimaryParticle.cc b/source/event/src/G4PrimaryParticle.cc
index 355c80e07f..f3869f0321 100644
--- a/source/event/src/G4PrimaryParticle.cc
+++ b/source/event/src/G4PrimaryParticle.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryParticle.cc,v 1.5 2001/02/08 06:07:17 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryParticle.cc,v 1.5.2.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PrimaryParticle.hh"
diff --git a/source/event/src/G4PrimaryTransformer.cc b/source/event/src/G4PrimaryTransformer.cc
index 9818410ac5..404a7fa271 100644
--- a/source/event/src/G4PrimaryTransformer.cc
+++ b/source/event/src/G4PrimaryTransformer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryTransformer.cc,v 1.8 2001/02/09 00:11:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryTransformer.cc,v 1.8.2.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PrimaryTransformer.hh"
diff --git a/source/event/src/G4PrimaryVertex.cc b/source/event/src/G4PrimaryVertex.cc
index a8cbc226c1..5ad3163b30 100644
--- a/source/event/src/G4PrimaryVertex.cc
+++ b/source/event/src/G4PrimaryVertex.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PrimaryVertex.cc,v 1.3 2000/10/19 15:19:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PrimaryVertex.cc,v 1.3.4.1 2001/06/28 19:07:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PrimaryVertex.hh"
diff --git a/source/event/src/G4StackManager.cc b/source/event/src/G4StackManager.cc
index b5e2a144d5..d14aaf08f4 100644
--- a/source/event/src/G4StackManager.cc
+++ b/source/event/src/G4StackManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackManager.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackManager.cc,v 1.3.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/src/G4StackedTrack.cc b/source/event/src/G4StackedTrack.cc
index 8d78894bdd..dace2996bc 100644
--- a/source/event/src/G4StackedTrack.cc
+++ b/source/event/src/G4StackedTrack.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackedTrack.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackedTrack.cc,v 1.3.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Last Modification : 02/Feb/96 M.Asai
diff --git a/source/event/src/G4StackingMessenger.cc b/source/event/src/G4StackingMessenger.cc
index ee4f36fc28..55737575d8 100644
--- a/source/event/src/G4StackingMessenger.cc
+++ b/source/event/src/G4StackingMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StackingMessenger.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StackingMessenger.cc,v 1.2.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 
diff --git a/source/event/src/G4TrackStack.cc b/source/event/src/G4TrackStack.cc
index f2bf95b95f..f955b3ab08 100644
--- a/source/event/src/G4TrackStack.cc
+++ b/source/event/src/G4TrackStack.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackStack.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackStack.cc,v 1.2.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Last Modification : 09/Dec/96 M.Asai
diff --git a/source/event/src/G4UserEventAction.cc b/source/event/src/G4UserEventAction.cc
index 6e38adc048..6ba0550cc4 100644
--- a/source/event/src/G4UserEventAction.cc
+++ b/source/event/src/G4UserEventAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserEventAction.cc,v 1.3 1999/12/15 14:49:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserEventAction.cc,v 1.3.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UserEventAction.hh"
diff --git a/source/event/src/G4UserStackingAction.cc b/source/event/src/G4UserStackingAction.cc
index 68acf491e1..cd9dda0bae 100644
--- a/source/event/src/G4UserStackingAction.cc
+++ b/source/event/src/G4UserStackingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserStackingAction.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserStackingAction.cc,v 1.3.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UserStackingAction.hh"
diff --git a/source/event/src/G4VPrimaryGenerator.cc b/source/event/src/G4VPrimaryGenerator.cc
index ffa773f2bf..26c1200e82 100644
--- a/source/event/src/G4VPrimaryGenerator.cc
+++ b/source/event/src/G4VPrimaryGenerator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPrimaryGenerator.cc,v 1.2 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPrimaryGenerator.cc,v 1.2.4.1 2001/06/28 19:07:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4VPrimaryGenerator
diff --git a/source/g3tog4/GNUmakefile b/source/g3tog4/GNUmakefile
index a218ed643e..66e3c18a42 100644
--- a/source/g3tog4/GNUmakefile
+++ b/source/g3tog4/GNUmakefile
@@ -110,7 +110,7 @@ all: lib
 
 lib: libc libF
 
-ifneq ($(G4MAKESHLIB),)
+ifneq ($(G4LIB_BUILD_SHARED),)
 libc : $(G4LIBDIR)/lib$(name).$(SHEXT)
 else
 libc : $(G4LIBDIR)/lib$(name).a
diff --git a/source/g3tog4/History b/source/g3tog4/History
index 1d26f061b4..205aa1fbfe 100644
--- a/source/g3tog4/History
+++ b/source/g3tog4/History
@@ -1,8 +1,21 @@
-$Id: History,v 1.42 2001/03/14 13:27:44 gcosmo Exp $
+$Id: History,v 1.44 2001/05/30 08:13:34 gcosmo Exp $
 
 G3toG4 Modification History (reverse chronological order, please !)
 --------------------------------------------------------------------
 
+g3tog4-V03-01-01 30-May-2001 G.Cosmo
+- Cleared pedantic warnings detected on Linux-g++ with ISO/ANSI setup.
+
+g3tog4-V03-01-00 15-May-2001 G.Cosmo
+- G3toG4BuildTree[.hh.cc]: fix for a case of the placement a volume
+                           in cloned mothers
+  G3toG4BuildTree() has been split in two methods G3toG4BuildLVTree() and
+  G3toG4BuildPVTree(), the first creating logical volumes only, the second
+  performing placements afterwards. Doing so, all mothers are ready (their
+  logical volumes are created) when a volume is put in more than one mother
+  (courtesy of I.Hrivnacova).
+- GNUmakefile: G4MAKESHLIB replaced with G4LIB_BUILD_SHARED.
+
 g3tog4-V03-00-02 14-Mar-2001 G.Cosmo
 - G3toG4MakeSolid.cc: fixed bug in construction of G4Sphere where theta and
   phi parameters were reversed according to G4Sphere constructor.
diff --git a/source/g3tog4/include/G3DetTable.hh b/source/g3tog4/include/G3DetTable.hh
index 20759771cd..b9c4e8e60b 100644
--- a/source/g3tog4/include/G3DetTable.hh
+++ b/source/g3tog4/include/G3DetTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3DetTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3DetTable.hh,v 1.6.4.1 2001/06/28 19:08:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G3DetTable class
 
diff --git a/source/g3tog4/include/G3DetTableEntry.hh b/source/g3tog4/include/G3DetTableEntry.hh
index c4b0c232d4..aae99dc0cc 100644
--- a/source/g3tog4/include/G3DetTableEntry.hh
+++ b/source/g3tog4/include/G3DetTableEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3DetTableEntry.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3DetTableEntry.hh,v 1.3.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G3DetTableEntry class
 
diff --git a/source/g3tog4/include/G3Division.hh b/source/g3tog4/include/G3Division.hh
index 9015a72dc2..f1df8fd6e2 100644
--- a/source/g3tog4/include/G3Division.hh
+++ b/source/g3tog4/include/G3Division.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3Division.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3Division.hh,v 1.4.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3EleTable.hh b/source/g3tog4/include/G3EleTable.hh
index 2bf24cf4da..ed3b2bb27a 100644
--- a/source/g3tog4/include/G3EleTable.hh
+++ b/source/g3tog4/include/G3EleTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3EleTable.hh,v 1.5 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3EleTable.hh,v 1.5.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3G4Interface.hh b/source/g3tog4/include/G3G4Interface.hh
index 52d1bc5b9e..39005c1b55 100644
--- a/source/g3tog4/include/G3G4Interface.hh
+++ b/source/g3tog4/include/G3G4Interface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3G4Interface.hh,v 1.7 1999/12/09 01:27:42 lockman Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3G4Interface.hh,v 1.7.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //   Interfaces for G3 equivalent routines
 //
diff --git a/source/g3tog4/include/G3MatTable.hh b/source/g3tog4/include/G3MatTable.hh
index 7e675071d6..d865e3acb3 100644
--- a/source/g3tog4/include/G3MatTable.hh
+++ b/source/g3tog4/include/G3MatTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MatTable.hh,v 1.9 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MatTable.hh,v 1.9.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MatTableEntry.hh b/source/g3tog4/include/G3MatTableEntry.hh
index 7b887593a4..39f9a97b70 100644
--- a/source/g3tog4/include/G3MatTableEntry.hh
+++ b/source/g3tog4/include/G3MatTableEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MatTableEntry.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MatTableEntry.hh,v 1.4.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MedTable.hh b/source/g3tog4/include/G3MedTable.hh
index 75f2648e18..00bed1c31a 100644
--- a/source/g3tog4/include/G3MedTable.hh
+++ b/source/g3tog4/include/G3MedTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MedTable.hh,v 1.8 2000/11/24 09:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MedTable.hh,v 1.8.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3MedTableEntry.hh b/source/g3tog4/include/G3MedTableEntry.hh
index 6d2bf57f5a..a54c2e6e58 100644
--- a/source/g3tog4/include/G3MedTableEntry.hh
+++ b/source/g3tog4/include/G3MedTableEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MedTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MedTableEntry.hh,v 1.4.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3PartTable.hh b/source/g3tog4/include/G3PartTable.hh
index 96e93b3301..24226594d7 100644
--- a/source/g3tog4/include/G3PartTable.hh
+++ b/source/g3tog4/include/G3PartTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3PartTable.hh,v 1.7 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3PartTable.hh,v 1.7.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3Pos.hh b/source/g3tog4/include/G3Pos.hh
index 69827c07ea..ddb867fc74 100644
--- a/source/g3tog4/include/G3Pos.hh
+++ b/source/g3tog4/include/G3Pos.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3Pos.hh,v 1.9 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3Pos.hh,v 1.9.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3RotTable.hh b/source/g3tog4/include/G3RotTable.hh
index 0bf4e572de..52e9be7d4b 100644
--- a/source/g3tog4/include/G3RotTable.hh
+++ b/source/g3tog4/include/G3RotTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3RotTable.hh,v 1.11 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3RotTable.hh,v 1.11.4.1 2001/06/28 19:08:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3RotTableEntry.hh b/source/g3tog4/include/G3RotTableEntry.hh
index 67cfb5d0bf..cfeaf754cc 100644
--- a/source/g3tog4/include/G3RotTableEntry.hh
+++ b/source/g3tog4/include/G3RotTableEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3RotTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3RotTableEntry.hh,v 1.4.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3SensVolVector.hh b/source/g3tog4/include/G3SensVolVector.hh
index 62fdbf31ad..590f9bd9f5 100644
--- a/source/g3tog4/include/G3SensVolVector.hh
+++ b/source/g3tog4/include/G3SensVolVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3SensVolVector.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3SensVolVector.hh,v 1.3.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // vector of logical volumes that were defined with
 // tracking medium with ISVOL=1
diff --git a/source/g3tog4/include/G3VolTable.hh b/source/g3tog4/include/G3VolTable.hh
index cd3e0a1cf2..98ff5d6b14 100644
--- a/source/g3tog4/include/G3VolTable.hh
+++ b/source/g3tog4/include/G3VolTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3VolTable.hh,v 1.15 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3VolTable.hh,v 1.15.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3VolTableEntry.hh b/source/g3tog4/include/G3VolTableEntry.hh
index 874e5b140f..d811330bfa 100644
--- a/source/g3tog4/include/G3VolTableEntry.hh
+++ b/source/g3tog4/include/G3VolTableEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3VolTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3VolTableEntry.hh,v 1.4.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class description:
diff --git a/source/g3tog4/include/G3toG4.hh b/source/g3tog4/include/G3toG4.hh
index 6f3e85ce4e..5cd400ee74 100644
--- a/source/g3tog4/include/G3toG4.hh
+++ b/source/g3tog4/include/G3toG4.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4.hh,v 1.6 2000/03/07 10:51:40 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4.hh,v 1.6.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/include/G3toG4.inc b/source/g3tog4/include/G3toG4.inc
index 6f4ff8bff3..822bb05df9 100644
--- a/source/g3tog4/include/G3toG4.inc
+++ b/source/g3tog4/include/G3toG4.inc
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: G3toG4.inc,v 1.2 1999/12/05 17:50:04 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: G3toG4.inc,v 1.2.8.1 2001/06/28 19:08:02 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
       integer maxlines
       parameter (maxlines = 750) ! max no. of cmd lines per C++ source file
diff --git a/source/g3tog4/include/G3toG4BuildTree.hh b/source/g3tog4/include/G3toG4BuildTree.hh
index 7a9c2415fc..d000dc708d 100644
--- a/source/g3tog4/include/G3toG4BuildTree.hh
+++ b/source/g3tog4/include/G3toG4BuildTree.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4BuildTree.hh,v 1.5 2000/11/24 09:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4BuildTree.hh,v 1.6.2.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class Description:
@@ -34,5 +50,7 @@
 #include "G3VolTableEntry.hh"
 
 void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE);
+void G3toG4BuildLVTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE);
+void G3toG4BuildPVTree(G3VolTableEntry* curVTE);
 
 #endif  
diff --git a/source/g3tog4/include/G3toG4MakeSolid.hh b/source/g3tog4/include/G3toG4MakeSolid.hh
index 8caf4eb7ff..021dbfdf77 100644
--- a/source/g3tog4/include/G3toG4MakeSolid.hh
+++ b/source/g3tog4/include/G3toG4MakeSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4MakeSolid.hh,v 1.5 2000/11/24 09:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4MakeSolid.hh,v 1.5.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------
 // Class Description:
diff --git a/source/g3tog4/include/G3toG4RotationMatrix.hh b/source/g3tog4/include/G3toG4RotationMatrix.hh
index dd9ed707d6..f1c161a9a4 100644
--- a/source/g3tog4/include/G3toG4RotationMatrix.hh
+++ b/source/g3tog4/include/G3toG4RotationMatrix.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RotationMatrix.hh,v 1.4 2000/11/24 09:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RotationMatrix.hh,v 1.4.4.1 2001/06/28 19:08:02 gunter Exp $
+// GEANT4 tag $Name:  $
 // ----------------------
 // Class description:
 //
diff --git a/source/g3tog4/include/gcbank.inc b/source/g3tog4/include/gcbank.inc
index 7b9aa4ba46..29307bafe2 100644
--- a/source/g3tog4/include/gcbank.inc
+++ b/source/g3tog4/include/gcbank.inc
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: gcbank.inc,v 1.2 1999/12/05 17:50:05 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: gcbank.inc,v 1.2.8.1 2001/06/28 19:08:02 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
       INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG
       INTEGER KWBANK,KWWORK,IWS
diff --git a/source/g3tog4/src/G3DetTable.cc b/source/g3tog4/src/G3DetTable.cc
index 51a8259f20..e6c3f86931 100644
--- a/source/g3tog4/src/G3DetTable.cc
+++ b/source/g3tog4/src/G3DetTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3DetTable.cc,v 1.9 2000/03/02 17:54:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3DetTable.cc,v 1.9.4.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "globals.hh"
 #include "G3DetTable.hh"
diff --git a/source/g3tog4/src/G3DetTableEntry.cc b/source/g3tog4/src/G3DetTableEntry.cc
index a92420c3ff..8d0cf7fdb2 100644
--- a/source/g3tog4/src/G3DetTableEntry.cc
+++ b/source/g3tog4/src/G3DetTableEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3DetTableEntry.cc,v 1.3 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3DetTableEntry.cc,v 1.3.4.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "globals.hh"
 #include "G3DetTableEntry.hh"
diff --git a/source/g3tog4/src/G3Division.cc b/source/g3tog4/src/G3Division.cc
index d26797a390..5b74d59f33 100644
--- a/source/g3tog4/src/G3Division.cc
+++ b/source/g3tog4/src/G3Division.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3Division.cc,v 1.9 2001/03/14 13:27:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3Division.cc,v 1.10.2.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi 13.10.99
 
@@ -290,7 +306,6 @@ void G3Division::SetRangeAndAxis()
     }
     else if ( shape == "PGON" ) {
         G4int i;
-        G4int npdv = int(Rpar[2]);
         G4int nz = int(Rpar[3]);
 
         G4double pPhi1 = Rpar[0]*deg;
diff --git a/source/g3tog4/src/G3EleTable.cc b/source/g3tog4/src/G3EleTable.cc
index 05ecd7d042..05613b37d8 100644
--- a/source/g3tog4/src/G3EleTable.cc
+++ b/source/g3tog4/src/G3EleTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3EleTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3EleTable.cc,v 1.9.4.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4strstreambuf.hh"
diff --git a/source/g3tog4/src/G3MatTable.cc b/source/g3tog4/src/G3MatTable.cc
index 90e7a6b841..0b484b7b09 100644
--- a/source/g3tog4/src/G3MatTable.cc
+++ b/source/g3tog4/src/G3MatTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MatTable.cc,v 1.12 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MatTable.cc,v 1.13.2.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -25,7 +41,7 @@ G3MatTable::~G3MatTable()
 
 G4Material* G3MatTable::get(G4int id) const
 {
-  for (G4int i=0; i< fMatVector->entries(); i++) {
+  for (size_t i=0; i< fMatVector->entries(); i++) {
     G3MatTableEntry* mte = (*fMatVector)[i];
     if (id == mte->GetID()) return mte->GetMaterial();
   }
diff --git a/source/g3tog4/src/G3MatTableEntry.cc b/source/g3tog4/src/G3MatTableEntry.cc
index 3a7ba3c44e..5881621f5d 100644
--- a/source/g3tog4/src/G3MatTableEntry.cc
+++ b/source/g3tog4/src/G3MatTableEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MatTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MatTableEntry.cc,v 1.2.8.1 2001/06/28 19:08:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3MedTable.cc b/source/g3tog4/src/G3MedTable.cc
index 5006ca9da8..13910408fd 100644
--- a/source/g3tog4/src/G3MedTable.cc
+++ b/source/g3tog4/src/G3MedTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MedTable.cc,v 1.10 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MedTable.cc,v 1.11.2.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -25,7 +41,7 @@ G3MedTable::~G3MedTable()
 
 G3MedTableEntry* G3MedTable::get(G4int id) const
 {
-  for (G4int i=0; i< fMedVector->entries(); i++) {
+  for (size_t i=0; i< fMedVector->entries(); i++) {
     G3MedTableEntry* mte = (*fMedVector)[i];
     if (id == mte->GetID()) return mte;
   }
diff --git a/source/g3tog4/src/G3MedTableEntry.cc b/source/g3tog4/src/G3MedTableEntry.cc
index 094cffd506..601e8068c6 100644
--- a/source/g3tog4/src/G3MedTableEntry.cc
+++ b/source/g3tog4/src/G3MedTableEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3MedTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3MedTableEntry.cc,v 1.2.8.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3NegVolPars.cc b/source/g3tog4/src/G3NegVolPars.cc
index c82a338594..806b51795d 100644
--- a/source/g3tog4/src/G3NegVolPars.cc
+++ b/source/g3tog4/src/G3NegVolPars.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3NegVolPars.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3NegVolPars.cc,v 1.8.2.1 2001/06/28 19:08:04 gunter Exp $ 
+// GEANT4 tag $Name:  $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
@@ -187,7 +203,6 @@ G4bool G3NegVolPars(G4double pars[], G4int *nparpt,
   // mother
   G4String shapem = mvte->GetShape();
   G4double* Rparm = mvte->GetRpar();
-  G4int nparm = mvte->GetNpar();    
 
   if (strcmp(routine,"GSPOS") == 0 || strcmp(routine,"GSVOLU") == 0) {
     NegPresent = G3CalcParamsFn(Rpar,npar,Rparm,shape,shapem);
diff --git a/source/g3tog4/src/G3PartTable.cc b/source/g3tog4/src/G3PartTable.cc
index 4110036a3b..dc94039bf2 100644
--- a/source/g3tog4/src/G3PartTable.cc
+++ b/source/g3tog4/src/G3PartTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3PartTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3PartTable.cc,v 1.9.4.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/strstream"
diff --git a/source/g3tog4/src/G3Pos.cc b/source/g3tog4/src/G3Pos.cc
index 081de62b8c..53106787fa 100644
--- a/source/g3tog4/src/G3Pos.cc
+++ b/source/g3tog4/src/G3Pos.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3Pos.cc,v 1.7 2000/03/02 17:54:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3Pos.cc,v 1.7.4.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G3RotTable.cc b/source/g3tog4/src/G3RotTable.cc
index 6ebc0e9eb5..6cd41f21fe 100644
--- a/source/g3tog4/src/G3RotTable.cc
+++ b/source/g3tog4/src/G3RotTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3RotTable.cc,v 1.12 2000/07/24 11:32:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3RotTable.cc,v 1.13.2.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -26,7 +42,7 @@ G3RotTable::~G3RotTable()
 
 G4RotationMatrix* G3RotTable::Get(G4int id) const
 {
-  for (G4int i=0; i<fRotVector->entries(); i++) {
+  for (size_t i=0; i<fRotVector->entries(); i++) {
     G3RotTableEntry* rte = (*fRotVector)[i];
     if (id == rte->GetID()) return rte->GetMatrix();
   }
diff --git a/source/g3tog4/src/G3RotTableEntry.cc b/source/g3tog4/src/G3RotTableEntry.cc
index 8a503680b6..252862b44c 100644
--- a/source/g3tog4/src/G3RotTableEntry.cc
+++ b/source/g3tog4/src/G3RotTableEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3RotTableEntry.cc,v 1.2 1999/12/05 17:50:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3RotTableEntry.cc,v 1.2.8.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G3VolTable.cc b/source/g3tog4/src/G3VolTable.cc
index 38289adba3..cb18940c1f 100644
--- a/source/g3tog4/src/G3VolTable.cc
+++ b/source/g3tog4/src/G3VolTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3VolTable.cc,v 1.19 2000/03/02 17:54:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3VolTable.cc,v 1.19.4.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G3VolTableEntry.cc b/source/g3tog4/src/G3VolTableEntry.cc
index e8eab3fa55..5462c51aec 100644
--- a/source/g3tog4/src/G3VolTableEntry.cc
+++ b/source/g3tog4/src/G3VolTableEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3VolTableEntry.cc,v 1.6 2000/11/28 12:07:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3VolTableEntry.cc,v 1.7.2.1 2001/06/28 19:08:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova, 13.10.99
 
@@ -170,7 +186,7 @@ void G3VolTableEntry::SetHasNegPars(G4bool hasNegPars) {
 }
 
 void G3VolTableEntry::ClearG3PosCopy(G4int copy) {
-  if (fG3Pos.entries()>0 && copy>=0 && copy<fG3Pos.entries()) 
+  if (fG3Pos.entries()>0 && copy>=0 && copy<G4int(fG3Pos.entries())) 
     fG3Pos.removeAt(copy);
 }
 
@@ -249,7 +265,7 @@ G3VolTableEntry::GetNoClones() {
 
 G3VolTableEntry* 
 G3VolTableEntry::GetDaughter(G4int i) {
-  if (i<fDaughters.entries() && i>=0)
+  if (i<G4int(fDaughters.entries()) && i>=0)
     return fDaughters[i];
   else 
     return 0;
@@ -257,7 +273,7 @@ G3VolTableEntry::GetDaughter(G4int i) {
 
 G3VolTableEntry*
 G3VolTableEntry::GetMother(G4int i){
-  if (i<fMothers.entries() && i>=0)
+  if (i<G4int(fMothers.entries()) && i>=0)
     return fMothers[i];
   else
     return 0;
@@ -274,7 +290,7 @@ G3VolTableEntry::GetMother(){
 
 G3VolTableEntry*
 G3VolTableEntry::GetClone(G4int i){
-  if (i<fClones.entries() && i>=0)
+  if (i<G4int(fClones.entries()) && i>=0)
     return fClones[i];
   else
     return 0;
diff --git a/source/g3tog4/src/G3fillParams.cc.archive b/source/g3tog4/src/G3fillParams.cc.archive
index c9b1a8987d..9baed7f165 100644
--- a/source/g3tog4/src/G3fillParams.cc.archive
+++ b/source/g3tog4/src/G3fillParams.cc.archive
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: G3fillParams.cc.archive,v 1.1 1999/12/06 19:19:57 lockman Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-08 $
 //
 // extracted from clparse.cc by I. Hrivnacova, 30.7.99
 
diff --git a/source/g3tog4/src/G3toG4BuildTree.cc b/source/g3tog4/src/G3toG4BuildTree.cc
index 4f0adcd201..ee2dfccc76 100644
--- a/source/g3tog4/src/G3toG4BuildTree.cc
+++ b/source/g3tog4/src/G3toG4BuildTree.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4BuildTree.cc,v 1.13 2001/01/25 17:41:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4BuildTree.cc,v 1.14.2.1 2001/06/28 19:08:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I. Hrivnacova, 2.8.99 
 
@@ -21,6 +37,12 @@
 #include "G4PVPlacement.hh"
 
 void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
+{
+  G3toG4BuildLVTree(curVTE, motherVTE);
+  G3toG4BuildPVTree(curVTE);
+}  
+
+void G3toG4BuildLVTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
 {
   // check existence of the solid
   if (curVTE->GetSolid()) {
@@ -46,75 +68,6 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
       // in case it is sensitive
       if (mte->GetISVOL()) G3SensVol.insert(curLog);
     }  
-  
-    // get mother logical volume
-    G4LogicalVolume* mothLV;
-    if (motherVTE) {
-      G4String motherName = motherVTE->GetName();    
-      if (curVTE->FindMother(motherName)->GetName() != motherName) {
-        // check consistency - tbr
-        G4Exception("G3toG4BuildTree: Inconsistent mother <-> daughter !!");
-      }
-      mothLV = motherVTE->GetLV();
-    }  
-    else {  	    
-       mothLV = 0;
-    }  
-    
-    // positions in motherVTE
-    for (G4int i=0; i<curVTE->NPCopies(); i++){
-
-      G3Pos* theG3Pos = curVTE->GetG3PosCopy(i);
-      if (theG3Pos &&
-          theG3Pos->GetMotherName() == motherVTE->GetMasterClone()->GetName()) {
-
-        // rotation matrix
-        G4int irot = theG3Pos->GetIrot();
-        G4RotationMatrix* theMatrix = 0;
-        if (irot>0) theMatrix = G3Rot.Get(irot);
-
-        // copy number
-        // (in G3 numbering starts from 1 but in G4 from 0)
-        G4int copyNo = theG3Pos->GetCopy() - 1;
-      
-        // position it if not top-level volume
-	if (mothLV != 0) {
-	  new G4PVPlacement(theMatrix,          // rotation matrix
-			    *(theG3Pos->GetPos()),  // its position
-			    curLog,                 // its LogicalVolume 
-			    curVTE->GetName(),      // PV name
-			    mothLV,                 // Mother LV
-			    0,                      // only
-			    copyNo);                // copy
-	
-        // verbose
-	  
-	  #ifdef G3G4DEBUG
-	    G4cout << "PV: " << i << "th copy of " << curVTE->GetName()
-		   << "  in " << motherVTE->GetName() << "  copyNo: " 
-		   << copyNo << "  irot: " << irot << "  pos: " 
-		   << *(theG3Pos->GetPos()) << G4endl;
-	  #endif
-	}
-	
-	// clear this position
-	curVTE->ClearG3PosCopy(i);
-	i--;
-      }
-    }
-
-    // divisions     
-    if (curVTE->GetDivision()) {
-      curVTE->GetDivision()->CreatePVReplica();
-      // verbose
-      #ifdef G3G4DEBUG
-	G4cout << "CreatePVReplica: " << curVTE->GetName() 
-	       << " in "  << motherVTE->GetName() << G4endl;
-      #endif
-
-      // clear this divison
-      curVTE->ClearDivision(); 
-    }
   }
   else {
     if ( !(curVTE->GetDivision() && motherVTE->GetMasterClone() == motherVTE &&
@@ -129,7 +82,96 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
   // process daughters
   G4int Ndau = curVTE->GetNoDaughters();
   for (int Idau=0; Idau<Ndau; Idau++){
-    G3toG4BuildTree(curVTE->GetDaughter(Idau), curVTE);
+    G3toG4BuildLVTree(curVTE->GetDaughter(Idau), curVTE);
+  }
+}
+
+void G3toG4BuildPVTree(G3VolTableEntry* curVTE)
+{
+  // check existence of the solid
+  if (curVTE->GetSolid()) {
+    G4LogicalVolume* curLog = curVTE->GetLV();
+  
+    // positions in motherVTE
+    for (G4int i=0; i<curVTE->NPCopies(); i++){
+
+      G3Pos* theG3Pos = curVTE->GetG3PosCopy(i);
+      if (theG3Pos) {
+
+        // loop over all mothers 
+        for (G4int im=0; im<curVTE->GetNoMothers(); im++) {
+
+          G3VolTableEntry* motherVTE = curVTE->GetMother(im);
+          if (theG3Pos->GetMotherName() == motherVTE->GetMasterClone()->GetName()) {
+     
+            // get mother logical volume
+            G4LogicalVolume* mothLV;
+            if (motherVTE) {
+              G4String motherName = motherVTE->GetName();    
+              if (!curVTE->FindMother(motherName)) continue;
+              if (curVTE->FindMother(motherName)->GetName() != motherName) {
+                // check consistency - tbr
+                G4Exception("G3toG4BuildTree: Inconsistent mother <-> daughter !!");
+              }
+              mothLV = motherVTE->GetLV();
+            }  
+            else {  	    
+              mothLV = 0;
+            }  
+    
+            // rotation matrix
+            G4int irot = theG3Pos->GetIrot();
+            G4RotationMatrix* theMatrix = 0;
+            if (irot>0) theMatrix = G3Rot.Get(irot);
+
+            // copy number
+            // (in G3 numbering starts from 1 but in G4 from 0)
+            G4int copyNo = theG3Pos->GetCopy() - 1;
+      
+            // position it if not top-level volume
+	    if (mothLV != 0) {
+	      new G4PVPlacement(theMatrix,              // rotation matrix
+	  		        *(theG3Pos->GetPos()),  // its position
+			        curLog,                 // its LogicalVolume 
+			        curVTE->GetName(),      // PV name
+			        mothLV,                 // Mother LV
+			        0,                      // only
+			        copyNo);                // copy
+	
+              // verbose
+  	      #ifdef G3G4DEBUG
+	        G4cout << "PV: " << i << "th copy of " << curVTE->GetName()
+	  	       << "  in " << motherVTE->GetName() << "  copyNo: " 
+		       << copyNo << "  irot: " << irot << "  pos: " 
+		       << *(theG3Pos->GetPos()) << G4endl;
+	      #endif
+            }
+	  }
+        }
+        // clear this position
+        curVTE->ClearG3PosCopy(i);
+        i--;
+      }
+    }
+
+    // divisions     
+    if (curVTE->GetDivision()) {
+      curVTE->GetDivision()->CreatePVReplica();
+      // verbose
+      #ifdef G3G4DEBUG
+	G4cout << "CreatePVReplica: " << curVTE->GetName() 
+	       << " in "  <<  curVTE->GetMother()->GetName() << G4endl;
+      #endif
+
+      // clear this divison
+      curVTE->ClearDivision(); 
+    }
+  }
+  
+  // process daughters
+  G4int Ndau = curVTE->GetNoDaughters();
+  for (int Idau=0; Idau<Ndau; Idau++){
+    G3toG4BuildPVTree(curVTE->GetDaughter(Idau));
   }
 }
 
diff --git a/source/g3tog4/src/G3toG4MakeSolid.cc b/source/g3tog4/src/G3toG4MakeSolid.cc
index f1d36d48cb..7b1a5dfea9 100644
--- a/source/g3tog4/src/G3toG4MakeSolid.cc
+++ b/source/g3tog4/src/G3toG4MakeSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4MakeSolid.cc,v 1.7 2001/03/12 09:49:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4MakeSolid.cc,v 1.7.2.1 2001/06/28 19:08:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 
 
diff --git a/source/g3tog4/src/G3toG4RotationMatrix.cc b/source/g3tog4/src/G3toG4RotationMatrix.cc
index 9209543ef5..c037b33481 100644
--- a/source/g3tog4/src/G3toG4RotationMatrix.cc
+++ b/source/g3tog4/src/G3toG4RotationMatrix.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G3toG4RotationMatrix.cc,v 1.2 1999/12/05 17:50:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G3toG4RotationMatrix.cc,v 1.2.8.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G3toG4RotationMatrix.hh"
 
diff --git a/source/g3tog4/src/G4BuildGeom.cc b/source/g3tog4/src/G4BuildGeom.cc
index 7b82c216ae..169ab97010 100644
--- a/source/g3tog4/src/G4BuildGeom.cc
+++ b/source/g3tog4/src/G4BuildGeom.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BuildGeom.cc,v 1.13 2000/11/24 09:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BuildGeom.cc,v 1.13.4.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I. Hrivnacova, 13.10.99 
 
diff --git a/source/g3tog4/src/G4ggclos.cc b/source/g3tog4/src/G4ggclos.cc
index c5a8af480e..69b9d11ac8 100644
--- a/source/g3tog4/src/G4ggclos.cc
+++ b/source/g3tog4/src/G4ggclos.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ggclos.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ggclos.cc,v 1.6.4.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
diff --git a/source/g3tog4/src/G4gsatt.cc b/source/g3tog4/src/G4gsatt.cc
index b0db6f0d14..5038103cf8 100644
--- a/source/g3tog4/src/G4gsatt.cc
+++ b/source/g3tog4/src/G4gsatt.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsatt.cc,v 1.8 2000/03/02 17:54:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsatt.cc,v 1.9.2.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "g4rw/cstring.h"
 #include "G3toG4.hh"
@@ -28,6 +44,6 @@ void PG4gsatt(G4String tokens[])
 void G4gsatt(G4String name, G4String attr, G4int ival)
 {
     // get logical volume pointer
-    G4LogicalVolume *lvol = G3Vol.GetVTE(name)->GetLV();
+    // G4LogicalVolume *lvol = G3Vol.GetVTE(name)->GetLV();
     G4cerr << "G4gsatt not implemented" << G4endl;
 }
diff --git a/source/g3tog4/src/G4gsdet.cc b/source/g3tog4/src/G4gsdet.cc
index e045661dd9..9326d6d776 100644
--- a/source/g3tog4/src/G4gsdet.cc
+++ b/source/g3tog4/src/G4gsdet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdet.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdet.cc,v 1.3.8.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "globals.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdeta.cc b/source/g3tog4/src/G4gsdeta.cc
index d4d45f553c..1b3eeeca5d 100644
--- a/source/g3tog4/src/G4gsdeta.cc
+++ b/source/g3tog4/src/G4gsdeta.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdeta.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdeta.cc,v 1.4.8.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // modified by I.Hrivnacova, 6 Oct 99
diff --git a/source/g3tog4/src/G4gsdetd.cc b/source/g3tog4/src/G4gsdetd.cc
index 2d93fcd436..504c72b641 100644
--- a/source/g3tog4/src/G4gsdetd.cc
+++ b/source/g3tog4/src/G4gsdetd.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdetd.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdetd.cc,v 1.5.2.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
@@ -33,9 +49,9 @@ void G4gsdetd(G4String chset, G4String chdet, G4int nd, G4String chnmsd[],
               G4int nbitsd[])
 {
     // Get pointer to detector chset
-    G4VSensitiveDetector* sdet = G3Det.GetSD(chset, chdet);
+    // G4VSensitiveDetector* sdet = G3Det.GetSD(chset, chdet);
     // Add hits to sensitive detector
-    for (G4int i=0; i<nd; i++) {
+    // for (G4int i=0; i<nd; i++) {
       // $$$        sdet->AddDigi(chnmsd[i],nbitsd[i]);
-    }
+    // }
 }
diff --git a/source/g3tog4/src/G4gsdeth.cc b/source/g3tog4/src/G4gsdeth.cc
index 1430732cfb..b633d74b04 100644
--- a/source/g3tog4/src/G4gsdeth.cc
+++ b/source/g3tog4/src/G4gsdeth.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdeth.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdeth.cc,v 1.5.2.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G3toG4.hh"
 #include "G3DetTable.hh"
@@ -35,9 +51,9 @@ void G4gsdeth(G4String chset, G4String chdet, G4int nh, G4String chnamh[],
               G4int nbitsh[], G4double orig[], G4double fact[])
 {
     // Get pointer to sensitive detector chset
-    G4VSensitiveDetector* sdet = G3Det.GetSD(chset, chdet);
+    // G4VSensitiveDetector* sdet = G3Det.GetSD(chset, chdet);
     // Add hits to sensitive detector
-    for (G4int i=0; i<nh; i++) {
+    // for (G4int i=0; i<nh; i++) {
       // $$$        sdet->AddHit(chnamh[i],nbitsh[i],orig[i],fact[i]);
-    }
+    // }
 }
diff --git a/source/g3tog4/src/G4gsdetu.cc b/source/g3tog4/src/G4gsdetu.cc
index fb2c5194df..5e5cf601ad 100644
--- a/source/g3tog4/src/G4gsdetu.cc
+++ b/source/g3tog4/src/G4gsdetu.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdetu.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdetu.cc,v 1.3.8.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G3toG4.hh"
 
diff --git a/source/g3tog4/src/G4gsdetv.cc b/source/g3tog4/src/G4gsdetv.cc
index 3aaca357fc..b94bc5b9ef 100644
--- a/source/g3tog4/src/G4gsdetv.cc
+++ b/source/g3tog4/src/G4gsdetv.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdetv.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdetv.cc,v 1.6.4.1 2001/06/28 19:08:06 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4ios.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gsdk.cc b/source/g3tog4/src/G4gsdk.cc
index 20491fd969..65f8a02abc 100644
--- a/source/g3tog4/src/G4gsdk.cc
+++ b/source/g3tog4/src/G4gsdk.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdk.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdk.cc,v 1.4.2.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4Decay.hh"
 #include "G3toG4.hh"
@@ -19,7 +35,6 @@ void PG4gsdk(G4String tokens[])
 
     // interpret the parameters
     G4int ipart = Ipar[0];
-    G4int inum = Ipar[1];
     G4int *mode = &Ipar[3];
     G4double *bratio = Rpar;
 
@@ -28,6 +43,7 @@ void PG4gsdk(G4String tokens[])
 
 void G4gsdk(G4int ipart, G4double bratio[], G4int mode[])
 {
+/*
     // create decay object for the particle
     G4Decay *decay = new G4Decay();
     // add decay modes
@@ -39,4 +55,5 @@ void G4gsdk(G4int ipart, G4double bratio[], G4int mode[])
     // associate decay object with particle ipart
     G4ParticleDefinition *part = G3Part.Get(ipart);
 // $$$    part->SetDecay(decay);
+*/
 }
diff --git a/source/g3tog4/src/G4gsdvn.cc b/source/g3tog4/src/G4gsdvn.cc
index 7b2a0f3a6e..43325941dd 100644
--- a/source/g3tog4/src/G4gsdvn.cc
+++ b/source/g3tog4/src/G4gsdvn.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdvn.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdvn.cc,v 1.6.2.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
@@ -35,7 +51,7 @@ void G4CreateCloneVTEWithDivision(G4String vname, G3VolTableEntry* mvte,
         G3DivType divType, G4int nofDivisions, G4int iaxis, G4int nmed, 
 	G4double c0, G4double step)
 {	
-  G3VolTableEntry* vte;
+  G3VolTableEntry* vte=0;
 
   // loop over all mothers
   for (G4int i=0; i<mvte->GetNoClones(); i++) {
diff --git a/source/g3tog4/src/G4gsdvn2.cc b/source/g3tog4/src/G4gsdvn2.cc
index b35c7fa06c..cb89cf3f6c 100644
--- a/source/g3tog4/src/G4gsdvn2.cc
+++ b/source/g3tog4/src/G4gsdvn2.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdvn2.cc,v 1.6 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdvn2.cc,v 1.6.8.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt.cc b/source/g3tog4/src/G4gsdvt.cc
index d7600eb3a0..6cfb748e43 100644
--- a/source/g3tog4/src/G4gsdvt.cc
+++ b/source/g3tog4/src/G4gsdvt.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdvt.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdvt.cc,v 1.5.8.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvt2.cc b/source/g3tog4/src/G4gsdvt2.cc
index 67192df2a0..5c89789a58 100644
--- a/source/g3tog4/src/G4gsdvt2.cc
+++ b/source/g3tog4/src/G4gsdvt2.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdvt2.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdvt2.cc,v 1.5.8.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi, 29 Oct 99
 
diff --git a/source/g3tog4/src/G4gsdvx.cc b/source/g3tog4/src/G4gsdvx.cc
index 76a4dc8bd2..06729d24bb 100644
--- a/source/g3tog4/src/G4gsdvx.cc
+++ b/source/g3tog4/src/G4gsdvx.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsdvx.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsdvx.cc,v 1.3.8.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, V.Berejnoi, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gsmate.cc b/source/g3tog4/src/G4gsmate.cc
index a23dc8dcc9..26e3d12d3c 100644
--- a/source/g3tog4/src/G4gsmate.cc
+++ b/source/g3tog4/src/G4gsmate.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsmate.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsmate.cc,v 1.7.2.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
@@ -30,7 +46,7 @@ void PG4gsmate(G4String tokens[])
   G4double z = Rpar[1];
   G4double dens = Rpar[2];
   G4double radl = Rpar[3];
-  G4double absl = Rpar[4];
+  // G4double absl = Rpar[4];
   G4double *ubuf = &Rpar[5];
 
   G4gsmate(imate, name, a, z, dens, radl, nwbf, ubuf);
@@ -92,7 +108,7 @@ void G4gsmate(G4int imate, G4String name, G4double ain, G4double zin,
   G4double a = ain*g/mole;
   G4double dens = densin*g/cm3;
 
-  G4Material* material;
+  G4Material* material=0;
   
   G4String sname = name.strip(G4String::both);
   if (sname == "AIR") {
diff --git a/source/g3tog4/src/G4gsmixt.cc b/source/g3tog4/src/G4gsmixt.cc
index 95b3dba666..411f97280d 100644
--- a/source/g3tog4/src/G4gsmixt.cc
+++ b/source/g3tog4/src/G4gsmixt.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsmixt.cc,v 1.7 1999/12/15 14:49:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsmixt.cc,v 1.7.4.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 27 Sep 99
 
diff --git a/source/g3tog4/src/G4gspart.cc b/source/g3tog4/src/G4gspart.cc
index ce93a3f7e3..012b8b4723 100644
--- a/source/g3tog4/src/G4gspart.cc
+++ b/source/g3tog4/src/G4gspart.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gspart.cc,v 1.3 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gspart.cc,v 1.3.8.1 2001/06/28 19:08:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4ProcessManager.hh"
 #include "G3toG4.hh"
diff --git a/source/g3tog4/src/G4gspos.cc b/source/g3tog4/src/G4gspos.cc
index 2de6385747..9b1322bcda 100644
--- a/source/g3tog4/src/G4gspos.cc
+++ b/source/g3tog4/src/G4gspos.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gspos.cc,v 1.11 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gspos.cc,v 1.11.8.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G4gsposp.cc b/source/g3tog4/src/G4gsposp.cc
index b2ec8fe7ae..03322cad8f 100644
--- a/source/g3tog4/src/G4gsposp.cc
+++ b/source/g3tog4/src/G4gsposp.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsposp.cc,v 1.13 2000/03/07 10:51:40 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsposp.cc,v 1.13.4.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/G4gsrotm.cc b/source/g3tog4/src/G4gsrotm.cc
index 214f591897..ca66a50932 100644
--- a/source/g3tog4/src/G4gsrotm.cc
+++ b/source/g3tog4/src/G4gsrotm.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsrotm.cc,v 1.8 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsrotm.cc,v 1.8.4.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G3toG4.hh"
 #include "G3RotTable.hh"
diff --git a/source/g3tog4/src/G4gstmed.cc b/source/g3tog4/src/G4gstmed.cc
index c596450809..5f2d01861e 100644
--- a/source/g3tog4/src/G4gstmed.cc
+++ b/source/g3tog4/src/G4gstmed.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gstmed.cc,v 1.4 1999/12/05 17:50:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gstmed.cc,v 1.4.8.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // The last G4int argument of G4gstmed(..) is used for sending
 // info whether the Geant3 tracking medium parameters should
diff --git a/source/g3tog4/src/G4gstpar.cc b/source/g3tog4/src/G4gstpar.cc
index 60fa74be10..0fcebdf0dc 100644
--- a/source/g3tog4/src/G4gstpar.cc
+++ b/source/g3tog4/src/G4gstpar.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gstpar.cc,v 1.5 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gstpar.cc,v 1.5.4.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G3toG4.hh"
 #include "G3VolTable.hh"
diff --git a/source/g3tog4/src/G4gsvolu.cc b/source/g3tog4/src/G4gsvolu.cc
index 17db75a795..30ca604ba5 100644
--- a/source/g3tog4/src/G4gsvolu.cc
+++ b/source/g3tog4/src/G4gsvolu.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4gsvolu.cc,v 1.7 1999/12/15 14:49:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4gsvolu.cc,v 1.7.4.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // by I.Hrivnacova, 13.10.99
 
diff --git a/source/g3tog4/src/clparse.cc b/source/g3tog4/src/clparse.cc
index d6d5ba57db..1c3843b112 100644
--- a/source/g3tog4/src/clparse.cc
+++ b/source/g3tog4/src/clparse.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: clparse.cc,v 1.11 2000/03/07 10:51:41 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: clparse.cc,v 1.11.4.1 2001/06/28 19:08:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // modified by I.Hrivnacova
 // added G3SensVol
diff --git a/source/g3tog4/src/g3routines.F b/source/g3tog4/src/g3routines.F
index 4945b0715f..5fb1051acd 100644
--- a/source/g3tog4/src/g3routines.F
+++ b/source/g3tog4/src/g3routines.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: g3routines.F,v 1.3 1999/12/05 17:50:15 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: g3routines.F,v 1.3.8.1 2001/06/28 19:08:08 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
 #define CALL_GEANT
 
diff --git a/source/g3tog4/src/g3test.F.main b/source/g3tog4/src/g3test.F.main
index 12bf2e028a..bb4ab24be6 100644
--- a/source/g3tog4/src/g3test.F.main
+++ b/source/g3tog4/src/g3test.F.main
@@ -6,7 +6,7 @@
 *     and all its terms.
 *    
 *     $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*     GEANT4 tag $Name:  $
 *    
 *
 *       g3test
diff --git a/source/g3tog4/src/g3tog4.F b/source/g3tog4/src/g3tog4.F
index 903248671f..deb8a986b4 100644
--- a/source/g3tog4/src/g3tog4.F
+++ b/source/g3tog4/src/g3tog4.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: g3tog4.F,v 1.3 1999/12/05 17:50:16 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: g3tog4.F,v 1.3.8.1 2001/06/28 19:08:09 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
 *
 *       G3toG4
diff --git a/source/g3tog4/src/g4geom.cc.main b/source/g3tog4/src/g4geom.cc.main
index 238fd7331d..4c4ac7b949 100644
--- a/source/g3tog4/src/g4geom.cc.main
+++ b/source/g3tog4/src/g4geom.cc.main
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $ 
-// GEANT4 tag $Name: geant4-03-01 $ 
+// GEANT4 tag $Name:  $ 
 //
 //   g4geom
 //
diff --git a/source/g3tog4/src/jshape.F b/source/g3tog4/src/jshape.F
index e14cdc1cd2..c8923a95a2 100644
--- a/source/g3tog4/src/jshape.F
+++ b/source/g3tog4/src/jshape.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: jshape.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: jshape.F,v 1.2.8.1 2001/06/28 19:08:09 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
 *     
 *--   Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch
diff --git a/source/g3tog4/src/mztog4.F b/source/g3tog4/src/mztog4.F
index d045c28d8c..22a629830a 100644
--- a/source/g3tog4/src/mztog4.F
+++ b/source/g3tog4/src/mztog4.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: mztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: mztog4.F,v 1.2.8.1 2001/06/28 19:08:09 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
       subroutine mztog4
 ************************************************************************
diff --git a/source/g3tog4/src/rztog4.F b/source/g3tog4/src/rztog4.F
index c5d5c4ac29..4a35a08084 100644
--- a/source/g3tog4/src/rztog4.F
+++ b/source/g3tog4/src/rztog4.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: rztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: rztog4.F,v 1.2.8.1 2001/06/28 19:08:09 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
       program rztog4
 ************************************************************************
diff --git a/source/g3tog4/src/tog4.F b/source/g3tog4/src/tog4.F
index f0341ac3ab..39418e9e13 100644
--- a/source/g3tog4/src/tog4.F
+++ b/source/g3tog4/src/tog4.F
@@ -1,12 +1,28 @@
-*     This code implementation is the intellectual property of
-*     the GEANT4 collaboration.
 *    
-*     By copying, distributing or modifying the Program (or any work
-*     based on the Program) you indicate your acceptance of this statement,
-*     and all its terms.
+*     ********************************************************************
+*     * DISCLAIMER                                                       *
+*     *                                                                  *
+*     * The following disclaimer summarizes all the specific disclaimers *
+*     * of contributors to this software. The specific disclaimers,which *
+*     * govern, are listed with their locations in:                      *
+*     *   http://cern.ch/geant4/license                                  *
+*     *                                                                  *
+*     * Neither the authors of this software system, nor their employing *
+*     * institutes,nor the agencies providing financial support for this *
+*     * work  make  any representation or  warranty, express or implied, *
+*     * regarding  this  software system or assume any liability for its *
+*     * use.                                                             *
+*     *                                                                  *
+*     * This  code  implementation is the  intellectual property  of the *
+*     * GEANT4 collaboration.                                            *
+*     * By copying,  distributing  or modifying the Program (or any work *
+*     * based  on  the Program)  you indicate  your  acceptance of  this *
+*     * statement, and all its terms.                                    *
+*     ********************************************************************
 *    
-*     $Id: tog4.F,v 1.3 1999/12/05 17:50:17 gcosmo Exp $
-*     GEANT4 tag $Name: geant4-03-01 $
+*    
+*     $Id: tog4.F,v 1.3.8.1 2001/06/28 19:08:09 gunter Exp $
+*     GEANT4 tag $Name:  $
 *    
       subroutine tog4
 ************************************************************************
diff --git a/source/geometry/History b/source/geometry/History
index a845988bbf..57de975539 100644
--- a/source/geometry/History
+++ b/source/geometry/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 2000/11/20 19:16:37 gcosmo Exp $
+$Id: History,v 1.18 2001/04/20 20:31:06 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Apr 20, 2001   Gabriele Cosmo               geometry-V03-01-00
+-----------------------------
+- Includes all geometry coworking tags after the migration to STL vector:
+  field-V03-00-05, geommng-V03-01-00, geomsolids-V03-01-00 and
+  geomvol-V03-01-01.
+
 Nov 20, 2000   Gabriele Cosmo               geometry-V02-00-00
 -----------------------------
 - QA code cleanup from Code-Wizard and warnings issued by
@@ -127,6 +133,16 @@ Nov  10,  99   John Apostolakis              geometry-V00-01-01
 ===============================================================================
   Geant4 1.0  , 1st STL-based release. 
 ===============================================================================
+June  7,  99   John Apostolakis              geometry-01-00-06
+
+- Tagged.
+
+June  7,  99   D. C. Williams
+ CSG Pcon/Pgon (and supporting classes) :  several changes
+
+June  4,  99   S. Giani
+ G4Trap                 : CalculateExtent fix
+ G4SmartVoxelHeader.cc  : protection against inconsistent CalculateExtent
 
 May  21,  99   John Apostolakis              geometry-01-00-05
 - Tagged.
diff --git a/source/geometry/magneticfield/History b/source/geometry/magneticfield/History
index 9763bad74c..3bfd2e39ff 100644
--- a/source/geometry/magneticfield/History
+++ b/source/geometry/magneticfield/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.33 2001/04/04 10:43:11 gcosmo Exp $
+$Id: History,v 1.37 2001/05/23 18:51:29 japost Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,21 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+May 23rd, 2001  J. Apostolakis - field-V03-01-01
+------------------------------
+- Fixed G4FieldManager constructors to give default values to delta
+  parameters.
+
+- Added Exception to G4RKG3Stepper constructor: the class does not work
+
+- Updated testPropagateSpin (it now compiles), 
+   and some outputs of testPropagateMagField (1 to 5)
+
+
+Apr 12th, 2001  P. Gumplinger - field-V03-01-00
+-----------------------------
+- Updated G4Mag_SpinEqRhs.hh and G4Mag_SpinEqRhs.cc for correction
+  to spin tracking.
 
 Apr 04th, 2001  G. Cosmo - field-V03-00-05
 ------------------------
diff --git a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
index 5a1ffd25c6..c33fa88c1e 100644
--- a/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
+++ b/source/geometry/magneticfield/include/G4CashKarpRKF45.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CashKarpRKF45.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CashKarpRKF45.hh,v 1.6.2.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4CashKarpRKF45
diff --git a/source/geometry/magneticfield/include/G4ChordFinder.hh b/source/geometry/magneticfield/include/G4ChordFinder.hh
index 8af3156ae6..6197289f11 100644
--- a/source/geometry/magneticfield/include/G4ChordFinder.hh
+++ b/source/geometry/magneticfield/include/G4ChordFinder.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChordFinder.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChordFinder.hh,v 1.6.2.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4ChordFinder
diff --git a/source/geometry/magneticfield/include/G4ChordFinder.icc b/source/geometry/magneticfield/include/G4ChordFinder.icc
index df06dbe25c..088ffdd373 100644
--- a/source/geometry/magneticfield/include/G4ChordFinder.icc
+++ b/source/geometry/magneticfield/include/G4ChordFinder.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChordFinder.icc,v 1.2 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChordFinder.icc,v 1.2.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4ChordFinder inline implementations
 //
diff --git a/source/geometry/magneticfield/include/G4ClassicalRK4.hh b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
index d96583974a..75c5824c22 100644
--- a/source/geometry/magneticfield/include/G4ClassicalRK4.hh
+++ b/source/geometry/magneticfield/include/G4ClassicalRK4.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClassicalRK4.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClassicalRK4.hh,v 1.4.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4ClassicalRK4
diff --git a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
index fc3b7fef2d..e40154213a 100644
--- a/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
+++ b/source/geometry/magneticfield/include/G4ElectroMagneticField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ElectroMagneticField.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ElectroMagneticField.hh,v 1.4.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4ElectroMagneticField
diff --git a/source/geometry/magneticfield/include/G4EqMagElectricField.hh b/source/geometry/magneticfield/include/G4EqMagElectricField.hh
index 06e3a45e6c..8d6dbce2b9 100644
--- a/source/geometry/magneticfield/include/G4EqMagElectricField.hh
+++ b/source/geometry/magneticfield/include/G4EqMagElectricField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EqMagElectricField.hh,v 1.5 2001/02/20 08:49:29 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EqMagElectricField.hh,v 1.5.2.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4EqMagElectricField
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.hh b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
index 308a85e119..e0cac4c7c9 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.hh
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EquationOfMotion.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EquationOfMotion.hh,v 1.4.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4EquationOfMotion
diff --git a/source/geometry/magneticfield/include/G4EquationOfMotion.icc b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
index bba6c09c01..ab6fde4231 100644
--- a/source/geometry/magneticfield/include/G4EquationOfMotion.icc
+++ b/source/geometry/magneticfield/include/G4EquationOfMotion.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EquationOfMotion.icc,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EquationOfMotion.icc,v 1.4.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Inline implementation 
diff --git a/source/geometry/magneticfield/include/G4ExplicitEuler.hh b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
index 4cb2b72ea4..35f30813ec 100644
--- a/source/geometry/magneticfield/include/G4ExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ExplicitEuler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExplicitEuler.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExplicitEuler.hh,v 1.4.4.1 2001/06/28 19:08:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4ExplicitEuler
diff --git a/source/geometry/magneticfield/include/G4Field.hh b/source/geometry/magneticfield/include/G4Field.hh
index 948a3d0ceb..cce496825d 100644
--- a/source/geometry/magneticfield/include/G4Field.hh
+++ b/source/geometry/magneticfield/include/G4Field.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Field.hh,v 1.4 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Field.hh,v 1.4.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4Field
diff --git a/source/geometry/magneticfield/include/G4FieldManager.hh b/source/geometry/magneticfield/include/G4FieldManager.hh
index be23e9c558..0c3ed79d71 100644
--- a/source/geometry/magneticfield/include/G4FieldManager.hh
+++ b/source/geometry/magneticfield/include/G4FieldManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldManager.hh,v 1.5 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldManager.hh,v 1.5.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 // class G4FieldManager
diff --git a/source/geometry/magneticfield/include/G4FieldManager.icc b/source/geometry/magneticfield/include/G4FieldManager.icc
index 435cff4307..ef43a07a40 100644
--- a/source/geometry/magneticfield/include/G4FieldManager.icc
+++ b/source/geometry/magneticfield/include/G4FieldManager.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldManager.icc,v 1.3 2000/11/01 15:15:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldManager.icc,v 1.3.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4FieldManager inline implementation 
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.hh b/source/geometry/magneticfield/include/G4FieldTrack.hh
index df6608b3ac..43d12c6e46 100644
--- a/source/geometry/magneticfield/include/G4FieldTrack.hh
+++ b/source/geometry/magneticfield/include/G4FieldTrack.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldTrack.hh,v 1.6 2001/03/27 15:35:14 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldTrack.hh,v 1.6.2.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4FieldTrack
diff --git a/source/geometry/magneticfield/include/G4FieldTrack.icc b/source/geometry/magneticfield/include/G4FieldTrack.icc
index b0b62fd9d1..9852a57bf5 100644
--- a/source/geometry/magneticfield/include/G4FieldTrack.icc
+++ b/source/geometry/magneticfield/include/G4FieldTrack.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldTrack.icc,v 1.7 2001/04/04 10:39:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldTrack.icc,v 1.7.2.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "PhysicalConstants.h"
 
diff --git a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
index d0650ef007..afc35b7727 100644
--- a/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixExplicitEuler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixExplicitEuler.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixExplicitEuler.hh,v 1.5.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4HelixExplicitEuler
diff --git a/source/geometry/magneticfield/include/G4HelixHeum.hh b/source/geometry/magneticfield/include/G4HelixHeum.hh
index bb33700f30..7ce501b46c 100644
--- a/source/geometry/magneticfield/include/G4HelixHeum.hh
+++ b/source/geometry/magneticfield/include/G4HelixHeum.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixHeum.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixHeum.hh,v 1.5.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4HelixHeum
diff --git a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
index ee6ceb5d0e..826fa820e7 100644
--- a/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4HelixImplicitEuler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixImplicitEuler.hh,v 1.5 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixImplicitEuler.hh,v 1.5.4.1 2001/06/28 19:08:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4HelixImplicitEuler
diff --git a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
index b0cec40f0c..20599f80e8 100644
--- a/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4HelixSimpleRunge.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixSimpleRunge.hh,v 1.4 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixSimpleRunge.hh,v 1.4.4.1 2001/06/28 19:08:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // W. Wander <wwc@mit.edu> 03/12/98
diff --git a/source/geometry/magneticfield/include/G4ImplicitEuler.hh b/source/geometry/magneticfield/include/G4ImplicitEuler.hh
index 110a0fc8cf..60d4af701c 100644
--- a/source/geometry/magneticfield/include/G4ImplicitEuler.hh
+++ b/source/geometry/magneticfield/include/G4ImplicitEuler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ImplicitEuler.hh,v 1.3 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ImplicitEuler.hh,v 1.3.4.1 2001/06/28 19:08:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // W. Wander <wwc@mit.edu> 12/09/97
diff --git a/source/geometry/magneticfield/include/G4LineSection.hh b/source/geometry/magneticfield/include/G4LineSection.hh
index 6ca480b412..4bec5f3d17 100644
--- a/source/geometry/magneticfield/include/G4LineSection.hh
+++ b/source/geometry/magneticfield/include/G4LineSection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LineSection.hh,v 1.4 2000/04/27 09:14:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LineSection.hh,v 1.4.4.1 2001/06/28 19:08:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4LineSection
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.hh b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
index 6fd9e162be..4b15133623 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagErrorStepper.hh,v 1.7 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagErrorStepper.hh,v 1.7.4.1 2001/06/28 19:08:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4MagErrorStepper
diff --git a/source/geometry/magneticfield/include/G4MagErrorStepper.icc b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
index 5bd43d870e..286752c0c5 100644
--- a/source/geometry/magneticfield/include/G4MagErrorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagErrorStepper.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagErrorStepper.icc,v 1.7 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagErrorStepper.icc,v 1.7.4.1 2001/06/28 19:08:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
index 1a97621396..c98b1b89a6 100644
--- a/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagHelicalStepper.hh,v 1.6 2001/03/22 18:48:52 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagHelicalStepper.hh,v 1.6.2.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4MagHelicalStepper
diff --git a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
index 618c7bc7c4..253c9030f4 100644
--- a/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagHelicalStepper.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagHelicalStepper.icc,v 1.4 2000/11/01 15:15:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagHelicalStepper.icc,v 1.4.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // linear Step in regions of no field
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
index 137f61e1b7..09cf2b7103 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorDriver.hh,v 1.7 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorDriver.hh,v 1.7.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4MagInt_Driver
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
index 8202ff211b..50b13a4cda 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorDriver.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorDriver.icc,v 1.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorDriver.icc,v 1.5.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
index ad7156a449..fba587d49d 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
+++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorStepper.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorStepper.hh,v 1.6.2.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4MagIntegratorStepper
diff --git a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
index f6fc9c17ca..6aee8fe6e7 100644
--- a/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
+++ b/source/geometry/magneticfield/include/G4MagIntegratorStepper.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorStepper.icc,v 1.4 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorStepper.icc,v 1.4.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 inline
diff --git a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
index 700298bb8b..6c29d55789 100644
--- a/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_EqRhs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mag_EqRhs.hh,v 1.5 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mag_EqRhs.hh,v 1.5.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4Mag_EqRhs
diff --git a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
index dd7b07f425..6f0814dc11 100644
--- a/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_SpinEqRhs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mag_SpinEqRhs.hh,v 1.4 2000/11/01 15:15:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mag_SpinEqRhs.hh,v 1.5.2.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4Mag_SpinEqRhs
@@ -19,6 +35,7 @@
 
 // History:
 // - Created: J.Apostolakis, P.Gumplinger - February 8th, 1999.
+// - Modified: P.Gumplinger - April 11th, 2001.
 
 #ifndef G4MAG_SPIN_EQRHS
 #define G4MAG_SPIN_EQRHS
@@ -51,6 +68,10 @@ class G4Mag_SpinEqRhs : public G4Mag_EqRhs
      G4double anomaly;
      G4double ParticleCharge;
 
+     G4double E;
+     G4double gamma;
+     G4double beta;
+
 };
 
 #endif /* G4MAG_SPIN_EQRHS */
diff --git a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
index bcffa3fb59..563ff27320 100644
--- a/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
+++ b/source/geometry/magneticfield/include/G4Mag_UsualEqRhs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mag_UsualEqRhs.hh,v 1.3 2000/04/27 09:14:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mag_UsualEqRhs.hh,v 1.3.4.1 2001/06/28 19:08:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4Mag_UsualEqRhs
diff --git a/source/geometry/magneticfield/include/G4MagneticField.hh b/source/geometry/magneticfield/include/G4MagneticField.hh
index 5c3c4279a3..7290207ed5 100644
--- a/source/geometry/magneticfield/include/G4MagneticField.hh
+++ b/source/geometry/magneticfield/include/G4MagneticField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagneticField.hh,v 1.6 2001/01/29 10:13:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagneticField.hh,v 1.6.2.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4MagneticField
diff --git a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
index a5a7c6bbed..ae5a0f55c7 100644
--- a/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
+++ b/source/geometry/magneticfield/include/G4RKG3_Stepper.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RKG3_Stepper.hh,v 1.6 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RKG3_Stepper.hh,v 1.7.2.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4RKG3_Stepper
@@ -30,7 +46,7 @@ class G4RKG3_Stepper : public G4MagIntegratorStepper
   public:  // with description
 
     G4RKG3_Stepper(G4Mag_EqRhs *EqRhs)
-      : G4MagIntegratorStepper(EqRhs,6){;}
+      : G4MagIntegratorStepper(EqRhs,6){ G4Exception(" G4RKG3_Stepper:  is not available in the current version.");}
       // Integrate over 6 variables only:  position & velocity.
 
     ~G4RKG3_Stepper(){;}
diff --git a/source/geometry/magneticfield/include/G4SimpleHeum.hh b/source/geometry/magneticfield/include/G4SimpleHeum.hh
index 2dfd04f531..e3d7c7ac10 100644
--- a/source/geometry/magneticfield/include/G4SimpleHeum.hh
+++ b/source/geometry/magneticfield/include/G4SimpleHeum.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleHeum.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleHeum.hh,v 1.4.4.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4SimpleHeum
diff --git a/source/geometry/magneticfield/include/G4SimpleRunge.hh b/source/geometry/magneticfield/include/G4SimpleRunge.hh
index 8abcb96156..c7386eaf11 100644
--- a/source/geometry/magneticfield/include/G4SimpleRunge.hh
+++ b/source/geometry/magneticfield/include/G4SimpleRunge.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleRunge.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleRunge.hh,v 1.4.4.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4SimpleRunge
diff --git a/source/geometry/magneticfield/include/G4UniformElectricField.hh b/source/geometry/magneticfield/include/G4UniformElectricField.hh
index 0471e50d32..0dfee7afc4 100644
--- a/source/geometry/magneticfield/include/G4UniformElectricField.hh
+++ b/source/geometry/magneticfield/include/G4UniformElectricField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UniformElectricField.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UniformElectricField.hh,v 1.4.4.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4UniformElectricField
diff --git a/source/geometry/magneticfield/include/G4UniformMagField.hh b/source/geometry/magneticfield/include/G4UniformMagField.hh
index 6ac44c05af..29c3ad8e00 100644
--- a/source/geometry/magneticfield/include/G4UniformMagField.hh
+++ b/source/geometry/magneticfield/include/G4UniformMagField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UniformMagField.hh,v 1.4 2000/11/01 15:15:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UniformMagField.hh,v 1.4.4.1 2001/06/28 19:08:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4UniformMagField
diff --git a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
index 1bbee871d6..2e2e72e128 100644
--- a/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
+++ b/source/geometry/magneticfield/src/G4CashKarpRKF45.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CashKarpRKF45.cc,v 1.8 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CashKarpRKF45.cc,v 1.8.2.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // The Cash-Karp Runge-Kutta-Fehlberg 4/5 method is an embedded fourth
 //  order method (giving fifth-order accuracy) for the solution
diff --git a/source/geometry/magneticfield/src/G4ChordFinder.cc b/source/geometry/magneticfield/src/G4ChordFinder.cc
index 7f67160618..682b92ead2 100644
--- a/source/geometry/magneticfield/src/G4ChordFinder.cc
+++ b/source/geometry/magneticfield/src/G4ChordFinder.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChordFinder.cc,v 1.18 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChordFinder.cc,v 1.18.2.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // 25.02.97 John Apostolakis,  design and implimentation 
diff --git a/source/geometry/magneticfield/src/G4ClassicalRK4.cc b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
index e3a75fa291..4c97cac7bb 100644
--- a/source/geometry/magneticfield/src/G4ClassicalRK4.cc
+++ b/source/geometry/magneticfield/src/G4ClassicalRK4.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClassicalRK4.cc,v 1.3 2000/11/01 15:15:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClassicalRK4.cc,v 1.3.4.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4ClassicalRK4.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4EqMagElectricField.cc b/source/geometry/magneticfield/src/G4EqMagElectricField.cc
index 68ab0437ce..85ca385080 100644
--- a/source/geometry/magneticfield/src/G4EqMagElectricField.cc
+++ b/source/geometry/magneticfield/src/G4EqMagElectricField.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  This is the standard right-hand side for equation of motion.
 //
 //    The only case another is required is when using a moving reference
diff --git a/source/geometry/magneticfield/src/G4EquationOfMotion.cc b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
index 96aab24a3b..5701e56e5d 100644
--- a/source/geometry/magneticfield/src/G4EquationOfMotion.cc
+++ b/source/geometry/magneticfield/src/G4EquationOfMotion.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EquationOfMotion.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EquationOfMotion.cc,v 1.3.4.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4EquationOfMotion.hh"
 
diff --git a/source/geometry/magneticfield/src/G4ExplicitEuler.cc b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
index c3f53dea6e..d22cf08281 100644
--- a/source/geometry/magneticfield/src/G4ExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ExplicitEuler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExplicitEuler.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExplicitEuler.cc,v 1.3.4.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Explicit Euler: x_1 = x_0 + h * dx_0
diff --git a/source/geometry/magneticfield/src/G4FieldManager.cc b/source/geometry/magneticfield/src/G4FieldManager.cc
index f24c332668..7d9e2f1b46 100644
--- a/source/geometry/magneticfield/src/G4FieldManager.cc
+++ b/source/geometry/magneticfield/src/G4FieldManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldManager.cc,v 1.3 2000/11/09 18:06:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldManager.cc,v 1.4.2.1 2001/06/28 19:08:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4FieldManager.hh"
 
@@ -14,6 +30,9 @@ G4FieldManager::G4FieldManager()
 { 
    fDetectorField= 0;
    fAllocatedChordFinder= false;
+
+   fDelta_One_Step_Value= fDefault_Delta_One_Step_Value;
+   fDelta_Intersection_Val= fDefault_Delta_Intersection_Val;
 }
 
 G4FieldManager::G4FieldManager(G4MagneticField *detectorField)
@@ -21,6 +40,9 @@ G4FieldManager::G4FieldManager(G4MagneticField *detectorField)
    fDetectorField= detectorField;
 
    this->CreateChordFinder(detectorField);
+
+   fDelta_One_Step_Value= fDefault_Delta_One_Step_Value;
+   fDelta_Intersection_Val= fDefault_Delta_Intersection_Val;
 }
 
 
diff --git a/source/geometry/magneticfield/src/G4FieldTrack.cc b/source/geometry/magneticfield/src/G4FieldTrack.cc
index c9de139e98..93e55a2795 100644
--- a/source/geometry/magneticfield/src/G4FieldTrack.cc
+++ b/source/geometry/magneticfield/src/G4FieldTrack.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FieldTrack.cc,v 1.3 2001/02/20 18:15:54 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FieldTrack.cc,v 1.3.2.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4FieldTrack.hh"
 
diff --git a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
index 3e12b7c028..cb22e69aa1 100644
--- a/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixExplicitEuler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixExplicitEuler.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixExplicitEuler.cc,v 1.3.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4HelixExplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixHeum.cc b/source/geometry/magneticfield/src/G4HelixHeum.cc
index dd66cd8112..ac543c8ce9 100644
--- a/source/geometry/magneticfield/src/G4HelixHeum.cc
+++ b/source/geometry/magneticfield/src/G4HelixHeum.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixHeum.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixHeum.cc,v 1.3.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4HelixHeum.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
index 2c08ca124b..fedb2ac5f0 100644
--- a/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4HelixImplicitEuler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixImplicitEuler.cc,v 1.3 2000/04/12 18:29:26 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixImplicitEuler.cc,v 1.3.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4HelixImplicitEuler.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
index bc2221bfee..dd16421ca0 100644
--- a/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4HelixSimpleRunge.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HelixSimpleRunge.cc,v 1.4 2000/11/20 17:29:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HelixSimpleRunge.cc,v 1.4.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4HelixSimpleRunge.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4ImplicitEuler.cc b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
index 79498a3d7c..a8a9a41f6a 100644
--- a/source/geometry/magneticfield/src/G4ImplicitEuler.cc
+++ b/source/geometry/magneticfield/src/G4ImplicitEuler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ImplicitEuler.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ImplicitEuler.cc,v 1.3.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  Implicit Euler:
diff --git a/source/geometry/magneticfield/src/G4LineSection.cc b/source/geometry/magneticfield/src/G4LineSection.cc
index cbb8de0c93..a91e1eff81 100644
--- a/source/geometry/magneticfield/src/G4LineSection.cc
+++ b/source/geometry/magneticfield/src/G4LineSection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LineSection.cc,v 1.4 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LineSection.cc,v 1.4.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // typedef double    G4double;  
 
diff --git a/source/geometry/magneticfield/src/G4MagErrorStepper.cc b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
index e43235411a..c9af5bf52e 100644
--- a/source/geometry/magneticfield/src/G4MagErrorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagErrorStepper.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagErrorStepper.cc,v 1.8 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagErrorStepper.cc,v 1.8.4.1 2001/06/28 19:08:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4MagErrorStepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
index 2b1fe4a755..cafdcee12c 100644
--- a/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagHelicalStepper.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagHelicalStepper.cc,v 1.7 2001/03/22 18:48:03 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagHelicalStepper.cc,v 1.7.2.1 2001/06/28 19:08:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4MagHelicalStepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
index 3b598335d1..ef67f215c3 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorDriver.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorDriver.cc,v 1.14 2000/11/20 17:29:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorDriver.cc,v 1.14.4.1 2001/06/28 19:08:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
index ef6ddafec1..2be9956932 100644
--- a/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
+++ b/source/geometry/magneticfield/src/G4MagIntegratorStepper.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MagIntegratorStepper.cc,v 1.5 2001/03/23 18:50:33 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MagIntegratorStepper.cc,v 1.5.2.1 2001/06/28 19:08:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4MagIntegratorStepper.hh"
 
diff --git a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
index cfc86a9ae7..ea80b16925 100644
--- a/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
+++ b/source/geometry/magneticfield/src/G4Mag_EqRhs.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mag_EqRhs.cc,v 1.6 2001/03/02 10:48:30 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mag_EqRhs.cc,v 1.6.2.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  This is the standard right-hand side for equation of motion  
 //    in a pure Magnetic Field .
diff --git a/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc
index 02f4eab09d..3ae9994685 100644
--- a/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc
+++ b/source/geometry/magneticfield/src/G4Mag_SpinEqRhs.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 //  This is the standard right-hand side for equation of motion.
 //        This version of the right-hand side includes
@@ -6,6 +28,7 @@
 //
 //            J. Apostolakis, February 8th, 1999
 //            P. Gumplinger,  February 8th, 1999
+//            P. Gumplinger,  April 11th, 2001
 //
 #include "G4Mag_SpinEqRhs.hh"
 #include "G4ThreeVector.hh"
@@ -23,8 +46,10 @@ G4Mag_SpinEqRhs::SetChargeMomentumMass(G4double particleCharge, // in e+ units
    anomaly = 1.165923e-3;
    ParticleCharge = particleCharge;
 
-   // for testing only
-   anomaly = 0.0; 
+   E = sqrt(sqr(MomentumXc)+sqr(mass));
+   beta  = MomentumXc/E;
+   gamma = E/mass;
+
 }
 
 void
@@ -42,18 +67,6 @@ G4Mag_SpinEqRhs::EvaluateRhsGivenB( const G4double y[],
    dydx[4] = FCof()*(y[5]*B[0] - y[3]*B[2]) ;   // Ay = a*(Vz*Bx - Vx*Bz)
    dydx[5] = FCof()*(y[3]*B[1] - y[4]*B[0]) ;   // Az = a*(Vx*By - Vy*Bx)
 
-   G4double beta_squared = velocity_mag_square/c_squared;
-   G4double beta  = sqrt(beta_squared);
-  
-   G4double gamma;
-
-   if (beta < 1.0){
-      gamma = 1. / sqrt( 1. - beta_squared);
-   } else {
-      beta = 1.0; 
-      gamma = DBL_MAX; 
-   }
-
    G4ThreeVector u;
    u.setX(inv_velocity_magnitude*y[3]);
    u.setY(inv_velocity_magnitude*y[4]);
diff --git a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
index 13fd22c555..10b3f8dd56 100644
--- a/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
+++ b/source/geometry/magneticfield/src/G4Mag_UsualEqRhs.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mag_UsualEqRhs.cc,v 1.3 2001/02/19 16:52:05 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mag_UsualEqRhs.cc,v 1.3.2.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  This is the standard right-hand side for equation of motion.
diff --git a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
index 6efd49de3c..5ef80e0633 100644
--- a/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
+++ b/source/geometry/magneticfield/src/G4RKG3_Stepper.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RKG3_Stepper.cc,v 1.5 2000/11/20 17:29:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RKG3_Stepper.cc,v 1.5.4.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4RKG3_Stepper.hh"
 #include "G4ThreeVector.hh"
diff --git a/source/geometry/magneticfield/src/G4SimpleHeum.cc b/source/geometry/magneticfield/src/G4SimpleHeum.cc
index fedc6cf74d..c66281c1f3 100644
--- a/source/geometry/magneticfield/src/G4SimpleHeum.cc
+++ b/source/geometry/magneticfield/src/G4SimpleHeum.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleHeum.cc,v 1.4 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleHeum.cc,v 1.4.4.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  Simple Heum:
 //        x_1 = x_0 + h *
diff --git a/source/geometry/magneticfield/src/G4SimpleRunge.cc b/source/geometry/magneticfield/src/G4SimpleRunge.cc
index c902bae69b..bec5301269 100644
--- a/source/geometry/magneticfield/src/G4SimpleRunge.cc
+++ b/source/geometry/magneticfield/src/G4SimpleRunge.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleRunge.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleRunge.cc,v 1.3.4.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  Simple Runge:
 //
diff --git a/source/geometry/magneticfield/src/G4UniformElectricField.cc b/source/geometry/magneticfield/src/G4UniformElectricField.cc
index 7417e3a86f..68434e3558 100644
--- a/source/geometry/magneticfield/src/G4UniformElectricField.cc
+++ b/source/geometry/magneticfield/src/G4UniformElectricField.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UniformElectricField.cc,v 1.3 2001/03/27 09:43:22 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UniformElectricField.cc,v 1.3.2.1 2001/06/28 19:08:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/source/geometry/magneticfield/src/G4UniformMagField.cc b/source/geometry/magneticfield/src/G4UniformMagField.cc
index 7b18f8a7f1..ca6d13217f 100644
--- a/source/geometry/magneticfield/src/G4UniformMagField.cc
+++ b/source/geometry/magneticfield/src/G4UniformMagField.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UniformMagField.cc,v 1.3 2000/11/01 15:15:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UniformMagField.cc,v 1.3.4.1 2001/06/28 19:08:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/source/geometry/management/History b/source/geometry/management/History
index f7da2a3422..1788feab69 100644
--- a/source/geometry/management/History
+++ b/source/geometry/management/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.19 2001/03/08 13:21:11 gcosmo Exp $
+$Id: History,v 1.24 2001/05/31 17:35:50 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,32 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 31, 2001  G. Cosmo                     geommng-V03-01-04
+- Adopt explicit initialisation for 'minExtents' and 'maxExtents'
+  in G4SmartVoxelHeader::BuildNodes(...), to allow porting on ObjectSpace STL.
+
+May 23, 2001  G. Cosmo                     geommng-V03-01-03
+- G4SmartVoxelHeader.cc: minor fix for removing pedantic warnings
+  detected on Linux-g++ with ISO/ANSI setup.
+
+May 03, 2001  G. Cosmo                     geommng-V03-01-02
+- G4DrawVoxels.cc: migration to STL vector according to changes in
+  graphics_reps module (greps-V03-01-01), now migrated as well.
+
+April 27, 2001  G. Cosmo                   geommng-V03-01-01
+- G4LogicalVolume.cc, G4SmartVoxelHeader.cc: fixed compilation warnings
+  on HP-UX, concerning potential uninitialised vector elements.
+
+April 20, 2001  G. Cosmo                   geommng-V03-01-00
+- Migration to STL vector:
+  o G4VSolid: migrated G4ThreeVectorList typedef.
+  o G4SolidStore, G4LogicalVolumeStore, G4PhysicalVolumeStore: migrated
+    inheritance from base collection of pointers.
+  o G4LogicalVolume: migrated data member "fDaughters".
+  o G4SmartVoxelHeader: migrated typedefs G4ProxyVector, G4NodeVector,
+    G4VolumeNosVector and G4VolumeExtentVector.
+  o G4SmartVoxelNode: migrated G4SliceVector typedef.
+
 March 07, 2001  G. Cosmo                   geommng-V03-00-01
 - G4PVPlacement.hh: corrected comments to constructor with G4RotationMatrix*
   as argument, to correspond to specifications in the User's Manual.
diff --git a/source/geometry/management/include/G4AffineTransform.hh b/source/geometry/management/include/G4AffineTransform.hh
index 60899e857b..474a4211d9 100644
--- a/source/geometry/management/include/G4AffineTransform.hh
+++ b/source/geometry/management/include/G4AffineTransform.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AffineTransform.hh,v 1.3 2000/04/20 16:49:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AffineTransform.hh,v 1.3.4.1 2001/06/28 19:08:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4AffineTransform
diff --git a/source/geometry/management/include/G4AffineTransform.icc b/source/geometry/management/include/G4AffineTransform.icc
index a263e0d590..136ee31f24 100644
--- a/source/geometry/management/include/G4AffineTransform.icc
+++ b/source/geometry/management/include/G4AffineTransform.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AffineTransform.icc,v 1.3 1999/12/15 14:49:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AffineTransform.icc,v 1.3.4.1 2001/06/28 19:08:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4AffineTransformation Inline implementation
diff --git a/source/geometry/management/include/G4AssemblyTriplet.hh b/source/geometry/management/include/G4AssemblyTriplet.hh
index 3cd0a8cb6b..dd59ca7325 100644
--- a/source/geometry/management/include/G4AssemblyTriplet.hh
+++ b/source/geometry/management/include/G4AssemblyTriplet.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyTriplet.hh,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyTriplet.hh,v 1.4.2.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4AssemblyTriplet
diff --git a/source/geometry/management/include/G4AssemblyTriplet.icc b/source/geometry/management/include/G4AssemblyTriplet.icc
index 788b1fd089..888319282e 100644
--- a/source/geometry/management/include/G4AssemblyTriplet.icc
+++ b/source/geometry/management/include/G4AssemblyTriplet.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyTriplet.icc,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyTriplet.icc,v 1.4.2.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4AssemblyTriplet - inline implementation
diff --git a/source/geometry/management/include/G4AssemblyVolume.hh b/source/geometry/management/include/G4AssemblyVolume.hh
index ce7ffc172d..4f70fb4f6a 100644
--- a/source/geometry/management/include/G4AssemblyVolume.hh
+++ b/source/geometry/management/include/G4AssemblyVolume.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyVolume.hh,v 1.4 2001/02/07 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyVolume.hh,v 1.4.2.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4AssemblyVolume
diff --git a/source/geometry/management/include/G4AssemblyVolume.icc b/source/geometry/management/include/G4AssemblyVolume.icc
index 80dfe734da..80a7952ad1 100644
--- a/source/geometry/management/include/G4AssemblyVolume.icc
+++ b/source/geometry/management/include/G4AssemblyVolume.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyVolume.icc,v 1.2 2001/02/07 17:30:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyVolume.icc,v 1.2.2.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4AssemblyVolume - inline implementation
diff --git a/source/geometry/management/include/G4DrawVoxels.hh b/source/geometry/management/include/G4DrawVoxels.hh
index 26ca502eea..5559205557 100644
--- a/source/geometry/management/include/G4DrawVoxels.hh
+++ b/source/geometry/management/include/G4DrawVoxels.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DrawVoxels.hh,v 1.9 2000/06/06 13:18:55 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DrawVoxels.hh,v 1.9.4.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4DrawVoxels
diff --git a/source/geometry/management/include/G4GeometryManager.hh b/source/geometry/management/include/G4GeometryManager.hh
index 35ac7288a2..eae5376841 100644
--- a/source/geometry/management/include/G4GeometryManager.hh
+++ b/source/geometry/management/include/G4GeometryManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryManager.hh,v 1.3 2000/04/20 16:49:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryManager.hh,v 1.3.4.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4GeometryManager
 //
diff --git a/source/geometry/management/include/G4LogicalSurface.hh b/source/geometry/management/include/G4LogicalSurface.hh
index 35a19892e2..001f18bdb4 100644
--- a/source/geometry/management/include/G4LogicalSurface.hh
+++ b/source/geometry/management/include/G4LogicalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalSurface.hh,v 1.5 2000/12/04 09:36:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalSurface.hh,v 1.5.2.1 2001/06/28 19:08:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Class G4LogicalSurface
diff --git a/source/geometry/management/include/G4LogicalSurface.icc b/source/geometry/management/include/G4LogicalSurface.icc
index 02adbeb573..0246e466e0 100644
--- a/source/geometry/management/include/G4LogicalSurface.icc
+++ b/source/geometry/management/include/G4LogicalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalSurface.icc,v 1.4 2000/12/04 09:36:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalSurface.icc,v 1.4.2.1 2001/06/28 19:08:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Surface Class Inline Methods
diff --git a/source/geometry/management/include/G4LogicalVolume.hh b/source/geometry/management/include/G4LogicalVolume.hh
index bca222be41..ff59452581 100644
--- a/source/geometry/management/include/G4LogicalVolume.hh
+++ b/source/geometry/management/include/G4LogicalVolume.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolume.hh,v 1.6 2000/11/01 15:39:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolume.hh,v 1.7.2.1 2001/06/28 19:08:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4LogicalVolume
@@ -39,7 +55,7 @@
 //
 // Data members:
 //
-//    G4RWTPtrOrderedVector<G4VPhysicalVolume> fDaughters
+//    G4std::vector<G4VPhysicalVolume*> fDaughters
 //    - Vector of daughters. Given initial size of 0.
 //    G4FieldManager *fFieldManager
 //    - Pointer (possibly NULL) to (magnetic or other) field manager object.
@@ -68,6 +84,7 @@
 //    - Weight used in the event biasing technique.
 
 // History:
+// 18.04.01 G.Cosmo: Migrated to STL vector
 // 12.02.99 S.Giani: Added user defined optimisation quality
 // 09.11.98 J. Apostolakis:  Changed G4MagneticField to G4FieldManager
 // 09.11.98 M. Verderi & JA. : added  BiasWeight member and Get/Set methods
@@ -82,7 +99,7 @@
 
 #include "globals.hh"
 #include "G4VPhysicalVolume.hh"	// Need operator == for vector fdaughters
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include <assert.h>
 
 // Forward declarations
@@ -97,6 +114,8 @@ class G4FastSimulationManager;
 
 class G4LogicalVolume
 {
+  typedef G4std::vector<G4VPhysicalVolume*> G4PhysicalVolumeList;
+
   public:  // with description
   
     G4LogicalVolume(G4VSolid *pSolid, G4Material *pMaterial,
@@ -206,7 +225,7 @@ class G4LogicalVolume
 
     // Data members:   
 
-    G4RWTPtrOrderedVector<G4VPhysicalVolume> fDaughters;    
+    G4PhysicalVolumeList fDaughters;
       // Vector of daughters. Given initial size of 0.
     G4FieldManager *fFieldManager;
       // Pointer (possibly NULL) to (magnetic or other) field manager object.
diff --git a/source/geometry/management/include/G4LogicalVolume.icc b/source/geometry/management/include/G4LogicalVolume.icc
index 79f303c904..0f239b8db1 100644
--- a/source/geometry/management/include/G4LogicalVolume.icc
+++ b/source/geometry/management/include/G4LogicalVolume.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolume.icc,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolume.icc,v 1.5.2.1 2001/06/28 19:08:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4LogicalVolume Inline Implementation file
@@ -15,6 +31,7 @@
 // 05.11.98 - M. Verderi: Add Get/Set methods for fBiasWeight
 // 09.11.98 - J. Apostolakis:  Changed MagneticField to FieldManager
 // 12.02.99 - S.Giani: Added set/get methods for voxelization quality
+// 18.04.01 - G.Cosmo: Migrated to STL vector
 
 inline
 G4String G4LogicalVolume::GetName() const
@@ -37,13 +54,13 @@ G4FieldManager* G4LogicalVolume::GetFieldManager() const
 inline
 G4int G4LogicalVolume::GetNoDaughters() const
     {
-	return fDaughters.entries();
+	return fDaughters.size();
     }
 
 inline
 G4VPhysicalVolume* G4LogicalVolume::GetDaughter(const G4int i) const
     {
-	return fDaughters(i);
+	return fDaughters[i];
     }
 
 inline
@@ -55,10 +72,7 @@ G4FastSimulationManager* G4LogicalVolume::GetFastSimulationManager () const
 inline
 void G4LogicalVolume::AddDaughter(G4VPhysicalVolume* pNewDaughter)
 {
-  // manual resize operation to avoid Rogue grabbing RW_DEFAULT
-
-      fDaughters.resize(fDaughters.entries()+1);
-      fDaughters.insert(pNewDaughter);
+      fDaughters.push_back(pNewDaughter);
 
   // Propagates the mother's FastSimulationManager pointer. If we are in
   // the World logical volume, propagates only if pointer != 0.
@@ -102,14 +116,26 @@ void G4LogicalVolume::AddDaughter(G4VPhysicalVolume* pNewDaughter)
 inline
 G4bool G4LogicalVolume::IsDaughter(const G4VPhysicalVolume* p) const
     {
-	return fDaughters.contains(p);
+	G4PhysicalVolumeList::const_iterator i;
+        for (i=fDaughters.begin(); i!=fDaughters.end(); ++i)
+        {
+          if (**i==*p) return true;
+        }
+        return false;
     }
 
 inline
 void G4LogicalVolume::RemoveDaughter(const G4VPhysicalVolume* p)
     {
-	fDaughters.remove(p);
-	fDaughters.resize(fDaughters.entries());
+	G4PhysicalVolumeList::iterator i;
+	for (i=fDaughters.begin(); i!=fDaughters.end(); ++i)
+	{
+	   if (**i==*p)
+	   {
+	      fDaughters.erase(i);
+	      break;
+	   }
+	}
     }
 
 inline
diff --git a/source/geometry/management/include/G4LogicalVolumeStore.hh b/source/geometry/management/include/G4LogicalVolumeStore.hh
index e79d5cf846..bd89082429 100644
--- a/source/geometry/management/include/G4LogicalVolumeStore.hh
+++ b/source/geometry/management/include/G4LogicalVolumeStore.hh
@@ -1,19 +1,35 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolumeStore.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolumeStore.hh,v 1.5.2.1 2001/06/28 19:08:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4LogicalVolumeStore
 //
 // Class description:
 //
 // Container for all LogicalVolumes, with functionality derived from
-// G4RWTPtrOrderedVector<T>. The class is a `singleton', in that only
+// std::vector<T>. The class is a `singleton', in that only
 // one can exist, and access is provided via the static function
 // G4LogicalVolumeStore::GetInstance()
 //
@@ -22,7 +38,7 @@
 // The underlying container initially has a capacity of 100.
 //
 // If much additional functionality is added, should consider containment
-// instead of inheritance for G4RWTPtrOrderedVector<T>.
+// instead of inheritance for std::vector<T>.
 //
 // Member data:
 //
@@ -30,16 +46,17 @@
 //   - Ptr to the single G4LogicalVolumeStore.
 
 // History:
-// 10.07.95 P.Kent Initial version
+// 18.04.01 G.Cosmo Migrated to STL vector
+// 10.07.95 P.Kent  Initial version
 
 #ifndef G4VLOGICALVOLUMESTORE_HH
 #define G4VLOGICALVOLUMESTORE_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 #include "G4LogicalVolume.hh"
 
-class G4LogicalVolumeStore : public G4RWTPtrOrderedVector<G4LogicalVolume>
+class G4LogicalVolumeStore : public G4std::vector<G4LogicalVolume*>
 {
   public:  // with description
 
diff --git a/source/geometry/management/include/G4PVParameterised.hh b/source/geometry/management/include/G4PVParameterised.hh
index 34f315e1b1..de112ba231 100644
--- a/source/geometry/management/include/G4PVParameterised.hh
+++ b/source/geometry/management/include/G4PVParameterised.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVParameterised.hh,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVParameterised.hh,v 1.4.4.1 2001/06/28 19:08:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/include/G4PVPlacement.hh b/source/geometry/management/include/G4PVPlacement.hh
index 69194e10cc..bbe4382591 100644
--- a/source/geometry/management/include/G4PVPlacement.hh
+++ b/source/geometry/management/include/G4PVPlacement.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVPlacement.hh,v 1.5 2001/03/07 17:34:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVPlacement.hh,v 1.5.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVPlacement
diff --git a/source/geometry/management/include/G4PVReplica.hh b/source/geometry/management/include/G4PVReplica.hh
index 48920876e2..42b920c437 100644
--- a/source/geometry/management/include/G4PVReplica.hh
+++ b/source/geometry/management/include/G4PVReplica.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVReplica.hh,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVReplica.hh,v 1.4.4.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVReplica
diff --git a/source/geometry/management/include/G4PhysicalVolumeStore.hh b/source/geometry/management/include/G4PhysicalVolumeStore.hh
index 9f08f9d88a..03da07f09d 100644
--- a/source/geometry/management/include/G4PhysicalVolumeStore.hh
+++ b/source/geometry/management/include/G4PhysicalVolumeStore.hh
@@ -1,19 +1,35 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeStore.hh,v 1.5 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeStore.hh,v 1.6.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PhysicalVolume
 //
 // Class description:
 //
 // Container for all solids, with functionality derived from
-// G4RWTPtrOrderedVector<T>. The class is a `singleton', in that only
+// std::vector<T>. The class is a `singleton', in that only
 // one can exist, and access is provided via the static method
 // G4PhysicalVolumeStore::GetInstance()
 //
@@ -22,7 +38,7 @@
 // container initially has a capacity of 100.
 //
 // If much additional functionality is added, should consider containment
-// instead of inheritance for G4RWTPtrOrderedVector<T>
+// instead of inheritance for std::vector<T>
 //
 // Member data:
 //
@@ -30,16 +46,17 @@
 //   - Ptr to the single G4PhysicalVolumeStore.
 
 // History:
-// 25.07.95 P.Kent Initial version
+// 18.04.01 G.Cosmo Migrated to STL vector
+// 25.07.95 P.Kent  Initial version
 
 #ifndef G4PHYSICALVOLUMESTORE_HH
 #define G4PHYSICALVOLUMESTORE_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 #include "G4VPhysicalVolume.hh"
 
-class G4PhysicalVolumeStore : public G4RWTPtrOrderedVector<G4VPhysicalVolume>
+class G4PhysicalVolumeStore : public G4std::vector<G4VPhysicalVolume*>
 {
   public:  // with description
 
@@ -64,10 +81,3 @@ class G4PhysicalVolumeStore : public G4RWTPtrOrderedVector<G4VPhysicalVolume>
 };
 
 #endif
-
-
-
-
-
-
-
diff --git a/source/geometry/management/include/G4SmartVoxelHeader.hh b/source/geometry/management/include/G4SmartVoxelHeader.hh
index 1c12afb86c..9bc34a9fb5 100644
--- a/source/geometry/management/include/G4SmartVoxelHeader.hh
+++ b/source/geometry/management/include/G4SmartVoxelHeader.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelHeader.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelHeader.hh,v 1.5.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4SmartVoxelHeader
 //
@@ -23,7 +39,7 @@
 // G4double fmaxExtent
 // G4double fminExtent
 //   - Minimum and maximum coordiantes along the axis
-// G4RWTPtrOrderedVector<G4SmartVoxelProxy> fslices
+// G4std::vector<G4SmartVoxelProxy*> fslices
 //   - The slices along the axis
 //
 // G4int fminEquivalent
@@ -32,7 +48,8 @@
 //     [Applies to the level of the header, not its nodes]
 
 // History:
-// 13.07.95 P.Kent Initial version
+// 18.04.01 G.Cosmo Migrated to STL vector
+// 13.07.95 P.Kent  Initial version
 
 #ifndef G4SMARTVOXELHEADER_HH
 #define G4SMARTVOXELHEADER_HH
@@ -46,9 +63,7 @@
 
 #include "G4ios.hh"
 
-#include "g4rw/tvvector.h"
-#include "g4rw/tpordvec.h"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 // Forward declarations
 class G4LogicalVolume;
@@ -56,16 +71,16 @@ class G4VoxelLimits;
 class G4VPhysicalVolume;
 
 // Typedefs
-typedef G4RWTPtrOrderedVector<G4SmartVoxelProxy> G4ProxyVector;
-typedef G4RWTPtrOrderedVector<G4SmartVoxelNode> G4NodeVector;
-typedef G4RWTValOrderedVector<G4int> G4VolumeNosVector;
-typedef G4RWTValVector<G4double> G4VolumeExtentVector;
+typedef G4std::vector<G4SmartVoxelProxy*> G4ProxyVector;
+typedef G4std::vector<G4SmartVoxelNode*> G4NodeVector;
+typedef G4std::vector<G4int> G4VolumeNosVector;
+typedef G4std::vector<G4double> G4VolumeExtentVector;
 
 class G4SmartVoxelHeader
 {
   public:  // with description
 
-    G4SmartVoxelHeader(G4LogicalVolume* pVolume,const G4int pSlice=0);
+    G4SmartVoxelHeader(G4LogicalVolume* pVolume, G4int pSlice=0);
       // Constructor for topmost header, to begin voxel construction at a
       // given logical volume. pSlice is used to set max and min equivalent
       // slice nos for the header - they apply to the level of the header,
@@ -75,9 +90,9 @@ class G4SmartVoxelHeader
       // Delete all referenced nodes [but *not* referenced physical volumes].
     
     G4int GetMaxEquivalentSliceNo() const;
-    void SetMaxEquivalentSliceNo(const G4int pMax);
+    void SetMaxEquivalentSliceNo(G4int pMax);
     G4int GetMinEquivalentSliceNo() const;
-    void SetMinEquivalentSliceNo(const G4int pMin);
+    void SetMinEquivalentSliceNo(G4int pMin);
       // Access functions for min/max equivalent slices (nodes & headers).
 
     EAxis GetAxis() const;
@@ -91,7 +106,7 @@ class G4SmartVoxelHeader
     G4int GetNoSlices() const;
       // Return the no of slices along the current axis.
     
-    G4SmartVoxelProxy* GetSlice(const G4int n) const;
+    G4SmartVoxelProxy* GetSlice(G4int n) const;
       // Return ptr to the proxy for the nth slice (numbering from 0,
       // no bounds checking performed).
 
@@ -110,7 +125,7 @@ class G4SmartVoxelHeader
     G4SmartVoxelHeader(G4LogicalVolume* pVolume,
 		       const G4VoxelLimits& pLimits,
 		       const G4VolumeNosVector* pCandidates,
-		       const G4int pSlice=0);
+		       G4int pSlice=0);
       // Build and refine voxels between specified limits, considering only
       // the physical volumes numbered `pCandidates'. pSlice is used to set max
       // and min equivalent slice nos for the header - they apply to the level
@@ -126,7 +141,7 @@ class G4SmartVoxelHeader
       // Build voxels for specified volume containing a single
       // replicated volume.
 
-    void BuildConsumedNodes(const G4int nReplicas);
+    void BuildConsumedNodes(G4int nReplicas);
       // Construct nodes in simple consuming case.
 
     void BuildVoxelsWithinLimits(G4LogicalVolume* pVolume,
diff --git a/source/geometry/management/include/G4SmartVoxelHeader.icc b/source/geometry/management/include/G4SmartVoxelHeader.icc
index ba34fe5fd6..23170653fc 100644
--- a/source/geometry/management/include/G4SmartVoxelHeader.icc
+++ b/source/geometry/management/include/G4SmartVoxelHeader.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelHeader.icc,v 1.1 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelHeader.icc,v 1.2.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4SmartVoxelHeader Inline implementation
@@ -19,7 +35,7 @@ G4int G4SmartVoxelHeader::GetMaxEquivalentSliceNo() const
 }
 
 inline
-void G4SmartVoxelHeader::SetMaxEquivalentSliceNo(const G4int pMax)
+void G4SmartVoxelHeader::SetMaxEquivalentSliceNo(G4int pMax)
 {
   fmaxEquivalent=pMax;
 }
@@ -31,7 +47,7 @@ G4int G4SmartVoxelHeader::GetMinEquivalentSliceNo() const
 }
 
 inline
-void G4SmartVoxelHeader::SetMinEquivalentSliceNo(const G4int pMin)
+void G4SmartVoxelHeader::SetMinEquivalentSliceNo(G4int pMin)
 {
   fminEquivalent=pMin;
 }
@@ -57,11 +73,11 @@ G4double G4SmartVoxelHeader::GetMinExtent() const
 inline
 G4int G4SmartVoxelHeader::GetNoSlices() const
 {
-  return fslices.entries();
+  return fslices.size();
 }
 
 inline
-G4SmartVoxelProxy* G4SmartVoxelHeader::GetSlice(const G4int n) const
+G4SmartVoxelProxy* G4SmartVoxelHeader::GetSlice(G4int n) const
 {
-  return fslices(n);
+  return fslices[n];
 }
diff --git a/source/geometry/management/include/G4SmartVoxelNode.hh b/source/geometry/management/include/G4SmartVoxelNode.hh
index e640169be0..937ce7c2ec 100644
--- a/source/geometry/management/include/G4SmartVoxelNode.hh
+++ b/source/geometry/management/include/G4SmartVoxelNode.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelNode.hh,v 1.4 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelNode.hh,v 1.5.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4SmartVoxelNode
 //
@@ -23,11 +39,12 @@
 // G4int fmaxEquivalent
 //   - Min and maximum nodes with same contents. Set by constructor
 //     and set methods.
-// G4RWTValOrderedVector<G4int>(1) fcontents
+// G4std::vector<G4int> fcontents
 //   - Vector of no.s of volumes inside the node.
 
 // History:
-// 12.07.95 P.Kent Initial version
+// 18.04.01 G.Cosmo Migrated to STL vector
+// 12.07.95 P.Kent  Initial version
 
 #ifndef G4SMARTVOXELNODE_HH
 #define G4SMARTVOXELNODE_HH
@@ -36,17 +53,16 @@
 #include "voxeldefs.hh"
 
 #include "G4VPhysicalVolume.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
-
-typedef G4RWTValOrderedVector<G4int> G4SliceVector;
+typedef G4std::vector<G4int> G4SliceVector;
 
 class G4SmartVoxelNode
 {
   public:  // with description
 
-    G4SmartVoxelNode(const G4int pSlice=0) : fminEquivalent(pSlice),
-                                             fmaxEquivalent(pSlice) {}
+    G4SmartVoxelNode(G4int pSlice=0) : fminEquivalent(pSlice),
+                                       fmaxEquivalent(pSlice) {}
       // Constructor. Create an empty node with slice number pSlice.
       // THis number is not stored, but used to provide defaults for the
       // minimum and maximum equivalent node numbers.
@@ -54,7 +70,7 @@ class G4SmartVoxelNode
     ~G4SmartVoxelNode() {}
       // Destructor. No actions.
 
-    G4int GetVolume(const G4int pVolumeNo) const;
+    G4int GetVolume(G4int pVolumeNo) const;
       // Return contained volume number pVolumeNo.
       // Note: starts from 0 and no bounds checking performed.
 
@@ -67,12 +83,12 @@ class G4SmartVoxelNode
     G4int GetMaxEquivalentSliceNo() const;
       // Return the maximum slice (node/header) number with the same contents,
       // and with all intermediate slice also having the same contents.
-    void SetMaxEquivalentSliceNo(const G4int pMax);
+    void SetMaxEquivalentSliceNo(G4int pMax);
       // Set the maximum slice number (as above).
     G4int GetMinEquivalentSliceNo() const;
       // Return the minimum slice (node/header) number with the same contents,
       // and with all intermediate nodes also having the same contents.
-    void SetMinEquivalentSliceNo(const G4int pMin);
+    void SetMinEquivalentSliceNo(G4int pMin);
       // Set the minimum slice number (as above).
 
     G4bool operator == (const G4SmartVoxelNode& v) const;
diff --git a/source/geometry/management/include/G4SmartVoxelNode.icc b/source/geometry/management/include/G4SmartVoxelNode.icc
index bfb2bb25a1..8113250c67 100644
--- a/source/geometry/management/include/G4SmartVoxelNode.icc
+++ b/source/geometry/management/include/G4SmartVoxelNode.icc
@@ -1,33 +1,49 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelNode.icc,v 1.1 2000/04/20 16:49:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelNode.icc,v 1.2.2.1 2001/06/28 19:08:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4SmartVoxelNode Inline implementation
 //
 
 inline
-G4int G4SmartVoxelNode::GetVolume(const G4int pVolumeNo) const
+G4int G4SmartVoxelNode::GetVolume(G4int pVolumeNo) const
 {
-  return fcontents(pVolumeNo);
+  return fcontents[pVolumeNo];
 }
 
 inline
 void G4SmartVoxelNode::Insert(G4int pVolumeNo)
 {
-  fcontents.insert(pVolumeNo);
+  fcontents.push_back(pVolumeNo);
 }
 
 inline
 G4int G4SmartVoxelNode::GetNoContained() const
 {
-  return fcontents.entries();
+  return fcontents.size();
 }
 
 inline
@@ -37,7 +53,7 @@ G4int G4SmartVoxelNode::GetMaxEquivalentSliceNo() const
 }
 
 inline
-void G4SmartVoxelNode::SetMaxEquivalentSliceNo(const G4int pMax)
+void G4SmartVoxelNode::SetMaxEquivalentSliceNo(G4int pMax)
 {
   fmaxEquivalent=pMax;
 }
@@ -49,7 +65,7 @@ G4int G4SmartVoxelNode::GetMinEquivalentSliceNo() const
 }
 
 inline
-void G4SmartVoxelNode::SetMinEquivalentSliceNo(const G4int pMin)
+void G4SmartVoxelNode::SetMinEquivalentSliceNo(G4int pMin)
 {
   fminEquivalent=pMin;
 }
diff --git a/source/geometry/management/include/G4SmartVoxelProxy.hh b/source/geometry/management/include/G4SmartVoxelProxy.hh
index 0a443997be..b5e682bf9d 100644
--- a/source/geometry/management/include/G4SmartVoxelProxy.hh
+++ b/source/geometry/management/include/G4SmartVoxelProxy.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelProxy.hh,v 1.4 2000/11/20 17:31:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelProxy.hh,v 1.4.4.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4SmartVoxelProxy
 //
diff --git a/source/geometry/management/include/G4SmartVoxelProxy.icc b/source/geometry/management/include/G4SmartVoxelProxy.icc
index 516599a69e..d95b66acdc 100644
--- a/source/geometry/management/include/G4SmartVoxelProxy.icc
+++ b/source/geometry/management/include/G4SmartVoxelProxy.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelProxy.icc,v 1.1 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelProxy.icc,v 1.1.4.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4SmartVoxelProxy Inline implementation
diff --git a/source/geometry/management/include/G4SolidStore.hh b/source/geometry/management/include/G4SolidStore.hh
index 7899d35025..7b0a830684 100644
--- a/source/geometry/management/include/G4SolidStore.hh
+++ b/source/geometry/management/include/G4SolidStore.hh
@@ -1,19 +1,35 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SolidStore.hh,v 1.4 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SolidStore.hh,v 1.5.2.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4SolidStore
 //
 // Class description:
 //
 // Container for all solids, with functionality derived from
-// G4RWTPtrOrderedVector<T>. The class is a `singleton', in that only
+// std::vector<T>. The class is a `singleton', in that only
 // one can exist, and access is provided via the static method
 // G4SolidStore::GetInstance().
 //
@@ -22,7 +38,7 @@
 // container initially has a capacity of 100.
 //
 // If much additional functionality is added, should consider containment
-// instead of inheritance for G4RWTPtrOrderedVector<T>
+// instead of inheritance for std::vector<T>
 //
 // Member data:
 //
@@ -30,16 +46,17 @@
 //   - Ptr to the single G4SolidStore
 
 // History:
-// 10.07.95 P.Kent Initial version
+// 18.04.01 G.Cosmo Migrated to STL vector
+// 10.07.95 P.Kent  Initial version
 
 #ifndef G4VSOLIDSTORE_HH
 #define G4VSOLIDSTORE_HH
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 #include "G4VSolid.hh"
 
-class G4SolidStore : public G4RWTPtrOrderedVector<G4VSolid>
+class G4SolidStore : public G4std::vector<G4VSolid*>
 {
   public:  // with description
 
diff --git a/source/geometry/management/include/G4VPVParameterisation.hh b/source/geometry/management/include/G4VPVParameterisation.hh
index cf98e8e583..6c0eab5e97 100644
--- a/source/geometry/management/include/G4VPVParameterisation.hh
+++ b/source/geometry/management/include/G4VPVParameterisation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPVParameterisation.hh,v 1.3 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPVParameterisation.hh,v 1.3.4.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VPVParamterisation
 //
diff --git a/source/geometry/management/include/G4VPhysicalVolume.hh b/source/geometry/management/include/G4VPhysicalVolume.hh
index 530ecedf73..10cc5f022e 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.hh
+++ b/source/geometry/management/include/G4VPhysicalVolume.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPhysicalVolume.hh,v 1.5 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPhysicalVolume.hh,v 1.5.4.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4VPhysicalVolume
diff --git a/source/geometry/management/include/G4VPhysicalVolume.icc b/source/geometry/management/include/G4VPhysicalVolume.icc
index bb60b8607e..120b7571b4 100644
--- a/source/geometry/management/include/G4VPhysicalVolume.icc
+++ b/source/geometry/management/include/G4VPhysicalVolume.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPhysicalVolume.icc,v 1.4 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPhysicalVolume.icc,v 1.4.4.1 2001/06/28 19:08:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4VPhysicalVolume Inline Implementation
diff --git a/source/geometry/management/include/G4VSolid.hh b/source/geometry/management/include/G4VSolid.hh
index 10b13f10de..22b7218673 100644
--- a/source/geometry/management/include/G4VSolid.hh
+++ b/source/geometry/management/include/G4VSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSolid.hh,v 1.7 2000/11/01 15:39:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSolid.hh,v 1.8.2.1 2001/06/28 19:08:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VSolid
@@ -61,9 +77,9 @@ class G4VisExtent;
 class G4DisplacedSolid;
 
 #include "G4ThreeVector.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
-typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
+typedef G4std::vector<G4ThreeVector> G4ThreeVectorList;
 typedef G4String   G4GeometryType;
 
 class G4VSolid
diff --git a/source/geometry/management/include/G4VSolid.icc b/source/geometry/management/include/G4VSolid.icc
index f13920b643..0682b9cb2e 100644
--- a/source/geometry/management/include/G4VSolid.icc
+++ b/source/geometry/management/include/G4VSolid.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSolid.icc,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSolid.icc,v 1.4.4.1 2001/06/28 19:08:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4VSolid Inline implementation
diff --git a/source/geometry/management/include/G4VTouchable.hh b/source/geometry/management/include/G4VTouchable.hh
index 3c422e5f0d..9e3fcf89e7 100644
--- a/source/geometry/management/include/G4VTouchable.hh
+++ b/source/geometry/management/include/G4VTouchable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VTouchable.hh,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VTouchable.hh,v 1.4.4.1 2001/06/28 19:08:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VTouchable
diff --git a/source/geometry/management/include/G4VTouchable.icc b/source/geometry/management/include/G4VTouchable.icc
index ad8e619199..f70ddf977e 100644
--- a/source/geometry/management/include/G4VTouchable.icc
+++ b/source/geometry/management/include/G4VTouchable.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VTouchable.icc,v 1.4 2000/11/01 15:39:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VTouchable.icc,v 1.4.4.1 2001/06/28 19:08:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VTouchable Inline implementation
diff --git a/source/geometry/management/include/G4VoxelLimits.hh b/source/geometry/management/include/G4VoxelLimits.hh
index 06007ef3ed..daa3e075c3 100644
--- a/source/geometry/management/include/G4VoxelLimits.hh
+++ b/source/geometry/management/include/G4VoxelLimits.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelLimits.hh,v 1.4 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelLimits.hh,v 1.4.4.1 2001/06/28 19:08:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VoxelLimits
 //
diff --git a/source/geometry/management/include/G4VoxelLimits.icc b/source/geometry/management/include/G4VoxelLimits.icc
index 09e8a785a2..bfe12ef201 100644
--- a/source/geometry/management/include/G4VoxelLimits.icc
+++ b/source/geometry/management/include/G4VoxelLimits.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelLimits.icc,v 1.1 2000/04/20 16:49:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelLimits.icc,v 1.1.4.1 2001/06/28 19:08:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4VoxelLimits Inline implementation
diff --git a/source/geometry/management/include/meshdefs.hh b/source/geometry/management/include/meshdefs.hh
index fbc5e9794e..c40c7abe83 100644
--- a/source/geometry/management/include/meshdefs.hh
+++ b/source/geometry/management/include/meshdefs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: meshdefs.hh,v 1.3 2000/04/20 16:49:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: meshdefs.hh,v 1.3.4.1 2001/06/28 19:08:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Tube/Cone Meshing constants for extent calculations
diff --git a/source/geometry/management/include/voxeldefs.hh b/source/geometry/management/include/voxeldefs.hh
index 6c397b379a..b7ec0f573c 100644
--- a/source/geometry/management/include/voxeldefs.hh
+++ b/source/geometry/management/include/voxeldefs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: voxeldefs.hh,v 1.4 2000/04/20 16:49:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: voxeldefs.hh,v 1.4.4.1 2001/06/28 19:08:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/geometry/management/src/G4AssemblyVolume.cc b/source/geometry/management/src/G4AssemblyVolume.cc
index 0f24cee6d3..6e51583bf3 100644
--- a/source/geometry/management/src/G4AssemblyVolume.cc
+++ b/source/geometry/management/src/G4AssemblyVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyVolume.cc,v 1.5 2001/02/08 12:33:56 radoone Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyVolume.cc,v 1.5.2.1 2001/06/28 19:08:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4AssemblyVolume - implementation
diff --git a/source/geometry/management/src/G4DrawVoxels.cc b/source/geometry/management/src/G4DrawVoxels.cc
index e017eab44f..0f66e4961a 100644
--- a/source/geometry/management/src/G4DrawVoxels.cc
+++ b/source/geometry/management/src/G4DrawVoxels.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DrawVoxels.cc,v 1.12 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DrawVoxels.cc,v 1.13.2.1 2001/06/28 19:08:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4DrawVoxels
@@ -80,7 +96,7 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
    G4ThreeVector t_centerofBoundingBox((xmin+xmax)*0.5,(ymin+ymax)*0.5,(zmin+zmax)*0.5);
    
    //ppl->resize(ppl->entries()+1);	//manual resize to avoid Rogue grabbing RW_DEFAULT
-   ppl->insert(G4PlacedPolyhedron(bounding_polyhedronBox,G4Translate3D(t_centerofBoundingBox)));
+   ppl->push_back(G4PlacedPolyhedron(bounding_polyhedronBox,G4Translate3D(t_centerofBoundingBox)));
    
    G4ThreeVector t_FirstCenterofVoxelPlane;
    const G4VisAttributes* voxelsVisAttributes=0;
@@ -147,7 +163,7 @@ void  G4DrawVoxels::ComputeVoxelPolyhedra(const G4LogicalVolume* lv,
 	current_translation_vector*=step*slice_no;
 		   
 	//ppl->resize(ppl->entries()+1);	//manual resize to avoid Rogue grabbing RW_DEFAULT
-	ppl->insert(G4PlacedPolyhedron(voxel_plane,G4Translate3D(current_translation_vector+t_FirstCenterofVoxelPlane)));
+	ppl->push_back(G4PlacedPolyhedron(voxel_plane,G4Translate3D(current_translation_vector+t_FirstCenterofVoxelPlane)));
 		   
 	slice_no=(slice->IsHeader()?slice->GetHeader()->GetMaxEquivalentSliceNo()+1
 		  			     :slice->GetNode()->GetMaxEquivalentSliceNo()+1);
@@ -215,8 +231,8 @@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume* lv) const{
    G4PlacedPolyhedronList* pplist=CreatePlacedPolyhedra(lv);
    if(pVVisManager) {
 	//Drawing the bounding and voxel polyhedra for the pVolume
-	for (size_t i=0;i<pplist->entries();i++)
-	   pVVisManager->Draw((*pplist)(i).GetPolyhedron(),(*pplist)(i).GetTransform()*transf3D);	
+	for (size_t i=0;i<pplist->size();i++)
+	   pVVisManager->Draw((*pplist)[i].GetPolyhedron(),(*pplist)[i].GetTransform()*transf3D);
    }
    else G4cout << "@@@@ void G4DrawVoxels::DrawVoxels(const G4LogicalVolume*) pVVisManager is null! @@@@" <<G4endl; 	
    delete pplist;
diff --git a/source/geometry/management/src/G4GeometryManager.cc b/source/geometry/management/src/G4GeometryManager.cc
index 396559b3af..89e782af2d 100644
--- a/source/geometry/management/src/G4GeometryManager.cc
+++ b/source/geometry/management/src/G4GeometryManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryManager.cc,v 1.2 1999/12/15 14:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryManager.cc,v 1.3.2.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4GeometryManager
 //
@@ -70,10 +86,10 @@ void G4GeometryManager::BuildOptimisations(const G4bool allOpts)
      G4SmartVoxelHeader *head;
      G4int nVolumes,n;
      Store=G4LogicalVolumeStore::GetInstance();
-     nVolumes=Store->entries();
+     nVolumes=Store->size();
      for (n=0;n<nVolumes;n++)
 	 {
-	     volume=Store->operator()(n);
+	     volume=(*Store)[n];
 // For safety, check if there are any existing voxels and delete before
 // replacement
 	     head = volume->GetVoxelHeader();
@@ -126,10 +142,10 @@ void G4GeometryManager::DeleteOptimisations()
      G4LogicalVolume *volume;
      G4SmartVoxelHeader *head;
      G4int nVolumes,n;
-     nVolumes=Store->entries();
+     nVolumes=Store->size();
      for (n=0;n<nVolumes;n++)
 	 {
-	     volume=Store->operator()(n);
+	     volume=(*Store)[n];
 	     head=volume->GetVoxelHeader();
 	     if (head)
 		 {
diff --git a/source/geometry/management/src/G4LogicalVolume.cc b/source/geometry/management/src/G4LogicalVolume.cc
index 0dce736d28..ad6d79588a 100644
--- a/source/geometry/management/src/G4LogicalVolume.cc
+++ b/source/geometry/management/src/G4LogicalVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolume.cc,v 1.5 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolume.cc,v 1.7.2.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4LogicalVolume Implementation
@@ -30,8 +46,8 @@ G4LogicalVolume::G4LogicalVolume( G4VSolid *pSolid, G4Material *pMaterial,
 				  G4FieldManager *pFieldMgr,
 				  G4VSensitiveDetector *pSDetector,
 				  G4UserLimits *pULimits)
- : fDaughters(0), fFieldManager(pFieldMgr), fVoxel(0), fSmartless(2.),
-   fVisAttributes (0), fFastSimulationManager (0), fIsEnvelope(FALSE)
+ : fDaughters(0,(G4VPhysicalVolume*)0), fFieldManager(pFieldMgr), fVoxel(0),
+   fSmartless(2.), fVisAttributes (0), fFastSimulationManager (0), fIsEnvelope(FALSE)
 {
     SetSolid(pSolid);
     SetMaterial(pMaterial);
@@ -136,10 +152,10 @@ G4LogicalVolume::FindMotherLogicalVolumeForEnvelope()
 
   // Look for the current volume's mother volume.
 
-  for (size_t LV=0;LV < Store->entries(); LV++){
+  for (size_t LV=0;LV < Store->size(); LV++){
      G4LogicalVolume *aLogVol;
     
-     aLogVol= Store->at(LV);
+     aLogVol= (*Store)[LV];
      if( (aLogVol!=this) &&         // Don't look for it inside itself...
 	(aLogVol->GetFastSimulationManager()!=NULL)){
       
diff --git a/source/geometry/management/src/G4LogicalVolumeStore.cc b/source/geometry/management/src/G4LogicalVolumeStore.cc
index f05f20b924..ee609f5b8a 100644
--- a/source/geometry/management/src/G4LogicalVolumeStore.cc
+++ b/source/geometry/management/src/G4LogicalVolumeStore.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolumeStore.cc,v 1.4 1999/12/15 14:49:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolumeStore.cc,v 1.5.2.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4LogicalVolumeStore
 //
@@ -20,14 +36,20 @@
 
 // Protected constructor: Construct underlying container with
 // initial size of 100 entries
-G4LogicalVolumeStore::G4LogicalVolumeStore() : G4RWTPtrOrderedVector<G4LogicalVolume>(100)
+G4LogicalVolumeStore::G4LogicalVolumeStore()
+ : G4std::vector<G4LogicalVolume*>()
 {
+  reserve(100);
 }
 
 // Destructor
 G4LogicalVolumeStore::~G4LogicalVolumeStore()
 {
- while (!isEmpty()) removeFirst();
+  while (!empty())
+  {
+//    delete front();
+    erase(begin());
+  }
 }
 
 // Static class variable
@@ -36,13 +58,20 @@ G4LogicalVolumeStore* G4LogicalVolumeStore::fgInstance = 0;
 // Add volume to container
 void G4LogicalVolumeStore::Register(G4LogicalVolume* pVolume)
 {
-    GetInstance()->insert(pVolume);
+    GetInstance()->push_back(pVolume);
 }
 
 // Remove volume from container
 void G4LogicalVolumeStore::DeRegister(G4LogicalVolume* pVolume)
 {
-    GetInstance()->remove(pVolume);
+  for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++)
+  {
+    if (**i==*pVolume)
+    {
+      GetInstance()->erase(i);
+      break;
+    }
+  }
 }
 
 // Return ptr to Store, setting if necessary
diff --git a/source/geometry/management/src/G4PVParameterised.cc b/source/geometry/management/src/G4PVParameterised.cc
index f15d92fec2..78a837d44f 100644
--- a/source/geometry/management/src/G4PVParameterised.cc
+++ b/source/geometry/management/src/G4PVParameterised.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVParameterised.cc,v 1.3 2000/11/01 15:39:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVParameterised.cc,v 1.3.4.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVParameterised
diff --git a/source/geometry/management/src/G4PVPlacement.cc b/source/geometry/management/src/G4PVPlacement.cc
index 2ae5864863..dd570ca944 100644
--- a/source/geometry/management/src/G4PVPlacement.cc
+++ b/source/geometry/management/src/G4PVPlacement.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVPlacement.cc,v 1.3 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVPlacement.cc,v 1.3.4.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVPlacement Implementation
diff --git a/source/geometry/management/src/G4PVReplica.cc b/source/geometry/management/src/G4PVReplica.cc
index 6dd7e6281f..9d7de7885e 100644
--- a/source/geometry/management/src/G4PVReplica.cc
+++ b/source/geometry/management/src/G4PVReplica.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVReplica.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVReplica.cc,v 1.2.4.1 2001/06/28 19:08:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVReplica Implementation
diff --git a/source/geometry/management/src/G4PhysicalVolumeStore.cc b/source/geometry/management/src/G4PhysicalVolumeStore.cc
index 0b8141ed18..6b6e9e0130 100644
--- a/source/geometry/management/src/G4PhysicalVolumeStore.cc
+++ b/source/geometry/management/src/G4PhysicalVolumeStore.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeStore.cc,v 1.5 2000/11/01 15:39:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeStore.cc,v 1.6.2.1 2001/06/28 19:08:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4PhysicalVolumeStore
 //
@@ -20,14 +36,20 @@
 
 // Protected constructor: Construct underlying container with
 // initial size of 100 entries
-G4PhysicalVolumeStore::G4PhysicalVolumeStore() : G4RWTPtrOrderedVector<G4VPhysicalVolume>(100)
+G4PhysicalVolumeStore::G4PhysicalVolumeStore()
+  : G4std::vector<G4VPhysicalVolume*>()
 {
+  reserve(100);
 }
 
 // Destructor
 G4PhysicalVolumeStore::~G4PhysicalVolumeStore()
 {
-  while (!isEmpty()) removeFirst();
+  while (!empty())
+  {
+//    delete front();
+    erase(begin());
+  }
 }
 
 // Static class variable
@@ -36,13 +58,20 @@ G4PhysicalVolumeStore* G4PhysicalVolumeStore::fgInstance = 0;
 // Add Solid to container
 void G4PhysicalVolumeStore::Register(G4VPhysicalVolume* pVolume)
 {
-    GetInstance()->insert(pVolume);
+    GetInstance()->push_back(pVolume);
 }
 
 // Remove Solid from container
 void G4PhysicalVolumeStore::DeRegister(G4VPhysicalVolume* pVolume)
 {
-    GetInstance()->remove(pVolume);
+  for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++)
+  {
+    if (**i==*pVolume)
+    {
+      GetInstance()->erase(i);
+      break;
+    }
+  }
 }
 
 // Return ptr to Store, setting if necessary
diff --git a/source/geometry/management/src/G4SmartVoxelHeader.cc b/source/geometry/management/src/G4SmartVoxelHeader.cc
index b925999b13..286de5f9df 100644
--- a/source/geometry/management/src/G4SmartVoxelHeader.cc
+++ b/source/geometry/management/src/G4SmartVoxelHeader.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelHeader.cc,v 1.7 2000/11/20 17:31:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelHeader.cc,v 1.11.2.1 2001/06/28 19:08:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4SmartVoxelHeader
@@ -16,6 +32,7 @@
 // Define G4GEOMETRY_VOXELDEBUG for debugging information on G4cout
 //
 // History:
+// 18.04.01 Migrated to STL vector - G.C.
 // 12.02.99 Introduction of new quality/smartless: max for (slices/candid) S.G.
 // 11.02.99 Voxels at lower levels are now built for collapsed slices      S.G.
 // 21.07.95 Full implementation, supporting non divided physical volumes
@@ -41,7 +58,7 @@
 // or parametric)
 
 G4SmartVoxelHeader::G4SmartVoxelHeader(G4LogicalVolume* pVolume,
-				       const G4int pSlice) :
+				       G4int pSlice) :
                                        fminEquivalent(pSlice),
                                        fmaxEquivalent(pSlice)
 {
@@ -66,7 +83,7 @@ G4SmartVoxelHeader::G4SmartVoxelHeader(G4LogicalVolume* pVolume,
 G4SmartVoxelHeader::G4SmartVoxelHeader(G4LogicalVolume* pVolume,
 				       const G4VoxelLimits& pLimits,
 				       const G4VolumeNosVector* pCandidates,
-				       const G4int pSlice) :
+				       G4int pSlice) :
                                        fminEquivalent(pSlice),
                                        fmaxEquivalent(pSlice)
 
@@ -75,9 +92,9 @@ G4SmartVoxelHeader::G4SmartVoxelHeader(G4LogicalVolume* pVolume,
     G4cout << "**** G4SmartVoxelHeader::G4SmartVoxelHeader" << G4endl
          << "     Limits " << pLimits << G4endl
          << "     Candidate #s = " ;
-    for (G4int i=0;i<pCandidates->entries();i++)
+    for (G4int i=0;i<pCandidates->size();i++)
 	{
-	    G4cout << pCandidates->at(i) << " ";
+	    G4cout << (*pCandidates)[i] << " ";
 	}
     G4cout << G4endl;
 #endif   
@@ -159,10 +176,11 @@ void G4SmartVoxelHeader::BuildVoxels(G4LogicalVolume* pVolume)
     G4VoxelLimits limits;	// Create `unlimited' limits object
     G4int nDaughters=pVolume->GetNoDaughters();
 
-    G4VolumeNosVector targetList(nDaughters);
+    G4VolumeNosVector targetList;
+    targetList.reserve(nDaughters);
     for (G4int i=0;i<nDaughters;i++)
 	{
-	  targetList.insert(i);
+	  targetList.push_back(i);
 	}
     BuildVoxelsWithinLimits(pVolume,limits,&targetList);
 }
@@ -190,11 +208,12 @@ void G4SmartVoxelHeader::BuildReplicaVoxels(G4LogicalVolume* pVolume)
 	if (consuming==false)
 		{
     		G4VoxelLimits limits;	// Create `unlimited' limits object
-		G4VolumeNosVector targetList(nReplicas);
+		G4VolumeNosVector targetList;
+		targetList.reserve(nReplicas);
 		for (G4int i=0;i<nReplicas;i++)
-			{
-	           	targetList.insert(i);
-			}
+		  {
+	           	targetList.push_back(i);
+		  }
 
         	G4ProxyVector* pSlices=BuildNodes(pVolume,limits,&targetList,axis);
                 faxis=axis;
@@ -273,13 +292,14 @@ void G4SmartVoxelHeader::BuildReplicaVoxels(G4LogicalVolume* pVolume)
 // 
 // o Modifies fslices `in place'
 // o faxis,fminExtent,fmaxExtent NOT modified
-void G4SmartVoxelHeader::BuildConsumedNodes(const G4int nReplicas)
+void G4SmartVoxelHeader::BuildConsumedNodes(G4int nReplicas)
 {
     G4int nNode,nVol;
     G4SmartVoxelNode *pNode;
     G4SmartVoxelProxy *pProxyNode;
 // Create and fill nodes in temporary G4NodeVector  (on stack)
-    G4NodeVector nodeList(nReplicas);
+    G4NodeVector nodeList;
+    nodeList.reserve(nReplicas);
     for (nNode=0;nNode<nReplicas;nNode++)
 	{
 	    pNode=new G4SmartVoxelNode(nNode);
@@ -287,11 +307,11 @@ void G4SmartVoxelHeader::BuildConsumedNodes(const G4int nReplicas)
 		{
 		    G4Exception("G4SmartVoxelHeader::BuildConsumedNodes Node allocation failed");
 		}
-	    nodeList.insert(pNode);
+	    nodeList.push_back(pNode);
 	}
     for (nVol=0;nVol<nReplicas;nVol++)
 	{
-	    nodeList(nVol)->Insert(nVol); // Insert replication of number
+	    nodeList[nVol]->Insert(nVol); // Insert replication of number
                                           // identical to voxel number
 	}
 
@@ -299,12 +319,12 @@ void G4SmartVoxelHeader::BuildConsumedNodes(const G4int nReplicas)
     fslices.clear();
     for (nNode=0;nNode<nReplicas;nNode++)
 	{
-	    pProxyNode=new G4SmartVoxelProxy(nodeList(nNode));
+	    pProxyNode=new G4SmartVoxelProxy(nodeList[nNode]);
 	    if (!pProxyNode)
 		{
 		    G4Exception("G4SmartVoxelHeader::BuildConsumedNodes Proxy Node allocation failed");
 		}
-	    fslices.insert(pProxyNode);
+	    fslices.push_back(pProxyNode);
 	}
 }
 
@@ -359,12 +379,29 @@ void G4SmartVoxelHeader::BuildVoxelsWithinLimits(G4LogicalVolume* pVolume,
 
 		    if (pTestSlices)
 			{
-			    maxNode=pTestSlices->entries();
+			    maxNode=pTestSlices->size();
 			    for (node=0;node<maxNode;node++)
 				{
-				    delete pTestSlices->operator()(node)->GetNode();
+				    delete (*pTestSlices)[node]->GetNode();
 				}
-			    pTestSlices->clearAndDestroy();
+			    // Destroy pTestSlices and all its contents
+			    G4SmartVoxelProxy* tmpProx;
+			    while (pTestSlices->size()>0)
+				{
+				  tmpProx = pTestSlices->back();
+				  pTestSlices->pop_back();
+				  for (G4ProxyVector::iterator
+				       i=pTestSlices->begin();
+				       i!=pTestSlices->end(); i++)
+				    {
+				       if (*i==tmpProx)
+					 {
+					   pTestSlices->erase(i);
+					   i--;
+					 }
+				    }
+				  if ( tmpProx )  delete tmpProx;    
+				} 
 			    delete pTestSlices;
 			}
 		}
@@ -426,12 +463,12 @@ G4SmartVoxelHeader::~G4SmartVoxelHeader()
     G4SmartVoxelProxy *lastProxy=0;
     G4SmartVoxelNode *dyingNode,*lastNode=0;
     G4SmartVoxelHeader *dyingHeader,*lastHeader=0;
-    maxNode=fslices.entries();
+    maxNode=fslices.size();
     for (node=0;node<maxNode;node++)
 	{
-	    if (fslices(node)->IsHeader())
+	    if (fslices[node]->IsHeader())
 		{
-		    dyingHeader=fslices(node)->GetHeader();
+		    dyingHeader=fslices[node]->GetHeader();
 		    if (lastHeader!=dyingHeader)
 			{
 			    lastHeader=dyingHeader;
@@ -441,7 +478,7 @@ G4SmartVoxelHeader::~G4SmartVoxelHeader()
 		}
 	    else
 		{
-		    dyingNode=fslices(node)->GetNode();
+		    dyingNode=fslices[node]->GetNode();
 		    if (dyingNode!=lastNode)
 			{
 			    lastNode=dyingNode;
@@ -454,9 +491,9 @@ G4SmartVoxelHeader::~G4SmartVoxelHeader()
 // Delete proxies
     for (proxy=0;proxy<maxNode;proxy++)
 	{
-	    if (fslices(proxy)!=lastProxy)
+	    if (fslices[proxy]!=lastProxy)
 		{
-		    lastProxy=fslices(proxy);
+		    lastProxy=fslices[proxy];
 		    delete lastProxy;
 		}
 	}
@@ -481,18 +518,18 @@ G4SmartVoxelHeader::~G4SmartVoxelHeader()
 void G4SmartVoxelHeader::BuildEquivalentSliceNos()
 {
     G4int sliceNo,minNo,maxNo,equivNo;
-    G4int maxNode=fslices.entries();
+    G4int maxNode=fslices.size();
     G4SmartVoxelNode *startNode,*sampleNode;
     for (sliceNo=0;sliceNo<maxNode;sliceNo++)
 	{
 	    minNo=sliceNo;
 // Get first node (see preconditions - will throw exception if a header)
-	    startNode=fslices(minNo)->GetNode();
+	    startNode=fslices[minNo]->GetNode();
 
 // Find max equivalent
 	    for (equivNo=minNo+1;equivNo<maxNode;equivNo++)
 		{
-		    sampleNode=fslices(equivNo)->GetNode();
+		    sampleNode=fslices[equivNo]->GetNode();
 		    if (!(*startNode==*sampleNode))
 			{
 			    break;
@@ -505,7 +542,7 @@ void G4SmartVoxelHeader::BuildEquivalentSliceNos()
 // Set min and max nos
 		    for (equivNo=minNo;equivNo<=maxNo;equivNo++)
 			{
-			    sampleNode=fslices(equivNo)->GetNode();
+			    sampleNode=fslices[equivNo]->GetNode();
 			    sampleNode->SetMinEquivalentSliceNo(minNo);
 			    sampleNode->SetMaxEquivalentSliceNo(maxNo);
 			}
@@ -529,12 +566,12 @@ void G4SmartVoxelHeader::BuildEquivalentSliceNos()
 void G4SmartVoxelHeader::CollectEquivalentNodes()
 {
     G4int sliceNo,maxNo,equivNo;
-    G4int maxNode=fslices.entries();
+    G4int maxNode=fslices.size();
     G4SmartVoxelNode *equivNode;
     G4SmartVoxelProxy *equivProxy;
     for (sliceNo=0;sliceNo<maxNode;sliceNo++)
 	{
-	    equivProxy=fslices(sliceNo);
+	    equivProxy=fslices[sliceNo];
 // Asuumption: (see preconditions) all slices are nodes
 	    equivNode=equivProxy->GetNode();
 	    maxNo=equivNode->GetMaxEquivalentSliceNo();
@@ -548,9 +585,9 @@ void G4SmartVoxelHeader::CollectEquivalentNodes()
 #endif
 		    for (equivNo=sliceNo+1;equivNo<=maxNo;equivNo++)
 			{
-			    delete fslices(equivNo)->GetNode();
-			    delete fslices(equivNo);
-			    fslices(equivNo)=equivProxy;
+			    delete fslices[equivNo]->GetNode();
+			    delete fslices[equivNo];
+			    fslices[equivNo]=equivProxy;
 			}
 		    sliceNo=maxNo;
 		}
@@ -571,12 +608,12 @@ void G4SmartVoxelHeader::CollectEquivalentNodes()
 void G4SmartVoxelHeader::CollectEquivalentHeaders()
 {
     G4int sliceNo,maxNo,equivNo;
-    G4int maxNode=fslices.entries();
+    G4int maxNode=fslices.size();
     G4SmartVoxelHeader *equivHeader,*sampleHeader;
     G4SmartVoxelProxy *equivProxy;
     for (sliceNo=0;sliceNo<maxNode;sliceNo++)
 	{
-	    equivProxy=fslices(sliceNo);
+	    equivProxy=fslices[sliceNo];
 	    if (equivProxy->IsHeader())
 		{
 		    equivHeader=equivProxy->GetHeader();
@@ -594,7 +631,7 @@ void G4SmartVoxelHeader::CollectEquivalentHeaders()
 			    for (equivNo=sliceNo+1;equivNo<=maxNo;equivNo++)
 				{
 				    
-				    sampleHeader=fslices(equivNo)->GetHeader();
+				    sampleHeader=fslices[equivNo]->GetHeader();
 				    if (*sampleHeader==*equivHeader)
 					{
 // Dlete sampleHeader + proxy and replace with equivHeader/Proxy
@@ -603,13 +640,13 @@ void G4SmartVoxelHeader::CollectEquivalentHeaders()
 #endif
 
 					    delete sampleHeader;
-					    delete fslices(equivNo);
-					    fslices(equivNo)=equivProxy;
+					    delete fslices[equivNo];
+					    fslices[equivNo]=equivProxy;
 					}
 				    else
 					{
 // Not equal. Set this header to be the current header for comparisons
-					    equivProxy=fslices(equivNo);
+					    equivProxy=fslices[equivNo];
 					    equivHeader=equivProxy->GetHeader();
 					}
 
@@ -652,7 +689,7 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
     G4int nVol,nNode,targetVolNo;
     G4VoxelLimits noLimits;
     
-    nCandidates=pCandidates->entries();
+    nCandidates=pCandidates->size();
 #ifdef G4GEOMETRY_VOXELDEBUG
     G4cout << "**** G4SmartVoxelHeader::BuildNodes" << G4endl
 	 << "     Limits = " << pLimits << G4endl
@@ -668,8 +705,8 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
       outerSolid->CalculateExtent(pAxis,noLimits,origin,motherMinExtent,motherMaxExtent);
     };
 
-    G4VolumeExtentVector minExtents(nCandidates);
-    G4VolumeExtentVector maxExtents(nCandidates);
+    G4VolumeExtentVector minExtents(nCandidates,0.);
+    G4VolumeExtentVector maxExtents(nCandidates,0.);
 
     if (pVolume->GetNoDaughters()==1 &&
         pVolume->GetDaughter(0)->IsReplicated()==true)
@@ -699,7 +736,7 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
 // Compute extents
     for (nVol=0;nVol<nCandidates;nVol++)
 	{
-	    targetVolNo=pCandidates->operator()(nVol);
+	    targetVolNo=(*pCandidates)[nVol];
 	    if (replicated==false)
 		{
 	    	pDaughter=pVolume->GetDaughter(targetVolNo);
@@ -729,8 +766,8 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
 	    if(!targetSolid->CalculateExtent(pAxis,pLimits,targetTransform,targetMinExtent,targetMaxExtent)){
 	        targetSolid->CalculateExtent(pAxis,noLimits,targetTransform,targetMinExtent,targetMaxExtent);
 	    };
-	    minExtents(nVol)=targetMinExtent;
-	    maxExtents(nVol)=targetMaxExtent;
+	    minExtents[nVol]=targetMinExtent;
+	    maxExtents[nVol]=targetMaxExtent;
 // Check not entirely outside mother when processing toplevel nodes
 	    if (!pLimits.IsLimited()&&((targetMaxExtent<=motherMinExtent)||(targetMinExtent>=motherMaxExtent)))
 		{
@@ -748,9 +785,9 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
 		{
 		    G4double width;
 		    const G4int kStraddlePercent=5;
-		    width=maxExtents(nVol)-minExtents(nVol);
-		    if (((motherMinExtent-minExtents(nVol))*100/width>kStraddlePercent)
-			||((maxExtents(nVol)-motherMaxExtent)*100/width>kStraddlePercent))
+		    width=maxExtents[nVol]-minExtents[nVol];
+		    if (((motherMinExtent-minExtents[nVol])*100/width>kStraddlePercent)
+			||((maxExtents[nVol]-motherMaxExtent)*100/width>kStraddlePercent))
 			{
 			    G4cout << "**** G4SmartVoxelHeader::BuildNodes" << G4endl
 				 << "     WARNING : Daughter # " << nVol
@@ -771,10 +808,10 @@ G4ProxyVector* G4SmartVoxelHeader::BuildNodes(G4LogicalVolume* pVolume,
     G4double currentWidth;
     for (nVol=0;nVol<nCandidates;nVol++)
 	{
-	    currentWidth=maxExtents(nVol)-minExtents(nVol);
+	    currentWidth=maxExtents[nVol]-minExtents[nVol];
 	    if (currentWidth<minWidth&&
-		maxExtents(nVol)>=pLimits.GetMinExtent(pAxis)&&
-		minExtents(nVol)<=pLimits.GetMaxExtent(pAxis))
+		maxExtents[nVol]>=pLimits.GetMinExtent(pAxis)&&
+		minExtents[nVol]<=pLimits.GetMaxExtent(pAxis))
 		{
 		    minWidth=currentWidth;
 		}
@@ -819,9 +856,8 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
     G4double nodeWidth=(motherMaxExtent-motherMinExtent)/noNodes;
 
 // Create G4VoxelNodes. Will Add proxies before setting fslices
-    G4NodeVector *nodeList;
-
-    nodeList= new G4NodeVector(noNodes);
+    G4NodeVector* nodeList = new G4NodeVector();
+    nodeList->reserve(noNodes);
 
     if (!nodeList)
 	{
@@ -835,7 +871,7 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
 		{
 		    G4Exception("G4SmartVoxelHeader::BuildNodes Node allocation failed");
 		}
-	    nodeList->insert(pNode);
+	    nodeList->push_back(pNode);
 	}
 // All nodes created (empty)
 
@@ -843,8 +879,8 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
     for (nVol=0;nVol<nCandidates;nVol++)
 	{
 	    G4int nodeNo,minContainingNode,maxContainingNode;
-	    minContainingNode=G4int ((minExtents(nVol)-motherMinExtent)/nodeWidth);
-	    maxContainingNode=G4int ((maxExtents(nVol)-motherMinExtent)/nodeWidth);
+	    minContainingNode=G4int ((minExtents[nVol]-motherMinExtent)/nodeWidth);
+	    maxContainingNode=G4int ((maxExtents[nVol]-motherMinExtent)/nodeWidth);
 
 // Only add nodes that are inside the limits of the axis
 	    if (maxContainingNode>=0&&minContainingNode<noNodes)
@@ -863,7 +899,7 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
 		    
 		    for (nodeNo=minContainingNode;nodeNo<=maxContainingNode;nodeNo++)
 			{
-			    nodeList->operator()(nodeNo)->Insert(pCandidates->operator()(nVol));
+			    (*nodeList)[nodeNo]->Insert((*pCandidates)[nVol]);
 			}
 		}
 	}
@@ -873,7 +909,8 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
 // nodeList *itself* - not the contents)
     G4ProxyVector *proxyList;
 
-    proxyList=new G4ProxyVector(noNodes);
+    proxyList=new G4ProxyVector();
+    proxyList->reserve(noNodes);
 
     if (!proxyList)
 	{
@@ -884,12 +921,12 @@ G4int    noNodes = ((noNodesSmart-noNodesExactI)>=0.5) ?
     for (nNode=0;nNode<noNodes;nNode++)
 	{
 	    G4SmartVoxelProxy *pProxyNode;
-	    pProxyNode=new G4SmartVoxelProxy(nodeList->operator()(nNode));
+	    pProxyNode=new G4SmartVoxelProxy((*nodeList)[nNode]);
 	    if (!pProxyNode)
 		{
 		    G4Exception("G4SmartVoxelHeader::BuildNodes Proxy Node allocation failed");
 		}
-	    proxyList->insert(pProxyNode);
+	    proxyList->push_back(pProxyNode);
 	}
     delete nodeList;
     return proxyList;
@@ -920,14 +957,14 @@ G4double G4SmartVoxelHeader::CalculateQuality(G4ProxyVector *pSlice)
     G4int noContained,maxContained=0;
     G4SmartVoxelNode *node;
 
-    nNodes=pSlice->entries();
+    nNodes=pSlice->size();
 
     for (G4int i=0;i<nNodes;i++)
 	{
-	    if (pSlice->operator()(i)->IsNode())
+	    if ((*pSlice)[i]->IsNode())
 		{
 // Definitely a node. Add info to running totals
-		    node=pSlice->operator()(i)->GetNode();
+		    node=(*pSlice)[i]->GetNode();
 		    noContained=node->GetNoContained();
 		    if (noContained)
 			{
@@ -980,7 +1017,7 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 				     G4VoxelLimits pLimits)
 {
     G4int refinedDepth=0,minVolumes;
-    G4int maxNode=fslices.entries();
+    G4int maxNode=fslices.size();
     if (pLimits.IsXLimited()) 
 	{
 	    refinedDepth++;
@@ -1023,21 +1060,22 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 	    for (targetNo=0;targetNo<maxNode;targetNo++)
 		{
 
-		    targetNodeProxy=fslices(targetNo);
+		    targetNodeProxy=fslices[targetNo];
 // Assume all slices are nodes (see preconditions)
 		    targetNode=targetNodeProxy->GetNode();
 
 		    if (targetNode->GetNoContained()>=minVolumes)
 			{
 			    noContainedDaughters=targetNode->GetNoContained();
-			    targetList = new G4VolumeNosVector(noContainedDaughters);
+			    targetList = new G4VolumeNosVector();
+			    targetList->reserve(noContainedDaughters);
 			    if (!targetList)
 				{
 				    G4Exception("G4SmartVoxelHeader::RefineNodes - Target volume no List new failed");
 				}
 			    for (i=0;i<noContainedDaughters;i++)
 				{
-				    targetList->insert(targetNode->GetVolume(i));
+				    targetList->push_back(targetNode->GetVolume(i));
 				}
 			    minNo=targetNode->GetMinEquivalentSliceNo();
 			    maxNo=targetNode->GetMaxEquivalentSliceNo();
@@ -1052,9 +1090,9 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 			    lastProxy=0;
 			    for (replaceNo=minNo;replaceNo<=maxNo;replaceNo++)
 				{
-				    if (lastProxy!=fslices(replaceNo))
+				    if (lastProxy!=fslices[replaceNo])
 					{
-					    lastProxy=fslices(replaceNo);
+					    lastProxy=fslices[replaceNo];
 					    delete lastProxy;
 					}
 				}
@@ -1079,7 +1117,7 @@ void G4SmartVoxelHeader::RefineNodes(G4LogicalVolume* pVolume,
 			    for (replaceNo=minNo;replaceNo<=maxNo;replaceNo++)
 				{
 
-				    fslices(replaceNo)=replaceHeaderProxy;
+				    fslices[replaceNo]=replaceHeaderProxy;
 				}
 // Finished replacing current `equivalent' group
 			    delete targetList;
@@ -1101,13 +1139,13 @@ G4bool G4SmartVoxelHeader::AllSlicesEqual() const
 {
     G4int noSlices;
     G4SmartVoxelProxy *refProxy;
-    noSlices=fslices.entries();
+    noSlices=fslices.size();
     if (noSlices>1)
 	{
-	    refProxy=fslices(0);
+	    refProxy=fslices[0];
 	    for (G4int i=1;i<noSlices;i++)
 		{
-		    if (refProxy!=fslices(i))
+		    if (refProxy!=fslices[i])
 			{
 			    return false;
 			}
@@ -1119,25 +1157,25 @@ G4bool G4SmartVoxelHeader::AllSlicesEqual() const
 // Output for debugging
 G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h)
 {
-    s << "Axis = " << h.faxis << G4endl;
+    s << "Axis = " << G4int(h.faxis) << G4endl;
     G4SmartVoxelProxy *collectNode=0,*collectHead=0;
     G4int collectNodeNo=0;
     G4int collectHeadNo=0;
     size_t i,j;
     G4bool haveHeaders=false;
 
-    for (i=0;i<h.fslices.entries();i++)
+    for (i=0;i<h.fslices.size();i++)
 	{
 	    s << "Slice #" << i << " = ";
-	    if (h.fslices(i)->IsNode())
+	    if (h.fslices[i]->IsNode())
 		{
-		    if (h.fslices(i)!=collectNode)
+		    if (h.fslices[i]!=collectNode)
 			{
 			    s << "{";
-			    for (G4int j=0;j<h.fslices(i)->GetNode()->GetNoContained();j++)
-				{ s << " " << h.fslices(i)->GetNode()->GetVolume(j); }
+			    for (G4int j=0;j<h.fslices[i]->GetNode()->GetNoContained();j++)
+				{ s << " " << h.fslices[i]->GetNode()->GetVolume(j); }
 			    s << " }" << G4endl;
-			    collectNode=h.fslices(i);
+			    collectNode=h.fslices[i];
 			    collectNodeNo=i;
 			}
 		    else
@@ -1148,10 +1186,10 @@ G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h)
 	    else
 		{
 		    haveHeaders=true;
-		    if (h.fslices(i)!=collectHead)
+		    if (h.fslices[i]!=collectHead)
 			{
 			    s << "Header" << G4endl;
-			    collectHead=h.fslices(i);
+			    collectHead=h.fslices[i];
 			    collectHeadNo=i;
 			}
 		    else
@@ -1164,17 +1202,17 @@ G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h)
     if (haveHeaders)
 	{
 	    collectHead=0;
-	    for (j=0;j<h.fslices.entries();j++)
+	    for (j=0;j<h.fslices.size();j++)
 		{
-		    if (h.fslices(j)->IsHeader())
+		    if (h.fslices[j]->IsHeader())
 			{
 
 			    s << "Header at Slice #" << j << " = ";
-			    if (h.fslices(j)!=collectHead)
+			    if (h.fslices[j]!=collectHead)
 				{
 				    s << G4endl 
-				      << (*(h.fslices(j)->GetHeader()));
-				    collectHead=h.fslices(j);
+				      << (*(h.fslices[j]->GetHeader()));
+				    collectHead=h.fslices[j];
 				    collectHeadNo=j;
 				}
 			    else
@@ -1186,4 +1224,3 @@ G4std::ostream& operator << (G4std::ostream&s, const G4SmartVoxelHeader& h)
 	}
     return s;
 }
-
diff --git a/source/geometry/management/src/G4SmartVoxelNode.cc b/source/geometry/management/src/G4SmartVoxelNode.cc
index f39724ecd3..afda8d9a9a 100644
--- a/source/geometry/management/src/G4SmartVoxelNode.cc
+++ b/source/geometry/management/src/G4SmartVoxelNode.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SmartVoxelNode.cc,v 1.2 1999/12/15 14:49:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SmartVoxelNode.cc,v 1.2.4.1 2001/06/28 19:08:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class G4SmartVoxelNode
 //
diff --git a/source/geometry/management/src/G4SolidStore.cc b/source/geometry/management/src/G4SolidStore.cc
index 431346d7d6..7c902950b2 100644
--- a/source/geometry/management/src/G4SolidStore.cc
+++ b/source/geometry/management/src/G4SolidStore.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SolidStore.cc,v 1.5 2000/09/11 11:09:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SolidStore.cc,v 1.6.2.1 2001/06/28 19:08:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4SolidStore
 //
@@ -20,15 +36,20 @@
 
 // Protected constructor: Construct underlying container with
 // initial size of 100 entries
-G4SolidStore::G4SolidStore() : G4RWTPtrOrderedVector<G4VSolid>(100)
+G4SolidStore::G4SolidStore()
+  : G4std::vector<G4VSolid*>()
 {
+  reserve(100);
 }
 
 // Destructor
 G4SolidStore::~G4SolidStore() 
 {
-  while (!isEmpty()) removeFirst();
-//  clearAndDestroy();
+  while (!empty())
+  {
+//    delete front();
+    erase(begin());
+  }
 }
 
 // Static class variable
@@ -37,13 +58,20 @@ G4SolidStore* G4SolidStore::fgInstance = 0;
 // Add Solid to container
 void G4SolidStore::Register(G4VSolid* pSolid)
 {
-    GetInstance()->insert(pSolid);
+    GetInstance()->push_back(pSolid);
 }
 
 // Remove Solid from container
 void G4SolidStore::DeRegister(G4VSolid* pSolid)
 {
-    GetInstance()->remove(pSolid);
+  for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++)
+  {
+    if (**i==*pSolid)
+    {
+      GetInstance()->erase(i);
+      break;
+    }
+  }
 }
 
 // Return ptr to Store, setting if necessary
diff --git a/source/geometry/management/src/G4VPVParameterisation.cc b/source/geometry/management/src/G4VPVParameterisation.cc
index eefaca77cd..b88b5df04b 100644
--- a/source/geometry/management/src/G4VPVParameterisation.cc
+++ b/source/geometry/management/src/G4VPVParameterisation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPVParameterisation.cc,v 1.2 1999/12/15 14:49:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPVParameterisation.cc,v 1.2.4.1 2001/06/28 19:08:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Default implementations for Parameterisations that do not
 //    parameterise solid and/or material
diff --git a/source/geometry/management/src/G4VPhysicalVolume.cc b/source/geometry/management/src/G4VPhysicalVolume.cc
index 9f49eafef5..fd5f04072e 100644
--- a/source/geometry/management/src/G4VPhysicalVolume.cc
+++ b/source/geometry/management/src/G4VPhysicalVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPhysicalVolume.cc,v 1.3 1999/12/15 14:49:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPhysicalVolume.cc,v 1.3.4.1 2001/06/28 19:08:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VPhysicalVolume Implementation
diff --git a/source/geometry/management/src/G4VSolid.cc b/source/geometry/management/src/G4VSolid.cc
index ae560b17f0..18d1440fc7 100644
--- a/source/geometry/management/src/G4VSolid.cc
+++ b/source/geometry/management/src/G4VSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSolid.cc,v 1.6 2000/11/16 14:29:23 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSolid.cc,v 1.7.2.1 2001/06/28 19:08:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VSolid
 //
@@ -32,14 +48,14 @@
 G4VSolid::G4VSolid(const G4String& name) :
 fshapeName(name) 
 {
-    G4SolidStore::GetInstance()->append(this);
+    G4SolidStore::GetInstance()->push_back(this);
 }
 
 // Destructor (virtual)
 // - Remove ourselves from solid Store
 G4VSolid::~G4VSolid()
 {
-    G4SolidStore::GetInstance()->remove(this);
+    G4SolidStore::GetInstance()->DeRegister(this);
 }
 	
 // Returns name by value
@@ -75,13 +91,13 @@ void G4VSolid::CalculateClippedPolygonExtent(G4ThreeVectorList& pPolygon,
   G4int noLeft,i;
   G4double component;
   ClipPolygon(pPolygon,pVoxelLimit);
-  noLeft = pPolygon.entries();
+  noLeft = pPolygon.size();
 
   if (noLeft)
   {
     for (i=0;i<noLeft;i++)
     {
-      component = pPolygon(i).operator()(pAxis);
+      component = pPolygon[i].operator()(pAxis);
 
       if (component < pMin)
       {
@@ -115,10 +131,10 @@ void G4VSolid::ClipCrossSection(G4ThreeVectorList* pVertices,
 {
 
     G4ThreeVectorList polygon;
-    polygon.append(pVertices->operator()(pSectionIndex));
-    polygon.append(pVertices->operator()(pSectionIndex+1));
-    polygon.append(pVertices->operator()(pSectionIndex+2));
-    polygon.append(pVertices->operator()(pSectionIndex+3));
+    polygon.push_back((*pVertices)[pSectionIndex]);
+    polygon.push_back((*pVertices)[pSectionIndex+1]);
+    polygon.push_back((*pVertices)[pSectionIndex+2]);
+    polygon.push_back((*pVertices)[pSectionIndex+3]);
     CalculateClippedPolygonExtent(polygon,pVoxelLimit,pAxis,pMin,pMax);
     return;
 }
@@ -141,28 +157,28 @@ void G4VSolid::ClipBetweenSections(G4ThreeVectorList* pVertices,
 			     G4double& pMin, G4double& pMax) const
 {
     G4ThreeVectorList polygon;
-    polygon.append(pVertices->operator()(pSectionIndex));
-    polygon.append(pVertices->operator()(pSectionIndex+4));
-    polygon.append(pVertices->operator()(pSectionIndex+5));
-    polygon.append(pVertices->operator()(pSectionIndex+1));
+    polygon.push_back((*pVertices)[pSectionIndex]);
+    polygon.push_back((*pVertices)[pSectionIndex+4]);
+    polygon.push_back((*pVertices)[pSectionIndex+5]);
+    polygon.push_back((*pVertices)[pSectionIndex+1]);
     CalculateClippedPolygonExtent(polygon,pVoxelLimit,pAxis,pMin,pMax);
     polygon.clear();
-    polygon.append(pVertices->operator()(pSectionIndex+1));
-    polygon.append(pVertices->operator()(pSectionIndex+5));
-    polygon.append(pVertices->operator()(pSectionIndex+6));
-    polygon.append(pVertices->operator()(pSectionIndex+2));
+    polygon.push_back((*pVertices)[pSectionIndex+1]);
+    polygon.push_back((*pVertices)[pSectionIndex+5]);
+    polygon.push_back((*pVertices)[pSectionIndex+6]);
+    polygon.push_back((*pVertices)[pSectionIndex+2]);
     CalculateClippedPolygonExtent(polygon,pVoxelLimit,pAxis,pMin,pMax);
     polygon.clear();
-    polygon.append(pVertices->operator()(pSectionIndex+2));
-    polygon.append(pVertices->operator()(pSectionIndex+6));
-    polygon.append(pVertices->operator()(pSectionIndex+7));
-    polygon.append(pVertices->operator()(pSectionIndex+3));
+    polygon.push_back((*pVertices)[pSectionIndex+2]);
+    polygon.push_back((*pVertices)[pSectionIndex+6]);
+    polygon.push_back((*pVertices)[pSectionIndex+7]);
+    polygon.push_back((*pVertices)[pSectionIndex+3]);
     CalculateClippedPolygonExtent(polygon,pVoxelLimit,pAxis,pMin,pMax);
     polygon.clear();
-    polygon.append(pVertices->operator()(pSectionIndex+3));
-    polygon.append(pVertices->operator()(pSectionIndex+7));
-    polygon.append(pVertices->operator()(pSectionIndex+4));
-    polygon.append(pVertices->operator()(pSectionIndex));
+    polygon.push_back((*pVertices)[pSectionIndex+3]);
+    polygon.push_back((*pVertices)[pSectionIndex+7]);
+    polygon.push_back((*pVertices)[pSectionIndex+4]);
+    polygon.push_back((*pVertices)[pSectionIndex]);
     CalculateClippedPolygonExtent(polygon,pVoxelLimit,pAxis,pMin,pMax);
     return;
 }
@@ -197,7 +213,7 @@ void G4VSolid::ClipPolygon(G4ThreeVectorList& pPolygon,
 		    ClipPolygonToSimpleLimits(pPolygon,outputPolygon,
 					      simpleLimit1);
 		    pPolygon.clear();
-		    if (!outputPolygon.entries())
+		    if (!outputPolygon.size())
 			{
 			    return;
 			}
@@ -205,7 +221,7 @@ void G4VSolid::ClipPolygon(G4ThreeVectorList& pPolygon,
 		    G4VoxelLimits simpleLimit2;
 		    simpleLimit2.AddLimit(kXAxis,-kInfinity,pVoxelLimit.GetMaxXExtent());
 		    ClipPolygonToSimpleLimits(outputPolygon,pPolygon,simpleLimit2);
-		    if (!pPolygon.entries())
+		    if (!pPolygon.size())
 			{
 			    return;
 			}
@@ -224,7 +240,7 @@ void G4VSolid::ClipPolygon(G4ThreeVectorList& pPolygon,
 // Must always clear pPolygon - for clip to simpleLimit2 and incase of
 // early exit
 		    pPolygon.clear();
-		    if (!outputPolygon.entries())
+		    if (!outputPolygon.size())
 			{
 			    return;
 			}
@@ -232,7 +248,7 @@ void G4VSolid::ClipPolygon(G4ThreeVectorList& pPolygon,
 		    G4VoxelLimits simpleLimit2;
 		    simpleLimit2.AddLimit(kYAxis,-kInfinity,pVoxelLimit.GetMaxYExtent());
 		    ClipPolygonToSimpleLimits(outputPolygon,pPolygon,simpleLimit2);
-		    if (!pPolygon.entries())
+		    if (!pPolygon.size())
 			{
 			    return;
 			}
@@ -251,7 +267,7 @@ void G4VSolid::ClipPolygon(G4ThreeVectorList& pPolygon,
 // Must always clear pPolygon - for clip to simpleLimit2 and incase of
 // early exit
 		    pPolygon.clear();
-		    if (!outputPolygon.entries())
+		    if (!outputPolygon.size())
 			{
 			    return;
 			}
@@ -272,18 +288,18 @@ void G4VSolid::ClipPolygonToSimpleLimits(G4ThreeVectorList& pPolygon,
 				      const G4VoxelLimits& pVoxelLimit) const
 {
     G4int i;
-    G4int noVertices=pPolygon.entries();
+    G4int noVertices=pPolygon.size();
     G4ThreeVector vEnd,vStart;
     for (i=0;i<noVertices;i++)
 	{
-	    vStart=pPolygon(i);
+	    vStart=pPolygon[i];
 	    if (i==noVertices-1)
 		{
-		    vEnd=pPolygon(0);
+		    vEnd=pPolygon[0];
 		}
 	    else
 		{
-		    vEnd=pPolygon(i+1);
+		    vEnd=pPolygon[i+1];
 		}
 
 	    if (pVoxelLimit.Inside(vStart))
@@ -291,13 +307,13 @@ void G4VSolid::ClipPolygonToSimpleLimits(G4ThreeVectorList& pPolygon,
 		    if (pVoxelLimit.Inside(vEnd))
 			{
 // vStart and vEnd inside -> output end point
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vEnd);
 			}
 		    else
 			{
 // vStart inside, vEnd outside -> output crossing point
 			    pVoxelLimit.ClipToLimits(vStart,vEnd);
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vEnd);
 			}
 		    
 		}
@@ -307,8 +323,8 @@ void G4VSolid::ClipPolygonToSimpleLimits(G4ThreeVectorList& pPolygon,
 			{
 // vStart outside, vEnd inside -> output inside section
 			    pVoxelLimit.ClipToLimits(vStart,vEnd);
-			    outputPolygon.insert(vStart);
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vStart);
+			    outputPolygon.push_back(vEnd);
 			}
 		    else
 // Both point outside -> no output
diff --git a/source/geometry/management/src/G4VoxelLimits.cc b/source/geometry/management/src/G4VoxelLimits.cc
index 63f3b0efa6..a87e52e432 100644
--- a/source/geometry/management/src/G4VoxelLimits.cc
+++ b/source/geometry/management/src/G4VoxelLimits.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelLimits.cc,v 1.3 2000/11/01 15:39:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelLimits.cc,v 1.3.4.1 2001/06/28 19:08:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VoxelLimits
 // 
diff --git a/source/geometry/solids/BREPS/History b/source/geometry/solids/BREPS/History
index 8e641ac3cd..9256734394 100644
--- a/source/geometry/solids/BREPS/History
+++ b/source/geometry/solids/BREPS/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.21 2001/02/05 18:45:32 gcosmo Exp $
+$Id: History,v 1.25 2001/06/15 11:59:35 gcosmo Exp $
 ----------------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,26 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+15/06/2001 : G. Cosmo            breps-V03-01-02
+- Fixes to allow -ansi compilation on Linux-g++, gcc-2.95-2 compiler:
+  o G4Ray.cc: changed usage of hypot(x,y) to sqrt(x*x+y*y).
+  o G4Hyperbola[.icc.cc]: changed usage of atanh(x) to 0.5*log((1+x)/(1-x)).
+- G4ProjectedSurface.cc: corrected initialisation of temporary G4Point3D
+  objects, to use the correct CLHEP constructor.
+
+27/04/2001 : G. Cosmo            breps-V03-01-01
+- G4BSplineCurve.cc: fixed compilation warnings on HP-UX, concerning
+  potential uninitialised vector elements.
+
+20/04/2001 : G. Cosmo            breps-V03-01-00
+- Migration to STL vector:
+  o G4Assembly: migrated G4PlacedVector typedef.
+  o G4PlacementVector: migrated G4PlacementVector typedef.
+  o G4Point3DVector: migrated G4Point3DVector typedef.
+  o G4CurveVector: migrated G4CurveVector typedef.
+  o G4BSplineCurve: migrated G4doubleVector typedef and removed
+    redefinition of G4Point3DVector.
+
 05/01/2001 : G. Cosmo            breps-V03-00-00
 - Removed useless inclusion of G4OrderedTable.hh from G4Assembly.hh and
   G4STEPEntity.hh.
@@ -146,6 +166,11 @@ committal in the CVS repository !
    >> Still remaining: reference to STEPaggregate in G4PointRat;
                        reference to instMgr in G4BREPSolid.cc.
 
+10/06/1999 : J. Apostolakis       breps-01-00-04
+
+G4FPlane.cc:  
+  Rays and planes are now considered parallel if dot product with plane's 
+  normal less than perMillion rather than perThousand (in the Intersect method).
 
 28/05/1999 : J. Apostolakis       breps-01-00-03a
  Tagged.
diff --git a/source/geometry/solids/BREPS/include/G4Assembly.hh b/source/geometry/solids/BREPS/include/G4Assembly.hh
index ce7886a3c5..1949de2968 100644
--- a/source/geometry/solids/BREPS/include/G4Assembly.hh
+++ b/source/geometry/solids/BREPS/include/G4Assembly.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Assembly.hh,v 1.6 2001/02/05 18:45:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Assembly.hh,v 1.7.2.1 2001/06/28 19:08:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Assembly
@@ -27,10 +43,11 @@
 #ifndef G4ASSEMBLY_HH
 #define G4ASSEMBLY_HH
 
+#include "g4std/vector"
 #include "G4PlacedSolid.hh"
 #include "G4BREPSolid.hh"
 
-typedef G4RWTPtrOrderedVector<G4PlacedSolid> G4PlacedVector;  
+typedef G4std::vector<G4PlacedSolid*> G4PlacedVector;  
 
 class G4Assembly
 {
diff --git a/source/geometry/solids/BREPS/include/G4Assembly.icc b/source/geometry/solids/BREPS/include/G4Assembly.icc
index cc6582c2a3..1eae3f6d3f 100644
--- a/source/geometry/solids/BREPS/include/G4Assembly.icc
+++ b/source/geometry/solids/BREPS/include/G4Assembly.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Assembly.icc,v 1.2 2000/08/28 15:00:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Assembly.icc,v 1.2.4.1 2001/06/28 19:08:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
index d16b3fcd0d..cfe683d28b 100644
--- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
+++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement3D.hh,v 1.3 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement3D.hh,v 1.3.4.1 2001/06/28 19:08:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3D
diff --git a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
index ce8a85605a..eb3635b5ff 100644
--- a/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
+++ b/source/geometry/solids/BREPS/include/G4Axis2Placement3D.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement3D.icc,v 1.4 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement3D.icc,v 1.4.4.1 2001/06/28 19:08:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.hh b/source/geometry/solids/BREPS/include/G4BREPSolid.hh
index 2f9a87bb40..e61d1d8a58 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolid.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolid.hh,v 1.8 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolid.hh,v 1.8.4.1 2001/06/28 19:08:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolid
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolid.icc b/source/geometry/solids/BREPS/include/G4BREPSolid.icc
index b00aea478e..26dff3c7e6 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolid.icc
+++ b/source/geometry/solids/BREPS/include/G4BREPSolid.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolid.icc,v 1.3 2000/11/08 14:21:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolid.icc,v 1.3.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
index 139c01d224..566c9e2f83 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidBox.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidBox.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidBox.hh,v 1.4.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidBox
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
index eb7b07f755..3dff728872 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCone.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidCone.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidCone.hh,v 1.4.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
index 00e19132ef..dd1a6153f2 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidCylinder.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidCylinder.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidCylinder.hh,v 1.4.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidCylinder
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
index 4019bc87d9..e8d6b3fb70 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidOpenPCone.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidOpenPCone.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidOpenPCone.hh,v 1.4.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidOpenPCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
index c7985dad77..a9de42d22c 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPCone.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidPCone.hh,v 1.5 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidPCone.hh,v 1.5.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidPCone
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
index 1e0096ce91..a9cf12a7d8 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidPolyhedra.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidPolyhedra.hh,v 1.6 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidPolyhedra.hh,v 1.6.4.1 2001/06/28 19:08:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidPolyhedra
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
index b360b49f7b..a709eab2cd 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidSphere.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidSphere.hh,v 1.5 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidSphere.hh,v 1.5.4.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidSphere
diff --git a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
index 8251e13ad6..e9a38e1adf 100644
--- a/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
+++ b/source/geometry/solids/BREPS/include/G4BREPSolidTorus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidTorus.hh,v 1.4 2000/11/08 14:21:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidTorus.hh,v 1.4.4.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BREPSolidTorus
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
index 555e9f18b9..a9fa378258 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurve.hh,v 1.8 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurve.hh,v 1.9.2.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurve
@@ -21,8 +37,8 @@
 #ifndef __BSPLINECURVE_H
 #define __BSPLINECURVE_H 
 
-#include "g4rw/tvvector.h"
 #include "G4Curve.hh"
+#include "G4Point3DVector.hh"
 
 class G4ControlPoints;
 class G4KnotVector;
@@ -31,8 +47,7 @@ class G4BSplineCurve : public G4Curve
 {
 public:
 
-  typedef G4RWTValVector<G4double> G4doubleVector;
-  typedef G4RWTValVector<G4Point3D> G4Point3DVector;
+  typedef G4std::vector<G4double> G4doubleVector;
 
 public:  // with description
 
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
index 5555d138e1..0ec8b33c6a 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurve.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurve.icc,v 1.4 2000/08/28 15:00:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurve.icc,v 1.5.2.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
@@ -22,7 +38,7 @@ inline G4int G4BSplineCurve::GetDegree() const
 }
 
 inline
-const G4BSplineCurve::G4Point3DVector*
+const G4Point3DVector*
 G4BSplineCurve::GetControlPointsList() const
 {
   return controlPointsList;
diff --git a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
index c267661665..ee5706c056 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineCurveWithKnots.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurveWithKnots.hh,v 1.3 2000/08/28 08:57:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurveWithKnots.hh,v 1.3.4.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnots
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
index 7a4832a161..04713af0e4 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurface.hh,v 1.9 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurface.hh,v 1.9.4.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurface
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
index 75ad6f2fde..0fdca88797 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurface.icc,v 1.3 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurface.icc,v 1.3.4.1 2001/06/28 19:08:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
index 379ba4359f..01f8d83ebe 100644
--- a/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
+++ b/source/geometry/solids/BREPS/include/G4BSplineSurfaceWithKnots.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceWithKnots.hh,v 1.2 2000/08/28 08:57:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceWithKnots.hh,v 1.2.4.1 2001/06/28 19:08:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnots
diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.hh b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
index 7052054f99..3c243f5a39 100644
--- a/source/geometry/solids/BREPS/include/G4BezierSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4BezierSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BezierSurface.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BezierSurface.hh,v 1.5.4.1 2001/06/28 19:08:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BezierSurface
diff --git a/source/geometry/solids/BREPS/include/G4BezierSurface.icc b/source/geometry/solids/BREPS/include/G4BezierSurface.icc
index 1178175e54..1a0a2a789e 100644
--- a/source/geometry/solids/BREPS/include/G4BezierSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4BezierSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BezierSurface.icc,v 1.2 2000/08/28 15:00:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BezierSurface.icc,v 1.2.4.1 2001/06/28 19:08:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
index b2da9d99dd..a0449d7cab 100644
--- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
+++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundingBox3D.hh,v 1.4 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundingBox3D.hh,v 1.4.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundingBox3D
diff --git a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
index 70c89da9d6..5c9b303654 100644
--- a/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
+++ b/source/geometry/solids/BREPS/include/G4BoundingBox3D.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundingBox3D.icc,v 1.2 2000/08/28 08:57:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundingBox3D.icc,v 1.2.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.hh b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
index 4d7b3adfb8..e2b0f7a32b 100644
--- a/source/geometry/solids/BREPS/include/G4CircularCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4CircularCurve.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CircularCurve.hh,v 1.6 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CircularCurve.hh,v 1.6.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CircularCurve
diff --git a/source/geometry/solids/BREPS/include/G4CircularCurve.icc b/source/geometry/solids/BREPS/include/G4CircularCurve.icc
index d39014c7dc..ffe186c002 100644
--- a/source/geometry/solids/BREPS/include/G4CircularCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4CircularCurve.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CircularCurve.icc,v 1.4 2000/08/28 15:00:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CircularCurve.icc,v 1.4.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
index d3d767ef5e..e66310f872 100644
--- a/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
+++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CompositeCurve.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CompositeCurve.hh,v 1.5.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CompositeCurve
diff --git a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
index b1cdd92002..70f1a6543d 100644
--- a/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
+++ b/source/geometry/solids/BREPS/include/G4CompositeCurve.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CompositeCurve.icc,v 1.3 2000/08/28 15:00:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CompositeCurve.icc,v 1.3.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Conic.hh b/source/geometry/solids/BREPS/include/G4Conic.hh
index 7bc70410a5..a5f11f1a2c 100644
--- a/source/geometry/solids/BREPS/include/G4Conic.hh
+++ b/source/geometry/solids/BREPS/include/G4Conic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Conic.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Conic.hh,v 1.5.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Conic
diff --git a/source/geometry/solids/BREPS/include/G4Conic.icc b/source/geometry/solids/BREPS/include/G4Conic.icc
index 353167bf0a..5d43ce19aa 100644
--- a/source/geometry/solids/BREPS/include/G4Conic.icc
+++ b/source/geometry/solids/BREPS/include/G4Conic.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Conic.icc,v 1.2 2000/08/28 08:57:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Conic.icc,v 1.2.4.1 2001/06/28 19:08:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
index a42422774e..3e21a1a65f 100644
--- a/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicalSurface.hh,v 1.7 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicalSurface.hh,v 1.7.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurface
diff --git a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
index 38e65ce17d..5bae977f5b 100644
--- a/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ConicalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicalSurface.icc,v 1.2 2000/08/28 15:00:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicalSurface.icc,v 1.2.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.hh b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
index f66af2367f..5bdbcecd14 100644
--- a/source/geometry/solids/BREPS/include/G4ControlPoints.hh
+++ b/source/geometry/solids/BREPS/include/G4ControlPoints.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ControlPoints.hh,v 1.5 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ControlPoints.hh,v 1.5.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ControlPoints
diff --git a/source/geometry/solids/BREPS/include/G4ControlPoints.icc b/source/geometry/solids/BREPS/include/G4ControlPoints.icc
index 66dd033044..6c74a949ff 100644
--- a/source/geometry/solids/BREPS/include/G4ControlPoints.icc
+++ b/source/geometry/solids/BREPS/include/G4ControlPoints.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ControlPoints.icc,v 1.1 2000/08/28 08:57:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ControlPoints.icc,v 1.1.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ConvexHull.hh b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
index ff0b3da644..c5a477b0fe 100644
--- a/source/geometry/solids/BREPS/include/G4ConvexHull.hh
+++ b/source/geometry/solids/BREPS/include/G4ConvexHull.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConvexHull.hh,v 1.4 2000/11/08 14:22:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConvexHull.hh,v 1.4.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConvexHull
diff --git a/source/geometry/solids/BREPS/include/G4Curve.hh b/source/geometry/solids/BREPS/include/G4Curve.hh
index 788fd85204..0ff2d07840 100644
--- a/source/geometry/solids/BREPS/include/G4Curve.hh
+++ b/source/geometry/solids/BREPS/include/G4Curve.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Curve.hh,v 1.7 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Curve.hh,v 1.7.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Curve
diff --git a/source/geometry/solids/BREPS/include/G4Curve.icc b/source/geometry/solids/BREPS/include/G4Curve.icc
index e7ef64868a..9954cd3397 100644
--- a/source/geometry/solids/BREPS/include/G4Curve.icc
+++ b/source/geometry/solids/BREPS/include/G4Curve.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Curve.icc,v 1.4 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Curve.icc,v 1.4.4.1 2001/06/28 19:08:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.hh b/source/geometry/solids/BREPS/include/G4CurvePoint.hh
index f326be9525..92413ac55c 100644
--- a/source/geometry/solids/BREPS/include/G4CurvePoint.hh
+++ b/source/geometry/solids/BREPS/include/G4CurvePoint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurvePoint.hh,v 1.4 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurvePoint.hh,v 1.4.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CurvePoint
diff --git a/source/geometry/solids/BREPS/include/G4CurvePoint.icc b/source/geometry/solids/BREPS/include/G4CurvePoint.icc
index 118e206f9d..e7535b3e8f 100644
--- a/source/geometry/solids/BREPS/include/G4CurvePoint.icc
+++ b/source/geometry/solids/BREPS/include/G4CurvePoint.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurvePoint.icc,v 1.2 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurvePoint.icc,v 1.2.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
index 353f3f32c5..8ff703d1b8 100644
--- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
+++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveRayIntersection.hh,v 1.3 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveRayIntersection.hh,v 1.3.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveRayIntersection
diff --git a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
index 5bfc4e3bb7..4d04d85a45 100644
--- a/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
+++ b/source/geometry/solids/BREPS/include/G4CurveRayIntersection.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveRayIntersection.icc,v 1.2 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveRayIntersection.icc,v 1.2.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4CurveVector.hh b/source/geometry/solids/BREPS/include/G4CurveVector.hh
index e37cff6007..b5fb6f5d33 100644
--- a/source/geometry/solids/BREPS/include/G4CurveVector.hh
+++ b/source/geometry/solids/BREPS/include/G4CurveVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveVector.hh,v 1.3 2000/08/28 08:57:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveVector.hh,v 1.4.2.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveVector
@@ -21,9 +37,9 @@
 #ifndef included_G4CurveVector
 #define included_G4CurveVector
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4Curve.hh"
 
-typedef G4RWTPtrOrderedVector<G4Curve> G4CurveVector;
+typedef G4std::vector<G4Curve*> G4CurveVector;
 
 #endif
diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
index 3a15ae794f..61d8a9bb2b 100644
--- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CylindricalSurface.hh,v 1.7 2000/11/08 20:26:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CylindricalSurface.hh,v 1.7.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurface
diff --git a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
index 26346dccbc..a3914b960a 100644
--- a/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4CylindricalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CylindricalSurface.icc,v 1.2 2000/08/28 15:00:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CylindricalSurface.icc,v 1.2.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.hh b/source/geometry/solids/BREPS/include/G4Ellipse.hh
index aacf09ffd5..eae5265759 100644
--- a/source/geometry/solids/BREPS/include/G4Ellipse.hh
+++ b/source/geometry/solids/BREPS/include/G4Ellipse.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ellipse.hh,v 1.7 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ellipse.hh,v 1.7.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Ellipse
diff --git a/source/geometry/solids/BREPS/include/G4Ellipse.icc b/source/geometry/solids/BREPS/include/G4Ellipse.icc
index 9a7ff3dc3d..9474bd7304 100644
--- a/source/geometry/solids/BREPS/include/G4Ellipse.icc
+++ b/source/geometry/solids/BREPS/include/G4Ellipse.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ellipse.icc,v 1.5 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ellipse.icc,v 1.5.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
index ef6e5c0d28..8cc77196b0 100644
--- a/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FConicalSurface.hh,v 1.10 2000/11/20 17:54:36 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FConicalSurface.hh,v 1.10.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FConicalSurface
diff --git a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
index 6ec80e37fa..743d08f8e0 100644
--- a/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4FConicalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FConicalSurface.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FConicalSurface.icc,v 1.2.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
index 2d090edb43..b17f9e2628 100644
--- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FCylindricalSurface.hh,v 1.10 2000/11/08 14:22:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FCylindricalSurface.hh,v 1.10.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FCylindricalSurface
diff --git a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
index 6fde40f16c..5edc9045f9 100644
--- a/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4FCylindricalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FCylindricalSurface.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FCylindricalSurface.icc,v 1.2.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4FPlane.hh b/source/geometry/solids/BREPS/include/G4FPlane.hh
index 91fc7f9fb3..4b7fc38ab1 100644
--- a/source/geometry/solids/BREPS/include/G4FPlane.hh
+++ b/source/geometry/solids/BREPS/include/G4FPlane.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FPlane.hh,v 1.10 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FPlane.hh,v 1.10.4.1 2001/06/28 19:08:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FPlane
diff --git a/source/geometry/solids/BREPS/include/G4FPlane.icc b/source/geometry/solids/BREPS/include/G4FPlane.icc
index 12353959cc..867024aa5c 100644
--- a/source/geometry/solids/BREPS/include/G4FPlane.icc
+++ b/source/geometry/solids/BREPS/include/G4FPlane.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FPlane.icc,v 1.3 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FPlane.icc,v 1.3.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Globals.hh b/source/geometry/solids/BREPS/include/G4Globals.hh
index 76c5fe4f17..4a31e130f1 100644
--- a/source/geometry/solids/BREPS/include/G4Globals.hh
+++ b/source/geometry/solids/BREPS/include/G4Globals.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Globals.hh,v 1.3 2000/08/28 08:57:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Globals.hh,v 1.3.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Author: A.Breakstone
 // Adaptation: J.Sulkimo, P.Urban.
diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.hh b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
index 5d52130e29..589425d207 100644
--- a/source/geometry/solids/BREPS/include/G4Hyperbola.hh
+++ b/source/geometry/solids/BREPS/include/G4Hyperbola.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hyperbola.hh,v 1.7 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Hyperbola.hh,v 1.7.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Hyperbola
diff --git a/source/geometry/solids/BREPS/include/G4Hyperbola.icc b/source/geometry/solids/BREPS/include/G4Hyperbola.icc
index 57f3fda842..6a7fee5f23 100644
--- a/source/geometry/solids/BREPS/include/G4Hyperbola.icc
+++ b/source/geometry/solids/BREPS/include/G4Hyperbola.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hyperbola.icc,v 1.5 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Hyperbola.icc,v 1.6.2.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
@@ -66,12 +82,7 @@ G4double G4Hyperbola::GetPPoint(const G4Point3D& pt) const
 {
   G4Point3D ptLocal= position.GetToPlacementCoordinates()*pt;
   G4double xval= ptLocal.y()/ptLocal.x()*ratioAxisImagAxis;
-  #ifdef WIN32
-    G4double ppoint= 0.5*log((1+xval)/(1-xval));
-  #else
-    G4double ppoint= atanh(xval);
-  #endif
-  return ppoint;
+  return 0.5*log((1+xval)/(1-xval));  // atanh(xval)
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.hh b/source/geometry/solids/BREPS/include/G4KnotVector.hh
index 64b4a4ae04..25eb34c268 100644
--- a/source/geometry/solids/BREPS/include/G4KnotVector.hh
+++ b/source/geometry/solids/BREPS/include/G4KnotVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KnotVector.hh,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KnotVector.hh,v 1.6.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4KnotVector
diff --git a/source/geometry/solids/BREPS/include/G4KnotVector.icc b/source/geometry/solids/BREPS/include/G4KnotVector.icc
index aae91eef3d..4fcbe55d92 100644
--- a/source/geometry/solids/BREPS/include/G4KnotVector.icc
+++ b/source/geometry/solids/BREPS/include/G4KnotVector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KnotVector.icc,v 1.2 2000/08/28 15:00:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KnotVector.icc,v 1.2.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Line.hh b/source/geometry/solids/BREPS/include/G4Line.hh
index e830fdab36..ba05a4ebc2 100644
--- a/source/geometry/solids/BREPS/include/G4Line.hh
+++ b/source/geometry/solids/BREPS/include/G4Line.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Line.hh,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Line.hh,v 1.6.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Line
diff --git a/source/geometry/solids/BREPS/include/G4Line.icc b/source/geometry/solids/BREPS/include/G4Line.icc
index f76c6aa5f4..05aad8ee5b 100644
--- a/source/geometry/solids/BREPS/include/G4Line.icc
+++ b/source/geometry/solids/BREPS/include/G4Line.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Line.icc,v 1.6 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Line.icc,v 1.6.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
index 638dfa33aa..4a7f3e357f 100644
--- a/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
+++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OsloMatrix.hh,v 1.4 2000/11/08 14:22:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OsloMatrix.hh,v 1.4.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4OsloMatrix
diff --git a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
index adfc218f72..8584400bf9 100644
--- a/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
+++ b/source/geometry/solids/BREPS/include/G4OsloMatrix.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OsloMatrix.icc,v 1.2 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OsloMatrix.icc,v 1.2.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Parabola.hh b/source/geometry/solids/BREPS/include/G4Parabola.hh
index 1c31f5b81a..ff022866b3 100644
--- a/source/geometry/solids/BREPS/include/G4Parabola.hh
+++ b/source/geometry/solids/BREPS/include/G4Parabola.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Parabola.hh,v 1.7 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Parabola.hh,v 1.7.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Parabola
diff --git a/source/geometry/solids/BREPS/include/G4Parabola.icc b/source/geometry/solids/BREPS/include/G4Parabola.icc
index 9a63252f8c..fd915e9e39 100644
--- a/source/geometry/solids/BREPS/include/G4Parabola.icc
+++ b/source/geometry/solids/BREPS/include/G4Parabola.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Parabola.icc,v 1.5 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Parabola.icc,v 1.5.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
index 526ae078d9..a9200311ac 100644
--- a/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
+++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacedSolid.hh,v 1.6 2000/11/09 19:12:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacedSolid.hh,v 1.6.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PlacedSolid
diff --git a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
index 1ceb1bdb6c..c449e4c9ef 100644
--- a/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
+++ b/source/geometry/solids/BREPS/include/G4PlacedSolid.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacedSolid.icc,v 1.4 2000/11/09 19:12:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacedSolid.icc,v 1.4.4.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4PlacementVector.hh b/source/geometry/solids/BREPS/include/G4PlacementVector.hh
index c2e10b5a31..b32612e543 100644
--- a/source/geometry/solids/BREPS/include/G4PlacementVector.hh
+++ b/source/geometry/solids/BREPS/include/G4PlacementVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacementVector.hh,v 1.3 2000/08/28 08:57:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacementVector.hh,v 1.4.2.1 2001/06/28 19:08:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PlacementVector
@@ -21,9 +37,9 @@
 #ifndef included_G4PlacementVector
 #define included_G4PlacementVector
 
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 #include "G4Axis2Placement3D.hh"
 
-typedef G4RWTPtrOrderedVector<G4Axis2Placement3D> G4PlacementVector;
+typedef G4std::vector<G4Axis2Placement3D*> G4PlacementVector;
 
 #endif
diff --git a/source/geometry/solids/BREPS/include/G4Plane.hh b/source/geometry/solids/BREPS/include/G4Plane.hh
index ce16741ccc..d70335d4f1 100644
--- a/source/geometry/solids/BREPS/include/G4Plane.hh
+++ b/source/geometry/solids/BREPS/include/G4Plane.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Plane.hh,v 1.4 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Plane.hh,v 1.4.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Plane
diff --git a/source/geometry/solids/BREPS/include/G4Point3DVector.hh b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
index 898ea78430..9dd58a563b 100644
--- a/source/geometry/solids/BREPS/include/G4Point3DVector.hh
+++ b/source/geometry/solids/BREPS/include/G4Point3DVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Point3DVector.hh,v 1.4 2000/08/28 08:57:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Point3DVector.hh,v 1.5.2.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Point3DVector
@@ -20,9 +36,9 @@
 #ifndef included_G4Point3DVector
 #define included_G4Point3DVector
 
-#include "g4rw/tvvector.h"
+#include "g4std/vector"
 #include "G4Point3D.hh"
 
-typedef G4RWTValVector<G4Point3D> G4Point3DVector;
+typedef G4std::vector<G4Point3D> G4Point3DVector;
 
 #endif
diff --git a/source/geometry/solids/BREPS/include/G4PointRat.hh b/source/geometry/solids/BREPS/include/G4PointRat.hh
index 922aedc90d..e1d07984f5 100644
--- a/source/geometry/solids/BREPS/include/G4PointRat.hh
+++ b/source/geometry/solids/BREPS/include/G4PointRat.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointRat.hh,v 1.8 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointRat.hh,v 1.8.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PointRat
diff --git a/source/geometry/solids/BREPS/include/G4PointRat.icc b/source/geometry/solids/BREPS/include/G4PointRat.icc
index cfe47d334c..360c5e51f8 100644
--- a/source/geometry/solids/BREPS/include/G4PointRat.icc
+++ b/source/geometry/solids/BREPS/include/G4PointRat.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointRat.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointRat.icc,v 1.2.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
index 3461133180..35e9e855b9 100644
--- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProjectedSurface.hh,v 1.5 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProjectedSurface.hh,v 1.5.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ProjectedSurface
diff --git a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
index eb836ea9a2..3ca1ad2102 100644
--- a/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ProjectedSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProjectedSurface.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProjectedSurface.icc,v 1.2.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Ray.hh b/source/geometry/solids/BREPS/include/G4Ray.hh
index 7325976d59..bd978c748e 100644
--- a/source/geometry/solids/BREPS/include/G4Ray.hh
+++ b/source/geometry/solids/BREPS/include/G4Ray.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ray.hh,v 1.5 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ray.hh,v 1.5.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Ray
diff --git a/source/geometry/solids/BREPS/include/G4Ray.icc b/source/geometry/solids/BREPS/include/G4Ray.icc
index c3d4961cce..360074cca7 100644
--- a/source/geometry/solids/BREPS/include/G4Ray.icc
+++ b/source/geometry/solids/BREPS/include/G4Ray.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ray.icc,v 1.4 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ray.icc,v 1.4.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
index 708f3d117d..e97f16b9e6 100644
--- a/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4RectangularTrimmedSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RectangularTrimmedSurface.hh,v 1.6 2000/11/08 14:22:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RectangularTrimmedSurface.hh,v 1.6.4.1 2001/06/28 19:08:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BezierSurface
diff --git a/source/geometry/solids/BREPS/include/G4STEPEntity.hh b/source/geometry/solids/BREPS/include/G4STEPEntity.hh
index 158b8c8547..617ddd4b9c 100644
--- a/source/geometry/solids/BREPS/include/G4STEPEntity.hh
+++ b/source/geometry/solids/BREPS/include/G4STEPEntity.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4STEPEntity.hh,v 1.5 2001/02/05 18:45:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4STEPEntity.hh,v 1.5.2.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4STEPEntity
diff --git a/source/geometry/solids/BREPS/include/G4Sort.hh b/source/geometry/solids/BREPS/include/G4Sort.hh
index 0c7dfd55ea..619f14f581 100644
--- a/source/geometry/solids/BREPS/include/G4Sort.hh
+++ b/source/geometry/solids/BREPS/include/G4Sort.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Sort.hh,v 1.3 2000/08/28 08:57:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Sort.hh,v 1.3.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 //
diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
index 58f3816403..24f4b7266a 100644
--- a/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SphericalSurface.hh,v 1.7 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SphericalSurface.hh,v 1.7.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SphericalSurface
diff --git a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
index fb56bed51c..fa678c59e1 100644
--- a/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4SphericalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SphericalSurface.icc,v 1.2 2000/08/28 15:00:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SphericalSurface.icc,v 1.2.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4Surface.hh b/source/geometry/solids/BREPS/include/G4Surface.hh
index f9493253ca..858b68d4f5 100644
--- a/source/geometry/solids/BREPS/include/G4Surface.hh
+++ b/source/geometry/solids/BREPS/include/G4Surface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Surface.hh,v 1.6 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Surface.hh,v 1.6.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Surface
diff --git a/source/geometry/solids/BREPS/include/G4Surface.icc b/source/geometry/solids/BREPS/include/G4Surface.icc
index 930e90e71f..408bc9e1fe 100644
--- a/source/geometry/solids/BREPS/include/G4Surface.icc
+++ b/source/geometry/solids/BREPS/include/G4Surface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Surface.icc,v 1.2 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Surface.icc,v 1.2.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
index a3d20359bf..59649e54fe 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceBoundary.hh,v 1.5 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceBoundary.hh,v 1.5.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceBoundary
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
index 90b863ad4a..a3ac649927 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
+++ b/source/geometry/solids/BREPS/include/G4SurfaceBoundary.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceBoundary.icc,v 1.2 2000/08/28 15:00:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceBoundary.icc,v 1.3.2.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
@@ -31,11 +47,11 @@ const G4BoundingBox3D& G4SurfaceBoundary::BBox() const
 inline
 G4int G4SurfaceBoundary::GetNumberOfPoints() const
 {
-  return points.length();
+  return points.size();
 }
 
 inline
 const G4Point3D& G4SurfaceBoundary::GetPoint(G4int Count) const
 {
-  return points.ref(Count);
+  return points[Count];
 }
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceList.hh b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
index f520bdb5df..3050c8d0f5 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceList.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceList.hh,v 1.4 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceList.hh,v 1.4.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceList
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
index dfc5f3c324..03bc5016e5 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceOfLinearExtrusion.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceOfLinearExtrusion.hh,v 1.3 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceOfLinearExtrusion.hh,v 1.3.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceOfLinearExtrusion
diff --git a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
index 1ea5ee0e0b..f5f99822d1 100644
--- a/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
+++ b/source/geometry/solids/BREPS/include/G4SurfaceOfRevolution.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceOfRevolution.hh,v 1.3 2000/11/08 14:22:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceOfRevolution.hh,v 1.3.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SurfaceOfRevolution
diff --git a/source/geometry/solids/BREPS/include/G4ThreeMat.hh b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
index 0dffdd614d..8ba054e5f4 100644
--- a/source/geometry/solids/BREPS/include/G4ThreeMat.hh
+++ b/source/geometry/solids/BREPS/include/G4ThreeMat.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ThreeMat.hh,v 1.7 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ThreeMat.hh,v 1.7.4.1 2001/06/28 19:08:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ThreeMat
diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
index 5a5fe2649c..707733ddf0 100644
--- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
+++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ToroidalSurface.hh,v 1.5 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ToroidalSurface.hh,v 1.5.4.1 2001/06/28 19:08:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ToroidalSurface
diff --git a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
index 21774d5094..f5b9a831a7 100644
--- a/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
+++ b/source/geometry/solids/BREPS/include/G4ToroidalSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ToroidalSurface.icc,v 1.2 2000/08/28 15:00:35 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ToroidalSurface.icc,v 1.2.4.1 2001/06/28 19:08:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/BREPS/include/G4UVHit.hh b/source/geometry/solids/BREPS/include/G4UVHit.hh
index 3bf8f2c7c6..d5ddb42f7c 100644
--- a/source/geometry/solids/BREPS/include/G4UVHit.hh
+++ b/source/geometry/solids/BREPS/include/G4UVHit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UVHit.hh,v 1.5 2000/11/08 14:22:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UVHit.hh,v 1.5.4.1 2001/06/28 19:08:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4UVHit
diff --git a/source/geometry/solids/BREPS/src/G4Assembly.cc b/source/geometry/solids/BREPS/src/G4Assembly.cc
index 4a6598a380..c8dd3acbdb 100644
--- a/source/geometry/solids/BREPS/src/G4Assembly.cc
+++ b/source/geometry/solids/BREPS/src/G4Assembly.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Assembly.cc,v 1.3 2000/11/08 14:22:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Assembly.cc,v 1.4.2.1 2001/06/28 19:08:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -25,14 +41,30 @@ G4Assembly::G4Assembly()
 
 G4Assembly::~G4Assembly()
 {
-  placedVec.clearAndDestroy();
+  G4PlacedSolid* a = 0;
+  
+  // Remove placedVec and delete all its contents
+  while (placedVec.size()>0)
+  {
+    a = placedVec.back();
+    placedVec.pop_back();
+    for (G4PlacedVector::iterator i=placedVec.begin(); i!=placedVec.end(); i++)
+    {
+      if (*i==a)
+      {
+	placedVec.erase(i);
+	i--;
+      }
+    } 
+    if ( a )  delete a;    
+  } 
 }
 
 void G4Assembly::SetPlacedVector(G4PlacedVector& pVec)
 {
-  numberOfSolids = pVec.entries();
+  numberOfSolids = pVec.size();
   
   for(G4int a=0;a<numberOfSolids;a++)
-    placedVec.append( pVec[a]);
+    placedVec.push_back( pVec[a]);
   
 }
diff --git a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
index bfa9c8ba90..585bf4bc6e 100644
--- a/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
+++ b/source/geometry/solids/BREPS/src/G4Axis2Placement3D.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement3D.cc,v 1.5 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement3D.cc,v 1.5.4.1 2001/06/28 19:08:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolid.cc b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
index 672baa7850..a2f039261c 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolid.cc,v 1.17 2000/11/20 17:54:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolid.cc,v 1.18.2.1 2001/06/28 19:08:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -668,7 +684,8 @@ G4BREPSolid::CreateRotatedVertices(const G4AffineTransform& pTransform) const
   G4Point3D Max = bbox->GetBoxMax();
 
   G4ThreeVectorList *vertices;
-  vertices=new G4ThreeVectorList(8);
+  vertices=new G4ThreeVectorList();
+  vertices->reserve(8);
     
   if (vertices)
     {
@@ -681,14 +698,14 @@ G4BREPSolid::CreateRotatedVertices(const G4AffineTransform& pTransform) const
       G4ThreeVector vertex6(Max.x(),Max.y(),Max.z());
       G4ThreeVector vertex7(Min.x(),Max.y(),Max.z());
 
-      vertices->insert(pTransform.TransformPoint(vertex0));
-      vertices->insert(pTransform.TransformPoint(vertex1));
-      vertices->insert(pTransform.TransformPoint(vertex2));
-      vertices->insert(pTransform.TransformPoint(vertex3));
-      vertices->insert(pTransform.TransformPoint(vertex4));
-      vertices->insert(pTransform.TransformPoint(vertex5));
-      vertices->insert(pTransform.TransformPoint(vertex6));
-      vertices->insert(pTransform.TransformPoint(vertex7));
+      vertices->push_back(pTransform.TransformPoint(vertex0));
+      vertices->push_back(pTransform.TransformPoint(vertex1));
+      vertices->push_back(pTransform.TransformPoint(vertex2));
+      vertices->push_back(pTransform.TransformPoint(vertex3));
+      vertices->push_back(pTransform.TransformPoint(vertex4));
+      vertices->push_back(pTransform.TransformPoint(vertex5));
+      vertices->push_back(pTransform.TransformPoint(vertex6));
+      vertices->push_back(pTransform.TransformPoint(vertex7));
     }
   else
     {
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
index f245cba4f7..57f6ebbf9f 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidBox.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidBox.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidBox.cc,v 1.4.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
index 2c2e098150..714611d938 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCone.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidCone.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidCone.cc,v 1.5.2.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -51,12 +67,12 @@ G4BREPSolidCone::G4BREPSolidCone(const G4String& name,
   tmp = new G4CircularCurve();
   tmp->Init(G4Axis2Placement3D(direction, axis2, origin) , large_radius);
   tmp->SetBounds(ArcStart1, ArcStart1);
-  CVec.insert(tmp);
+  CVec.push_back(tmp);
 
   tmp = new G4CircularCurve();
   tmp->Init(G4Axis2Placement3D(direction, axis2, origin2), large_radius);
   tmp->SetBounds(ArcStart2, ArcStart2);
-  CVec.insert(tmp);
+  CVec.push_back(tmp);
 
   SurfaceVec[0] = new G4FConicalSurface(tmporigin, axis, 
 					length, radius, large_radius);
@@ -70,7 +86,7 @@ G4BREPSolidCone::G4BREPSolidCone(const G4String& name,
   tmp = new G4CircularCurve();
   tmp->Init(G4Axis2Placement3D(direction, axis2, origin), radius);
   tmp->SetBounds(ArcStart1, ArcStart1);
-  CVec2.insert(tmp);
+  CVec2.push_back(tmp);
 
   SurfaceVec[1] = new G4FPlane(tmpaxis, direction, origin2);
   //new G4AdvancedFace("G4FPlane" , origin2, direction, tmpaxis, CVec2, 1);
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
index 0158b18a66..8b325571e9 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidCylinder.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidCylinder.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidCylinder.cc,v 1.5.2.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -47,7 +63,7 @@ G4BREPSolidCylinder::G4BREPSolidCylinder(const G4String& name,
   tmp = new G4CircularCurve;
   tmp->Init( G4Axis2Placement3D(direction, axis1, origin), radius );
   tmp->SetBounds(ArcStart1, ArcStart1);
-  cv.insert(tmp);
+  cv.push_back(tmp);
 
   SurfaceVec[1] = new G4FPlane(direction, axis1, origin);
   SurfaceVec[1]->SetBoundaries(&cv);
@@ -62,7 +78,7 @@ G4BREPSolidCylinder::G4BREPSolidCylinder(const G4String& name,
   tmp = new G4CircularCurve;
   tmp->Init( G4Axis2Placement3D(direction, axis2, origin2), radius);
   tmp->SetBounds(ArcStart2, ArcStart2);
-  cv.insert(tmp);
+  cv.push_back(tmp);
 
   SurfaceVec[2] = new G4FPlane(direction, axis2, origin2);
   SurfaceVec[2]->SetBoundaries(&cv);
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
index d94401d53b..26f8596295 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidOpenPCone.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidOpenPCone.cc,v 1.5 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidOpenPCone.cc,v 1.5.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
index 2312326ba5..46856b023e 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPCone.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidPCone.cc,v 1.17 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidPCone.cc,v 1.18.2.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -123,7 +139,7 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
 	else
 	  tmp1->SetSameSense(0);
 
-	cv1.append(tmp1);
+	cv1.push_back(tmp1);
       }
 
       if(R2 != 0)  
@@ -135,7 +151,7 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
 	  tmp2->SetSameSense(0);
 	else
 	  tmp2->SetSameSense(1);
-	cv1.append(tmp2);
+	cv1.push_back(tmp2);
       }
 	
       SurfaceVec[b]   = new G4FPlane(PlaneDir, PlaneAxis, LocalOrigin);
@@ -279,13 +295,13 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
     tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, Origin), RMIN[0]);
     tmp->SetBounds(ArcStart1a, ArcStart1a);
     tmp->SetSameSense(0);
-    cv.append(tmp);
+    cv.push_back(tmp);
   
     tmp = new G4CircularCurve;
     tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, Origin), RMAX[0]);
     tmp->SetBounds(ArcStart1b, ArcStart1b);
     tmp->SetSameSense(1);
-    cv.append(tmp);
+    cv.push_back(tmp);
 
     SurfaceVec[nb_of_surfaces-2] = new G4FPlane(PlaneDir, -PlaneAxis, Origin);
     SurfaceVec[nb_of_surfaces-2]->SetBoundaries(&cv);
@@ -311,14 +327,14 @@ G4BREPSolidPCone::G4BREPSolidPCone(const G4String& name,
 	      RMIN[sections]);
     tmp->SetBounds(ArcStart2a, ArcStart2a);
     tmp->SetSameSense(0);
-    cv.append(tmp);
+    cv.push_back(tmp);
     
     tmp = new G4CircularCurve;
     tmp->Init(G4Axis2Placement3D(PlaneDir, PlaneAxis, LocalOrigin), 
 	      RMAX[sections]);
     tmp->SetBounds(ArcStart2b, ArcStart2b);
     tmp->SetSameSense(1);
-    cv.append(tmp);
+    cv.push_back(tmp);
   
     SurfaceVec[nb_of_surfaces-1]= new G4FPlane(PlaneDir, PlaneAxis, LocalOrigin);
     SurfaceVec[nb_of_surfaces-1]->SetBoundaries(&cv);
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
index 41076615a6..275a98fc9d 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidPolyhedra.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidPolyhedra.cc,v 1.15 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidPolyhedra.cc,v 1.15.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
index 3e05f2fbdc..b7ebbc0cb6 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidSphere.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidSphere.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidSphere.cc,v 1.4.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
index 6284740fc5..3bd6aff576 100644
--- a/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
+++ b/source/geometry/solids/BREPS/src/G4BREPSolidTorus.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BREPSolidTorus.cc,v 1.4 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BREPSolidTorus.cc,v 1.4.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
index e82fe67e1f..b8bcea1719 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurve.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurve.cc,v 1.5 2000/11/08 14:22:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurve.cc,v 1.7.2.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -30,8 +46,9 @@ void G4BSplineCurve::Init(G4int degree0, G4Point3DVector* controlPointsList0,
 {
   degree= degree0;
    
-  G4int nbpoints =  controlPointsList0->length();
-  controlPointsList = new G4Point3DVector(nbpoints);
+  G4int nbpoints =  controlPointsList0->size();
+  controlPointsList = new G4Point3DVector();
+  controlPointsList->reserve(nbpoints);
 
   G4int a;  
   for(a = 0; a < nbpoints; a++)
@@ -39,22 +56,23 @@ void G4BSplineCurve::Init(G4int degree0, G4Point3DVector* controlPointsList0,
     (*controlPointsList)[a] = (*controlPointsList0)[a];
   }
  
-  G4int nbknots = knots0->length();
-  knots = new G4doubleVector(nbknots);
+  G4int nbknots = knots0->size();
+  knots = new G4doubleVector();
+  knots->reserve(nbknots);
   for(a = 0; a < nbknots; a++)
   {
     (*knots)[a] = (*knots0)[a];
   }
 
-  G4int nbweights = weightsData0->length();
-  weightsData  = new G4doubleVector(nbweights);
+  G4int nbweights = weightsData0->size();
+  weightsData  = new G4doubleVector();
+  weightsData->reserve(nbweights);
   for(a = 0; a < nbweights; a++)
   {
     (*weightsData)[a] = (*weightsData0)[a];
   }
   
-
-  SetBounds((*knots)[0], (*knots)[knots->length()-1]);
+  SetBounds((*knots)[0], (*knots)[knots->size()-1]);
 }
 
 
@@ -159,13 +177,13 @@ G4Curve* G4BSplineCurve::Project(const G4Transform3D& tr)
   // just transform + project all control points
   // what about self intersections?
   
-  G4int            n                    = controlPointsList->length();
+  G4int            n                    = controlPointsList->size();
   G4Point3DVector* newControlPointsList = new G4Point3DVector(n);
 
-  for (G4int i=0; i<n; i++) 
+  for (G4int i=0; i<n; i++)
   {
-    G4Point3D& p= (*newControlPointsList)(i);
-    p= tr*(*controlPointsList)(i);
+    G4Point3D& p= (*newControlPointsList)[i];
+    p= tr*(*controlPointsList)[i];
     p.setZ(0);
   }
 
@@ -270,11 +288,11 @@ int G4BSplineCurve::Inside( const G4Point3d& Hit, const G4Ray& rayref)
 void G4BSplineCurve::InitBounded()
 {
   // just like in the old functions
-  G4int pointCount = controlPointsList->length();
-  bBox.Init( (*controlPointsList)(0) );
+  G4int pointCount = controlPointsList->size();
+  bBox.Init( (*controlPointsList)[0] );
   for (G4int i=1; i<pointCount; i++) 
   {
-    bBox.Extend( (*controlPointsList)(i) );
+    bBox.Extend( (*controlPointsList)[i] );
   }
 }
 
diff --git a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
index c6cf65f399..a8fd59e5bb 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineCurveWithKnots.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurveWithKnots.cc,v 1.3 2000/08/28 08:57:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurveWithKnots.cc,v 1.3.4.1 2001/06/28 19:08:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
index 98028aecc8..9113286cb6 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurface.cc,v 1.10 2000/11/20 17:54:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurface.cc,v 1.10.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
index f951f725fc..67da79aa35 100644
--- a/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
+++ b/source/geometry/solids/BREPS/src/G4BSplineSurfaceWithKnots.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceWithKnots.cc,v 1.2 2000/08/28 08:57:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceWithKnots.cc,v 1.2.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BezierSurface.cc b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
index 7ae9601d6e..53718b1ac8 100644
--- a/source/geometry/solids/BREPS/src/G4BezierSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4BezierSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BezierSurface.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BezierSurface.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
index fae6bc114b..90b34011f9 100644
--- a/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
+++ b/source/geometry/solids/BREPS/src/G4BoundingBox3D.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundingBox3D.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundingBox3D.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CircularCurve.cc b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
index cd09f39c14..273411af87 100644
--- a/source/geometry/solids/BREPS/src/G4CircularCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4CircularCurve.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CircularCurve.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CircularCurve.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
index b7542add84..95dc663076 100644
--- a/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
+++ b/source/geometry/solids/BREPS/src/G4CompositeCurve.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CompositeCurve.cc,v 1.8 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CompositeCurve.cc,v 1.9.2.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -24,15 +40,15 @@ G4CompositeCurve::G4CompositeCurve(){}
 G4CompositeCurve::G4CompositeCurve(const G4Point3DVector& vertices)
 {
   G4CurveVector cv;
-  for (size_t i=0; i<vertices.length(); i++) 
+  for (size_t i=0; i<vertices.size(); i++) 
   {
     G4Point3D p1= vertices[i];
-    G4Point3D p2= vertices[(i+1) % vertices.length()];
+    G4Point3D p2= vertices[(i+1) % vertices.size()];
     
     G4Line* l= new G4Line;
     l->Init(p1, p2-p1);
     l->SetBounds(p1, p2);
-    cv.insert(l);
+    cv.push_back(l);
   }
   
   Init(cv);
@@ -40,7 +56,22 @@ G4CompositeCurve::G4CompositeCurve(const G4Point3DVector& vertices)
 
 G4CompositeCurve::~G4CompositeCurve()
 {
-  segments.clearAndDestroy();
+  // Remove segments and delete all its contents
+  G4Curve* a = 0;
+  while (segments.size()>0)
+  {
+    a = segments.back();
+    segments.pop_back();
+    for (G4CurveVector::iterator i=segments.begin(); i!=segments.end(); i++)
+    {
+      if (*i==a)
+      {
+	segments.erase(i);
+	i--;
+      }
+    } 
+    if ( a )  delete a;    
+  } 
 }
 
 G4String G4CompositeCurve::GetEntityType() const 
@@ -51,17 +82,34 @@ G4String G4CompositeCurve::GetEntityType() const
 G4Curve* G4CompositeCurve::Project(const G4Transform3D& tr)
 {
   G4CurveVector newSegments;
+  G4Curve* a = 0;
+  G4Curve* c = 0;
   
-  for (size_t i=0; i<segments.entries(); i++) 
+  for (size_t i=0; i<segments.size(); i++) 
   {
-    G4Curve* c= segments[i]->Project(tr);
+    c = segments[i]->Project(tr);
     if (c==0) 
     {
-      newSegments.clearAndDestroy();
+      // Remove newSegments and delete all its contents
+      while (newSegments.size()>0)
+      {
+        a = newSegments.back();
+        newSegments.pop_back();
+        for (G4CurveVector::iterator i=newSegments.begin();
+	                             i!=newSegments.end(); i++)
+        {
+          if (*i==a)
+          {
+	    newSegments.erase(i);
+	    i--;
+          }
+        } 
+        if ( a )  delete a;    
+      } 
       return 0;
     }
 
-    newSegments.insert(c);
+    newSegments.push_back(c);
   }
   
   G4CompositeCurve* r= new G4CompositeCurve;
@@ -116,9 +164,9 @@ G4int G4CompositeCurve::IntersectRay2D(const G4Ray& ray)
   G4int nbinter = 0;
   G4int temp = 0;
  
-  for (size_t i=0; i<segments.entries(); i++) 
+  for (size_t i=0; i<segments.size(); i++) 
   {
-    G4Curve& c= *(segments(i));
+    G4Curve& c= *(segments[i]);
     temp = c.IntersectRay2D(ray);
 
     // test if the point is on the composite curve
@@ -147,7 +195,7 @@ void G4CompositeCurve::InitBounded()
   const G4BoundingBox3D* b= segments[0]->BBox();
   bBox.Init(b->GetBoxMin(), b->GetBoxMax());
   
-  for (size_t i=1; i<segments.entries(); i++) 
+  for (size_t i=1; i<segments.size(); i++) 
   {
     b= segments[i]->BBox();
     bBox.Extend(b->GetBoxMin());
diff --git a/source/geometry/solids/BREPS/src/G4Conic.cc b/source/geometry/solids/BREPS/src/G4Conic.cc
index 0b082fae97..6c609a2d2b 100644
--- a/source/geometry/solids/BREPS/src/G4Conic.cc
+++ b/source/geometry/solids/BREPS/src/G4Conic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Conic.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Conic.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
index faffd3e450..ebd33e8e5a 100644
--- a/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ConicalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicalSurface.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicalSurface.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ControlPoints.cc b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
index 938771ff1d..d606fa2a7b 100644
--- a/source/geometry/solids/BREPS/src/G4ControlPoints.cc
+++ b/source/geometry/solids/BREPS/src/G4ControlPoints.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ControlPoints.cc,v 1.5 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ControlPoints.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Curve.cc b/source/geometry/solids/BREPS/src/G4Curve.cc
index 30a9db92ff..0798b9b218 100644
--- a/source/geometry/solids/BREPS/src/G4Curve.cc
+++ b/source/geometry/solids/BREPS/src/G4Curve.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Curve.cc,v 1.5 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Curve.cc,v 1.5.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CurvePoint.cc b/source/geometry/solids/BREPS/src/G4CurvePoint.cc
index 43f53e7fce..23571c66cc 100644
--- a/source/geometry/solids/BREPS/src/G4CurvePoint.cc
+++ b/source/geometry/solids/BREPS/src/G4CurvePoint.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurvePoint.cc,v 1.3 2000/11/08 14:22:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurvePoint.cc,v 1.3.4.1 2001/06/28 19:08:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
index 63c2261bf4..b4847dfbbd 100644
--- a/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
+++ b/source/geometry/solids/BREPS/src/G4CurveRayIntersection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveRayIntersection.cc,v 1.3 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveRayIntersection.cc,v 1.3.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
index 5e3d0afc99..d2ac54ceb2 100644
--- a/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4CylindricalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CylindricalSurface.cc,v 1.3 2000/08/28 08:57:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CylindricalSurface.cc,v 1.3.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Ellipse.cc b/source/geometry/solids/BREPS/src/G4Ellipse.cc
index c12f522c82..0075885135 100644
--- a/source/geometry/solids/BREPS/src/G4Ellipse.cc
+++ b/source/geometry/solids/BREPS/src/G4Ellipse.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ellipse.cc,v 1.6 2000/11/10 17:41:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ellipse.cc,v 1.6.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
index 8cda2bd559..bfaef409d5 100644
--- a/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FConicalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FConicalSurface.cc,v 1.14 2000/11/20 17:54:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FConicalSurface.cc,v 1.14.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
index 72d93349b4..9e9062455f 100644
--- a/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4FCylindricalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FCylindricalSurface.cc,v 1.11 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FCylindricalSurface.cc,v 1.11.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4FPlane.cc b/source/geometry/solids/BREPS/src/G4FPlane.cc
index 16bbc87732..b07fbf589c 100644
--- a/source/geometry/solids/BREPS/src/G4FPlane.cc
+++ b/source/geometry/solids/BREPS/src/G4FPlane.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FPlane.cc,v 1.11 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FPlane.cc,v 1.12.2.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -52,7 +68,7 @@ G4FPlane::G4FPlane(const G4Point3DVector* pVec,
                    const G4Point3DVector* iVec,
 		   G4int sense)
   : pplace( (*pVec)[0]-(*pVec)[1],                    // direction
-	    ((*pVec)[pVec->length()-1]-(*pVec)[0])
+	    ((*pVec)[pVec->size()-1]-(*pVec)[0])
 	    .cross((*pVec)[0]-(*pVec)[1]),            // axis
 	    (*pVec)[0]                             )  // location
 
@@ -70,10 +86,10 @@ G4FPlane::G4FPlane(const G4Point3DVector* pVec,
 
   polygon= new G4CompositeCurve(*pVec);
  
-  for (size_t i=0; i< polygon->GetSegments().length(); i++) 
+  for (size_t i=0; i< polygon->GetSegments().size(); i++) 
     polygon->GetSegments()[i]->SetSameSense(sameSense);
 
-  bounds.insert(polygon);
+  bounds.push_back(polygon);
   
   // Eventual inner boundary
   
@@ -81,15 +97,15 @@ G4FPlane::G4FPlane(const G4Point3DVector* pVec,
   {
     polygon= new G4CompositeCurve(*iVec);
 
-    for (size_t i=0; i< polygon->GetSegments().length(); i++) 
+    for (size_t i=0; i< polygon->GetSegments().size(); i++) 
     polygon->GetSegments()[i]->SetSameSense(sameSense);
 
-    bounds.insert(polygon);
+    bounds.push_back(polygon);
   }
   
   // Set sense for boundaries  
   
-  for (size_t j=0; j< bounds.length(); j++) 
+  for (size_t j=0; j< bounds.size(); j++) 
     bounds[j]->SetSameSense(sameSense);
   
 
diff --git a/source/geometry/solids/BREPS/src/G4Hyperbola.cc b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
index 4fd2fcb641..6cfb8e423a 100644
--- a/source/geometry/solids/BREPS/src/G4Hyperbola.cc
+++ b/source/geometry/solids/BREPS/src/G4Hyperbola.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hyperbola.cc,v 1.5 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Hyperbola.cc,v 1.6.2.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -100,11 +116,7 @@ G4Curve* G4Hyperbola::Project(const G4Transform3D& tr)
 
   G4double xval = -2*a*b/(a.mag2()+b.mag2());
   
-#ifdef WIN32
-  G4double u= (0.5*log((1+xval)/(1-xval)))/2;
-#else
-  G4double u= atanh( xval ) / 2;
-#endif
+  G4double u= (0.5*log((1+xval)/(1-xval)))/2;  // atanh(xval)/2
 
   // get the coordinate axis directions and the semiaxis lengths
   G4Vector3D sAxis= G4Vector3D( a*cosh(u)+b*sinh(u) );
@@ -154,13 +166,9 @@ void G4Hyperbola::InitBounded()
       
       if (abs(tanhu)<=1) 
       {
-        #ifdef WIN32
-          G4double u= 0.5*log((1+tanhu)/(1-tanhu));
-        #else
-	  G4double u= atanh(tanhu);
-        #endif
-	
-	  if (IsPOn(u)) bBox.Extend(GetPoint(u));
+        G4double u= 0.5*log((1+tanhu)/(1-tanhu));  // atanh(tanhu)
+	if (IsPOn(u))
+	  bBox.Extend(GetPoint(u));
       }
     }
   }
diff --git a/source/geometry/solids/BREPS/src/G4KnotVector.cc b/source/geometry/solids/BREPS/src/G4KnotVector.cc
index 11083b112a..21ab0b2c96 100644
--- a/source/geometry/solids/BREPS/src/G4KnotVector.cc
+++ b/source/geometry/solids/BREPS/src/G4KnotVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KnotVector.cc,v 1.5 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KnotVector.cc,v 1.5.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Line.cc b/source/geometry/solids/BREPS/src/G4Line.cc
index a26c9832ac..4be11c2ba5 100644
--- a/source/geometry/solids/BREPS/src/G4Line.cc
+++ b/source/geometry/solids/BREPS/src/G4Line.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Line.cc,v 1.6 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Line.cc,v 1.6.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
index 133798d76a..78c6854017 100644
--- a/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
+++ b/source/geometry/solids/BREPS/src/G4OsloMatrix.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OsloMatrix.cc,v 1.4 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OsloMatrix.cc,v 1.4.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Parabola.cc b/source/geometry/solids/BREPS/src/G4Parabola.cc
index eaac8fde71..b682228617 100644
--- a/source/geometry/solids/BREPS/src/G4Parabola.cc
+++ b/source/geometry/solids/BREPS/src/G4Parabola.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Parabola.cc,v 1.4 2000/11/08 14:22:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Parabola.cc,v 1.4.4.1 2001/06/28 19:08:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
index 2d473455c6..6d45734f51 100644
--- a/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
+++ b/source/geometry/solids/BREPS/src/G4PlacedSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacedSolid.cc,v 1.3 2000/08/28 08:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacedSolid.cc,v 1.3.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4PointRat.cc b/source/geometry/solids/BREPS/src/G4PointRat.cc
index ccd54f9b11..97cd09c615 100644
--- a/source/geometry/solids/BREPS/src/G4PointRat.cc
+++ b/source/geometry/solids/BREPS/src/G4PointRat.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointRat.cc,v 1.4 2000/08/28 08:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointRat.cc,v 1.4.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
index 5277ee9675..7163e99633 100644
--- a/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ProjectedSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProjectedSurface.cc,v 1.6 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProjectedSurface.cc,v 1.7.2.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -105,8 +121,8 @@ void G4ProjectedSurface::CalcBBox()
       if(bmaxy < tmpy) box_maxy=tmpy;
     }
     
-  G4Point3D box_min(box_minx,box_miny);
-  G4Point3D box_max(box_maxx,box_maxy);
+  G4Point3D box_min(box_minx,box_miny,0.);
+  G4Point3D box_max(box_maxx,box_maxy,0.);
 
   delete bbox;
   bbox = new G4BoundingBox3D(box_min, box_max);
diff --git a/source/geometry/solids/BREPS/src/G4Ray.cc b/source/geometry/solids/BREPS/src/G4Ray.cc
index f5fcabe2af..31e00eefde 100644
--- a/source/geometry/solids/BREPS/src/G4Ray.cc
+++ b/source/geometry/solids/BREPS/src/G4Ray.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ray.cc,v 1.5 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ray.cc,v 1.6.2.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -103,12 +119,12 @@ void G4Ray::MatVecOrtho(register G4Vector3D &out,
     i_Which=2;
   
   if(!i_Which)
-    f = hypot( in.y(), in.z() );
+    f = sqrt((in.y())*(in.y())+(in.z())*(in.z()));    // hypot(in.y(),in.z())
   else
     if(i_Which==1)
-      f = hypot( in.z(), in.x() );
+      f = sqrt((in.z())*(in.z())+(in.x())*(in.x()));  // hypot(in.z(),in.x())
     else
-      f = hypot( in.x(), in.y() );
+      f = sqrt((in.x())*(in.x())+(in.y())*(in.y()));  // hypot(in.x(),in.y())
   
     if( NearZero( f, SMALL ) )
     {
diff --git a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
index 2caed6f020..88c8d2ff51 100644
--- a/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4RectangularTrimmedSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RectangularTrimmedSurface.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RectangularTrimmedSurface.cc,v 1.5.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Sort.cc b/source/geometry/solids/BREPS/src/G4Sort.cc
index ef79403225..6da87443a4 100644
--- a/source/geometry/solids/BREPS/src/G4Sort.cc
+++ b/source/geometry/solids/BREPS/src/G4Sort.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Sort.cc,v 1.3 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Sort.cc,v 1.3.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 source file
diff --git a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
index e5c9001f19..2a07ff875d 100644
--- a/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4SphericalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SphericalSurface.cc,v 1.4 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SphericalSurface.cc,v 1.4.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4Surface.cc b/source/geometry/solids/BREPS/src/G4Surface.cc
index 504f25c87f..616cf4e668 100644
--- a/source/geometry/solids/BREPS/src/G4Surface.cc
+++ b/source/geometry/solids/BREPS/src/G4Surface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Surface.cc,v 1.7 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Surface.cc,v 1.8.2.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -158,19 +174,19 @@ G4double G4Surface::ClosestDistanceToPoint(const G4Point3D& Pt)
   G4double tmpDistance;
   const G4CurveVector& bounds= surfaceBoundary.GetBounds();
 
-  G4int entr = bounds.entries();
+  G4int entr = bounds.size();
 
   for (G4int i=0; i<entr; i++) 
   {
-    G4Curve* c= bounds(i);
+    G4Curve* c= bounds[i];
 
     if (c->GetEntityType() == "G4CompositeCurve") 
     {
       G4CompositeCurve* cc= (G4CompositeCurve*)c;
       const G4CurveVector& segments= cc->GetSegments();
-      for (size_t i=0; i<segments.entries(); i++) 
+      for (size_t i=0; i<segments.size(); i++) 
       {
-	G4Curve* ccc= segments(i);
+	G4Curve* ccc= segments[i];
 	tmpDistance= (G4Point3D(Pt.x(), Pt.y(), Pt.z())-ccc->GetEnd()).mag2();
 	if (pointDistance > tmpDistance) 
 	{
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
index 9deccaa7b3..1023e2be13 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceBoundary.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceBoundary.cc,v 1.8 2000/11/20 17:54:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceBoundary.cc,v 1.9.2.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
@@ -37,7 +53,7 @@ void G4SurfaceBoundary::Init(const G4CurveVector& bounds0)
   bBox.Init(b->GetBoxMin(), b->GetBoxMax());
   
   size_t i;
-  for ( i=1; i<bounds.entries(); i++) 
+  for ( i=1; i<bounds.size(); i++) 
   {
     b= bounds[i]->BBox();
     bBox.Extend(b->GetBoxMin());
@@ -47,37 +63,37 @@ void G4SurfaceBoundary::Init(const G4CurveVector& bounds0)
   // the points array is probably unused, so the following code is useless
   G4int cnt= 0;
 
-  size_t entr = bounds.entries();
+  size_t entr = bounds.size();
 
   for (i=0; i < entr; i++) 
   {
-    G4Curve* c = bounds(i);
+    G4Curve* c = bounds[i];
 
     if (c->GetEntityType() == "G4CompositeCurve") 
     {
       G4CompositeCurve* cc = (G4CompositeCurve*)c;
       const G4CurveVector& segments = cc->GetSegments();
-      cnt+= segments.entries();
+      cnt+= segments.size();
     } 
     else 
       cnt++;
   }
 
-  points.reshape(cnt);
+  points.resize(cnt);
   
   G4int j= 0;
   
-  for (i=0; i<bounds.entries(); i++) 
+  for (i=0; i<bounds.size(); i++) 
   {
-    G4Curve* c= bounds(i);
+    G4Curve* c= bounds[i];
     if (c->GetEntityType() == "G4CompositeCurve") 
     {
       G4CompositeCurve* cc = (G4CompositeCurve*)c;
       const G4CurveVector& segments = cc->GetSegments();
      
-      for (size_t i=0; i<segments.entries(); i++) 
+      for (size_t i=0; i<segments.size(); i++) 
       {
-	G4Curve* ccc = segments(i);
+	G4Curve* ccc = segments[i];
 	G4Point3D p  = ccc->GetEnd();
 	points[j]= p;
 	j++;
@@ -97,20 +113,37 @@ void G4SurfaceBoundary::Init(const G4CurveVector& bounds0)
 G4SurfaceBoundary* G4SurfaceBoundary::Project(const G4Transform3D& tr)
 {
   G4CurveVector newBounds;
+  G4Curve* a = 0;
+  G4Curve* c = 0;
   
-  for (size_t i=0; i<bounds.entries(); i++)
+  for (size_t i=0; i<bounds.size(); i++)
   {
-    G4Curve* c= bounds[i]->Project(tr);
+    c= bounds[i]->Project(tr);
     
     if (c==0) 
     {
-      newBounds.clearAndDestroy();
+      // Remove newBounds and delete all its contents
+      while (newBounds.size()>0)
+      {
+        a = newBounds.back();
+        newBounds.pop_back();
+        for (G4CurveVector::iterator i=newBounds.begin();
+                                     i!=newBounds.end(); i++)
+        {
+          if (*i==a)
+          {
+	    newBounds.erase(i);
+	    i--;
+          }
+        } 
+        if ( a )  delete a;    
+      } 
       return 0;
     }
     // L. Broglia
     c->SetSameSense( bounds[i]->GetSameSense() );
 
-    newBounds.insert(c);
+    newBounds.push_back(c);
   }
   
   G4SurfaceBoundary* lof= new G4SurfaceBoundary;
@@ -143,9 +176,9 @@ G4int G4SurfaceBoundary::IntersectRay2D(const G4Ray& ray)
   G4int nbinter = 0;
   G4int temp = 0;
 
-  for (size_t i=0; i < bounds.entries(); i++) 
+  for (size_t i=0; i < bounds.size(); i++) 
   {   
-    G4Curve& c = *bounds.at(i);
+    G4Curve& c = *bounds[i];
     temp = c.IntersectRay2D(ray);
 
     // test if the point is on the boundary
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceList.cc b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
index 2b03e46aa0..863f87ba9b 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceList.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceList.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceList.cc,v 1.5.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
index d6a9ad7290..b26a42655f 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceOfLinearExtrusion.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SurfaceOfLinearExtrusion.cc,v 1.2 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SurfaceOfLinearExtrusion.cc,v 1.2.4.1 2001/06/28 19:08:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
index 18568a4a04..5c6bfb043b 100644
--- a/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
+++ b/source/geometry/solids/BREPS/src/G4SurfaceOfRevolution.cc
@@ -1,9 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // By copying, distributing or modifying the Program (or any work
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4SurfaceOfRevolution.cc,v 1.2 2000/08/28 08:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4SurfaceOfRevolution.cc,v 1.2.4.1 2001/06/28 19:08:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ThreeMat.cc b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
index 5b59e40334..94c94d3798 100644
--- a/source/geometry/solids/BREPS/src/G4ThreeMat.cc
+++ b/source/geometry/solids/BREPS/src/G4ThreeMat.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ThreeMat.cc,v 1.5 2000/11/08 14:22:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ThreeMat.cc,v 1.5.4.1 2001/06/28 19:08:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
index 0f301724b8..122175c09e 100644
--- a/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
+++ b/source/geometry/solids/BREPS/src/G4ToroidalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ToroidalSurface.cc,v 1.5 2000/11/20 17:54:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ToroidalSurface.cc,v 1.5.4.1 2001/06/28 19:08:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // GEANT 4 class source file
diff --git a/source/geometry/solids/Boolean/History b/source/geometry/solids/Boolean/History
index 41c2e20bad..3efd1f94f8 100644
--- a/source/geometry/solids/Boolean/History
+++ b/source/geometry/solids/Boolean/History
@@ -1,5 +1,5 @@
 
-$Id: History,v 1.20 2001/03/19 10:30:34 gcosmo Exp $
+$Id: History,v 1.21 2001/05/30 14:06:05 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+ May 30  2001  Vladimir Grichine    geom-solid-bool-V03-01-00
+  - G4IntersectionSolid: fix in DistanceToIn(p,v) resolving bug observed
+    in problem report #153.
+
  Mar 19  2001  Gabriele Cosmo       geom-solid-bool-V03-00-03
 
   - G4IntersectionSolid:
diff --git a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
index 806348fe28..1620eb7bc9 100644
--- a/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4BooleanSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BooleanSolid.hh,v 1.4 2000/11/02 12:25:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BooleanSolid.hh,v 1.4.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4BooleanSolid
diff --git a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
index 9b9e925ef8..22f315158b 100644
--- a/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4DisplacedSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DisplacedSolid.hh,v 1.10 2000/11/22 16:09:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DisplacedSolid.hh,v 1.10.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4DisplacedSolid
diff --git a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
index 8009f076be..fc033482fd 100644
--- a/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4IntersectionSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IntersectionSolid.hh,v 1.4 2000/11/02 12:25:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IntersectionSolid.hh,v 1.4.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4IntersectionSolid
diff --git a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
index 37d2b48691..0ea39a0446 100644
--- a/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4SubtractionSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SubtractionSolid.hh,v 1.4 2000/11/02 12:25:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SubtractionSolid.hh,v 1.4.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4SubtractionSolid
diff --git a/source/geometry/solids/Boolean/include/G4UnionSolid.hh b/source/geometry/solids/Boolean/include/G4UnionSolid.hh
index dfec494fa9..7f9e7ea481 100644
--- a/source/geometry/solids/Boolean/include/G4UnionSolid.hh
+++ b/source/geometry/solids/Boolean/include/G4UnionSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnionSolid.hh,v 1.5 2000/11/02 12:25:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnionSolid.hh,v 1.5.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4UnionSolid
diff --git a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
index 8f91a834d6..05b30498d0 100644
--- a/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4BooleanSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BooleanSolid.cc,v 1.4 2000/11/20 17:56:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BooleanSolid.cc,v 1.4.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation for the abstract base class for solids created by boolean 
 // operations between other solids
diff --git a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
index 4c7da6cd05..d41da040a7 100644
--- a/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4DisplacedSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DisplacedSolid.cc,v 1.13 2000/11/22 15:19:20 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DisplacedSolid.cc,v 1.13.4.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation for G4DisplacedSolid class for boolean 
 // operations between other solids
diff --git a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
index 56adf05c2e..fc21dfd701 100644
--- a/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
@@ -1,21 +1,39 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IntersectionSolid.cc,v 1.11 2001/03/19 10:30:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IntersectionSolid.cc,v 1.12.2.1 2001/06/28 19:08:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
 // History:
 //
-// 12.09.98 V.Grichine 
-// 29.07.99 V.Grichine, modifications in DistanceToIn(p,v)
+// 29.05.01 V.Grichine, bug was fixed in DistanceToIn(p,v)
 // 16.03.01 V.Grichine, modifications in CalculateExtent() and Inside()
 //                      based on D.Williams proposal
+// 29.07.99 V.Grichine, modifications in DistanceToIn(p,v)
+// 12.09.98 V.Grichine, implementation based on discussions with J. Apostolakis and 
+//                      S. Giani 
 
 #include "G4IntersectionSolid.hh"
 // #include "G4DisplacedSolid.hh"
@@ -206,14 +224,27 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p,
     {
       do
       {
-        disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
-   
+	if( fPtrSolidB->Inside(p+dist*v) == kInside    )
+	{
+	  disTmp = fPtrSolidB->DistanceToOut(p+dist*v,v) ; 
+	}
+	else
+	{
+          disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
+	}
         if( disTmp != kInfinity )
         {
           dist += disTmp ;
           if(Inside(p+dist*v) == kOutside  )
 	  {
-            disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
+	    if( fPtrSolidA->Inside(p+dist*v) == kInside    )
+	    {
+	      disTmp = fPtrSolidA->DistanceToOut(p+dist*v,v) ; 
+	    }
+	    else
+	    {
+              disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
+	    }
             if( disTmp != kInfinity  )
 	    {
               dist += disTmp ;
@@ -240,14 +271,27 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p,
     {     
       do 
       {
-        disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
-   
+	if( fPtrSolidA->Inside(p+dist*v) == kInside    )
+	{
+	  disTmp = fPtrSolidA->DistanceToOut(p+dist*v,v) ; 
+	}
+	else
+	{
+          disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
+	}   
         if( disTmp != kInfinity )
         {
           dist += disTmp ;
           if(Inside(p+dist*v) == kOutside  )
 	  {
-            disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
+	    if( fPtrSolidB->Inside(p+dist*v) == kInside    )
+	    {
+	      disTmp = fPtrSolidB->DistanceToOut(p+dist*v,v) ; 
+	    }
+	    else
+	    {
+              disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
+	    }
             if( disTmp != kInfinity  )
 	    {
               dist += disTmp ;
@@ -273,14 +317,27 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p,
     {
       do
       {
-        disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
-   
+	if( fPtrSolidB->Inside(p+dist*v) == kInside    )
+	{
+	  disTmp = fPtrSolidB->DistanceToOut(p+dist*v,v) ; 
+	}
+	else
+	{
+          disTmp = fPtrSolidB->DistanceToIn(p+dist*v,v) ;
+	}
         if( disTmp != kInfinity )
         {
           dist += disTmp ;
           if(Inside(p+dist*v) == kOutside  )
 	  {
-            disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
+	    if( fPtrSolidA->Inside(p+dist*v) == kInside    )
+	    {
+	      disTmp = fPtrSolidA->DistanceToOut(p+dist*v,v) ; 
+	    }
+	    else
+	    {
+              disTmp = fPtrSolidA->DistanceToIn(p+dist*v,v) ;
+	    }
             if( disTmp != kInfinity  )
 	    {
               dist += disTmp ;
diff --git a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
index 1a2feaed64..6bfc243af1 100644
--- a/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SubtractionSolid.cc,v 1.12 2001/01/23 08:26:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SubtractionSolid.cc,v 1.12.2.1 2001/06/28 19:08:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
diff --git a/source/geometry/solids/Boolean/src/G4UnionSolid.cc b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
index 7d4789fc8e..03f735ffb1 100644
--- a/source/geometry/solids/Boolean/src/G4UnionSolid.cc
+++ b/source/geometry/solids/Boolean/src/G4UnionSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnionSolid.cc,v 1.16 2001/03/19 10:30:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnionSolid.cc,v 1.16.2.1 2001/06/28 19:08:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation of methods for the class G4IntersectionSolid
 //
diff --git a/source/geometry/solids/CSG/History b/source/geometry/solids/CSG/History
index 034bce01b2..840cd30169 100644
--- a/source/geometry/solids/CSG/History
+++ b/source/geometry/solids/CSG/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.39 2001/02/21 15:47:36 gcosmo Exp $
+$Id: History,v 1.42 2001/05/18 08:14:43 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,23 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 18, 2001   G.Cosmo                   geom-solids-csg-V03-01-02
+- Added G4CSGDEBUG preprocessor flag to discriminate for debug verbosity
+  specific to CSG solids. Included in G4Exception of DistanceToOut() for
+  "point p is outside" in G4Box, G4Cons, G4Tubs.
+
+Apr 20, 2001   G.Cosmo                   geom-solids-csg-V03-01-01
+- Updates for migration to STL vector.
+  Modified files: G4Box.cc, G4Cons.cc, G4Para.cc, G4Sphere.cc,
+                  G4Torus.cc, G4Trap.cc, G4Trd.cc, G4Tubs.cc.
+  Require coworking with the rest of geometry-V03-01-00.
+
+Apr 18,   01   V. Grichine               geom-solids-csg-V03-01-00
+- G4Trap.cc:
+  o Fixed memory leak in CalculateExtent() for creation of vertices in
+    case of finite rotation. (courtesy of D.Williams)
+  o Removed useless inclusion of math.h.
+
 Feb 21,   01   V. Grichine               geom-solids-csg-V03-00-03
 - G4Tubs.cc:
   o Fixed bug in function Inside(p) in computation of pPhi
diff --git a/source/geometry/solids/CSG/include/G4Box.hh b/source/geometry/solids/CSG/include/G4Box.hh
index d2ebf5e207..41618c865e 100644
--- a/source/geometry/solids/CSG/include/G4Box.hh
+++ b/source/geometry/solids/CSG/include/G4Box.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Box.hh,v 1.6 2001/01/31 17:30:42 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Box.hh,v 1.6.2.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 class header file
diff --git a/source/geometry/solids/CSG/include/G4CSGSolid.hh b/source/geometry/solids/CSG/include/G4CSGSolid.hh
index fadf94b4be..2742c610f0 100644
--- a/source/geometry/solids/CSG/include/G4CSGSolid.hh
+++ b/source/geometry/solids/CSG/include/G4CSGSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CSGSolid.hh,v 1.4 2000/11/02 17:06:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CSGSolid.hh,v 1.4.4.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Cons.hh b/source/geometry/solids/CSG/include/G4Cons.hh
index 42d84cb55e..692d59bd60 100644
--- a/source/geometry/solids/CSG/include/G4Cons.hh
+++ b/source/geometry/solids/CSG/include/G4Cons.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Cons.hh,v 1.5 2000/11/02 17:06:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Cons.hh,v 1.5.4.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Para.hh b/source/geometry/solids/CSG/include/G4Para.hh
index c8900fb9cc..593dc5265f 100644
--- a/source/geometry/solids/CSG/include/G4Para.hh
+++ b/source/geometry/solids/CSG/include/G4Para.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Para.hh,v 1.6 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Para.hh,v 1.6.4.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Sphere.hh b/source/geometry/solids/CSG/include/G4Sphere.hh
index 8a24f72928..5200de704f 100644
--- a/source/geometry/solids/CSG/include/G4Sphere.hh
+++ b/source/geometry/solids/CSG/include/G4Sphere.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Sphere.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Sphere.hh,v 1.5.4.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Torus.hh b/source/geometry/solids/CSG/include/G4Torus.hh
index d95d59563f..8183799dc6 100644
--- a/source/geometry/solids/CSG/include/G4Torus.hh
+++ b/source/geometry/solids/CSG/include/G4Torus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Torus.hh,v 1.12 2001/01/12 09:01:53 medernac Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Torus.hh,v 1.12.2.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Trap.hh b/source/geometry/solids/CSG/include/G4Trap.hh
index 996402498a..334fa3bfd5 100644
--- a/source/geometry/solids/CSG/include/G4Trap.hh
+++ b/source/geometry/solids/CSG/include/G4Trap.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trap.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trap.hh,v 1.5.4.1 2001/06/28 19:08:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Trd.hh b/source/geometry/solids/CSG/include/G4Trd.hh
index 55d5ac2787..e2b25f080f 100644
--- a/source/geometry/solids/CSG/include/G4Trd.hh
+++ b/source/geometry/solids/CSG/include/G4Trd.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trd.hh,v 1.6 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trd.hh,v 1.6.4.1 2001/06/28 19:09:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/include/G4Tubs.hh b/source/geometry/solids/CSG/include/G4Tubs.hh
index bb1350bc7f..c5490f52cf 100644
--- a/source/geometry/solids/CSG/include/G4Tubs.hh
+++ b/source/geometry/solids/CSG/include/G4Tubs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Tubs.hh,v 1.5 2000/11/02 17:06:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Tubs.hh,v 1.5.4.1 2001/06/28 19:09:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/CSG/src/G4Box.cc b/source/geometry/solids/CSG/src/G4Box.cc
index 2b9f5bcec9..8fd88adc46 100644
--- a/source/geometry/solids/CSG/src/G4Box.cc
+++ b/source/geometry/solids/CSG/src/G4Box.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Box.cc,v 1.13 2001/02/01 08:22:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Box.cc,v 1.15.2.1 2001/06/28 19:09:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
@@ -696,6 +712,7 @@ G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
 {
   G4double safx1,safx2,safy1,safy2,safz1,safz2,safe;
 
+#ifdef G4CSGDEBUG
   if( Inside(p) == kOutside )
   {
      G4cout.precision(16) ;
@@ -708,9 +725,11 @@ G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
      G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
      G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
      G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
-  G4Exception("Invalid call in G4Box::DistanceToOut(p),  point p is outside") ;
-     //    G4cout<<"G4Box::DistanceToOut(p),point p is outside ?!" << G4endl ;
+     G4Exception("Invalid call in G4Box::DistanceToOut(p),  point p is outside") ;
+     // G4cout << "G4Box::DistanceToOut(p),point p is outside ?!" << G4endl ;
   }
+#endif
+
   safx1 = fDx - p.x() ;
   safx2 = fDx + p.x() ;
   safy1 = fDy - p.y() ;
@@ -743,7 +762,8 @@ G4double G4Box::DistanceToOut(const G4ThreeVector& p) const
 G4ThreeVectorList*
 G4Box::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 {
-  G4ThreeVectorList* vertices = new G4ThreeVectorList(8) ;
+  G4ThreeVectorList* vertices = new G4ThreeVectorList();
+  vertices->reserve(8);
 
   if (vertices)
   {
@@ -756,14 +776,14 @@ G4Box::CreateRotatedVertices(const G4AffineTransform& pTransform) const
     G4ThreeVector vertex6(fDx,fDy,fDz) ;
     G4ThreeVector vertex7(-fDx,fDy,fDz) ;
 
-    vertices->insert(pTransform.TransformPoint(vertex0));
-    vertices->insert(pTransform.TransformPoint(vertex1));
-    vertices->insert(pTransform.TransformPoint(vertex2));
-    vertices->insert(pTransform.TransformPoint(vertex3));
-    vertices->insert(pTransform.TransformPoint(vertex4));
-    vertices->insert(pTransform.TransformPoint(vertex5));
-    vertices->insert(pTransform.TransformPoint(vertex6));
-    vertices->insert(pTransform.TransformPoint(vertex7));
+    vertices->push_back(pTransform.TransformPoint(vertex0));
+    vertices->push_back(pTransform.TransformPoint(vertex1));
+    vertices->push_back(pTransform.TransformPoint(vertex2));
+    vertices->push_back(pTransform.TransformPoint(vertex3));
+    vertices->push_back(pTransform.TransformPoint(vertex4));
+    vertices->push_back(pTransform.TransformPoint(vertex5));
+    vertices->push_back(pTransform.TransformPoint(vertex6));
+    vertices->push_back(pTransform.TransformPoint(vertex7));
   }
   else
   {
diff --git a/source/geometry/solids/CSG/src/G4CSGSolid.cc b/source/geometry/solids/CSG/src/G4CSGSolid.cc
index 99a7f79a63..5395adfcb0 100644
--- a/source/geometry/solids/CSG/src/G4CSGSolid.cc
+++ b/source/geometry/solids/CSG/src/G4CSGSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CSGSolid.cc,v 1.2 1999/12/15 14:50:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CSGSolid.cc,v 1.2.4.1 2001/06/28 19:09:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4CSGSolid.hh"
 
diff --git a/source/geometry/solids/CSG/src/G4Cons.cc b/source/geometry/solids/CSG/src/G4Cons.cc
index bd2ecd601d..5cb1b59c3f 100644
--- a/source/geometry/solids/CSG/src/G4Cons.cc
+++ b/source/geometry/solids/CSG/src/G4Cons.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Cons.cc,v 1.16 2000/11/20 17:57:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Cons.cc,v 1.18.2.1 2001/06/28 19:09:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4Cons
 //
@@ -453,7 +469,7 @@ G4bool G4Cons::CalculateExtent( const EAxis              pAxis,
     pMin = +kInfinity ;
     pMax = -kInfinity ;
 
-    noEntries          = vertices->entries() ;
+    noEntries          = vertices->size() ;
     noBetweenSections4 = noEntries-4 ;
 	    
     for ( i = 0 ; i < noEntries ; i += 4 )
@@ -1928,7 +1944,8 @@ G4double G4Cons::DistanceToOut(const G4ThreeVector& p) const
   G4double tanRMin,secRMin,pRMin ;
   G4double tanRMax,secRMax,pRMax ;
   G4double safePhi,phiC,cosPhiC,sinPhiC,ePhi ;
-/*
+
+#ifdef G4CSGDEBUG
   if( Inside(p) == kOutside )
   {
     G4cout.precision(16) ;
@@ -1945,10 +1962,11 @@ G4double G4Cons::DistanceToOut(const G4ThreeVector& p) const
     G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
     G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
     G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
-    //  G4Exception("Invalid call in G4Cons::DistanceToOut(p), p is outside") ;
-    G4cout << "G4Cons::DistanceToOut(p), p is outside ?!" << G4endl ;
+    G4Exception("Invalid call in G4Cons::DistanceToOut(p), p is outside") ;
+    // G4cout << "G4Cons::DistanceToOut(p), p is outside ?!" << G4endl ;
   }
-*/
+#endif
+
   rho = sqrt(p.x()*p.x() + p.y()*p.y()) ;
   safeZ = fDz - fabs(p.z()) ;
 
@@ -2046,7 +2064,8 @@ G4Cons::CreateRotatedVertices(const G4AffineTransform& pTransform) const
   {
     sAngle = fSPhi ;
   } 
-  vertices = new G4ThreeVectorList(noCrossSections*4) ;
+  vertices = new G4ThreeVectorList();
+  vertices->reserve(noCrossSections*4) ;
 
   if (vertices)
   {
@@ -2075,10 +2094,10 @@ G4Cons::CreateRotatedVertices(const G4AffineTransform& pTransform) const
       vertex2 = G4ThreeVector(rMaxX2,rMaxY2,+fDz) ;
       vertex3 = G4ThreeVector(rMinX2,rMinY2,+fDz) ;
 
-      vertices->insert(pTransform.TransformPoint(vertex0)) ;
-      vertices->insert(pTransform.TransformPoint(vertex1)) ;
-      vertices->insert(pTransform.TransformPoint(vertex2)) ;
-      vertices->insert(pTransform.TransformPoint(vertex3)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex0)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex1)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex2)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex3)) ;
     }
   }
   else
diff --git a/source/geometry/solids/CSG/src/G4Para.cc b/source/geometry/solids/CSG/src/G4Para.cc
index 8303b838ee..27e7c610c9 100644
--- a/source/geometry/solids/CSG/src/G4Para.cc
+++ b/source/geometry/solids/CSG/src/G4Para.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Para.cc,v 1.6 2000/11/20 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Para.cc,v 1.7.2.1 2001/06/28 19:09:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4Para
 //
@@ -17,7 +33,6 @@
 // 31.10.96 V.Grichine Modifications according G4Box/Tubs before to commit
 // 18.11.99 V. Grichine , kIndefined was added to ESide
 
-#include <math.h>
 #include "G4Para.hh"
 #include "G4VoxelLimits.hh"
 #include "G4AffineTransform.hh"
@@ -1002,7 +1017,8 @@ G4ThreeVectorList*
    G4Para::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 {
     G4ThreeVectorList *vertices;
-    vertices=new G4ThreeVectorList(8);
+    vertices=new G4ThreeVectorList();
+    vertices->reserve(8);
     if (vertices)
 	{
 	    G4ThreeVector vertex0(-fDz*fTthetaCphi-fDy*fTalpha-fDx,-fDz*fTthetaSphi-fDy,-fDz);
@@ -1014,14 +1030,14 @@ G4ThreeVectorList*
 	    G4ThreeVector vertex6(+fDz*fTthetaCphi+fDy*fTalpha-fDx,+fDz*fTthetaSphi+fDy,+fDz);
 	    G4ThreeVector vertex7(+fDz*fTthetaCphi+fDy*fTalpha+fDx,+fDz*fTthetaSphi+fDy,+fDz);
 
-	    vertices->insert(pTransform.TransformPoint(vertex0));
-	    vertices->insert(pTransform.TransformPoint(vertex1));
-	    vertices->insert(pTransform.TransformPoint(vertex2));
-	    vertices->insert(pTransform.TransformPoint(vertex3));
-	    vertices->insert(pTransform.TransformPoint(vertex4));
-	    vertices->insert(pTransform.TransformPoint(vertex5));
-	    vertices->insert(pTransform.TransformPoint(vertex6));
-	    vertices->insert(pTransform.TransformPoint(vertex7));
+	    vertices->push_back(pTransform.TransformPoint(vertex0));
+	    vertices->push_back(pTransform.TransformPoint(vertex1));
+	    vertices->push_back(pTransform.TransformPoint(vertex2));
+	    vertices->push_back(pTransform.TransformPoint(vertex3));
+	    vertices->push_back(pTransform.TransformPoint(vertex4));
+	    vertices->push_back(pTransform.TransformPoint(vertex5));
+	    vertices->push_back(pTransform.TransformPoint(vertex6));
+	    vertices->push_back(pTransform.TransformPoint(vertex7));
 	}
     else
 	{
diff --git a/source/geometry/solids/CSG/src/G4Sphere.cc b/source/geometry/solids/CSG/src/G4Sphere.cc
index 10a174dde5..ba860ab354 100644
--- a/source/geometry/solids/CSG/src/G4Sphere.cc
+++ b/source/geometry/solids/CSG/src/G4Sphere.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Sphere.cc,v 1.8 2000/11/20 17:57:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Sphere.cc,v 1.9.2.1 2001/06/28 19:09:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4Sphere
 //
@@ -304,18 +320,18 @@ G4bool G4Sphere::CalculateExtent( const EAxis pAxis,
 	    pMin=+kInfinity;
 	    pMax=-kInfinity;
 
-	    noEntries=vertices->entries();  // noPolygonVertices*noPhiCrossSections
+	    noEntries=vertices->size();  // noPolygonVertices*noPhiCrossSections
 	    noBetweenSections=noEntries-noPolygonVertices;
 	    
-	         G4ThreeVectorList ThetaPolygon ;
+	    G4ThreeVectorList ThetaPolygon ;
 	    for (i=0;i<noEntries;i+=noPolygonVertices)
 		{
 		   for(j=0;j<(noPolygonVertices/2)-1;j++)
 		  {
-		    ThetaPolygon.append(vertices->operator()(i+j)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+j+1)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices-2-j)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices-1-j)) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+j]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+j+1]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices-2-j]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices-1-j]) ;		  
 	            CalculateClippedPolygonExtent(ThetaPolygon,pVoxelLimit,pAxis,pMin,pMax);
 		    ThetaPolygon.clear() ;
 		  }
@@ -324,17 +340,17 @@ G4bool G4Sphere::CalculateExtent( const EAxis pAxis,
 		{
 		   for(j=0;j<noPolygonVertices-1;j++)
 		  {
-		    ThetaPolygon.append(vertices->operator()(i+j)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+j+1)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices+j+1)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices+j)) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+j]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+j+1]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices+j+1]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices+j]) ;		  
 	            CalculateClippedPolygonExtent(ThetaPolygon,pVoxelLimit,pAxis,pMin,pMax);
 		    ThetaPolygon.clear() ;
 		  }
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices-1)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+noPolygonVertices)) ;		  
-		    ThetaPolygon.append(vertices->operator()(i+2*noPolygonVertices-1)) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices-1]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i]) ;  
+		    ThetaPolygon.push_back((*vertices)[i+noPolygonVertices]) ;		  
+		    ThetaPolygon.push_back((*vertices)[i+2*noPolygonVertices-1]) ;		  
 	            CalculateClippedPolygonExtent(ThetaPolygon,pVoxelLimit,pAxis,pMin,pMax);
 		    ThetaPolygon.clear() ;
 		}
@@ -2651,7 +2667,8 @@ G4Sphere::CreateRotatedVertices(const G4AffineTransform& pTransform,
                fRmax/cos(meshAnglePhi*0.5) : fRmax/cos(meshTheta*0.5);
     G4double* cosCrossTheta = new G4double[noThetaSections];
     G4double* sinCrossTheta = new G4double[noThetaSections];    
-    vertices=new G4ThreeVectorList(noPhiCrossSections*(noThetaSections*2));
+    vertices=new G4ThreeVectorList();
+    vertices->reserve(noPhiCrossSections*(noThetaSections*2));
     if (vertices && cosCrossTheta && sinCrossTheta)
 	{
     for (crossSectionPhi=0;crossSectionPhi<noPhiCrossSections;crossSectionPhi++)
@@ -2672,7 +2689,7 @@ G4Sphere::CreateRotatedVertices(const G4AffineTransform& pTransform,
 		  rMinZ=fRmin*cosCrossTheta[crossSectionTheta];
 		    
 		    vertex=G4ThreeVector(rMinX,rMinY,rMinZ);
-		    vertices->insert(pTransform.TransformPoint(vertex));
+		    vertices->push_back(pTransform.TransformPoint(vertex));
 		    
 		}    // Theta forward 
     
@@ -2683,7 +2700,7 @@ G4Sphere::CreateRotatedVertices(const G4AffineTransform& pTransform,
 		  rMaxZ=meshRMax*cosCrossTheta[crossSectionTheta];
 		    
 		    vertex=G4ThreeVector(rMaxX,rMaxY,rMaxZ);
-		    vertices->insert(pTransform.TransformPoint(vertex));
+		    vertices->push_back(pTransform.TransformPoint(vertex));
 
 		}   // Theta back 
 	  }       // Phi
diff --git a/source/geometry/solids/CSG/src/G4Torus.cc b/source/geometry/solids/CSG/src/G4Torus.cc
index aa237aeaf7..b289494381 100644
--- a/source/geometry/solids/CSG/src/G4Torus.cc
+++ b/source/geometry/solids/CSG/src/G4Torus.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Torus.cc,v 1.23 2001/01/29 13:12:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Torus.cc,v 1.24.2.1 2001/06/28 19:09:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4Torus
@@ -884,7 +900,7 @@ G4bool G4Torus::CalculateExtent(const EAxis pAxis,
     pMin = +kInfinity ;
     pMax = -kInfinity ;
 
-    noEntries          = vertices->entries() ;
+    noEntries          = vertices->size() ;
     noBetweenSections4 = noEntries - noPolygonVertices ;
 	    
     for (i=0;i<noEntries;i+=noPolygonVertices)
@@ -2115,7 +2131,8 @@ G4ThreeVectorList*
   {
     sAngle = fSPhi ;
   }
-  vertices = new G4ThreeVectorList(noCrossSections*4) ;
+  vertices = new G4ThreeVectorList();
+  vertices->reserve(noCrossSections*4) ;
   
   if (vertices)
   {
@@ -2136,10 +2153,10 @@ G4ThreeVectorList*
 		    vertex2=G4ThreeVector(rMaxX,rMaxY,+fRmax);
 		    vertex3=G4ThreeVector(rMinX,rMinY,+fRmax);
 
-		    vertices->insert(pTransform.TransformPoint(vertex0));
-		    vertices->insert(pTransform.TransformPoint(vertex1));
-		    vertices->insert(pTransform.TransformPoint(vertex2));
-		    vertices->insert(pTransform.TransformPoint(vertex3));
+		    vertices->push_back(pTransform.TransformPoint(vertex0));
+		    vertices->push_back(pTransform.TransformPoint(vertex1));
+		    vertices->push_back(pTransform.TransformPoint(vertex2));
+		    vertices->push_back(pTransform.TransformPoint(vertex3));
     }
     noPolygonVertices = 4 ;
   }
diff --git a/source/geometry/solids/CSG/src/G4Trap.cc b/source/geometry/solids/CSG/src/G4Trap.cc
index d9c2c0e860..2cb707bd19 100644
--- a/source/geometry/solids/CSG/src/G4Trap.cc
+++ b/source/geometry/solids/CSG/src/G4Trap.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trap.cc,v 1.8 2000/11/20 17:58:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trap.cc,v 1.11.2.1 2001/06/28 19:09:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4Trap
 //
@@ -21,7 +37,6 @@
 // 19.11.99 V.Grichine, kUndefined was added to Eside enum
 // 13.12.99 V.Grichine, bug fixed in DistanceToIn(p,v)
 
-#include <math.h>
 #include "G4Trap.hh"
 #include "G4VoxelLimits.hh"
 #include "G4AffineTransform.hh"
@@ -37,7 +52,7 @@
 //
 // Accuracy of coplanarity
 
-const G4double kCoplanar_Tolerance=1E-4;
+const G4double kCoplanar_Tolerance = 1E-4 ;
 
 //////////////////////////////////////////////////////////////////////////
 //
@@ -67,28 +82,26 @@ G4Trap::G4Trap( const G4String& pName,
 	        G4double pDy2, G4double pDx3, G4double pDx4,
 	        G4double pAlp2) : G4CSGSolid(pName)
 {
-   if (pDz>0 && pDy1>0 && pDx1>0 && pDx2>0 && pDy2>0 && pDx3>0 && pDx4>0)
-   {
-	   fDz=pDz;
-	   fTthetaCphi=tan(pTheta)*cos(pPhi);
-	   fTthetaSphi=tan(pTheta)*sin(pPhi);
+  if ( pDz > 0 && pDy1 > 0 && pDx1 > 0 && 
+       pDx2 > 0 && pDy2 > 0 && pDx3 > 0 && pDx4 > 0 )
+  {
+    fDz=pDz;
+    fTthetaCphi=tan(pTheta)*cos(pPhi);
+    fTthetaSphi=tan(pTheta)*sin(pPhi);
 	    
-	   fDy1=pDy1;
-	   fDx1=pDx1;
-	   fDx2=pDx2;
-	   fTalpha1=tan(pAlp1);
+    fDy1=pDy1;
+    fDx1=pDx1;
+    fDx2=pDx2;
+    fTalpha1=tan(pAlp1);
 	   
-	   fDy2=pDy2;
-	   fDx3=pDx3;
-	   fDx4=pDx4;
-	   fTalpha2=tan(pAlp2);
+    fDy2=pDy2;
+    fDx3=pDx3;
+    fDx4=pDx4;
+    fTalpha2=tan(pAlp2);
 
-	   MakePlanes();
-    }
-    else
-    {
-       G4Exception("Error in G4Trap::G4Trap - Invalid Length G4Trap parameters");
-    }
+    MakePlanes();
+  }
+  else G4Exception("Error in G4Trap::G4Trap - Invalid Length G4Trap parameters");
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -561,282 +574,278 @@ G4bool G4Trap::MakePlane( const G4ThreeVector& p1,
 //
 // Calculate extent under transform and specified limit
 
-G4bool G4Trap::CalculateExtent(const EAxis pAxis,
-                               const G4VoxelLimits& pVoxelLimit,
-                               const G4AffineTransform& pTransform,
-                               G4double& pMin, G4double& pMax) const
+G4bool G4Trap::CalculateExtent( const EAxis pAxis,
+                                const G4VoxelLimits& pVoxelLimit,
+                                const G4AffineTransform& pTransform,
+                                      G4double& pMin, G4double& pMax) const
 {
+  G4double xMin, xMax, yMin, yMax, zMin, zMax;
+  G4bool flag;
 
-    G4double xMin, xMax, yMin, yMax, zMin, zMax;
-    G4bool flag;
+  if (!pTransform.IsRotated())
+  {  
+    // Special case handling for unrotated trapezoids
+    // Compute z/x/y/ mins and maxs respecting limits, with early returns
+    // if outside limits. Then switch() on pAxis
 
-    if (!pTransform.IsRotated())
-   {  
-                      // Special case handling for unrotated trapezoids
-                      // Compute z/x/y/ mins and maxs respecting limits, with early returns
-                      // if outside limits. Then switch() on pAxis
-	  G4int i ; 
-          G4double xoffset;
-          G4double yoffset;
-          G4double zoffset;
-	  G4double temp[8] ;          // some points for intersection with zMin/zMax
+    G4int i ; 
+    G4double xoffset;
+    G4double yoffset;
+    G4double zoffset;
+    G4double temp[8] ;     // some points for intersection with zMin/zMax
+    G4ThreeVector pt[8];   // vertices after translation
 	  
-          xoffset=pTransform.NetTranslation().x();	    
-          yoffset=pTransform.NetTranslation().y();
-          zoffset=pTransform.NetTranslation().z();
+    xoffset=pTransform.NetTranslation().x();	    
+    yoffset=pTransform.NetTranslation().y();
+    zoffset=pTransform.NetTranslation().z();
  
-          G4ThreeVector pt[8];   // vertices after translation
-          pt[0]=G4ThreeVector(xoffset-fDz*fTthetaCphi-fDy1*fTalpha1-fDx1,
+    pt[0]=G4ThreeVector(xoffset-fDz*fTthetaCphi-fDy1*fTalpha1-fDx1,
                		      yoffset-fDz*fTthetaSphi-fDy1,zoffset-fDz);
-          pt[1]=G4ThreeVector(xoffset-fDz*fTthetaCphi-fDy1*fTalpha1+fDx1,
+    pt[1]=G4ThreeVector(xoffset-fDz*fTthetaCphi-fDy1*fTalpha1+fDx1,
 		              yoffset-fDz*fTthetaSphi-fDy1,zoffset-fDz);
-          pt[2]=G4ThreeVector(xoffset-fDz*fTthetaCphi+fDy1*fTalpha1-fDx2,
+    pt[2]=G4ThreeVector(xoffset-fDz*fTthetaCphi+fDy1*fTalpha1-fDx2,
 		              yoffset-fDz*fTthetaSphi+fDy1,zoffset-fDz);
-          pt[3]=G4ThreeVector(xoffset-fDz*fTthetaCphi+fDy1*fTalpha1+fDx2,
+    pt[3]=G4ThreeVector(xoffset-fDz*fTthetaCphi+fDy1*fTalpha1+fDx2,
 		              yoffset-fDz*fTthetaSphi+fDy1,zoffset-fDz);
-          pt[4]=G4ThreeVector(xoffset+fDz*fTthetaCphi-fDy2*fTalpha2-fDx3,
+    pt[4]=G4ThreeVector(xoffset+fDz*fTthetaCphi-fDy2*fTalpha2-fDx3,
 		              yoffset+fDz*fTthetaSphi-fDy2,zoffset+fDz);
-          pt[5]=G4ThreeVector(xoffset+fDz*fTthetaCphi-fDy2*fTalpha2+fDx3,
+    pt[5]=G4ThreeVector(xoffset+fDz*fTthetaCphi-fDy2*fTalpha2+fDx3,
 		              yoffset+fDz*fTthetaSphi-fDy2,zoffset+fDz);
-          pt[6]=G4ThreeVector(xoffset+fDz*fTthetaCphi+fDy2*fTalpha2-fDx4,
+    pt[6]=G4ThreeVector(xoffset+fDz*fTthetaCphi+fDy2*fTalpha2-fDx4,
 		              yoffset+fDz*fTthetaSphi+fDy2,zoffset+fDz);
-          pt[7]=G4ThreeVector(xoffset+fDz*fTthetaCphi+fDy2*fTalpha2+fDx4,
+    pt[7]=G4ThreeVector(xoffset+fDz*fTthetaCphi+fDy2*fTalpha2+fDx4,
 		              yoffset+fDz*fTthetaSphi+fDy2,zoffset+fDz);
-	    zMin=zoffset-fDz;
-	    zMax=zoffset+fDz;
-	    if (pVoxelLimit.IsZLimited())
-		{
-		    if (zMin>pVoxelLimit.GetMaxZExtent()+kCarTolerance
-			||zMax<pVoxelLimit.GetMinZExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (zMin<pVoxelLimit.GetMinZExtent())
-				{
-				    zMin=pVoxelLimit.GetMinZExtent();
-				}
-			    if (zMax>pVoxelLimit.GetMaxZExtent())
-				{
-				    zMax=pVoxelLimit.GetMaxZExtent();
-				}
-			}
-		}
+    zMin=zoffset-fDz;
+    zMax=zoffset+fDz;
 
-            temp[0] = pt[0].y()+(pt[4].y()-pt[0].y())*(zMin-pt[0].z())/(pt[4].z()-pt[0].z()) ;
-       	    temp[1] = pt[0].y()+(pt[4].y()-pt[0].y())*(zMax-pt[0].z())/(pt[4].z()-pt[0].z()) ;
-	    temp[2] = pt[2].y()+(pt[6].y()-pt[2].y())*(zMin-pt[2].z())/(pt[6].z()-pt[2].z()) ;
-	    temp[3] = pt[2].y()+(pt[6].y()-pt[2].y())*(zMax-pt[2].z())/(pt[6].z()-pt[2].z()) ;	      
-	    yMax = yoffset - fabs(fDz*fTthetaSphi) - fDy1 - fDy2 ;
-	    yMin = -yMax ;
-	    for(i=0;i<4;i++)
-	    {
-	       if(temp[i] > yMax) yMax = temp[i] ;
-	       if(temp[i] < yMin) yMin = temp[i] ;
-	    }
-	    
-	    if (pVoxelLimit.IsYLimited())
-		{
-		    if (yMin>pVoxelLimit.GetMaxYExtent()+kCarTolerance
-			||yMax<pVoxelLimit.GetMinYExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (yMin<pVoxelLimit.GetMinYExtent())
-				{
-				    yMin=pVoxelLimit.GetMinYExtent();
-				}
-			    if (yMax>pVoxelLimit.GetMaxYExtent())
-				{
-				    yMax=pVoxelLimit.GetMaxYExtent();
-				}
-			}
-		}
+    if ( pVoxelLimit.IsZLimited() )
+    {
+      if ( zMin > pVoxelLimit.GetMaxZExtent() + kCarTolerance ||
+           zMax < pVoxelLimit.GetMinZExtent() - kCarTolerance    )
+      {
+        return false;
+      }
+      else
+      {
+        if ( zMin < pVoxelLimit.GetMinZExtent() )
+	{
+	  zMin = pVoxelLimit.GetMinZExtent() ;
+	}
+	if ( zMax > pVoxelLimit.GetMaxZExtent() )
+	{
+	  zMax = pVoxelLimit.GetMaxZExtent() ;
+	}
+      }
+    }
+    temp[0] = pt[0].y()+(pt[4].y()-pt[0].y())*(zMin-pt[0].z())/(pt[4].z()-pt[0].z()) ;
+    temp[1] = pt[0].y()+(pt[4].y()-pt[0].y())*(zMax-pt[0].z())/(pt[4].z()-pt[0].z()) ;
+    temp[2] = pt[2].y()+(pt[6].y()-pt[2].y())*(zMin-pt[2].z())/(pt[6].z()-pt[2].z()) ;
+    temp[3] = pt[2].y()+(pt[6].y()-pt[2].y())*(zMax-pt[2].z())/(pt[6].z()-pt[2].z()) ;
 
-            temp[0] = pt[0].x()+(pt[4].x()-pt[0].x())*(zMin-pt[0].z())/(pt[4].z()-pt[0].z()) ;
-       	    temp[1] = pt[0].x()+(pt[4].x()-pt[0].x())*(zMax-pt[0].z())/(pt[4].z()-pt[0].z()) ;
-	    temp[2] = pt[2].x()+(pt[6].x()-pt[2].x())*(zMin-pt[2].z())/(pt[6].z()-pt[2].z()) ;
-	    temp[3] = pt[2].x()+(pt[6].x()-pt[2].x())*(zMax-pt[2].z())/(pt[6].z()-pt[2].z()) ;
-            temp[4] = pt[3].x()+(pt[7].x()-pt[3].x())*(zMin-pt[3].z())/(pt[7].z()-pt[3].z()) ;
-       	    temp[5] = pt[3].x()+(pt[7].x()-pt[3].x())*(zMax-pt[3].z())/(pt[7].z()-pt[3].z()) ;
-	    temp[6] = pt[1].x()+(pt[5].x()-pt[1].x())*(zMin-pt[1].z())/(pt[5].z()-pt[1].z()) ;
-	    temp[7] = pt[1].x()+(pt[5].x()-pt[1].x())*(zMax-pt[1].z())/(pt[5].z()-pt[1].z()) ;
-	    
-	    xMax = xoffset - fabs(fDz*fTthetaCphi) - fDx1 - fDx2 -fDx3 - fDx4 ;
-	    xMin = -xMax ;
-	    for(i=0;i<8;i++)
-	    {
-	       if(temp[i] > xMax) xMax = temp[i] ;
-	       if(temp[i] < xMin) xMin = temp[i] ;
-	    }
-	                                          // xMax/Min = f(yMax/Min) ?
-	    if (pVoxelLimit.IsXLimited())
-		{
-		    if (xMin>pVoxelLimit.GetMaxXExtent()+kCarTolerance
-			||xMax<pVoxelLimit.GetMinXExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (xMin<pVoxelLimit.GetMinXExtent())
-				{
-				    xMin=pVoxelLimit.GetMinXExtent();
-				}
-			    if (xMax>pVoxelLimit.GetMaxXExtent())
-				{
-				    xMax=pVoxelLimit.GetMaxXExtent();
-				}
-			}
-		}
+    yMax = yoffset - fabs(fDz*fTthetaSphi) - fDy1 - fDy2 ;
+    yMin = -yMax ;
 
-	    switch (pAxis)
-		{
-		case kXAxis:
-		    pMin=xMin;
-		    pMax=xMax;
-		    break;
-		case kYAxis:
-		    pMin=yMin;
-		    pMax=yMax;
-		    break;
-		case kZAxis:
-		    pMin=zMin;
-		    pMax=zMax;
-		    break;
-		default:
-		    break;
-		}
+    for( i = 0 ; i < 4 ; i++ )
+    {
+      if( temp[i] > yMax ) yMax = temp[i] ;
+      if( temp[i] < yMin ) yMin = temp[i] ;
+    }    
+    if ( pVoxelLimit.IsYLimited() )
+    {
+      if ( yMin > pVoxelLimit.GetMaxYExtent() + kCarTolerance ||
+           yMax < pVoxelLimit.GetMinYExtent() - kCarTolerance    )
+      {
+        return false;
+      }
+      else
+      {
+	if ( yMin < pVoxelLimit.GetMinYExtent() )
+	{
+	  yMin = pVoxelLimit.GetMinYExtent() ;
+	}
+	if ( yMax > pVoxelLimit.GetMaxYExtent() )
+	{
+	  yMax = pVoxelLimit.GetMaxYExtent() ;
+	}
+      }
+    }
+    temp[0] = pt[0].x()+(pt[4].x()-pt[0].x())*(zMin-pt[0].z())/(pt[4].z()-pt[0].z()) ;
+    temp[1] = pt[0].x()+(pt[4].x()-pt[0].x())*(zMax-pt[0].z())/(pt[4].z()-pt[0].z()) ;
+    temp[2] = pt[2].x()+(pt[6].x()-pt[2].x())*(zMin-pt[2].z())/(pt[6].z()-pt[2].z()) ;
+    temp[3] = pt[2].x()+(pt[6].x()-pt[2].x())*(zMax-pt[2].z())/(pt[6].z()-pt[2].z()) ;
+    temp[4] = pt[3].x()+(pt[7].x()-pt[3].x())*(zMin-pt[3].z())/(pt[7].z()-pt[3].z()) ;
+    temp[5] = pt[3].x()+(pt[7].x()-pt[3].x())*(zMax-pt[3].z())/(pt[7].z()-pt[3].z()) ;
+    temp[6] = pt[1].x()+(pt[5].x()-pt[1].x())*(zMin-pt[1].z())/(pt[5].z()-pt[1].z()) ;
+    temp[7] = pt[1].x()+(pt[5].x()-pt[1].x())*(zMax-pt[1].z())/(pt[5].z()-pt[1].z()) ;
+	    
+    xMax = xoffset - fabs(fDz*fTthetaCphi) - fDx1 - fDx2 -fDx3 - fDx4 ;
+    xMin = -xMax ;
 
-	    pMin-=kCarTolerance;
-	    pMax+=kCarTolerance;
+    for( i = 0 ; i < 8 ; i++ )
+    {
+      if( temp[i] > xMax) xMax = temp[i] ;
+      if( temp[i] < xMin) xMin = temp[i] ;
+    }	                                          
+    if (pVoxelLimit.IsXLimited())   // xMax/Min = f(yMax/Min) ?
+    {
+      if ( xMin > pVoxelLimit.GetMaxXExtent() + kCarTolerance ||
+           xMax < pVoxelLimit.GetMinXExtent() - kCarTolerance    )
+      {
+	return false;
+      }
+      else
+      {
+        if ( xMin < pVoxelLimit.GetMinXExtent() )
+	{
+	  xMin = pVoxelLimit.GetMinXExtent() ;
+	}
+	if ( xMax > pVoxelLimit.GetMaxXExtent() )
+	{
+	  xMax = pVoxelLimit.GetMaxXExtent() ;
+	}
+      }
+    }
+    switch (pAxis)
+    {
+      case kXAxis:
+	   pMin=xMin;
+	   pMax=xMax;
+	   break;
 
-	    flag = true;
-   }
-    else
-   {
-// General rotated case - 
+      case kYAxis:
+	   pMin=yMin;
+	   pMax=yMax;
+	   break;
 
-	    G4bool existsAfterClip=false;
-	    G4ThreeVectorList *vertices;
+      case kZAxis:
+	   pMin=zMin;
+	   pMax=zMax;
+	   break;
+      default:
+	   break;
+    }
+    pMin -= kCarTolerance;
+    pMax += kCarTolerance;
 
-	    pMin=+kInfinity;
-	    pMax=-kInfinity;
+    flag = true;
+  }
+  else    // General rotated case - 
+  {
+    G4bool existsAfterClip = false ;
+    G4ThreeVectorList*       vertices;
+    pMin                   = +kInfinity;
+    pMax                   = -kInfinity;
 	    
-// Calculate rotated vertex coordinates
-	    vertices=CreateRotatedVertices(pTransform);
-	    
-	    xMin = +kInfinity; yMin = +kInfinity; zMin = +kInfinity;
-	    xMax = -kInfinity; yMax = -kInfinity; zMax = -kInfinity;
-	    
-	    for(G4int nv=0; nv<8; nv++){
-	    
-	       if((*vertices)[nv].x() > xMax){xMax = (*vertices)[nv].x();};
-	       if((*vertices)[nv].y() > yMax){yMax = (*vertices)[nv].y();};
-	       if((*vertices)[nv].z() > zMax){zMax = (*vertices)[nv].z();};
-	    
-	       if((*vertices)[nv].x() < xMin){xMin = (*vertices)[nv].x();};
-	       if((*vertices)[nv].y() < yMin){yMin = (*vertices)[nv].y();};
-	       if((*vertices)[nv].z() < zMin){zMin = (*vertices)[nv].z();};
-	       
-	    };
-	    
-	    if (pVoxelLimit.IsZLimited())
-		{
-		    if (zMin>pVoxelLimit.GetMaxZExtent()+kCarTolerance
-			||zMax<pVoxelLimit.GetMinZExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (zMin<pVoxelLimit.GetMinZExtent())
-				{
-				    zMin=pVoxelLimit.GetMinZExtent();
-				}
-			    if (zMax>pVoxelLimit.GetMaxZExtent())
-				{
-				    zMax=pVoxelLimit.GetMaxZExtent();
-				}
-			}
-		}
-	    
-            if (pVoxelLimit.IsYLimited())
-		{
-		    if (yMin>pVoxelLimit.GetMaxYExtent()+kCarTolerance
-			||yMax<pVoxelLimit.GetMinYExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (yMin<pVoxelLimit.GetMinYExtent())
-				{
-				    yMin=pVoxelLimit.GetMinYExtent();
-				}
-			    if (yMax>pVoxelLimit.GetMaxYExtent())
-				{
-				    yMax=pVoxelLimit.GetMaxYExtent();
-				}
-			}
-		}
-
-             if (pVoxelLimit.IsXLimited())
-		{
-		    if (xMin>pVoxelLimit.GetMaxXExtent()+kCarTolerance
-			||xMax<pVoxelLimit.GetMinXExtent()-kCarTolerance)
-			{
-			    return false;
-			}
-		    else
-			{
-			    if (xMin<pVoxelLimit.GetMinXExtent())
-				{
-				    xMin=pVoxelLimit.GetMinXExtent();
-				}
-			    if (xMax>pVoxelLimit.GetMaxXExtent())
-				{
-				    xMax=pVoxelLimit.GetMaxXExtent();
-				}
-			}
-		}
-
-	    switch (pAxis)
-		{
-		case kXAxis:
-		    pMin=xMin;
-		    pMax=xMax;
-		    break;
-		case kYAxis:
-		    pMin=yMin;
-		    pMax=yMax;
-		    break;
-		case kZAxis:
-		    pMin=zMin;
-		    pMax=zMax;
-		    break;
-		default:
-		    break;
-		}
+    // Calculate rotated vertex coordinates. Operator 'new' is called
 
+    vertices = CreateRotatedVertices(pTransform);
 	    
-	    if (pMin!=kInfinity||pMax!=-kInfinity)
-		{
-		    existsAfterClip=true;
+    xMin = +kInfinity; yMin = +kInfinity; zMin = +kInfinity;
+    xMax = -kInfinity; yMax = -kInfinity; zMax = -kInfinity;
+	    
+    for( G4int nv = 0 ; nv < 8 ; nv++ )
+    { 
+      if( (*vertices)[nv].x() > xMax ) xMax = (*vertices)[nv].x();
+      if( (*vertices)[nv].y() > yMax ) yMax = (*vertices)[nv].y();
+      if( (*vertices)[nv].z() > zMax ) zMax = (*vertices)[nv].z();
+	    
+      if( (*vertices)[nv].x() < xMin ) xMin = (*vertices)[nv].x();
+      if( (*vertices)[nv].y() < yMin ) yMin = (*vertices)[nv].y();
+      if( (*vertices)[nv].z() < zMin ) zMin = (*vertices)[nv].z();
+    }
+    if ( pVoxelLimit.IsZLimited() )
+    {
+      if ( zMin > pVoxelLimit.GetMaxZExtent() + kCarTolerance ||
+           zMax < pVoxelLimit.GetMinZExtent() - kCarTolerance    )
+      {
+        delete vertices ;    //  'new' in the function called
+	return false;
+      }
+      else
+      {
+        if ( zMin < pVoxelLimit.GetMinZExtent() )
+	{
+	  zMin = pVoxelLimit.GetMinZExtent() ;
+	}
+	if ( zMax > pVoxelLimit.GetMaxZExtent() )
+	{
+	  zMax = pVoxelLimit.GetMaxZExtent() ;
+	}
+      }
+    } 
+    if ( pVoxelLimit.IsYLimited() )
+    {
+      if ( yMin > pVoxelLimit.GetMaxYExtent() + kCarTolerance ||
+           yMax < pVoxelLimit.GetMinYExtent() - kCarTolerance    )
+      {
+        delete vertices ;    //  'new' in the function called
+	return false;
+      }
+      else
+      {
+        if ( yMin < pVoxelLimit.GetMinYExtent() )
+	{
+	  yMin = pVoxelLimit.GetMinYExtent() ;
+	}
+	if ( yMax > pVoxelLimit.GetMaxYExtent() )
+        {
+	  yMax = pVoxelLimit.GetMaxYExtent() ;
+	}
+      }
+    }
+    if ( pVoxelLimit.IsXLimited() )
+    {
+      if ( xMin > pVoxelLimit.GetMaxXExtent() + kCarTolerance ||
+           xMax < pVoxelLimit.GetMinXExtent() - kCarTolerance    )
+      {
+        delete vertices ;    //  'new' in the function called
+	return false ;
+      } 
+      else
+      {
+        if ( xMin < pVoxelLimit.GetMinXExtent() )
+	{
+	  xMin = pVoxelLimit.GetMinXExtent() ;
+	}
+	if ( xMax > pVoxelLimit.GetMaxXExtent() )
+	{
+	  xMax = pVoxelLimit.GetMaxXExtent() ;
+        }
+      }
+    }
+    switch (pAxis)
+    {
+      case kXAxis:
+	   pMin=xMin;
+	   pMax=xMax;
+	   break;
+
+      case kYAxis:
+	   pMin=yMin;
+	   pMax=yMax;
+	   break;
+
+      case kZAxis:
+	   pMin=zMin;
+	   pMax=zMax;
+	   break;
+
+      default:
+	   break;
+    }
+    if ( pMin != kInfinity || pMax != -kInfinity )
+    {
+      existsAfterClip=true;
 		    
-// Add tolerance to avoid precision troubles
-		    pMin-=kCarTolerance;
-		    pMax+=kCarTolerance;
-		    
-		};
+      // Add tolerance to avoid precision troubles
 
-	    delete vertices ;          //  'new' in the function called
-	    flag = existsAfterClip ;
-   }
-   return flag;
+      pMin -= kCarTolerance ;
+      pMax += kCarTolerance ;	    
+    }
+    delete vertices ;          //  'new' in the function called
+    flag = existsAfterClip ;
+  }
+  return flag;
 }
 
 
@@ -1387,7 +1396,8 @@ G4ThreeVectorList*
 G4Trap::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 {
     G4ThreeVectorList *vertices;
-    vertices=new G4ThreeVectorList(8);
+    vertices=new G4ThreeVectorList();
+    vertices->reserve(8);
     if (vertices)
 	{
 	    G4ThreeVector vertex0(-fDz*fTthetaCphi-fDy1*fTalpha1-fDx1,-fDz*fTthetaSphi-fDy1,-fDz);
@@ -1399,14 +1409,14 @@ G4Trap::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 	    G4ThreeVector vertex6(+fDz*fTthetaCphi+fDy2*fTalpha2-fDx4,+fDz*fTthetaSphi+fDy2,+fDz);
 	    G4ThreeVector vertex7(+fDz*fTthetaCphi+fDy2*fTalpha2+fDx4,+fDz*fTthetaSphi+fDy2,+fDz);
 
-	    vertices->insert(pTransform.TransformPoint(vertex0));
-	    vertices->insert(pTransform.TransformPoint(vertex1));
-	    vertices->insert(pTransform.TransformPoint(vertex2));
-	    vertices->insert(pTransform.TransformPoint(vertex3));
-	    vertices->insert(pTransform.TransformPoint(vertex4));
-	    vertices->insert(pTransform.TransformPoint(vertex5));
-	    vertices->insert(pTransform.TransformPoint(vertex6));
-	    vertices->insert(pTransform.TransformPoint(vertex7));
+	    vertices->push_back(pTransform.TransformPoint(vertex0));
+	    vertices->push_back(pTransform.TransformPoint(vertex1));
+	    vertices->push_back(pTransform.TransformPoint(vertex2));
+	    vertices->push_back(pTransform.TransformPoint(vertex3));
+	    vertices->push_back(pTransform.TransformPoint(vertex4));
+	    vertices->push_back(pTransform.TransformPoint(vertex5));
+	    vertices->push_back(pTransform.TransformPoint(vertex6));
+	    vertices->push_back(pTransform.TransformPoint(vertex7));
 	}
     else
 	{
diff --git a/source/geometry/solids/CSG/src/G4Trd.cc b/source/geometry/solids/CSG/src/G4Trd.cc
index 8410fbc8a2..7d272cb759 100644
--- a/source/geometry/solids/CSG/src/G4Trd.cc
+++ b/source/geometry/solids/CSG/src/G4Trd.cc
@@ -1,24 +1,36 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trd.cc,v 1.7 2000/11/20 17:58:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trd.cc,v 1.8.2.1 2001/06/28 19:09:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Implementation for G4Trd class
 //
-// $ Id: $ 
-//
 // History:
 // ~1996,  V. Grichine, 1st implementation based on old code of P. Kent
 // 07.05.00, V. Grichine, in d = DistanceToIn(p,v), if d<0.5*kCarTolerance, d=0
 
-
-
 #include "G4Trd.hh"
 
 #include "G4VPVParameterisation.hh"
@@ -30,8 +42,6 @@
 #include "G4NURBS.hh"
 #include "G4NURBSbox.hh"
 
-#include <math.h>
-
 /////////////////////////////////////////////////////////////////////////
 //
 // Constructor - check & set half widths
@@ -1144,7 +1154,8 @@ G4ThreeVectorList*
 G4Trd::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 {
     G4ThreeVectorList *vertices;
-    vertices=new G4ThreeVectorList(8);
+    vertices=new G4ThreeVectorList();
+    vertices->reserve(8);
     if (vertices)
 	{
 	    G4ThreeVector vertex0(-fDx1,-fDy1,-fDz);
@@ -1156,14 +1167,14 @@ G4Trd::CreateRotatedVertices(const G4AffineTransform& pTransform) const
 	    G4ThreeVector vertex6(fDx2,fDy2,fDz);
 	    G4ThreeVector vertex7(-fDx2,fDy2,fDz);
 
-	    vertices->insert(pTransform.TransformPoint(vertex0));
-	    vertices->insert(pTransform.TransformPoint(vertex1));
-	    vertices->insert(pTransform.TransformPoint(vertex2));
-	    vertices->insert(pTransform.TransformPoint(vertex3));
-	    vertices->insert(pTransform.TransformPoint(vertex4));
-	    vertices->insert(pTransform.TransformPoint(vertex5));
-	    vertices->insert(pTransform.TransformPoint(vertex6));
-	    vertices->insert(pTransform.TransformPoint(vertex7));
+	    vertices->push_back(pTransform.TransformPoint(vertex0));
+	    vertices->push_back(pTransform.TransformPoint(vertex1));
+	    vertices->push_back(pTransform.TransformPoint(vertex2));
+	    vertices->push_back(pTransform.TransformPoint(vertex3));
+	    vertices->push_back(pTransform.TransformPoint(vertex4));
+	    vertices->push_back(pTransform.TransformPoint(vertex5));
+	    vertices->push_back(pTransform.TransformPoint(vertex6));
+	    vertices->push_back(pTransform.TransformPoint(vertex7));
 	}
     else
 	{
diff --git a/source/geometry/solids/CSG/src/G4Tubs.cc b/source/geometry/solids/CSG/src/G4Tubs.cc
index 452ca70f98..1c602f1269 100644
--- a/source/geometry/solids/CSG/src/G4Tubs.cc
+++ b/source/geometry/solids/CSG/src/G4Tubs.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Tubs.cc,v 1.28 2001/02/21 15:47:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Tubs.cc,v 1.30.2.1 2001/06/28 19:09:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4Tubs
@@ -1551,6 +1567,8 @@ G4double G4Tubs::DistanceToOut(const G4ThreeVector& p) const
   G4double safe, rho, safeR1, safeR2, safeZ ;
   G4double safePhi, phiC, cosPhiC, sinPhiC, ePhi ;
   rho = sqrt(p.x()*p.x() + p.y()*p.y()) ;
+
+#ifdef G4CSGDEBUG
   if( Inside(p) == kOutside )
   {
     G4cout.precision(16) ;
@@ -1565,9 +1583,10 @@ G4double G4Tubs::DistanceToOut(const G4ThreeVector& p) const
     G4cout << "p.x() = "   << p.x()/mm << " mm" << G4endl ;
     G4cout << "p.y() = "   << p.y()/mm << " mm" << G4endl ;
     G4cout << "p.z() = "   << p.z()/mm << " mm" << G4endl << G4endl ;
- // G4Exception("Invalid call in G4Tubs::DistanceToOut(p),  point p is outside") ;
-    G4cout << "G4Tubs::DistanceToOut(p), point p is outside !?" << G4endl ;
+    G4Exception("Invalid call in G4Tubs::DistanceToOut(p),  point p is outside") ;
+    // G4cout << "G4Tubs::DistanceToOut(p), point p is outside !?" << G4endl ;
   }
+#endif
 
   if ( fRMin )
   {
@@ -1648,7 +1667,8 @@ G4Tubs::CreateRotatedVertices(const G4AffineTransform& pTransform) const
   if (fDPhi == M_PI*2.0 && fSPhi == 0 ) sAngle = -meshAngle*0.5 ;
   else                                  sAngle =  fSPhi ;
     
-  vertices = new G4ThreeVectorList(noCrossSections*4);
+  vertices = new G4ThreeVectorList();
+  vertices->reserve(noCrossSections*4);
     
   if ( vertices )
   {
@@ -1669,10 +1689,10 @@ G4Tubs::CreateRotatedVertices(const G4AffineTransform& pTransform) const
       vertex2 = G4ThreeVector(rMaxX,rMaxY,+fDz) ;
       vertex3 = G4ThreeVector(rMinX,rMinY,+fDz) ;
 
-      vertices->insert(pTransform.TransformPoint(vertex0)) ;
-      vertices->insert(pTransform.TransformPoint(vertex1)) ;
-      vertices->insert(pTransform.TransformPoint(vertex2)) ;
-      vertices->insert(pTransform.TransformPoint(vertex3)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex0)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex1)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex2)) ;
+      vertices->push_back(pTransform.TransformPoint(vertex3)) ;
     }
   }
   else
diff --git a/source/geometry/solids/History b/source/geometry/solids/History
index 9607454b3b..356ea541ec 100644
--- a/source/geometry/solids/History
+++ b/source/geometry/solids/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.8 2000/11/13 08:21:57 gcosmo Exp $
+$Id: History,v 1.9 2001/04/20 20:02:08 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,10 +17,18 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Apr   20th, 2001   G. Cosmo                -  geomsolids-V03-01-00
+- Collects tags breps-V03-01-00, geom-solids-csg-V03-01-01,
+  stepinterface-V03-01-00, geom-solids-specific-V03-01-00,
+  geom-solid-bool-V03-00-03 and the latest fixes to STEP.
+- Added X11RayTracer tool (E.Medernach) for unit testing and latest
+  updates to SBT and Fred test suites.
+  
 Nov   13th, 2000   G. Cosmo                -  geomsolids-V02-00-01
 
-- Collects tags breps-V02-00-02, geom-solids-csg-V02-00-09, stepinterface-V02-00-01
-  and geom-solids-specific-V02-00-03 on top of the previous tag.
+- Collects tags breps-V02-00-02, geom-solids-csg-V02-00-09,
+  stepinterface-V02-00-01 and geom-solids-specific-V02-00-03
+  on top of the previous tag.
 
 Nov   09th, 2000   G. Cosmo                -  geomsolids-V02-00-00
 
diff --git a/source/geometry/solids/STEP/History b/source/geometry/solids/STEP/History
index 577fc5787b..3d825b06ac 100644
--- a/source/geometry/solids/STEP/History
+++ b/source/geometry/solids/STEP/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2000/11/20 18:14:53 gcosmo Exp $
+$Id: History,v 1.6 2001/06/18 08:41:12 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -19,6 +19,14 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+June 18, 2001           Gabriele Cosmo (STEP-V03-01-00)
+- dirobj.cc: removed usage of strdup() to allow porting on Linux-g++ -ansi
+  setup. Replaced with existing solution for __O3DB__.
+
+April 20, 2001          Gabriele Cosmo
+- Minor fixes for removing some pedantic warnings from Linux-g++,
+  modified files: scl_hash.cc, scl_string.cc.
+
 November 20, 2000	Gabriele Cosmo (STEP-V02-00-00)
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o commented out variables declared and not used.
diff --git a/source/geometry/solids/STEP/include/classes.h b/source/geometry/solids/STEP/include/classes.h
index 6434c78405..1941a591a4 100644
--- a/source/geometry/solids/STEP/include/classes.h
+++ b/source/geometry/solids/STEP/include/classes.h
@@ -6,7 +6,7 @@
 
 //
 // $Id: classes.h,v 1.3 2000/01/21 13:42:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name:  $
 //
 /*
 ** Fed-x parser output module for generating C++  class definitions
diff --git a/source/geometry/solids/STEP/src/dirobj.cc b/source/geometry/solids/STEP/src/dirobj.cc
index b26d6f2b74..b47b355998 100644
--- a/source/geometry/solids/STEP/src/dirobj.cc
+++ b/source/geometry/solids/STEP/src/dirobj.cc
@@ -10,7 +10,7 @@
 * and is not subject to copyright.
 */
 
-/* $Id: dirobj.cc,v 1.6 2000/11/21 07:54:50 gcosmo Exp $  */ 
+/* $Id: dirobj.cc,v 1.7 2001/06/18 08:19:40 gcosmo Exp $  */ 
 
 /*
  * DirObj implementation
@@ -500,12 +500,12 @@ void DirObj::InsertFile (const char* f, int index) {
         CheckIndex(index);
         spot = &fileList[index];
     }
-#ifdef __O3DB__
+//#ifdef __O3DB__	// Removed strdup() for ANSI porting - GC
     char* string = new char [strlen (f)];
     strcpy (string, f);
-#else
-    char* string = strdup(f);
-#endif
+//#else
+//    char* string = strdup(f);
+//#endif
     *spot = string;
     ++fileCount;
 }
diff --git a/source/geometry/solids/STEP/src/scl_hash.cc b/source/geometry/solids/STEP/src/scl_hash.cc
index f6e54973b8..b842a3f983 100644
--- a/source/geometry/solids/STEP/src/scl_hash.cc
+++ b/source/geometry/solids/STEP/src/scl_hash.cc
@@ -1,4 +1,4 @@
-/*  "$Id: scl_hash.cc,v 1.3 2000/01/21 13:43:15 gcosmo Exp $"; */
+/*  "$Id: scl_hash.cc,v 1.4 2001/04/20 19:07:14 gcosmo Exp $"; */
 
 /*
  * Dynamic hashing, after CACM April 1988 pp 446-457, by Per-Ake Larson.
@@ -109,7 +109,7 @@ HASHcreate(unsigned count)
     ** minimum SEGMENT_SIZE, then convert into segments.
     */
     i = SEGMENT_SIZE;
-    while (i < count)
+    while (i < int(count))
 	i <<= 1;
     count = DIV(i, SEGMENT_SIZE);
 
@@ -124,7 +124,7 @@ HASHcreate(unsigned count)
     /*
     ** Allocate initial 'i' segments of buckets
     */
-    for (i = 0; i < count; i++)  
+    for (i = 0; i < int(count); i++)  
 /*	table->Directory[i] = (struct Element **) calloc(SEGMENT_SIZE,sizeof(struct Element));*/
       {
 	table->Directory[i] = new struct Element * [SEGMENT_SIZE];
diff --git a/source/geometry/solids/STEP/src/scl_string.cc b/source/geometry/solids/STEP/src/scl_string.cc
index 21a99f4cfc..5e85ebe9d6 100644
--- a/source/geometry/solids/STEP/src/scl_string.cc
+++ b/source/geometry/solids/STEP/src/scl_string.cc
@@ -10,7 +10,7 @@
 * and is not subject to copyright.
 */
 
-/* $Id: scl_string.cc,v 1.3 2000/01/21 13:43:15 gcosmo Exp $ */
+/* $Id: scl_string.cc,v 1.4 2001/04/20 19:07:14 gcosmo Exp $ */
 
 #include <scl_string.h>
 #include <stdio.h>
@@ -46,7 +46,7 @@ SCLstring::SCLstring (const char * str, int lim)
 
   // check the length
   int l;
-  if (lim && (strlen (str) > lim)) l = lim;
+  if (lim && (int(strlen (str)) > lim)) l = lim;
   else l = strlen (str);
 
   _strBufSize = newBufSize (l);
diff --git a/source/geometry/solids/STEPinterface/History b/source/geometry/solids/STEPinterface/History
index b48f65b8c7..2fa469ad0a 100644
--- a/source/geometry/solids/STEPinterface/History
+++ b/source/geometry/solids/STEPinterface/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.8 2000/11/20 18:17:25 gcosmo Exp $
+$Id: History,v 1.9 2001/04/20 19:17:47 gcosmo Exp $
 ----------------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+20th April 2001  Gabriele Cosmo (stepinterface-V03-01-00)
+- Migration to STL vector:
+  o G4GeometryCreator, migrated typedefs: G4PlacedSolidVector,
+    G4SurfaceVector, G4SolidVector.
+  o G4GeometryTable, migrated typedef G4CreatorVector.
+
 20th November 2000  Gabriele Cosmo  (stepinterface-V02-00-02)
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o commented out variables declared and not used.
diff --git a/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
index d6b1bc3bb4..469889990a 100644
--- a/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AdvancedBrepShapeRepresentationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AdvancedBrepShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AdvancedBrepShapeRepresentationCreator.hh,v 1.3.4.1 2001/06/28 19:09:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedBrepShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
index 018fcd765d..f20e7c792b 100644
--- a/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AdvancedFaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AdvancedFaceCreator.hh,v 1.3 2000/11/09 16:35:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AdvancedFaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedFaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh b/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
index 35654ff2c8..ec1c73eab5 100644
--- a/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4AssemblyCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyCreator.hh,v 1.3.4.1 2001/06/28 19:09:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AssemblyCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
index d676337212..b0fdd34360 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis1PlacementCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis1PlacementCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis1PlacementCreator.hh,v 1.3.4.1 2001/06/28 19:09:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis1PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
index e6f8b2c6ce..dd3192424a 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2Placement2dCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement2dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement2dCreator.hh,v 1.3.4.1 2001/06/28 19:09:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement2dCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
index 6c93d22074..1110d1dd33 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2Placement3dCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement3dCreator.hh,v 1.3 2000/11/09 16:35:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement3dCreator.hh,v 1.3.4.1 2001/06/28 19:09:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3dCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
index 5558882e67..e0d80a544c 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2PlacementCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2PlacementCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
index 031908b925..7e031a6d28 100644
--- a/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4Axis2PlacementsCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2PlacementsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2PlacementsCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
index 306e00cd04..f0d8993dd6 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineCurveWithKnotsCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurveWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurveWithKnotsCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
index cb7b88d170..254e0a5e44 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
index 2048b9c22e..2c4839ee83 100644
--- a/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BSplineSurfaceWithKnotsCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceWithKnotsCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceWithKnotsCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
index 705ea3802a..7bb5ec22d7 100644
--- a/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4BoundedSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundedSurfaceCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundedSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundedSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh b/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
index f887f305cf..a045a8586c 100644
--- a/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CartesianPointCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CartesianPointCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CartesianPointCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CartesianPointCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh b/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
index ab20ff99bd..bc2c968469 100644
--- a/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CircleCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CircleCreator.hh,v 1.3 2000/11/09 16:35:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CircleCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CircleCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh b/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
index cf389bf9d1..d0c2d33f20 100644
--- a/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ClosedShellCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClosedShellCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClosedShellCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ClosedShellCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
index c111b8dc41..5f5c04e50e 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConicCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
index 6fec7844b7..b07dcd6700 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConicalSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicalSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh b/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
index 2d28ba85f1..bc8c066196 100644
--- a/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ConnectedFaceSetCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConnectedFaceSetCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConnectedFaceSetCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConnectedFaceSetCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
index 9bba516d36..6e3e15e889 100644
--- a/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ContextDependentShapeRepresentationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ContextDependentShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ContextDependentShapeRepresentationCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ContextDependentShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
index 50b2ecd721..8d8526b61e 100644
--- a/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CurveCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
index 4d0c36c86d..b9da5da446 100644
--- a/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4CylindricalSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CylindricalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CylindricalSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh b/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
index 83b99a8a43..a8a44419b1 100644
--- a/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4DirectionCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DirectionCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DirectionCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4DirectionCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
index 3d4d6d81a3..7196772f2b 100644
--- a/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EdgeCurveCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EdgeCurveCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EdgeCurveCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeCurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh b/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
index 4bd7caca1c..a8aadd4aac 100644
--- a/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EdgeLoopCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EdgeLoopCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EdgeLoopCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeLoopCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh b/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
index 960b826f61..f82c5c964b 100644
--- a/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4EllipseCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EllipseCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EllipseCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EllipseCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
index 04ff44226b..4a72db69bd 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceBoundCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceBoundCreator.hh,v 1.3.4.1 2001/06/28 19:09:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceBoundCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
index 39a43411d5..3c5361e78c 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceOuterBoundCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceOuterBoundCreator.hh,v 1.3 2000/11/09 16:35:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceOuterBoundCreator.hh,v 1.3.4.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceOuterBoundCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
index 04875fb62f..754d009429 100644
--- a/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4FaceSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceSurfaceCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh b/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
index 806eeb6f1e..09d592d8a5 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometricRepresentationContextCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometricRepresentationContextCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometricRepresentationContextCreator.hh,v 1.3.4.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometricRepresentationContextCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh b/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
index f0fb7bc58e..e274100a2f 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometryCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryCreator.hh,v 1.5 2000/11/10 17:44:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryCreator.hh,v 1.6.2.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometryCreator
@@ -25,14 +41,15 @@
 #define G4GEOMETRYCREATOR_HH
 
 #include <schema.h>
+#include "g4std/vector"
 #include "globals.hh"
 #include "G4PlacedSolid.hh"
 #include "G4Surface.hh"
 #include "G4BREPSolid.hh"
 
-typedef G4RWTPtrOrderedVector<G4PlacedSolid> G4PlacedSolidVector;
-typedef G4RWTPtrOrderedVector<G4Surface> G4SurfaceVector;
-typedef G4RWTPtrOrderedVector<G4BREPSolid> G4SolidVector;
+typedef G4std::vector<G4PlacedSolid*> G4PlacedSolidVector;
+typedef G4std::vector<G4Surface*> G4SurfaceVector;
+typedef G4std::vector<G4BREPSolid*> G4SolidVector;
 
 class G4GeometryCreator
 {
diff --git a/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh b/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
index d82cabf76a..63822add6e 100644
--- a/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
+++ b/source/geometry/solids/STEPinterface/include/G4GeometryTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryTable.hh,v 1.4 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryTable.hh,v 1.5.2.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometryTable
@@ -24,10 +40,11 @@
 #ifndef G4GEOMETRYTABLE_HH
 #define G4GEOMETRYTABLE_HH
 
+#include "g4std/vector"
 #include "globals.hh"
 #include "G4GeometryCreator.hh"
 
-typedef G4RWTPtrOrderedVector<G4GeometryCreator> G4CreatorVector;
+typedef G4std::vector<G4GeometryCreator*> G4CreatorVector;
 
 class G4GeometryTable
 {
diff --git a/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh b/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
index ce77de6dfe..0f2a01dbbe 100644
--- a/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4HyperbolaCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HyperbolaCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HyperbolaCreator.hh,v 1.3.4.1 2001/06/28 19:09:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4HyperbolaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
index 5d7675f828..b07e18d9aa 100644
--- a/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ItemDefinedTransformationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ItemDefinedTransformationCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ItemDefinedTransformationCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ItemDefinedTransformationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4LineCreator.hh b/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
index 63ab7134f7..1734f3228a 100644
--- a/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4LineCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LineCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LineCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4LineCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh b/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
index 4563af52ad..178213a084 100644
--- a/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ManifoldSolidBrepCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ManifoldSolidBrepCreator.hh,v 1.3 2000/11/09 16:35:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ManifoldSolidBrepCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ManifoldSolidBrepCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
index c694ffcef9..388b8bcd4f 100644
--- a/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4NISTStepReader.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NISTStepReader.hh,v 1.4 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NISTStepReader.hh,v 1.4.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4NISTStepReader
diff --git a/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh b/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
index 99c7e05228..1a6aa49747 100644
--- a/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4OpenShellCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenShellCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenShellCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4OpenShellCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh b/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
index d2a404951b..6b84eefe1d 100644
--- a/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4OrientedEdgeCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OrientedEdgeCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OrientedEdgeCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4OrientedEdgeCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh b/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
index 8fef14e456..b666fa7b27 100644
--- a/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ParabolaCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParabolaCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParabolaCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ParabolaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh b/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
index 4c6881e0bd..406497b206 100644
--- a/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PlaneCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlaneCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlaneCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PlaneCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
index ec243e87bc..6c69be9fa9 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointCreator.hh,v 1.3 2000/11/09 16:35:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PointCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
index f22c947022..0be5c045f5 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointOnCurveCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointOnCurveCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointOnCurveCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PointOnCurveCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
index ffbb398ba5..5a4bbe0f11 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointOnSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointOnSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointOnSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PointOnSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh b/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
index cf8978be6c..272e7dd032 100644
--- a/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4PointReplicaCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointReplicaCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointReplicaCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4PointReplicaCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh b/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
index ca6c17a420..275b1c320c 100644
--- a/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ProductDefinitionShapeCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProductDefinitionShapeCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProductDefinitionShapeCreator.hh,v 1.3.4.1 2001/06/28 19:09:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ProductDefinitionShapeCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
index 6cf228c98d..7cbc15ff60 100644
--- a/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RationalBSplineSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RationalBSplineSurfaceCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RationalBSplineSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4RationalBSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
index ace49a157c..b7ab9b5692 100644
--- a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RepresentationRelationshipCreator.hh,v 1.4 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RepresentationRelationshipCreator.hh,v 1.4.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4RepresentationRelationshipCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
index ee29b2b97e..fadb060bd5 100644
--- a/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4RepresentationRelationshipWithTransformationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RepresentationRelationshipWithTransformationCreator.hh,v 1.3 2000/11/09 16:35:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RepresentationRelationshipWithTransformationCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4RepresentationRelationshipWithTransformationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
index e556634c29..b794755f51 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeDefinitionRepresentationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeDefinitionRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeDefinitionRepresentationCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeDefinitionRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
index ab19317a9f..9da3508dc2 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeRepresentationCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeRepresentationCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
index c7f877ae55..17bca64ab8 100644
--- a/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ShapeRepresentationRelationshipCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeRepresentationRelationshipCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeRepresentationRelationshipCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ShapeRepresentationRelationshipCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
index 7ff97076eb..a46d3a6b15 100644
--- a/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4SphericalSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SphericalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SphericalSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4SphericalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
index dfabd241bc..b5b3c262a6 100644
--- a/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
+++ b/source/geometry/solids/STEPinterface/include/G4StepFileReader.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StepFileReader.hh,v 1.4 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StepFileReader.hh,v 1.4.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4StepFileReader
diff --git a/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh b/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
index 9259ef188b..27a66a1fc8 100644
--- a/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4ToroidalSurfaceCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ToroidalSurfaceCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ToroidalSurfaceCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ToroidalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh b/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
index 20d0c010ed..9a5d58cf1a 100644
--- a/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4VectorCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VectorCreator.hh,v 1.3 2000/11/09 16:35:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VectorCreator.hh,v 1.3.4.1 2001/06/28 19:09:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4VectorCreator
diff --git a/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh b/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
index ef510dbb9a..8ea5fb942f 100644
--- a/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
+++ b/source/geometry/solids/STEPinterface/include/G4VertexPointCreator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VertexPointCreator.hh,v 1.3 2000/11/09 16:35:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VertexPointCreator.hh,v 1.3.4.1 2001/06/28 19:09:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4VertexPointCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
index ca9a4657ec..75a3613cf8 100644
--- a/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AdvancedBrepShapeRepresentationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AdvancedBrepShapeRepresentationCreator.cc,v 1.4 2000/11/20 18:17:26 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AdvancedBrepShapeRepresentationCreator.cc,v 1.5.2.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedBrepShapeRepresentationCreator
@@ -93,7 +109,7 @@ void G4AdvancedBrepShapeRepresentationCreator::CreateG4Geometry(STEPentity& sEnt
          else
 	   placedSld = new G4PlacedSolid(sld, place0);
        
-         placedSldV->append(placedSld);
+         placedSldV->push_back(placedSld);
        }
    }
    else
diff --git a/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
index 753772f808..41e2708245 100644
--- a/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AdvancedFaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AdvancedFaceCreator.cc,v 1.3 2000/02/25 16:36:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AdvancedFaceCreator.cc,v 1.4.2.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AdvancedFaceCreator
@@ -56,12 +72,12 @@ void G4AdvancedFaceCreator::CreateG4Geometry(STEPentity& Ent)
     {
       G4CompositeCurve* pcc= new G4CompositeCurve;
       pcc->Init(*((G4CurveVector*)tmp));
-      boundaryVec->insert(pcc);
+      boundaryVec->push_back(pcc);
     }
     Node = Node->NextNode();
   }      
   
-  G4int boundNum = boundaryVec->entries();
+  G4int boundNum = boundaryVec->size();
   if (boundNum != boundaryCount)
     G4cerr << "WARNING - G4AdvancedFaceCreator::CreateG4Geometry" << G4endl
            << "\tTotal of " << boundNum << " G4CompositeCurve components created, out of "
diff --git a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
index 20871ed83c..f2ce1ac6a4 100644
--- a/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4AssemblyCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AssemblyCreator.cc,v 1.7 2000/11/20 18:17:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AssemblyCreator.cc,v 1.8.2.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4AssemblyCreator
@@ -140,12 +156,12 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& sEntity)
 	else
 	{
 	  G4PlacedSolidVector* tmpV = (G4PlacedSolidVector*)tmp; 
-	  G4int entr = tmpV->entries();
+	  G4int entr = tmpV->size();
 
 	  for(G4int b=0; b<entr; b++)
 	  {
-	    ps =  tmpV->at(b);
-	    psv->append(ps);
+	    ps = (*tmpV)[b];
+	    psv->push_back(ps);
 	  }
 	}
 
@@ -194,12 +210,12 @@ void G4AssemblyCreator::CreateG4Geometry(STEPentity& sEntity)
 	else
 	{
 	  G4PlacedSolidVector* tmpV = (G4PlacedSolidVector*)tmp; 
-	  G4int entr = tmpV->entries();
+	  G4int entr = tmpV->size();
 
 	  for(G4int b=0; b<entr; b++)
 	  {
-	    ps =  tmpV->at(b);
-	    psv->append(ps);
+	    ps =  (*tmpV)[b];
+	    psv->push_back(ps);
 	  }
 	}
 	index = ent->STEPfile_id ;
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
index f11a5fb0e7..7057b458eb 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis1PlacementCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis1PlacementCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis1PlacementCreator.cc,v 1.2.4.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis1PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
index 86a7dee3ab..a0a9cb7a70 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2Placement2dCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement2dCreator.cc,v 1.2 2000/01/21 13:45:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement2dCreator.cc,v 1.2.4.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement2dCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
index f1eae9aee0..c6cee8c96a 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2Placement3dCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2Placement3dCreator.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2Placement3dCreator.cc,v 1.4.4.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2Placement3dCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
index f3713e3d03..2f9b760134 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2PlacementCreator.cc,v 1.2 2000/01/21 13:45:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2PlacementCreator.cc,v 1.2.4.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
index b0d5707497..8aadd203f9 100644
--- a/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4Axis2PlacementsCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Axis2PlacementsCreator.cc,v 1.3 2000/01/21 13:45:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Axis2PlacementsCreator.cc,v 1.3.4.1 2001/06/28 19:09:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4Axis2PlacementsCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
index fff71d1401..1c88c8bc18 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineCurveWithKnotsCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineCurveWithKnotsCreator.cc,v 1.5 2000/11/20 18:17:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineCurveWithKnotsCreator.cc,v 1.6.2.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineCurveWithKnotsCreator
@@ -19,12 +35,11 @@
 // ----------------------------------------------------------------------
 
 #include <instmgr.h>
+#include "g4std/vector"
 #include "G4BSplineCurveWithKnotsCreator.hh"
 #include "G4GeometryTable.hh"
 #include "G4BSplineCurve.hh"
 
-typedef G4RWTValVector<G4double> G4doubleVector;
-
 G4BSplineCurveWithKnotsCreator G4BSplineCurveWithKnotsCreator::csc;
 
 
@@ -43,8 +58,8 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
 
   G4int             degree;
   G4Point3DVector   controlPointsList;
-  G4doubleVector    knots;
-  G4doubleVector    weightsData;
+  G4std::vector<G4double>    knots;
+  G4std::vector<G4double>    weightsData;
   G4BSplineCurve*   bSpline = new G4BSplineCurve();
 
   // degree
@@ -114,8 +129,8 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
     G4Point3D* pt = (G4Point3D*) tmp;
     G4Point3D Pt(pt->x(), pt->y(), pt->z());
 
-    if(G4int(controlPointsList.length()) <= nbpoint+1)
-      controlPointsList.reshape(nbpoint+1);
+    if(G4int(controlPointsList.size()) <= nbpoint+1)
+      controlPointsList.resize(nbpoint+1);
 
     controlPointsList[nbpoint] = Pt;
     
@@ -159,8 +174,8 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
     if (weight <= 0)
       weight = 1;
 
-    if(G4int(weightsData.length()) <= nbpoint+1)
-      weightsData.reshape(nbpoint+1);
+    if(G4int(weightsData.size()) <= nbpoint+1)
+      weightsData.resize(nbpoint+1);
     
     weightsData[nbpoint] = weight;
     nbpoint++;
@@ -204,8 +219,8 @@ void G4BSplineCurveWithKnotsCreator::CreateG4Geometry(STEPentity& Ent)
     if (knot <= 0)
       knot = 1;
 
-    if(G4int(knots.length()) <= nbpoint+1)
-      knots.reshape(nbpoint+1);
+    if(G4int(knots.size()) <= nbpoint+1)
+      knots.resize(nbpoint+1);
    
     knots[nbpoint] = knot;
     nbpoint++;
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
index 2c590342f9..b4cf4f2588 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceCreator.cc,v 1.4.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
index f06aa92c8a..c503da1048 100644
--- a/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BSplineSurfaceWithKnotsCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BSplineSurfaceWithKnotsCreator.cc,v 1.4 2000/11/20 18:17:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BSplineSurfaceWithKnotsCreator.cc,v 1.4.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BSplineSurfaceWithKnotsCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
index 41a4dc029b..9cfccd4cb5 100644
--- a/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4BoundedSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundedSurfaceCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundedSurfaceCreator.cc,v 1.5.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4BoundedSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc b/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
index a50bd70bbe..752a802e76 100644
--- a/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CartesianPointCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CartesianPointCreator.cc,v 1.2 2000/01/21 13:45:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CartesianPointCreator.cc,v 1.2.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CartesianPointCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc b/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
index 8804c95e61..2dbb5a6ceb 100644
--- a/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CircleCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CircleCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CircleCreator.cc,v 1.3.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CircleCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc b/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
index 06df61e52c..986200696d 100644
--- a/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ClosedShellCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClosedShellCreator.cc,v 1.5 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClosedShellCreator.cc,v 1.6.2.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ClosedShellCreator
@@ -47,12 +63,12 @@ void G4ClosedShellCreator::CreateG4Geometry(STEPentity& Ent)
   {
     TmpEnt = ((EntityNode*)Node)->node;
     void *tmp = G4GeometryTable::CreateObject(*TmpEnt);
-    if (tmp) SurfaceVec.append((G4Surface*)tmp);
+    if (tmp) SurfaceVec.push_back((G4Surface*)tmp);
     Node = Node->NextNode();
   }      
 
   // create G4solid
-  G4int SurfNum = SurfaceVec.entries();
+  G4int SurfNum = SurfaceVec.size();
   G4Surface** srfVec =  new G4Surface*[SurfNum];
   if (SurfNum != FaceCount)
     G4cerr << "WARNING - G4ClosedShellCreator::CreateG4Geometry" << G4endl
diff --git a/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
index ee67eac57f..69c08ce7b2 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConicCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicCreator.cc,v 1.3 2000/11/20 18:17:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicCreator.cc,v 1.3.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
index 88e035bd34..2331018e21 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConicalSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConicalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConicalSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConicalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc b/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
index 87af4a991d..14b351a707 100644
--- a/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ConnectedFaceSetCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ConnectedFaceSetCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ConnectedFaceSetCreator.cc,v 1.2.4.1 2001/06/28 19:09:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ConnectedFaceSetCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
index a3dd0c7c00..3cb61f6429 100644
--- a/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ContextDependentShapeRepresentationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ContextDependentShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ContextDependentShapeRepresentationCreator.cc,v 1.3.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4ContextDependentShapeRepresentationCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
index 2443becb60..83e28d4365 100644
--- a/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CurveCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CurveCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CurveCreator.cc,v 1.2.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CurveCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
index d5430e6081..ffba2dea7a 100644
--- a/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4CylindricalSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CylindricalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CylindricalSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4CylindricalSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc b/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
index 7787edab84..945d0d2c13 100644
--- a/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4DirectionCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DirectionCreator.cc,v 1.2 2000/01/21 13:46:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DirectionCreator.cc,v 1.2.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4DirectionCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
index 58da699ea9..80d976638d 100644
--- a/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EdgeCurveCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EdgeCurveCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EdgeCurveCreator.cc,v 1.4.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeCurveCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc b/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
index 23830593ef..e53279010d 100644
--- a/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EdgeLoopCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EdgeLoopCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EdgeLoopCreator.cc,v 1.4.2.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EdgeLoopCreator
@@ -46,11 +62,11 @@ void G4EdgeLoopCreator::CreateG4Geometry(STEPentity& Ent)
     {
       TmpEnt = ((EntityNode*)Node)->node;
       void *tmp =G4GeometryTable::CreateObject(*TmpEnt);
-      if (tmp) CurveVec->append((G4Curve*)tmp);
+      if (tmp) CurveVec->push_back((G4Curve*)tmp);
       Node = Node->NextNode();
     }      
 
-  G4int EdgeNum = CurveVec->entries();
+  G4int EdgeNum = CurveVec->size();
   if (EdgeNum != EdgeCount)
     G4cerr << "WARNING - G4EdgeLoopCreator::CreateG4Geometry" << G4endl
            << "\tTotal of " << EdgeNum << " G4Curve components created, out of "
diff --git a/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc b/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
index 9cb26716e0..4a282bd997 100644
--- a/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4EllipseCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EllipseCreator.cc,v 1.3 2000/02/25 16:36:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EllipseCreator.cc,v 1.3.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4EllipseCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
index 90b22d0208..72424e74e3 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceBoundCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceBoundCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceBoundCreator.cc,v 1.4.4.1 2001/06/28 19:09:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceBoundCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
index b903c739b9..55c3690d34 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceOuterBoundCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceOuterBoundCreator.cc,v 1.2 2000/01/21 13:46:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceOuterBoundCreator.cc,v 1.2.4.1 2001/06/28 19:09:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceOuterBoundCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
index 4e00a83023..d76ed8acf3 100644
--- a/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4FaceSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FaceSurfaceCreator.cc,v 1.4 2000/11/20 18:17:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FaceSurfaceCreator.cc,v 1.4.4.1 2001/06/28 19:09:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4FaceSurfaceCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc b/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
index 48758292a5..1d0802c30f 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometricRepresentationContextCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometricRepresentationContextCreator.cc,v 1.4 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometricRepresentationContextCreator.cc,v 1.4.4.1 2001/06/28 19:09:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ----------------------------------------------------------------------
 // Class G4GeometricRepresentationContextCreator
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc b/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
index a975c3c9cd..4dfc649fa2 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometryCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryCreator.cc,v 1.5 2000/11/10 17:44:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryCreator.cc,v 1.5.4.1 2001/06/28 19:09:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
index e383288427..3cd6779f2e 100644
--- a/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
+++ b/source/geometry/solids/STEPinterface/src/G4GeometryTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeometryTable.cc,v 1.7 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeometryTable.cc,v 1.8.2.1 2001/06/28 19:09:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
@@ -38,9 +54,9 @@ G4bool G4GeometryTable::ExistsInTable(G4String& objectName)
 {
   G4bool existsInTable = false;
 
-  for(size_t a=0;a<RegisteredObjects.length();a++)
+  for(size_t a=0;a<RegisteredObjects.size();a++)
   {
-    G4GeometryCreator* gcTmp =  RegisteredObjects(a);
+    G4GeometryCreator* gcTmp =  RegisteredObjects[a];
     G4String rName = gcTmp->Name();
     if(rName == objectName) existsInTable = true;
   }
@@ -53,14 +69,14 @@ void G4GeometryTable::RegisterObject(G4GeometryCreator* gc)
   G4String newName = gc->Name();
   
   if(!ExistsInTable(newName))
-    RegisteredObjects.append(gc);
+    RegisteredObjects.push_back(gc);
 }
 
 G4GeometryCreator* G4GeometryTable::GetObject(G4String objectName)
 {
-  for(size_t a=0; a<RegisteredObjects.length(); a++)
+  for(size_t a=0; a<RegisteredObjects.size(); a++)
   {
-    G4GeometryCreator* gcTmp =  RegisteredObjects(a);
+    G4GeometryCreator* gcTmp =  RegisteredObjects[a];
     G4String rName = gcTmp->Name();
     
     if(rName == objectName)
@@ -133,7 +149,7 @@ void G4GeometryTable::PrintObjectNames()
   G4GeometryCreator* gc=0;
   G4int a=0;
 
-  G4int objectCount = RegisteredObjects.length();
+  G4int objectCount = RegisteredObjects.size();
   if(!objectCount)
     {
       G4cout << "No registered objects in table." << G4endl;
diff --git a/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc b/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
index 7c354b85f0..f33bf73439 100644
--- a/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4HyperbolaCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HyperbolaCreator.cc,v 1.2 2000/01/21 13:46:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HyperbolaCreator.cc,v 1.2.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
index cad89de920..5793e4a7af 100644
--- a/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ItemDefinedTransformationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ItemDefinedTransformationCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ItemDefinedTransformationCreator.cc,v 1.4.2.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
@@ -53,7 +69,7 @@ void G4ItemDefinedTransformationCreator::CreateG4Geometry(STEPentity& Ent)
   // place = (G4Placement*)tmp;
   place = (G4Axis2Placement3D*)tmp;
 
-  if (place) places->append(place);
+  if (place) places->push_back(place);
   attrName="transform_item_2";
     Attr = GetNamedAttribute(attrName, Ent);
   TmpEnt = *Attr->ptr.c;
@@ -67,7 +83,7 @@ void G4ItemDefinedTransformationCreator::CreateG4Geometry(STEPentity& Ent)
   // place = (G4Placement*)tmp;
   place = (G4Axis2Placement3D*)tmp;
 
-  if (place) places->append(place);
+  if (place) places->push_back(place);
 
   createdObject = places;
 }
diff --git a/source/geometry/solids/STEPinterface/src/G4LineCreator.cc b/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
index da585f6f08..e95195c870 100644
--- a/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4LineCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LineCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LineCreator.cc,v 1.3.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc b/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
index 670748af42..1dd7736682 100644
--- a/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ManifoldSolidBrepCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ManifoldSolidBrepCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ManifoldSolidBrepCreator.cc,v 1.3.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
index bc55b522b4..abcf2f81e2 100644
--- a/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
+++ b/source/geometry/solids/STEPinterface/src/G4NISTStepReader.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NISTStepReader.cc,v 1.4 2000/11/09 16:35:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NISTStepReader.cc,v 1.4.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc b/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
index f23ccb791a..9f99ac5a88 100644
--- a/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4OpenShellCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenShellCreator.cc,v 1.2 2000/01/21 13:46:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenShellCreator.cc,v 1.2.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc b/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
index e2919533c1..1c3f9423c9 100644
--- a/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4OrientedEdgeCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OrientedEdgeCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OrientedEdgeCreator.cc,v 1.3.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc b/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
index 57d71ca613..c8cd22a2db 100644
--- a/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ParabolaCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParabolaCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParabolaCreator.cc,v 1.2.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc b/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
index a8b385d84d..753e9424f2 100644
--- a/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PlaneCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlaneCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlaneCreator.cc,v 1.3.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
index 8aa9305c4f..a48bcbcc54 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointCreator.cc,v 1.2 2000/01/21 13:46:04 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointCreator.cc,v 1.2.4.1 2001/06/28 19:09:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
index de5dbe6595..3bfe691fe8 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointOnCurveCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointOnCurveCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointOnCurveCreator.cc,v 1.3.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
index a19571e814..b962d9e386 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointOnSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointOnSurfaceCreator.cc,v 1.3 2000/02/25 16:36:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointOnSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc b/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
index 11ca5ee01d..593cd8c986 100644
--- a/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4PointReplicaCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PointReplicaCreator.cc,v 1.2 2000/01/21 13:46:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PointReplicaCreator.cc,v 1.2.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc b/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
index d6c3680535..8420902e29 100644
--- a/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ProductDefinitionShapeCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProductDefinitionShapeCreator.cc,v 1.3 2000/01/21 13:46:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProductDefinitionShapeCreator.cc,v 1.3.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
index 9db56e4cfe..f60fac27fd 100644
--- a/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RationalBSplineSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RationalBSplineSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RationalBSplineSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
index 5265552cf0..b18ca5c24f 100644
--- a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RepresentationRelationshipCreator.cc,v 1.5 2000/11/20 18:17:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RepresentationRelationshipCreator.cc,v 1.6.2.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
@@ -81,8 +97,8 @@ void G4RepresentationRelationshipCreator::CreateG4Geometry(STEPentity& Ent)
   {
     G4cerr << "WARNING - G4RepresentationRelationshipCreator::CreateG4Geometry" << G4endl
 	   << "\tInconsistent association for representations:" << G4endl
-	   << "\t" << e1Name << " - Rep_1 entries: " << places->entries() << G4endl
-	   << "\t" << e2Name << " - Rep_2 entries: " << tmpsldV->entries() << G4endl
+	   << "\t" << e1Name << " - Rep_1 entries: " << places->size() << G4endl
+	   << "\t" << e2Name << " - Rep_2 entries: " << tmpsldV->size() << G4endl
 	   << "\tRepresentation Relationship NOT created." << G4endl;
     createdObject=0;
     return;
@@ -115,12 +131,12 @@ void G4RepresentationRelationshipCreator::CreateG4Geometry(STEPentity& Ent)
       
       subEnt = (STEPentity*)repItem1;
       itemDefPlaces = new G4PlacementVector();
-      itemDefPlaces->append( ( (G4Axis2Placement3D*)G4GeometryTable::
-			       CreateObject(*subEnt)                  ) );
+      itemDefPlaces->push_back( ( (G4Axis2Placement3D*)G4GeometryTable::
+			           CreateObject(*subEnt)                  ) );
       
       subEnt  = (STEPentity*)repItem2;
-      itemDefPlaces->append( ( (G4Axis2Placement3D*)G4GeometryTable::
-			       CreateObject(*subEnt)                  ) );
+      itemDefPlaces->push_back( ( (G4Axis2Placement3D*)G4GeometryTable::
+			           CreateObject(*subEnt)                  ) );
     }
     else
     {  
@@ -136,17 +152,17 @@ void G4RepresentationRelationshipCreator::CreateG4Geometry(STEPentity& Ent)
   // See also creator for Advanced BREP shape Representations.
   // All this needs to be reviewed ! - GC
   //
-  G4Axis2Placement3D* place = (G4Axis2Placement3D*)(places->at(0));
-  G4int entr = tmpsldV->entries();
+  G4Axis2Placement3D* place = (G4Axis2Placement3D*)((*places)[0]);
+  G4int entr = tmpsldV->size();
   for(G4int a = 0; a < entr; a++)
   {
-    if (0 < a < places->entries())
-      place = (G4Axis2Placement3D*)(places->at(a));
-    tmpsld = tmpsldV->at(a);
+    if (0 < a < places->size())
+      place = (G4Axis2Placement3D*)((*places)[a]);
+    tmpsld = (*tmpsldV)[a];
     if (tmpsld)
     {
       sld = new G4PlacedSolid((G4BREPSolid*)(tmpsld->GetSolid()), place);
-      sldV->append(sld);
+      sldV->push_back(sld);
     }
     else
     {
diff --git a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
index 70e7925b9a..361c9dc903 100644
--- a/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4RepresentationRelationshipWithTransformationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RepresentationRelationshipWithTransformationCreator.cc,v 1.2 2000/01/21 13:46:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RepresentationRelationshipWithTransformationCreator.cc,v 1.2.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
index fd5a90b3db..9013f1774d 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeDefinitionRepresentationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeDefinitionRepresentationCreator.cc,v 1.5 2000/11/09 16:35:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeDefinitionRepresentationCreator.cc,v 1.5.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
index 99c6568a91..36644e88a4 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeRepresentationCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeRepresentationCreator.cc,v 1.4.2.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
@@ -57,11 +73,11 @@ void G4ShapeRepresentationCreator::CreateG4Geometry(STEPentity& Ent)
       place =(G4Axis2Placement3D*)G4GeometryTable::CreateObject(*TmpEnt);
 
       if (place)
-        placements->append(place);
+        placements->push_back(place);
       en = (EntityNode*)en->NextNode();
     }
   
-  G4int placementNum = placements->entries();
+  G4int placementNum = placements->size();
   if (placementNum != placementCount)
     G4cerr << "WARNING - G4ShapeRepresentationCreator::CreateG4Geometry" << G4endl
            << "\tTotal of " << placementNum << " G4Axis2Placement3D components created, out of "
diff --git a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
index 46fe69ee3b..36dddb06be 100644
--- a/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ShapeRepresentationRelationshipCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShapeRepresentationRelationshipCreator.cc,v 1.2 2000/01/21 13:46:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShapeRepresentationRelationshipCreator.cc,v 1.2.4.1 2001/06/28 19:09:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
index 9946492384..ebc4828915 100644
--- a/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4SphericalSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SphericalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SphericalSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc b/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
index 3544d83182..3f4569a7d6 100644
--- a/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4ToroidalSurfaceCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ToroidalSurfaceCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ToroidalSurfaceCreator.cc,v 1.3.4.1 2001/06/28 19:09:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc b/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
index d09fa09bed..db7b8a52b7 100644
--- a/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4VectorCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VectorCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VectorCreator.cc,v 1.3.4.1 2001/06/28 19:09:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc b/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
index e20d1416e5..e491f01331 100644
--- a/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
+++ b/source/geometry/solids/STEPinterface/src/G4VertexPointCreator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VertexPointCreator.cc,v 1.3 2000/02/25 16:36:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VertexPointCreator.cc,v 1.3.4.1 2001/06/28 19:09:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/History b/source/geometry/solids/specific/History
index ec393e1347..af9d17f879 100644
--- a/source/geometry/solids/specific/History
+++ b/source/geometry/solids/specific/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.17 2001/04/03 08:28:31 gcosmo Exp $
+$Id: History,v 1.19 2001/04/20 19:13:47 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,11 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+20-Apr-2001, G.Cosmo (geom-solids-specific-V03-01-00)
+- Migration to STL vector:
+  o In G4ClippablePolygon, migrated G4ThreeVectorList typedef and
+    made private to class.
+    
 03-Apr-2001, D.Williams  (geom-solids-specific-V03-00-01)
 -----------------------
 - G4IntersectingCone.cc: make small adjustment to help with roundoff error
diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.hh b/source/geometry/solids/specific/include/G4ClippablePolygon.hh
index 01dd9baa5f..ecc05d57eb 100644
--- a/source/geometry/solids/specific/include/G4ClippablePolygon.hh
+++ b/source/geometry/solids/specific/include/G4ClippablePolygon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClippablePolygon.hh,v 1.4 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClippablePolygon.hh,v 1.5.2.1 2001/06/28 19:09:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------------
@@ -26,6 +42,8 @@
 #ifndef G4ClippablePolygon_hh
 #define G4ClippablePolygon_hh
 
+#include "g4std/vector"
+
 #include "globals.hh"
 #include "geomdefs.hh"
 #include "G4ThreeVector.hh"
@@ -36,11 +54,10 @@ class G4AffineTransform;
 class G4AffineTransform;
 class G4VoxelLimits;
 
-#include "g4rw/tvordvec.h"
-typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
-
 class G4ClippablePolygon
 {
+  typedef G4std::vector<G4ThreeVector> G4ThreeVectorList;
+
   public:  // with description
 
 	G4ClippablePolygon();
diff --git a/source/geometry/solids/specific/include/G4ClippablePolygon.icc b/source/geometry/solids/specific/include/G4ClippablePolygon.icc
index f0493381cc..96c62a49d1 100644
--- a/source/geometry/solids/specific/include/G4ClippablePolygon.icc
+++ b/source/geometry/solids/specific/include/G4ClippablePolygon.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClippablePolygon.icc,v 1.1 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClippablePolygon.icc,v 1.2.2.1 2001/06/28 19:09:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
@@ -31,11 +47,11 @@ const G4ThreeVector G4ClippablePolygon::GetNormal() const
 inline
 G4int G4ClippablePolygon::GetNumVertices() const
 {
-   return vertices.entries();
+   return vertices.size();
 }
 
 inline
 G4bool G4ClippablePolygon::Empty() const
 {
-   return vertices.entries()==0;
+   return vertices.size()==0;
 }
diff --git a/source/geometry/solids/specific/include/G4EllipticalTube.hh b/source/geometry/solids/specific/include/G4EllipticalTube.hh
index 59fdbf97cc..57655b11c9 100644
--- a/source/geometry/solids/specific/include/G4EllipticalTube.hh
+++ b/source/geometry/solids/specific/include/G4EllipticalTube.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EllipticalTube.hh,v 1.8 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EllipticalTube.hh,v 1.8.4.1 2001/06/28 19:09:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 class header file
diff --git a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
index f48917410a..e82cf05b7d 100644
--- a/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
+++ b/source/geometry/solids/specific/include/G4EnclosingCylinder.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnclosingCylinder.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnclosingCylinder.hh,v 1.3.4.1 2001/06/28 19:09:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Hype.hh b/source/geometry/solids/specific/include/G4Hype.hh
index 2ec0d87b61..8cb74874c2 100644
--- a/source/geometry/solids/specific/include/G4Hype.hh
+++ b/source/geometry/solids/specific/include/G4Hype.hh
@@ -1,13 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hype.hh,v 1.4 2000/11/02 16:54:48 gcosmo Exp $
+//
+// $Id: G4Hype.hh,v 1.4.4.1 2001/06/28 19:09:22 gunter Exp $
 // $Original: G4Hype.hh,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Hype.icc b/source/geometry/solids/specific/include/G4Hype.icc
index e67d9106eb..5378bfdddc 100644
--- a/source/geometry/solids/specific/include/G4Hype.icc
+++ b/source/geometry/solids/specific/include/G4Hype.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hype.icc,v 1.1 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Hype.icc,v 1.1.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------------
 // GEANT 4 inline definitions file
diff --git a/source/geometry/solids/specific/include/G4IntersectingCone.hh b/source/geometry/solids/specific/include/G4IntersectingCone.hh
index 07603b1835..983e0798d3 100644
--- a/source/geometry/solids/specific/include/G4IntersectingCone.hh
+++ b/source/geometry/solids/specific/include/G4IntersectingCone.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IntersectingCone.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IntersectingCone.hh,v 1.3.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.hh b/source/geometry/solids/specific/include/G4PolyPhiFace.hh
index 61af0605d8..2bf5ff5917 100644
--- a/source/geometry/solids/specific/include/G4PolyPhiFace.hh
+++ b/source/geometry/solids/specific/include/G4PolyPhiFace.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyPhiFace.hh,v 1.3 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyPhiFace.hh,v 1.3.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyPhiFace.icc b/source/geometry/solids/specific/include/G4PolyPhiFace.icc
index c8b6bba251..82baa27cd0 100644
--- a/source/geometry/solids/specific/include/G4PolyPhiFace.icc
+++ b/source/geometry/solids/specific/include/G4PolyPhiFace.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyPhiFace.icc,v 1.2 2000/11/02 16:54:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyPhiFace.icc,v 1.2.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Polycone.hh b/source/geometry/solids/specific/include/G4Polycone.hh
index b7bee90975..37b038edeb 100644
--- a/source/geometry/solids/specific/include/G4Polycone.hh
+++ b/source/geometry/solids/specific/include/G4Polycone.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polycone.hh,v 1.5 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polycone.hh,v 1.5.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyconeSide.hh b/source/geometry/solids/specific/include/G4PolyconeSide.hh
index 952c810e92..8048821df7 100644
--- a/source/geometry/solids/specific/include/G4PolyconeSide.hh
+++ b/source/geometry/solids/specific/include/G4PolyconeSide.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyconeSide.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyconeSide.hh,v 1.3.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4Polyhedra.hh b/source/geometry/solids/specific/include/G4Polyhedra.hh
index 46ba3c666b..879190d785 100644
--- a/source/geometry/solids/specific/include/G4Polyhedra.hh
+++ b/source/geometry/solids/specific/include/G4Polyhedra.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyhedra.hh,v 1.4 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyhedra.hh,v 1.4.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4PolyhedraSide.hh b/source/geometry/solids/specific/include/G4PolyhedraSide.hh
index ca75b0dd86..fc458911d4 100644
--- a/source/geometry/solids/specific/include/G4PolyhedraSide.hh
+++ b/source/geometry/solids/specific/include/G4PolyhedraSide.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyhedraSide.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyhedraSide.hh,v 1.3.4.1 2001/06/28 19:09:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
index 77ac611afe..7db1545a68 100644
--- a/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
+++ b/source/geometry/solids/specific/include/G4ReduciblePolygon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReduciblePolygon.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReduciblePolygon.hh,v 1.3.4.1 2001/06/28 19:09:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4SolidExtentList.hh b/source/geometry/solids/specific/include/G4SolidExtentList.hh
index 7e86a72824..57c6b71d25 100644
--- a/source/geometry/solids/specific/include/G4SolidExtentList.hh
+++ b/source/geometry/solids/specific/include/G4SolidExtentList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SolidExtentList.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SolidExtentList.hh,v 1.3.4.1 2001/06/28 19:09:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4VCSGface.hh b/source/geometry/solids/specific/include/G4VCSGface.hh
index b3c1ca5814..8f30b27af6 100644
--- a/source/geometry/solids/specific/include/G4VCSGface.hh
+++ b/source/geometry/solids/specific/include/G4VCSGface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VCSGface.hh,v 1.3 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VCSGface.hh,v 1.3.4.1 2001/06/28 19:09:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/include/G4VCSGfaceted.hh b/source/geometry/solids/specific/include/G4VCSGfaceted.hh
index ea0e7c3bec..7980b7eb4e 100644
--- a/source/geometry/solids/specific/include/G4VCSGfaceted.hh
+++ b/source/geometry/solids/specific/include/G4VCSGfaceted.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VCSGfaceted.hh,v 1.5 2000/11/02 16:54:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VCSGfaceted.hh,v 1.5.4.1 2001/06/28 19:09:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4ClippablePolygon.cc b/source/geometry/solids/specific/src/G4ClippablePolygon.cc
index ed40c679d0..31be3b2b4e 100644
--- a/source/geometry/solids/specific/src/G4ClippablePolygon.cc
+++ b/source/geometry/solids/specific/src/G4ClippablePolygon.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ClippablePolygon.cc,v 1.4 2000/11/13 08:11:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ClippablePolygon.cc,v 1.5.2.1 2001/06/28 19:09:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
@@ -42,7 +58,7 @@ G4ClippablePolygon::~G4ClippablePolygon()
 //
 void G4ClippablePolygon::AddVertexInOrder( const G4ThreeVector vertex )
 {
-	vertices.append( vertex );
+	vertices.push_back( vertex );
 }
 
 
@@ -67,7 +83,7 @@ G4bool G4ClippablePolygon::Clip( const G4VoxelLimits &voxelLimit )
 		ClipAlongOneAxis( voxelLimit, kZAxis );
 	}
 	
-	return (vertices.entries() > 0);
+	return (vertices.size() > 0);
 }
 
 
@@ -84,7 +100,7 @@ G4bool G4ClippablePolygon::PartialClip( const G4VoxelLimits &voxelLimit, const E
 		if (IgnoreMe != kZAxis) ClipAlongOneAxis( voxelLimit, kZAxis );
 	}
 	
-	return (vertices.entries() > 0);
+	return (vertices.size() > 0);
 }
 
 
@@ -97,7 +113,7 @@ G4bool G4ClippablePolygon::GetExtent( const EAxis axis,
 	//
 	// Okay, how many entries do we have?
 	//
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	
 	//
 	// Return false if nothing is left
@@ -107,14 +123,14 @@ G4bool G4ClippablePolygon::GetExtent( const EAxis axis,
 	//
 	// Initialize min and max to our first vertex
 	//
-	min = max = vertices(0).operator()( axis );
+	min = max = vertices[0].operator()( axis );
 	
 	//
 	// Compare to the rest
 	//
 	G4int i;
 	for( i=1; i<noLeft; i++ ) {
-		G4double component = vertices(i).operator()( axis );
+		G4double component = vertices[i].operator()( axis );
 		if (component < min )
 			min = component;
 		else if (component > max )
@@ -133,7 +149,7 @@ G4bool G4ClippablePolygon::GetExtent( const EAxis axis,
 //
 const G4ThreeVector *G4ClippablePolygon::GetMinPoint( const EAxis axis ) const
 {
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	if (noLeft==0) G4Exception( "G4ClippablePolygon::GetMinPoint -- empty polygon" );
 	
 	const G4ThreeVector *answer = &(vertices[0]);
@@ -141,7 +157,7 @@ const G4ThreeVector *G4ClippablePolygon::GetMinPoint( const EAxis axis ) const
 
 	G4int i;
 	for( i=1; i<noLeft; i++ ) {
-		G4double component = vertices(i).operator()( axis );
+		G4double component = vertices[i].operator()( axis );
 		if (component < min) {
 			answer = &(vertices[i]);
 			min = component;
@@ -160,7 +176,7 @@ const G4ThreeVector *G4ClippablePolygon::GetMinPoint( const EAxis axis ) const
 //
 const G4ThreeVector *G4ClippablePolygon::GetMaxPoint( const EAxis axis ) const
 {
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	if (noLeft==0) G4Exception( "G4ClippablePolygon::GetMaxPoint -- empty polygon" );
 	
 	const G4ThreeVector *answer = &(vertices[0]);
@@ -168,7 +184,7 @@ const G4ThreeVector *G4ClippablePolygon::GetMaxPoint( const EAxis axis ) const
 
 	G4int i;
 	for( i=1; i<noLeft; i++ ) {
-		G4double component = vertices(i).operator()( axis );
+		G4double component = vertices[i].operator()( axis );
 		if (component > max) {
 			answer = &(vertices[i]);
 			max = component;
@@ -200,7 +216,7 @@ G4bool G4ClippablePolygon::InFrontOf( const G4ClippablePolygon &other, EAxis axi
 	//
 	// If things are empty, do something semi-sensible
 	//
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	if (noLeft==0) return false;
 	
 	if (other.Empty()) return true;
@@ -260,7 +276,7 @@ G4bool G4ClippablePolygon::BehindOf( const G4ClippablePolygon &other, EAxis axis
 	//
 	// If things are empty, do something semi-sensible
 	//
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	if (noLeft==0) return false;
 	
 	if (other.Empty()) return true;
@@ -322,7 +338,7 @@ G4bool G4ClippablePolygon::GetPlanerExtent( const G4ThreeVector &pointOnPlane,
 	//
 	// Okay, how many entries do we have?
 	//
-	G4int noLeft = vertices.entries();
+	G4int noLeft = vertices.size();
 	
 	//
 	// Return false if nothing is left
@@ -332,14 +348,14 @@ G4bool G4ClippablePolygon::GetPlanerExtent( const G4ThreeVector &pointOnPlane,
 	//
 	// Initialize min and max to our first vertex
 	//
-	min = max = planeNormal.dot(vertices(0)-pointOnPlane);
+	min = max = planeNormal.dot(vertices[0]-pointOnPlane);
 	
 	//
 	// Compare to the rest
 	//
 	G4int i;
 	for( i=1; i<noLeft; i++ ) {
-		G4double component = planeNormal.dot(vertices(i) - pointOnPlane);
+		G4double component = planeNormal.dot(vertices[i] - pointOnPlane);
 		if (component < min )
 			min = component;
 		else if (component > max )
@@ -372,7 +388,7 @@ void G4ClippablePolygon::ClipAlongOneAxis( const G4VoxelLimits &voxelLimit, cons
 	// If nothing is left from the above clip, we might as well return now
 	// (but with an empty vertices)
 	//
-	if (tempPolygon.entries() == 0) {
+	if (tempPolygon.size() == 0) {
 		vertices.clear();
 		return;
 	}
@@ -388,7 +404,7 @@ void G4ClippablePolygon::ClipAlongOneAxis( const G4VoxelLimits &voxelLimit, cons
 	//
 	// If nothing is left, return now
 	//
-	if (vertices.entries() == 0) return;
+	if (vertices.size() == 0) return;
 }
 
 
@@ -403,21 +419,21 @@ void G4ClippablePolygon::ClipToSimpleLimits( G4ThreeVectorList& pPolygon,
 				             const G4VoxelLimits& pVoxelLimit   )
 {
     G4int i;
-    G4int noVertices=pPolygon.entries();
+    G4int noVertices=pPolygon.size();
     G4ThreeVector vEnd,vStart;
     
     outputPolygon.clear();
     
     for (i=0;i<noVertices;i++)
 	{
-	    vStart=pPolygon(i);
+	    vStart=pPolygon[i];
 	    if (i==noVertices-1)
 		{
-		    vEnd=pPolygon(0);
+		    vEnd=pPolygon[0];
 		}
 	    else
 		{
-		    vEnd=pPolygon(i+1);
+		    vEnd=pPolygon[i+1];
 		}
 
 	    if (pVoxelLimit.Inside(vStart))
@@ -425,13 +441,13 @@ void G4ClippablePolygon::ClipToSimpleLimits( G4ThreeVectorList& pPolygon,
 		    if (pVoxelLimit.Inside(vEnd))
 			{
 // vStart and vEnd inside -> output end point
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vEnd);
 			}
 		    else
 			{
 // vStart inside, vEnd outside -> output crossing point
 			    pVoxelLimit.ClipToLimits(vStart,vEnd);
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vEnd);
 			}
 		    
 		}
@@ -441,8 +457,8 @@ void G4ClippablePolygon::ClipToSimpleLimits( G4ThreeVectorList& pPolygon,
 			{
 // vStart outside, vEnd inside -> output inside section
 			    pVoxelLimit.ClipToLimits(vStart,vEnd);
-			    outputPolygon.insert(vStart);
-			    outputPolygon.insert(vEnd);
+			    outputPolygon.push_back(vStart);
+			    outputPolygon.push_back(vEnd);
 			}
 		    else
 // Both point outside -> no output
diff --git a/source/geometry/solids/specific/src/G4EllipticalTube.cc b/source/geometry/solids/specific/src/G4EllipticalTube.cc
index 4bf2f436f8..10407d7fb5 100644
--- a/source/geometry/solids/specific/src/G4EllipticalTube.cc
+++ b/source/geometry/solids/specific/src/G4EllipticalTube.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EllipticalTube.cc,v 1.9 2000/11/20 18:18:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EllipticalTube.cc,v 1.9.4.1 2001/06/28 19:09:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
index 0f62d67b43..048bd95ca0 100644
--- a/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
+++ b/source/geometry/solids/specific/src/G4EnclosingCylinder.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnclosingCylinder.cc,v 1.2 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnclosingCylinder.cc,v 1.2.4.1 2001/06/28 19:09:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Hype.cc b/source/geometry/solids/specific/src/G4Hype.cc
index 2f6d765073..db7fab2b19 100644
--- a/source/geometry/solids/specific/src/G4Hype.cc
+++ b/source/geometry/solids/specific/src/G4Hype.cc
@@ -1,13 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Hype.cc,v 1.6 2001/01/04 18:30:50 davidw Exp $
+//
+// $Id: G4Hype.cc,v 1.6.2.1 2001/06/28 19:09:25 gunter Exp $
 // $Original: G4Hype.cc,v 1.0 1998/06/09 16:57:50 safai Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4IntersectingCone.cc b/source/geometry/solids/specific/src/G4IntersectingCone.cc
index bb16a8e53c..5011917d71 100644
--- a/source/geometry/solids/specific/src/G4IntersectingCone.cc
+++ b/source/geometry/solids/specific/src/G4IntersectingCone.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IntersectingCone.cc,v 1.3 2001/03/30 18:44:10 davidw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IntersectingCone.cc,v 1.3.2.1 2001/06/28 19:09:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4PolyPhiFace.cc b/source/geometry/solids/specific/src/G4PolyPhiFace.cc
index 0ca5653759..a3774eaa2b 100644
--- a/source/geometry/solids/specific/src/G4PolyPhiFace.cc
+++ b/source/geometry/solids/specific/src/G4PolyPhiFace.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyPhiFace.cc,v 1.3 2000/11/20 18:18:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyPhiFace.cc,v 1.3.4.1 2001/06/28 19:09:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Polycone.cc b/source/geometry/solids/specific/src/G4Polycone.cc
index f0f13dc52c..5be357dfa8 100644
--- a/source/geometry/solids/specific/src/G4Polycone.cc
+++ b/source/geometry/solids/specific/src/G4Polycone.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polycone.cc,v 1.4 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polycone.cc,v 1.4.4.1 2001/06/28 19:09:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4PolyconeSide.cc b/source/geometry/solids/specific/src/G4PolyconeSide.cc
index 0cd8f2235b..1d2c484e95 100644
--- a/source/geometry/solids/specific/src/G4PolyconeSide.cc
+++ b/source/geometry/solids/specific/src/G4PolyconeSide.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyconeSide.cc,v 1.3 2000/11/20 18:18:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyconeSide.cc,v 1.3.4.1 2001/06/28 19:09:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4Polyhedra.cc b/source/geometry/solids/specific/src/G4Polyhedra.cc
index 239130beee..42bf21d9f0 100644
--- a/source/geometry/solids/specific/src/G4Polyhedra.cc
+++ b/source/geometry/solids/specific/src/G4Polyhedra.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyhedra.cc,v 1.2 2000/11/02 16:54:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyhedra.cc,v 1.2.4.1 2001/06/28 19:09:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4PolyhedraSide.cc b/source/geometry/solids/specific/src/G4PolyhedraSide.cc
index 4eb011097b..dea35ae925 100644
--- a/source/geometry/solids/specific/src/G4PolyhedraSide.cc
+++ b/source/geometry/solids/specific/src/G4PolyhedraSide.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolyhedraSide.cc,v 1.3 2000/11/20 18:19:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolyhedraSide.cc,v 1.3.4.1 2001/06/28 19:09:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
index 5424d51cb3..c159474027 100644
--- a/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
+++ b/source/geometry/solids/specific/src/G4ReduciblePolygon.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReduciblePolygon.cc,v 1.3 2000/11/20 18:19:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReduciblePolygon.cc,v 1.3.4.1 2001/06/28 19:09:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4SolidExtentList.cc b/source/geometry/solids/specific/src/G4SolidExtentList.cc
index 6e6237b2dc..9179a8ea7e 100644
--- a/source/geometry/solids/specific/src/G4SolidExtentList.cc
+++ b/source/geometry/solids/specific/src/G4SolidExtentList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SolidExtentList.cc,v 1.1 2000/04/07 11:03:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SolidExtentList.cc,v 1.1.4.1 2001/06/28 19:09:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/solids/specific/src/G4VCSGfaceted.cc b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
index 9f9da08f2c..a644ffbb38 100644
--- a/source/geometry/solids/specific/src/G4VCSGfaceted.cc
+++ b/source/geometry/solids/specific/src/G4VCSGfaceted.cc
@@ -1,11 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // the GEANT4 collaboration.
 //
 // By copying, distributing or modifying the Program (or any work
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4VCSGfaceted.cc,v 1.6 2000/11/20 18:19:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4VCSGfaceted.cc,v 1.6.4.1 2001/06/28 19:09:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/geometry/volumes/History b/source/geometry/volumes/History
index 40bb37e814..ef85223eea 100644
--- a/source/geometry/volumes/History
+++ b/source/geometry/volumes/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.33 2001/03/19 12:10:41 japost Exp $
+$Id: History,v 1.48 2001/05/31 17:33:20 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,7 +16,66 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-March 12th, 2001     J. Apostolakis - geomvol-V03-00-03
+
+May 31st, 2001       G. Cosmo - geomvol-V03-01-08
+- Fixed usage of 'fabs', which belongs to global scope, NOT in std
+  namespace. Detected by compilation error on DEC ISO/ANSI setup.
+- G4VoxelNavigation.icc: initialised data-member in initialiser list of
+  constructor with explicit initialisation to dummy values to allow porting
+  on ObjecSpace STL.
+
+May 23rd, 2001       J. Apostolakis - geomvol-V03-01-07
+- Added methods to Set the minimum epsilon (relative accuracy) to
+  Propagator In Field.
+
+May 23rd, 2001       J. Apostolakis - geomvol-V03-01-06
+- Added new parameter to Propagator In Field, 
+  fEpsilonMin which is the minimal relative accuracy for MF driving.
+
+May 23rd, 2001       J. Apostolakis - geomvol-V03-01-05
+- Moved Delta Intersection and One Step from PropagatorInField to Field Manager.
+- Modified G4TransportationManager.cc to initialise default values accordingly.
+  (Incorporating changes into a tag, finally, after fix to G4FieldManager 
+  constructors. ) 
+o This tag requires and co-works with field-V03-01-01.
+  This now ENABLES the use of different Field Managers for different parts of
+  the detector.  First implementation allows a volume that has a field
+  manager to override the global one.  
+  Note: All field managers currently must refer to fields in global coordinates
+o New ability: to set the delta accuracy parameters differently in different
+  volumes (even while maintaining the same field as the global one!).  
+
+May 23rd, 2001       G. Cosmo - geomvol-V03-01-04
+- Fixes in G4ReplicaNavigation for bug reports #253 and #254:
+  o in VoxelLocate(...), treated particular case of rotational symmetry
+    with extent over 360 degrees (courtesy of H.Boie).
+  o in DistanceToOutPhi(...), fix to correctly handle cases where the
+    starting point is on boundary of replicas and direction is along boundary.
+
+May 15th, 2001       G. Cosmo - geomvol-V03-01-03
+- G4AuxiliaryNavServices::CheckPointOnSurface(): added additional check to resolve
+  endless looping of G4Navigator in case the track is passing through a point, edge
+  or surface shared by two solids.
+  This problem occured when G4Navigator was trying to transport a particle when
+  exiting a solid. Transportation will now perform a few zero steps and continues
+  stepping instead of looping around the same point. Fixes problem report #185.
+
+April 27th, 2001     G. Cosmo - geomvol-V03-01-02
+- G4VoxelNavigation.icc: fixed compilation warnings on HP-UX, concerning
+  potential uninitialised vector elements.
+
+April 20th, 2001     G. Cosmo - geomvol-V03-01-01
+- Updated unit tests to conform to recent STL vector migration.
+
+April 17th, 2001     G. Cosmo - geomvol-V03-01-00
+- Migration to STL vector:
+  o Modified classes:
+    G4VoxelNavigation, G4NavigationHistory, G4BlockingList,
+    G4LogicalSkinSurface, G4LogicalBorderSurface.
+  o Removed GetIndex() and table-index data from G4LogicalSkinSurface
+    and G4LogicalBorderSurface.
+
+March 19th, 2001     J. Apostolakis - geomvol-V03-00-03
 - G4PropagatorInField: 
      Modified to use new (not obsolete) methods of G4FieldTrack. 
      Deleted old/obsolete ComputeStep method 
diff --git a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
index d34c556a6a..c501be32cb 100644
--- a/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
+++ b/source/geometry/volumes/include/G4AuxiliaryNavServices.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AuxiliaryNavServices.hh,v 1.3 2000/04/25 16:15:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AuxiliaryNavServices.hh,v 1.3.4.1 2001/06/28 19:09:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4NormalNavigation
diff --git a/source/geometry/volumes/include/G4AuxiliaryNavServices.icc b/source/geometry/volumes/include/G4AuxiliaryNavServices.icc
index cd9e6c6518..cabe8dc819 100644
--- a/source/geometry/volumes/include/G4AuxiliaryNavServices.icc
+++ b/source/geometry/volumes/include/G4AuxiliaryNavServices.icc
@@ -1,33 +1,79 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AuxiliaryNavServices.icc,v 1.3.2.1 2001/06/28 19:09:37 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+//
+// class G4AuxiliaryNavServices Inline implementation
+//
 
 inline G4bool G4AuxiliaryNavServices::CheckPointOnSurface( const G4VSolid* sampleSolid, 
-			    const G4ThreeVector& localPoint, 
-			    const G4ThreeVector* globalDirection, 
-			    const G4AffineTransform& sampleTransform,
-			    const G4bool  locatedOnEdge)
+                                                           const G4ThreeVector& localPoint, 
+                                                           const G4ThreeVector* globalDirection, 
+                                                           const G4AffineTransform& sampleTransform,
+                                                           const G4bool  locatedOnEdge)
 {
   G4ThreeVector localDirection, sampleNormal;
   G4bool enter=false;
 
   if (sampleSolid->Inside(localPoint)!=kOutside) 
-    {
-      if(locatedOnEdge && (globalDirection!=0))
-	{
-	  // We are probably located on an edge.
-	  localDirection= sampleTransform.TransformAxis(*globalDirection); 
-	  
-	  // Check whether we enter the volume
-	  // 
-	  sampleNormal= sampleSolid->SurfaceNormal(localPoint);
-	  if ( sampleNormal.dot(localDirection) <= 0 )
-	    {
-	      enter= true;
-	    }
-	}
-      else
-	{
-	  enter= true;
-	}
-    }
+  {
+     if(locatedOnEdge && (globalDirection!=0))
+     {
+        // We are probably located on an edge.
+        localDirection= sampleTransform.TransformAxis(*globalDirection); 
+
+        // Check whether we enter the volume
+        // 
+        sampleNormal= sampleSolid->SurfaceNormal(localPoint);
+        if ( sampleNormal.dot(localDirection) <= 0 )
+        {
+           if( sampleNormal.dot(localDirection) == 0 )
+           {
+              // We can't decide yet, let's make sure we're entering the solid
+              //
+              // If by a confusion we entered the next solid we find out now that
+              // whether to leave or to enter.
+              // This happens when we're no the surface or edge shared by two solids
+              //
+              G4double distanceToIn = sampleSolid->DistanceToIn( localPoint, localDirection );
+              if( distanceToIn != kInfinity )
+              {
+                 enter = true;
+              } 
+           }
+           else
+           {
+              enter= true;
+           }
+        }
+     }
+     else
+     {
+        enter= true;
+     }
+  }
   return enter;
 }
 
diff --git a/source/geometry/volumes/include/G4BlockingList.hh b/source/geometry/volumes/include/G4BlockingList.hh
index 6325eefeac..dd64401f3c 100644
--- a/source/geometry/volumes/include/G4BlockingList.hh
+++ b/source/geometry/volumes/include/G4BlockingList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BlockingList.hh,v 1.4 2000/04/25 16:15:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BlockingList.hh,v 1.5.2.1 2001/06/28 19:09:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4BlockingList
 //
@@ -30,7 +46,7 @@
 #define G4BLOCKINGLIST_HH
 
 #include "globals.hh"
-#include "g4rw/tvvector.h"
+#include "g4std/vector"
 
 const G4int kBlockingListMaxDefault = 500; // Block up to 511 daughters
 				           // initially
@@ -77,7 +93,7 @@ class G4BlockingList
     G4int fBlockTagNo, fStride;		
       // Current blocked volume tag number.
 
-    G4RWTValVector<G4int> fBlockingList; 
+    G4std::vector<G4int> fBlockingList; 
       // Blocked volumes: Elements with indices
       // corresponding to blocked volume set to fBlockTagNo.
 
diff --git a/source/geometry/volumes/include/G4BlockingList.icc b/source/geometry/volumes/include/G4BlockingList.icc
index e972635ba4..90e6f73b50 100644
--- a/source/geometry/volumes/include/G4BlockingList.icc
+++ b/source/geometry/volumes/include/G4BlockingList.icc
@@ -1,21 +1,36 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BlockingList.icc,v 1.3 2000/11/20 18:59:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BlockingList.icc,v 1.4.2.1 2001/06/28 19:09:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4BlockingList  Inlined Implementation
 //
 
 inline G4BlockingList::G4BlockingList(G4int maxDefault,G4int stride)
-  : fStride(stride), fBlockingList(maxDefault)
+  : fStride(stride), fBlockingList(maxDefault,0)
 {
-	FullyReset();
 }
 
 // Do nothing destructor
@@ -25,17 +40,17 @@ inline G4BlockingList::~G4BlockingList()
 
 inline G4int G4BlockingList::Length() const
 {
-	return fBlockingList.length();
+	return fBlockingList.size();
 }
 
 inline void G4BlockingList::BlockVolume(const G4int v)
 {
-	fBlockingList(v)=fBlockTagNo;
+	fBlockingList[v]=fBlockTagNo;
 }
 
 inline G4bool G4BlockingList::IsBlocked(const G4int v) const
 {
-	return (fBlockingList(v)==fBlockTagNo) ? true:false;
+	return (fBlockingList[v]==fBlockTagNo) ? true:false;
 }
 
 
@@ -53,14 +68,14 @@ inline void G4BlockingList::Reset()
 
 inline void G4BlockingList::Enlarge(const G4int nv)
 {
-	G4int len=fBlockingList.length();
+	G4int len=fBlockingList.size();
 	if (len<nv)
 		{
 			G4int newlen=(nv/fStride+1)*fStride;
-			fBlockingList.reshape(newlen);
+			fBlockingList.resize(newlen);
 			for (G4int i=len;i<newlen;i++)
 				{
-					fBlockingList(i)=0;
+					fBlockingList[i]=0;
 				}
 		}
 }
diff --git a/source/geometry/volumes/include/G4GRSSolid.hh b/source/geometry/volumes/include/G4GRSSolid.hh
index ea8acd0e0e..235ca18f6d 100644
--- a/source/geometry/volumes/include/G4GRSSolid.hh
+++ b/source/geometry/volumes/include/G4GRSSolid.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSSolid.hh,v 1.4 2000/11/01 16:51:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSSolid.hh,v 1.4.4.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSSolid
diff --git a/source/geometry/volumes/include/G4GRSSolid.icc b/source/geometry/volumes/include/G4GRSSolid.icc
index 3e07b3f005..6bed7bd18b 100644
--- a/source/geometry/volumes/include/G4GRSSolid.icc
+++ b/source/geometry/volumes/include/G4GRSSolid.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSSolid.icc,v 1.4 2000/11/20 18:59:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSSolid.icc,v 1.4.4.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSSolid inline implementation
diff --git a/source/geometry/volumes/include/G4GRSVolume.hh b/source/geometry/volumes/include/G4GRSVolume.hh
index a9d7a486bb..8245a3a010 100644
--- a/source/geometry/volumes/include/G4GRSVolume.hh
+++ b/source/geometry/volumes/include/G4GRSVolume.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSVolume.hh,v 1.4 2000/11/01 16:51:05 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSVolume.hh,v 1.4.4.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSVolume
diff --git a/source/geometry/volumes/include/G4GRSVolume.icc b/source/geometry/volumes/include/G4GRSVolume.icc
index 86493c4fe9..c6aac4dc79 100644
--- a/source/geometry/volumes/include/G4GRSVolume.icc
+++ b/source/geometry/volumes/include/G4GRSVolume.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSVolume.icc,v 1.5 2000/11/20 18:59:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSVolume.icc,v 1.5.4.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSVolume inline implementation
diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.hh b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
index 5fd3ec7a76..55f9e5e268 100644
--- a/source/geometry/volumes/include/G4LogicalBorderSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalBorderSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalBorderSurface.hh,v 1.5 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalBorderSurface.hh,v 1.6.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // class G4LogicalBorderSurface
@@ -36,8 +52,7 @@
 #include  "G4LogicalSurface.hh"
 #include "G4VPhysicalVolume.hh"
 
-// G4RWTPtrOrderedVector
-#include "g4rw/tpordvec.h"
+#include "g4std/vector"
 
 class G4Event;
 
@@ -80,13 +95,11 @@ class G4LogicalBorderSurface: public G4LogicalSurface
 	inline void SetVolume2(G4VPhysicalVolume* vol2);
           // These are potentially dangerous.
 
-        static const G4RWTPtrOrderedVector<G4LogicalBorderSurface>* GetSurfaceTable();
+        static const G4std::vector<G4LogicalBorderSurface*> *GetSurfaceTable();
         static size_t GetNumberOfBorderSurfaces();
 	static void DumpInfo(); 
 	  //   Methods dealing with the table of surfaces.
 
-	inline size_t GetIndex() const;
-
         //////////////
         // Operators
         //////////////
@@ -108,14 +121,11 @@ class G4LogicalBorderSurface: public G4LogicalSurface
 	G4VPhysicalVolume* Volume1;	// Physical Volume pointer on side 1
 	G4VPhysicalVolume* Volume2;	// Physical Volume pointer on side 2
 
-	static G4RWTPtrOrderedVector<G4LogicalBorderSurface> theBorderSurfaceTable;
+	static G4std::vector<G4LogicalBorderSurface*> theBorderSurfaceTable;
           // The static Table of Surfaces
-
-	size_t theIndexInTable;
-          // Index of surface in the surface table
 };
 
-typedef G4RWTPtrOrderedVector<G4LogicalBorderSurface> G4LogicalBorderSurfaceTable;
+typedef G4std::vector<G4LogicalBorderSurface*> G4LogicalBorderSurfaceTable;
 
 ////////////////////
 // Inline methods
diff --git a/source/geometry/volumes/include/G4LogicalBorderSurface.icc b/source/geometry/volumes/include/G4LogicalBorderSurface.icc
index c52f656ebd..b4599aeb00 100644
--- a/source/geometry/volumes/include/G4LogicalBorderSurface.icc
+++ b/source/geometry/volumes/include/G4LogicalBorderSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalBorderSurface.icc,v 1.2 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalBorderSurface.icc,v 1.3.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4LogicalBorderSurface inline implementation
@@ -44,9 +60,3 @@ void G4LogicalBorderSurface::SetVolume2(G4VPhysicalVolume* vol2)
 {
   Volume2 = vol2;
 }
-
-inline
-size_t G4LogicalBorderSurface::GetIndex() const
-{
-  return theIndexInTable;
-}
diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.hh b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
index f8269a5a3a..e0ab191560 100644
--- a/source/geometry/volumes/include/G4LogicalSkinSurface.hh
+++ b/source/geometry/volumes/include/G4LogicalSkinSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalSkinSurface.hh,v 1.5 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalSkinSurface.hh,v 1.6.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // class G4LogicalSkinSurface
@@ -36,15 +52,12 @@
 #include "G4LogicalSurface.hh"
 #include "G4LogicalVolume.hh"
 
-// G4RWTPtrOrderedVector
-#include "g4rw/tpordvec.h"
-
+#include "g4std/vector"
 
 /////////////////////
 // Class Definition
 /////////////////////
 
-
 class G4LogicalSkinSurface : public G4LogicalSurface 
 {
 
@@ -75,10 +88,6 @@ class G4LogicalSkinSurface : public G4LogicalSurface
         static void DumpInfo(); // const 
 	  // Methods dealing with the table of surfaces.
 
-#if THESE_ARE_NEEDED
-	inline size_t GetIndex() const;
-#endif
-
         //////////////
         // Operators
         //////////////
@@ -100,15 +109,12 @@ private:
 	G4LogicalVolume* LogVolume;
 	  // Logical Volume pointer on side 1
 
-  	static G4RWTPtrOrderedVector<G4LogicalSkinSurface> theSurfaceTable;
+  	static G4std::vector<G4LogicalSkinSurface*> theSurfaceTable;
 	  // The static Table of Surfaces
 
-	size_t theIndexInTable;
-	  // Index of surface in the surface table
-
 };
 
-typedef G4RWTPtrOrderedVector<G4LogicalSkinSurface> G4LogicalSkinSurfaceTable;
+typedef G4std::vector<G4LogicalSkinSurface*> G4LogicalSkinSurfaceTable;
 
 ////////////////////
 // Inline methods
diff --git a/source/geometry/volumes/include/G4LogicalSkinSurface.icc b/source/geometry/volumes/include/G4LogicalSkinSurface.icc
index 7cc2faa502..55dd8795db 100644
--- a/source/geometry/volumes/include/G4LogicalSkinSurface.icc
+++ b/source/geometry/volumes/include/G4LogicalSkinSurface.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalSkinSurface.icc,v 1.2 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalSkinSurface.icc,v 1.3.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4LogicalSkinSurface inline implementation
@@ -23,11 +39,3 @@ void G4LogicalSkinSurface::SetLogicalVolume(G4LogicalVolume* vol)
 {
   LogVolume = vol;
 }
-
-#if THESE_ARE_NEEDED
-inline
-size_t G4LogicalSkinSurface::GetIndex() const
-{
-  return theIndexInTable;
-}
-#endif
diff --git a/source/geometry/volumes/include/G4NavigationHistory.hh b/source/geometry/volumes/include/G4NavigationHistory.hh
index 29170f156a..657d51a33d 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.hh
+++ b/source/geometry/volumes/include/G4NavigationHistory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationHistory.hh,v 1.7 2000/11/20 18:59:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationHistory.hh,v 1.8.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4NavigationHistory
 //
@@ -31,8 +47,7 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4NavigationLevel.hh"
 
-#include "g4rw/tvvector.h"
-#include "g4rw/tpvector.h"
+#include "g4std/vector"
 #include "g4std/iostream"
 
 class G4NavigationHistory
@@ -122,7 +137,7 @@ class G4NavigationHistory
 
  private:
 
-  G4RWTValVector<G4NavigationLevel>  fNavHistory;
+  G4std::vector<G4NavigationLevel>  fNavHistory;
 
   G4int fStackDepth;
     // Depth of stack: effectively depth in geometrical tree
diff --git a/source/geometry/volumes/include/G4NavigationHistory.icc b/source/geometry/volumes/include/G4NavigationHistory.icc
index 51a9de2d0f..d1556ff7ca 100644
--- a/source/geometry/volumes/include/G4NavigationHistory.icc
+++ b/source/geometry/volumes/include/G4NavigationHistory.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationHistory.icc,v 1.3 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationHistory.icc,v 1.4.2.1 2001/06/28 19:09:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4NavigationHistory Inline implementation
@@ -40,11 +56,11 @@ G4NavigationHistory::operator=(const G4NavigationHistory &h)
 
   // fNavHistory=h.fNavHistory;   // This works, but is very slow.
   if( this->GetMaxDepth() < h.fStackDepth ){
-     fNavHistory.reshape( h.fStackDepth ); 
+     fNavHistory.resize( h.fStackDepth ); 
   }
   register G4int ilev= h.fStackDepth;
   for ( ; ilev>=0; ilev--) { 
-     fNavHistory(ilev) = h.fNavHistory(ilev); 
+     fNavHistory[ilev] = h.fNavHistory[ilev]; 
   } 
 
   fStackDepth=h.fStackDepth;
@@ -67,10 +83,10 @@ void G4NavigationHistory::Clear()
 	tmpNavLevel=G4NavigationLevel(0, dummyTransform, kParameterised, -1) ;
 
 	Reset();
-	for (G4int ilev=fNavHistory.length()-1; ilev>=0; ilev--)
+	for (G4int ilev=fNavHistory.size()-1; ilev>=0; ilev--)
 	{
 	   // fNavHistory(ilev)= 0;
-	   fNavHistory(ilev)= tmpNavLevel;
+	   fNavHistory[ilev]= tmpNavLevel;
 	}
 }
 
@@ -85,7 +101,7 @@ void G4NavigationHistory::SetFirstEntry(G4VPhysicalVolume* pVol)
 	if(pVol !=0) {
 	    translation=pVol->GetTranslation();
 	}
-	fNavHistory(0)= G4NavigationLevel( pVol,
+	fNavHistory[0]= G4NavigationLevel( pVol,
 					   G4AffineTransform(translation), 
 					   kNormal );
 }
@@ -93,31 +109,31 @@ void G4NavigationHistory::SetFirstEntry(G4VPhysicalVolume* pVol)
 inline
 const G4AffineTransform* G4NavigationHistory::GetPtrTopTransform() const
 {
-	return   fNavHistory(fStackDepth).GetPtrTransform();
+	return   fNavHistory[fStackDepth].GetPtrTransform();
 }
 
 inline
 const G4AffineTransform& G4NavigationHistory::GetTopTransform() const
 {
-	return fNavHistory(fStackDepth).GetTransform();
+	return fNavHistory[fStackDepth].GetTransform();
 }
 
 inline
 G4int G4NavigationHistory::GetTopReplicaNo() const
 {
-	return fNavHistory(fStackDepth).GetReplicaNo();
+	return fNavHistory[fStackDepth].GetReplicaNo();
 }
 
 inline
 EVolume G4NavigationHistory::GetTopVolumeType() const
 {
-	return fNavHistory(fStackDepth).GetVolumeType();
+	return fNavHistory[fStackDepth].GetVolumeType();
 }
 
 inline
 G4VPhysicalVolume* G4NavigationHistory::GetTopVolume() const
 {
-	return fNavHistory(fStackDepth).GetPhysicalVolume();
+	return fNavHistory[fStackDepth].GetPhysicalVolume();
 }
 
 inline
@@ -130,31 +146,31 @@ inline
 const G4AffineTransform&
 G4NavigationHistory::GetTransform(G4int n) const
 {
-	return fNavHistory(n).GetTransform();
+	return fNavHistory[n].GetTransform();
 }
 
 inline
 G4int G4NavigationHistory::GetReplicaNo(G4int n) const
 {
-	return fNavHistory(n).GetReplicaNo();
+	return fNavHistory[n].GetReplicaNo();
 }
 
 inline
 EVolume G4NavigationHistory::GetVolumeType(G4int n) const
 {
-	return fNavHistory(n).GetVolumeType();
+	return fNavHistory[n].GetVolumeType();
 }
 
 inline
 G4VPhysicalVolume* G4NavigationHistory::GetVolume(G4int n) const
 {
-	return fNavHistory(n).GetPhysicalVolume();
+	return fNavHistory[n].GetPhysicalVolume();
 }
 
 inline
 G4int G4NavigationHistory::GetMaxDepth() const
 {
-	return fNavHistory.length();
+	return fNavHistory.size();
 }
 
 inline
@@ -177,11 +193,11 @@ void G4NavigationHistory::BackLevel(G4int n)
 inline
 void G4NavigationHistory::EnlargeHistory()
 {
-	G4int len=fNavHistory.length();
+	G4int len=fNavHistory.size();
 	if (len==fStackDepth)
 		{       // Note: Resize operation clears additional entries
 			G4int nlen=len+kHistoryStride;
-			fNavHistory.reshape(nlen);
+			fNavHistory.resize(nlen);
 		}	
 }
 
@@ -193,9 +209,9 @@ void G4NavigationHistory::NewLevel(G4VPhysicalVolume *pNewMother,
 {
 	EnlargeHistory();	// Enlarge if required
 	fStackDepth++;
-	fNavHistory(fStackDepth) = 
+	fNavHistory[fStackDepth] = 
 	       G4NavigationLevel(pNewMother, 
-				 fNavHistory(fStackDepth-1).GetTransform(),
+				 fNavHistory[fStackDepth-1].GetTransform(),
 				 G4AffineTransform(pNewMother->GetRotation(),
 						pNewMother->GetTranslation()),
 				 vType,
diff --git a/source/geometry/volumes/include/G4NavigationLevel.hh b/source/geometry/volumes/include/G4NavigationLevel.hh
index 948f62109f..0d778a41be 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.hh
+++ b/source/geometry/volumes/include/G4NavigationLevel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationLevel.hh,v 1.12 2000/11/01 16:51:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationLevel.hh,v 1.12.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4NavigationLevel
 //
diff --git a/source/geometry/volumes/include/G4NavigationLevel.icc b/source/geometry/volumes/include/G4NavigationLevel.icc
index 1e54926054..7f5b52179f 100644
--- a/source/geometry/volumes/include/G4NavigationLevel.icc
+++ b/source/geometry/volumes/include/G4NavigationLevel.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationLevel.icc,v 1.10 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationLevel.icc,v 1.10.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 30.09.97 J.Apostolakis Initial version. 
 //                        
diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.hh b/source/geometry/volumes/include/G4NavigationLevelRep.hh
index 183e11abd2..225bea656d 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.hh
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationLevelRep.hh,v 1.5 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationLevelRep.hh,v 1.5.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4NavigationLevelRep
 //
diff --git a/source/geometry/volumes/include/G4NavigationLevelRep.icc b/source/geometry/volumes/include/G4NavigationLevelRep.icc
index 03abb9398b..275b0175c0 100644
--- a/source/geometry/volumes/include/G4NavigationLevelRep.icc
+++ b/source/geometry/volumes/include/G4NavigationLevelRep.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationLevelRep.icc,v 1.4 2000/11/20 18:59:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationLevelRep.icc,v 1.4.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  1 October 1997 J.Apostolakis Initial version. 
 //                        
diff --git a/source/geometry/volumes/include/G4Navigator.hh b/source/geometry/volumes/include/G4Navigator.hh
index b0c1e88cea..489f8f8781 100644
--- a/source/geometry/volumes/include/G4Navigator.hh
+++ b/source/geometry/volumes/include/G4Navigator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Navigator.hh,v 1.6 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Navigator.hh,v 1.6.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4Navigator
diff --git a/source/geometry/volumes/include/G4Navigator.icc b/source/geometry/volumes/include/G4Navigator.icc
index f0a632836a..572c4b620e 100644
--- a/source/geometry/volumes/include/G4Navigator.icc
+++ b/source/geometry/volumes/include/G4Navigator.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Navigator.icc,v 1.3 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Navigator.icc,v 1.3.4.1 2001/06/28 19:09:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4Navigator Inline implementation
diff --git a/source/geometry/volumes/include/G4NormalNavigation.hh b/source/geometry/volumes/include/G4NormalNavigation.hh
index 6ca0a5bb04..5bdfba29e1 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.hh
+++ b/source/geometry/volumes/include/G4NormalNavigation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NormalNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NormalNavigation.hh,v 1.3.4.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4NormalNavigation
diff --git a/source/geometry/volumes/include/G4NormalNavigation.icc b/source/geometry/volumes/include/G4NormalNavigation.icc
index 222d0dc314..a7bac8d973 100644
--- a/source/geometry/volumes/include/G4NormalNavigation.icc
+++ b/source/geometry/volumes/include/G4NormalNavigation.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NormalNavigation.icc,v 1.3 2000/11/20 18:59:40 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NormalNavigation.icc,v 1.3.4.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4NormalNavigation Inline Implementation
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.hh b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
index 80d74453f1..6e6a4d9970 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.hh
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParameterisedNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParameterisedNavigation.hh,v 1.3.4.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4ParameterisedNavigation
diff --git a/source/geometry/volumes/include/G4ParameterisedNavigation.icc b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
index 9c5597d8e6..1f2eed03fd 100644
--- a/source/geometry/volumes/include/G4ParameterisedNavigation.icc
+++ b/source/geometry/volumes/include/G4ParameterisedNavigation.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParameterisedNavigation.icc,v 1.3 2000/11/20 18:59:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParameterisedNavigation.icc,v 1.3.4.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4ParameterisedNavigation Inline implementation
diff --git a/source/geometry/volumes/include/G4PropagatorInField.hh b/source/geometry/volumes/include/G4PropagatorInField.hh
index 9af8415927..ce6eb03e33 100644
--- a/source/geometry/volumes/include/G4PropagatorInField.hh
+++ b/source/geometry/volumes/include/G4PropagatorInField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PropagatorInField.hh,v 1.10.4.1 2001/02/20 18:23:31 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PropagatorInField.hh,v 1.15.2.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PropagatorInField 
@@ -73,12 +89,6 @@ class G4PropagatorInField
    inline G4bool         IsParticleLooping() const;
      // Return the state after the Step
 
-   inline G4double  DeltaIntersection() const; 
-     // The accuracy of finding an intersection
-
-   G4double  DeltaOneStep();
-     // The accuracy of a single Step
-
    inline G4double  GetEpsilonStep() const;
      // Relative accuracy for current Step (Calc.)
    inline void      SetEpsilonStep(G4double newEps);
@@ -100,13 +110,14 @@ class G4PropagatorInField
      // Accuracy for one tracking/physics step.
                                     
    inline void    SetAccuraciesWithDeltaOneStep(G4double deltaOneStep);  
-     // Sets both accuracies, maintaining a particular ratio
-     // for accuracties of volume Intersection and Integration (in One Step)
+     // Sets both accuracies for the Global (Detector) field, 
+     // maintaining a particular ratio for accuracties 
+     // of volume Intersection and Integration (in One Step).
 
-   inline void    SetDeltaOneStep(G4double deltaOneStep);  
-     // Set accuracy for integration of one step.   (only)
    inline void    SetDeltaIntersection(G4double deltaIntersection);
      // Set accuracy of  intersection of a volume.  (only)
+   inline void    SetDeltaOneStep(G4double deltaOneStep);  
+     // Set accuracy for integration of one step.   (only)
 
    inline G4int   GetMaxLoopCount() const;
    inline void    SetMaxLoopCount(G4int new_max);
@@ -123,6 +134,10 @@ class G4PropagatorInField
 
    inline G4FieldTrack GetEndState() const;
 
+     // Minimum for Relative accuracy of any Step 
+   inline G4double  GetMinimumEpsilonStep() const;
+   inline void      SetMinimumEpsilonStep(G4double newEpsMin);
+
  public:  // without description
 
    // void  SetGlobalFieldMgr( G4FieldManager *detectorFieldMgr );
@@ -147,7 +162,10 @@ class G4PropagatorInField
  private:
 
    G4FieldManager *fDetectorFieldMgr; 
-     // The  Field Manager of the whole Detector.
+     // The  Field Manager of the whole Detector.  (default)
+
+   G4FieldManager *fCurrentFieldMgr;
+     // The  Field Manager of the current volume (may be the one above.)
 
    G4Navigator   *fNavigator;
 
@@ -165,15 +183,12 @@ class G4PropagatorInField
    G4int  fVerboseLevel;
      // For debuging purposes
 
-   //  Values for the required accuracies
-   //
-   G4double  fDelta_One_Step_Value;      //  for one tracking/physics step
-   G4double  fDelta_Intersection_Val;    //  for boundary intersection
+   //  Values for the small possible relative accuracy of a step
+   //       (corresponding to the greatest possible integration accuracy)
 
-   //  Their default values ...  (set in G4PropagatemagField.cc)
-   //
-   static const G4double  fDefault_Delta_One_Step_Value;   // = 0.25 * mm;
-   static const G4double  fDefault_Delta_Intersection_Val; // = 0.1 * mm;
+     // Minimum for Relative accuracy of any Step 
+   G4double  fEpsilonMin; 
+   static const G4double  fEpsilonMinDefault;               // 1.0e-10 ;  
 
    G4int  fmax_loop_count;
 
@@ -191,3 +206,5 @@ class G4PropagatorInField
 #include "G4PropagatorInField.icc"
 
 #endif 
+
+
diff --git a/source/geometry/volumes/include/G4PropagatorInField.icc b/source/geometry/volumes/include/G4PropagatorInField.icc
index b6e7e610e5..01eca149ae 100644
--- a/source/geometry/volumes/include/G4PropagatorInField.icc
+++ b/source/geometry/volumes/include/G4PropagatorInField.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PropagatorInField.icc,v 1.13.4.1 2001/02/20 18:23:32 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PropagatorInField.icc,v 1.18.2.2 2001/06/28 20:18:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------------------
 //	GEANT 4  include file implementation
 //
-//	For information related to this code contact:
-//	GEANT4 Collaboration
 // ------------------------------------------------------------------------
 // 
 // 25.10.96 John Apostolakis, design and implementation 
@@ -28,13 +42,12 @@
 inline
 G4PropagatorInField::G4PropagatorInField(G4Navigator    *theNavigator, 
 		                         G4FieldManager *detectorFieldMgr)
-  : fDetectorFieldMgr(detectorFieldMgr),
+  : fDetectorFieldMgr(detectorFieldMgr), 
+    fCurrentFieldMgr(detectorFieldMgr), 
     fNavigator(theNavigator),
     End_PointAndTangent(G4ThreeVector(0.,0.,0.),
-			G4ThreeVector(0.,0.,0.),0.0,0.0,0.0,0.0),
+			G4ThreeVector(0.,0.,0.),0.0,0.0,0.0,0.0,0.0),
     fVerboseLevel(0),
-    fDelta_One_Step_Value(fDefault_Delta_One_Step_Value),
-    fDelta_Intersection_Val(fDefault_Delta_Intersection_Val),
     fmax_loop_count(10000)
 {
      // this->fChordFinder = new G4ChordFinder( (G4MagneticField*)0, 1e-6 );
@@ -51,7 +64,7 @@ G4ChordFinder* G4PropagatorInField::GetChordFinder()
 {
       // Now only the "Chord Finder" of the global Field Mgr is used
       //  ... 
-      return fDetectorFieldMgr->GetChordFinder(); 
+      return fCurrentFieldMgr->GetChordFinder(); 
 }
 
 inline
@@ -110,33 +123,36 @@ void     G4PropagatorInField::SetMaxLoopCount(G4int new_max)
 inline
 G4double G4PropagatorInField::GetDeltaIntersection() const
 {
-  return fDelta_Intersection_Val;
+      return fCurrentFieldMgr->GetDeltaIntersection();
 } 
 
 inline
 G4double G4PropagatorInField::GetDeltaOneStep() const
 {
-  return fDelta_One_Step_Value;
-}                                    
+      return fCurrentFieldMgr->GetDeltaOneStep();
+}
 
 inline
 void
 G4PropagatorInField::SetAccuraciesWithDeltaOneStep(G4double valDeltaOneStep)
 { 
-  fDelta_One_Step_Value= valDeltaOneStep;  
-  fDelta_Intersection_Val = 0.4 * fDelta_One_Step_Value;
+   fDetectorFieldMgr->SetAccuraciesWithDeltaOneStep(valDeltaOneStep);
+   //  this->SetDeltaOneStep(valDeltaOneStep);
+   // this->SetDeltaIntersection( 0.4 * fDelta_One_Step_Value);
 }
 
 inline
 void G4PropagatorInField::SetDeltaOneStep(G4double valDeltaOneStep)
 { 
-  fDelta_One_Step_Value= valDeltaOneStep;  
+   fDetectorFieldMgr->SetDeltaOneStep( valDeltaOneStep); 
+   // fCurrentFieldMgr->SetDeltaOneStep( valDeltaOneStep);  
 }
 
 inline
 void G4PropagatorInField::SetDeltaIntersection(G4double valDeltaIntersection)
 {
-  fDelta_Intersection_Val = valDeltaIntersection;
+  fDetectorFieldMgr->SetDeltaIntersection(valDeltaIntersection);
+   // fCurrentFieldMgr->SetDeltaOneStep( valDeltaOneStep); 
 }
 
 inline
@@ -156,3 +172,17 @@ G4FieldTrack G4PropagatorInField::GetEndState() const
 {
   return End_PointAndTangent;
 }
+
+// Minimum for Relative accuracy of any Step 
+inline 
+G4double  G4PropagatorInField::GetMinimumEpsilonStep() const
+{
+  return fEpsilonMin; 
+}
+
+inline 
+void      G4PropagatorInField::SetMinimumEpsilonStep(G4double newEpsMin)
+{
+  if( (newEpsMin > 0.0) && (fabs(1.0+newEpsMin)>1.0) )
+    fEpsilonMin= newEpsMin;
+}
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.hh b/source/geometry/volumes/include/G4ReplicaNavigation.hh
index 45af520aec..bdeb84f350 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.hh
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReplicaNavigation.hh,v 1.3 2000/04/25 16:15:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReplicaNavigation.hh,v 1.3.4.1 2001/06/28 19:09:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4ReplicaNavigation
diff --git a/source/geometry/volumes/include/G4ReplicaNavigation.icc b/source/geometry/volumes/include/G4ReplicaNavigation.icc
index b47c7a52b2..a28ddf3193 100644
--- a/source/geometry/volumes/include/G4ReplicaNavigation.icc
+++ b/source/geometry/volumes/include/G4ReplicaNavigation.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReplicaNavigation.icc,v 1.3 2000/11/20 18:59:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReplicaNavigation.icc,v 1.4.2.1 2001/06/28 19:09:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4ReplicaNavigation Inline implementation
@@ -17,14 +33,16 @@ inline G4int G4ReplicaNavigation::VoxelLocate(const G4SmartVoxelHeader *pHead,
 {
   EAxis targetHeaderAxis;
   G4double coord=0.;
-  G4double targetHeaderMin;
+  G4double targetHeaderMin, targetHeaderMax;
   G4double targetHeaderNodeWidth,targetNodePos;
   G4int targetHeaderNoSlices,targetNodeNo;
   
   targetHeaderAxis=pHead->GetAxis();
   targetHeaderNoSlices=pHead->GetNoSlices();
   targetHeaderMin=pHead->GetMinExtent();
-  targetHeaderNodeWidth=(pHead->GetMaxExtent()-targetHeaderMin)/targetHeaderNoSlices;
+  targetHeaderMax=pHead->GetMaxExtent();
+  targetHeaderNodeWidth=(targetHeaderMax-targetHeaderMin)/targetHeaderNoSlices;
+
   switch (targetHeaderAxis)
     {
     case kXAxis:
@@ -60,27 +78,40 @@ inline G4int G4ReplicaNavigation::VoxelLocate(const G4SmartVoxelHeader *pHead,
       // (or similar)       P.Kent
       // assert(targetNodeNo>=0&&targetNodeNo<targetHeaderNoSlices);
 
-      //  The assert above fails for simulation of high energy electrons 
-      //  It is not clear what is the cause for this failure.
-      //  The code below attempts to rectify this problem until a
-      //   complete resolution is possible.    
+      // The assert above fails for simulation of high energy electrons 
+      // It is not clear what is the cause for this failure.
+      // The code below attempts to rectify this problem until a
+      // complete resolution is possible.    
       // 					J.Apostolakis, June 12, 1998
+
       if((targetNodeNo<0) || (targetNodeNo>=targetHeaderNoSlices))
         {
+
 #ifdef G4_REPORT_REPLICA_NAV
-          G4cerr << " ERROR: assert in G4ReplicaNavigation::VoxelLocate " 
+        G4cerr << " WARNING: assert in G4ReplicaNavigation::VoxelLocate " 
                << " has failed : " << G4endl <<
                << " (targetNodeNo>=0&&targetNodeNo<targetHeaderNoSlices) " 
     	       << " targetNodeNo= " << targetNodeNo 
                << " Number of Slices =  " << targetHeaderNoSlices << G4endl;
 #endif
-	  if (targetNodeNo<0)
-	    {
-	      targetNodeNo=0;
-	    }
-	  else if (targetNodeNo>=targetHeaderNoSlices)
-	    {
-	      targetNodeNo=targetHeaderNoSlices-1;
+          // In the case of rotational symmetry and an extent over the
+          // whole 360 degrees, the above is not true and you can go from
+          // the last voxel to the zeroth and vice versa
+          //                                        H.Boie, April 30, 2001  
+          if(targetHeaderAxis==kPhi &&
+             targetHeaderMin==0     && targetHeaderMax==2*M_PI)
+            {
+              if(targetNodeNo<0) 
+                targetNodeNo=targetHeaderNoSlices-1;
+              else if(targetNodeNo>=targetHeaderNoSlices)
+                targetNodeNo=0;
+            }
+          else 
+            {
+	      if(targetNodeNo<0)
+	        targetNodeNo=0;
+  	      else if(targetNodeNo>=targetHeaderNoSlices)
+	        targetNodeNo=targetHeaderNoSlices-1;
 	    }
         }
     }
diff --git a/source/geometry/volumes/include/G4TouchableHistory.hh b/source/geometry/volumes/include/G4TouchableHistory.hh
index 5a233ae277..9d297dd08a 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.hh
+++ b/source/geometry/volumes/include/G4TouchableHistory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TouchableHistory.hh,v 1.4 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TouchableHistory.hh,v 1.4.4.1 2001/06/28 19:09:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4TouchableHistory
diff --git a/source/geometry/volumes/include/G4TouchableHistory.icc b/source/geometry/volumes/include/G4TouchableHistory.icc
index 606ccd25d4..8220e8a5e2 100644
--- a/source/geometry/volumes/include/G4TouchableHistory.icc
+++ b/source/geometry/volumes/include/G4TouchableHistory.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TouchableHistory.icc,v 1.5 2000/11/20 18:59:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TouchableHistory.icc,v 1.5.4.1 2001/06/28 19:09:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4TouchableHistory inline implementation
diff --git a/source/geometry/volumes/include/G4TransportationManager.hh b/source/geometry/volumes/include/G4TransportationManager.hh
index 7cb14c3372..286f5bf5e3 100644
--- a/source/geometry/volumes/include/G4TransportationManager.hh
+++ b/source/geometry/volumes/include/G4TransportationManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransportationManager.hh,v 1.5 2000/11/01 16:51:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransportationManager.hh,v 1.5.4.1 2001/06/28 19:09:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4TransportationManager
 //
diff --git a/source/geometry/volumes/include/G4TransportationManager.icc b/source/geometry/volumes/include/G4TransportationManager.icc
index cef72ae5ac..681fbc6f6e 100644
--- a/source/geometry/volumes/include/G4TransportationManager.icc
+++ b/source/geometry/volumes/include/G4TransportationManager.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransportationManager.icc,v 1.4 2000/11/01 16:51:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransportationManager.icc,v 1.4.4.1 2001/06/28 19:09:42 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //	GEANT 4  inlined function members implementation
 // ------------------------------------------------------------
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.hh b/source/geometry/volumes/include/G4VoxelNavigation.hh
index 7b1ab76c22..6046340f7e 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.hh
+++ b/source/geometry/volumes/include/G4VoxelNavigation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelNavigation.hh,v 1.7 2000/11/01 16:51:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelNavigation.hh,v 1.8.2.1 2001/06/28 19:09:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VoxelNavigation
@@ -36,8 +52,7 @@
 #include "G4SmartVoxelProxy.hh"
 #include "G4SmartVoxelNode.hh"
 #include "G4SmartVoxelHeader.hh"
-#include "g4rw/tvvector.h"
-#include "g4rw/tpvector.h"
+#include "g4std/vector"
 
 class G4VoxelNavigation
 {
@@ -90,19 +105,19 @@ class G4VoxelNavigation
       // Note: fVoxelDepth==0+ => fVoxelAxisStack(0+) contains axes of voxel
       //       fVoxelDepth==-1 -> not in voxel
 
-    G4RWTValVector<EAxis> fVoxelAxisStack;
+    G4std::vector<EAxis> fVoxelAxisStack;
       // Voxel axes
 
-    G4RWTValVector<G4int> fVoxelNoSlicesStack;
+    G4std::vector<G4int> fVoxelNoSlicesStack;
       // No slices per voxel at each level
 
-    G4RWTValVector<G4double> fVoxelSliceWidthStack; 
+    G4std::vector<G4double> fVoxelSliceWidthStack; 
       // Width of voxels at each level 
 
-    G4RWTValVector<G4int> fVoxelNodeNoStack;	  
+    G4std::vector<G4int> fVoxelNodeNoStack;	  
       // Node no point is inside at each level 
 				
-    G4RWTPtrVector<G4SmartVoxelHeader> fVoxelHeaderStack;
+    G4std::vector<G4SmartVoxelHeader*> fVoxelHeaderStack;
       // Voxel headers at each level
 
     G4SmartVoxelNode* fVoxelNode;
diff --git a/source/geometry/volumes/include/G4VoxelNavigation.icc b/source/geometry/volumes/include/G4VoxelNavigation.icc
index 37280548fb..c6ec26f243 100644
--- a/source/geometry/volumes/include/G4VoxelNavigation.icc
+++ b/source/geometry/volumes/include/G4VoxelNavigation.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelNavigation.icc,v 1.4 2000/11/20 18:59:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelNavigation.icc,v 1.7.2.1 2001/06/28 19:09:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4VoxelNavigation Inline implementation
@@ -14,11 +30,11 @@
 inline
 G4VoxelNavigation::G4VoxelNavigation()
   : fVoxelDepth(-1),
-    fVoxelAxisStack(kNavigatorVoxelStackMax),
-    fVoxelNoSlicesStack(kNavigatorVoxelStackMax),
-    fVoxelSliceWidthStack(kNavigatorVoxelStackMax),
-    fVoxelNodeNoStack(kNavigatorVoxelStackMax),
-    fVoxelHeaderStack(kNavigatorVoxelStackMax),
+    fVoxelAxisStack(kNavigatorVoxelStackMax,kXAxis),
+    fVoxelNoSlicesStack(kNavigatorVoxelStackMax,0),
+    fVoxelSliceWidthStack(kNavigatorVoxelStackMax,0.),
+    fVoxelNodeNoStack(kNavigatorVoxelStackMax,0),
+    fVoxelHeaderStack(kNavigatorVoxelStackMax,(G4SmartVoxelHeader*)0),
     fVoxelNode(0)
 {
 }
@@ -55,11 +71,11 @@ G4VoxelNavigation::VoxelLocate(G4SmartVoxelHeader *pHead,
 			targetNodeNo=targetHeaderNoSlices-1;
 			}
 // Stack info for stepping
-		fVoxelAxisStack(fVoxelDepth)=targetHeaderAxis;
-		fVoxelNoSlicesStack(fVoxelDepth)=targetHeaderNoSlices;
-		fVoxelSliceWidthStack(fVoxelDepth)=targetHeaderNodeWidth;
-		fVoxelNodeNoStack(fVoxelDepth)=targetNodeNo;
-		fVoxelHeaderStack(fVoxelDepth)=targetVoxelHeader;
+		fVoxelAxisStack[fVoxelDepth]=targetHeaderAxis;
+		fVoxelNoSlicesStack[fVoxelDepth]=targetHeaderNoSlices;
+		fVoxelSliceWidthStack[fVoxelDepth]=targetHeaderNodeWidth;
+		fVoxelNodeNoStack[fVoxelDepth]=targetNodeNo;
+		fVoxelHeaderStack[fVoxelDepth]=targetVoxelHeader;
 		
 		sampleProxy=targetVoxelHeader->GetSlice(targetNodeNo);
 		if (sampleProxy->IsNode())
diff --git a/source/geometry/volumes/src/G4AuxiliaryNavServices.cc b/source/geometry/volumes/src/G4AuxiliaryNavServices.cc
index 88c2ef72b7..4409a67d84 100644
--- a/source/geometry/volumes/src/G4AuxiliaryNavServices.cc
+++ b/source/geometry/volumes/src/G4AuxiliaryNavServices.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4AuxiliaryNavServices.hh"
 #include "globals.hh"
 
diff --git a/source/geometry/volumes/src/G4BlockingList.cc b/source/geometry/volumes/src/G4BlockingList.cc
index 02f186aa70..0ca646b0b0 100644
--- a/source/geometry/volumes/src/G4BlockingList.cc
+++ b/source/geometry/volumes/src/G4BlockingList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BlockingList.cc,v 1.2 1999/12/15 14:50:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BlockingList.cc,v 1.3.2.1 2001/06/28 19:09:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4BlockingList Implementation
@@ -19,9 +35,9 @@
 void G4BlockingList::FullyReset()
 {
 	fBlockTagNo=1;
-	for (G4int i=fBlockingList.length()-1;i>=0;i--)
+	for (G4int i=fBlockingList.size()-1;i>=0;i--)
 		{
-			fBlockingList(i)=0;
+			fBlockingList[i]=0;
 		}	
 	
 }
diff --git a/source/geometry/volumes/src/G4GRSSolid.cc b/source/geometry/volumes/src/G4GRSSolid.cc
index 0d8c5f4a49..21f90754d9 100644
--- a/source/geometry/volumes/src/G4GRSSolid.cc
+++ b/source/geometry/volumes/src/G4GRSSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSSolid.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSSolid.cc,v 1.3.4.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSSolid Implementation
diff --git a/source/geometry/volumes/src/G4GRSVolume.cc b/source/geometry/volumes/src/G4GRSVolume.cc
index 511ec0de51..0f9c1ba425 100644
--- a/source/geometry/volumes/src/G4GRSVolume.cc
+++ b/source/geometry/volumes/src/G4GRSVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GRSVolume.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GRSVolume.cc,v 1.3.4.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4GRSVolume Implementation
diff --git a/source/geometry/volumes/src/G4LogicalBorderSurface.cc b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
index e0b4f5cbb1..7b6778643b 100644
--- a/source/geometry/volumes/src/G4LogicalBorderSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalBorderSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalBorderSurface.cc,v 1.5 2000/11/20 19:05:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalBorderSurface.cc,v 1.6.2.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalBorderSurface Implementation
@@ -45,8 +61,7 @@ G4LogicalBorderSurface::G4LogicalBorderSurface(const G4String& name,
     Volume1(vol1), Volume2(vol2)
 {
   // Store in the table of Surfaces
-  theBorderSurfaceTable.insert(this);
-  theIndexInTable = theBorderSurfaceTable.index(this);
+  theBorderSurfaceTable.push_back(this);
 }
 
 G4LogicalBorderSurface::
@@ -56,7 +71,6 @@ G4LogicalBorderSurface(const G4LogicalBorderSurface& right)
   SetTransitionRadiationSurface(right.GetTransitionRadiationSurface());
   Volume1 = right.Volume1;
   Volume2 = right.Volume2;
-  theIndexInTable = right.theIndexInTable;
   theBorderSurfaceTable = right.theBorderSurfaceTable;
 }
 
@@ -77,7 +91,6 @@ G4LogicalBorderSurface::operator=(const G4LogicalBorderSurface &right)
     SetTransitionRadiationSurface(right.GetTransitionRadiationSurface());
     Volume1 = right.Volume1;
     Volume2 = right.Volume2;
-    theIndexInTable = right.theIndexInTable;
     theBorderSurfaceTable = right.theBorderSurfaceTable;
   }
   return *this;
@@ -98,7 +111,7 @@ G4LogicalBorderSurface::operator!=(const G4LogicalBorderSurface &right) const
   // Methods
   ////////////
 
-const G4RWTPtrOrderedVector<G4LogicalBorderSurface>*
+const G4std::vector<G4LogicalBorderSurface*> *
 G4LogicalBorderSurface::GetSurfaceTable()
 {
 	return &theBorderSurfaceTable;
@@ -106,14 +119,14 @@ G4LogicalBorderSurface::GetSurfaceTable()
 
 size_t G4LogicalBorderSurface::GetNumberOfBorderSurfaces()
 {
-	return theBorderSurfaceTable.length();
+	return theBorderSurfaceTable.size();
 }
 
 G4LogicalBorderSurface*
 G4LogicalBorderSurface::GetSurface(const G4VPhysicalVolume* vol1,
 				   const G4VPhysicalVolume* vol2)
 {
-	for (size_t i=0; i<theBorderSurfaceTable.length(); i++) {
+	for (size_t i=0; i<theBorderSurfaceTable.size(); i++) {
 		if(theBorderSurfaceTable[i]->GetVolume1() == vol1 &&
 		   theBorderSurfaceTable[i]->GetVolume2() == vol2 )
 			return theBorderSurfaceTable[i];
@@ -129,7 +142,7 @@ void G4LogicalBorderSurface::DumpInfo() // Class method (it is really const)
     G4cout << "***** Surface Table : Nb of Surfaces = " << 
             GetNumberOfBorderSurfaces() << " *****" << G4endl;
 
-    for (size_t i=0; i<theBorderSurfaceTable.length(); i++) {
+    for (size_t i=0; i<theBorderSurfaceTable.size(); i++) {
       G4cout << theBorderSurfaceTable[i]->GetName() << " : " << G4endl <<
           "  Surface type   = " << theBorderSurfaceTable[i]->GetName() << G4endl;
 #ifdef PRINT_INFO
diff --git a/source/geometry/volumes/src/G4LogicalSkinSurface.cc b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
index 1a6a3a5288..600e83bd54 100644
--- a/source/geometry/volumes/src/G4LogicalSkinSurface.cc
+++ b/source/geometry/volumes/src/G4LogicalSkinSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalSkinSurface.cc,v 1.5 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalSkinSurface.cc,v 1.6.2.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // G4LogicalSkinSurface Implementation
@@ -45,8 +61,7 @@ G4LogicalSkinSurface::G4LogicalSkinSurface(const G4String&   name,
     LogVolume(logicalVolume)
 {
   // Store in the table of Surfaces
-  theSurfaceTable.insert(this);
-  theIndexInTable = theSurfaceTable.index(this);
+  theSurfaceTable.push_back(this);
 }
 
 G4LogicalSkinSurface::G4LogicalSkinSurface(const G4LogicalSkinSurface &right)
@@ -54,7 +69,6 @@ G4LogicalSkinSurface::G4LogicalSkinSurface(const G4LogicalSkinSurface &right)
 {
     SetTransitionRadiationSurface(right.GetTransitionRadiationSurface());
     LogVolume = right.LogVolume;
-    theIndexInTable = right.theIndexInTable;
     theSurfaceTable = right.theSurfaceTable;
 }
 
@@ -74,7 +88,6 @@ G4LogicalSkinSurface::operator=(const G4LogicalSkinSurface &right)
     SetName(right.GetName());
     SetTransitionRadiationSurface(right.GetTransitionRadiationSurface());
     LogVolume = right.LogVolume;
-    theIndexInTable = right.theIndexInTable;
     theSurfaceTable = right.theSurfaceTable;
   }
   return *this;
@@ -97,13 +110,13 @@ G4LogicalSkinSurface::operator!=(const G4LogicalSkinSurface &right) const
 
 size_t G4LogicalSkinSurface::GetNumberOfSkinSurfaces()
 {
-	return theSurfaceTable.length();
+	return theSurfaceTable.size();
 }
 
 G4LogicalSkinSurface*
 G4LogicalSkinSurface::GetSurface(const G4LogicalVolume* vol)
 {
-	for (size_t i=0; i<theSurfaceTable.length(); i++) {
+	for (size_t i=0; i<theSurfaceTable.size(); i++) {
 		if(theSurfaceTable[i]->GetLogicalVolume() == vol)
 			return theSurfaceTable[i];
 	}
@@ -118,7 +131,7 @@ void G4LogicalSkinSurface::DumpInfo()
     G4cout << "***** Surface Table : Nb of Surfaces = "
            << GetNumberOfSkinSurfaces() << " *****" << G4endl;
 
-    for (size_t i=0; i<theSurfaceTable.length(); i++) {
+    for (size_t i=0; i<theSurfaceTable.size(); i++) {
       G4LogicalSkinSurface *pSkinSurface= theSurfaceTable[i];
       G4cout << theSurfaceTable[i]->GetName() << " : " << G4endl <<
 	" Skin of logical volume " << pSkinSurface->GetLogicalVolume()->GetName  ()
diff --git a/source/geometry/volumes/src/G4NavigationHistory.cc b/source/geometry/volumes/src/G4NavigationHistory.cc
index c72a1c6e39..6866028aa7 100644
--- a/source/geometry/volumes/src/G4NavigationHistory.cc
+++ b/source/geometry/volumes/src/G4NavigationHistory.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NavigationHistory.cc,v 1.3 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NavigationHistory.cc,v 1.3.4.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4NavigationHistory Implementation P.Kent August 96
diff --git a/source/geometry/volumes/src/G4Navigator.cc b/source/geometry/volumes/src/G4Navigator.cc
index 6f7fd85c3c..9efcf19b56 100644
--- a/source/geometry/volumes/src/G4Navigator.cc
+++ b/source/geometry/volumes/src/G4Navigator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Navigator.cc,v 1.11 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Navigator.cc,v 1.11.4.1 2001/06/28 19:09:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4Navigator Implementation  Paul Kent July 95/96
diff --git a/source/geometry/volumes/src/G4NormalNavigation.cc b/source/geometry/volumes/src/G4NormalNavigation.cc
index 361ae6f6f5..9320f96457 100644
--- a/source/geometry/volumes/src/G4NormalNavigation.cc
+++ b/source/geometry/volumes/src/G4NormalNavigation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NormalNavigation.cc,v 1.3 2000/11/20 19:05:58 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NormalNavigation.cc,v 1.3.4.1 2001/06/28 19:09:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4NormalNavigation Implementation
diff --git a/source/geometry/volumes/src/G4ParameterisedNavigation.cc b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
index 3d52a68d02..0ec5a84600 100644
--- a/source/geometry/volumes/src/G4ParameterisedNavigation.cc
+++ b/source/geometry/volumes/src/G4ParameterisedNavigation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParameterisedNavigation.cc,v 1.3 2000/11/20 19:05:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParameterisedNavigation.cc,v 1.3.4.1 2001/06/28 19:09:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4ParameterisedNavigation Implementation
diff --git a/source/geometry/volumes/src/G4PropagatorInField.cc b/source/geometry/volumes/src/G4PropagatorInField.cc
index 5fe0832d83..9082532ae6 100644
--- a/source/geometry/volumes/src/G4PropagatorInField.cc
+++ b/source/geometry/volumes/src/G4PropagatorInField.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PropagatorInField.cc,v 1.12.4.1 2001/02/20 18:23:32 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PropagatorInField.cc,v 1.19.2.1 2001/06/28 19:09:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // 
@@ -32,56 +48,40 @@
 //const G4double G4PropagatorInField::fDefault_Delta_Intersection_Val= 0.1 * mm;
 //const G4double G4PropagatorInField::fDefault_Delta_One_Step_Value = 0.25 * mm;
 
-// -------------------------------------------------------------------------
-#if OLD_SIGNATURE_IS_INVALID
-G4double 
-G4PropagatorInField::
-  ComputeStep(const  G4ThreeVector &   StartPointA,
-	      const  G4ThreeVector &   Velocity,              // Unit or non 
-	             G4double          CurrentProposedStepLength,
-	             G4double	       &currentSafety,             // In/Out 
-     	             G4VPhysicalVolume *pPhysVol )
-// Compute the next geometric Step for simple magnetic field
-{
-  G4FieldTrack  aFieldTrack = 
-    G4FieldTrack(  StartPointA, 
-		   Velocity, 
-		   0.0,          // length of path
-		   0.0,          // energy
-	      // PROBLEM ---> zero energy will create zero momentum !!
-                   0.0,          // lab tof
-		   0.0,          // proper tof
-		   0 );
-
-  //  Do the Transport in the field (non recti-linear)
-  return this->ComputeStep( aFieldTrack,
-			    CurrentProposedStepLength, 
-			    currentSafety );
-}
-#endif
-
-// -------------------------------------------------------------------------
-G4double 
-G4PropagatorInField::
-  ComputeStep(G4FieldTrack& pFieldTrack,
-	      G4double      CurrentProposedStepLength,
-	      G4double&     currentSafety,                // IN/OUT
-	      G4VPhysicalVolume *pPhysVol)
+const G4double  G4PropagatorInField::fEpsilonMinDefault = 1.0e-10 ;  
 
+///////////////////////////////////////////////////////////////////////////
+//
 // Compute the next geometric Step
+
+
+G4double G4PropagatorInField::
+         ComputeStep( G4FieldTrack&      pFieldTrack,
+	              G4double           CurrentProposedStepLength,
+	              G4double&          currentSafety,                // IN/OUT
+	              G4VPhysicalVolume* pPhysVol)
 {
   // Parameters for adaptive Runge-Kutta integration
-  //
+  
   G4double      h_TrialStepSize;        // 1st Step Size 
   G4double      TruePathLength= CurrentProposedStepLength;
   G4double      StepTaken= 0.0; 
-  G4double      s_length_taken; 
+  G4double      s_length_taken, epsilon ; 
   G4bool        intersects;
   G4bool        first_substep= true;
 
   G4double	    NewSafety;
   fParticleIsLooping= false;
 
+  // Set the field manager if the volume has one, else use the global one
+  fCurrentFieldMgr = fDetectorFieldMgr;
+  if( pPhysVol) {
+     G4FieldManager *newFieldMgr=0;
+     newFieldMgr= pPhysVol->GetLogicalVolume()->GetFieldManager(); 
+     if ( newFieldMgr ) 
+        fCurrentFieldMgr = newFieldMgr;
+  }
+  
   G4FieldTrack  CurrentState(pFieldTrack);
 
 #if 0
@@ -98,15 +98,21 @@ G4PropagatorInField::
   // (used to calculate the relative accuracy) must be guessed.
   //
   
-  if( CurrentProposedStepLength >= kInfinity ){
+  if( CurrentProposedStepLength >= kInfinity )
+  {
      G4ThreeVector StartPointA, VelocityUnit;
      StartPointA = pFieldTrack.GetPosition();
      VelocityUnit= pFieldTrack.GetMomentumDir();
+
      CurrentProposedStepLength= 1.e3 *  ( 10.0 * cm + 
 		  fNavigator->GetWorldVolume()->GetLogicalVolume()->
                   GetSolid()->DistanceToOut(StartPointA, VelocityUnit) ) ;
   }
-  this->SetEpsilonStep( GetDeltaOneStep() / CurrentProposedStepLength);
+  epsilon = GetDeltaOneStep() / CurrentProposedStepLength ;
+
+  if( epsilon < fEpsilonMin ) epsilon = fEpsilonMin ;
+
+  this->SetEpsilonStep( epsilon );
 
   if( fNoZeroStep > fThresholdNo_ZeroSteps ) {
      G4double stepTrial; //  = fMidPoint_CurveLen_of_LastAttempt;
diff --git a/source/geometry/volumes/src/G4ReplicaNavigation.cc b/source/geometry/volumes/src/G4ReplicaNavigation.cc
index c0038322af..e324bc1f6c 100644
--- a/source/geometry/volumes/src/G4ReplicaNavigation.cc
+++ b/source/geometry/volumes/src/G4ReplicaNavigation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReplicaNavigation.cc,v 1.8 2001/03/09 15:32:50 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReplicaNavigation.cc,v 1.9.2.1 2001/06/28 19:09:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4ReplicaNavigation Implementation
@@ -331,7 +347,7 @@ G4ReplicaNavigation::DistanceToOutPhi(const G4ThreeVector &localPoint,
 	    {
 	      // Leaving immediately by starting phi
 	      //
-	      Dist=0;
+	      Dist=(compE<0) ? 0 : kInfinity;
 	    }
 	}
       else
@@ -639,12 +655,12 @@ G4ReplicaNavigation::ComputeStep(const G4ThreeVector &globalPoint,
 			localDirection);
       if (sampleStep<ourStep)
 	{
+	  if ((sampleStep == 0) && (sampleSafety<0.5*kCarTolerance))
+	    ourStep=sampleStep+kCarTolerance;
+	  else
+	    ourStep=sampleStep;
 	  exiting=true;
 	  validExitNormal=false;
-	  if (sampleStep != 0)
-	    ourStep=sampleStep;
-	  else
-	    ourStep=sampleStep+kCarTolerance;
 	}
     }
 
diff --git a/source/geometry/volumes/src/G4TouchableHistory.cc b/source/geometry/volumes/src/G4TouchableHistory.cc
index b812942883..8778fe010d 100644
--- a/source/geometry/volumes/src/G4TouchableHistory.cc
+++ b/source/geometry/volumes/src/G4TouchableHistory.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TouchableHistory.cc,v 1.4 2000/11/01 16:51:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TouchableHistory.cc,v 1.4.4.1 2001/06/28 19:09:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4TouchableHistory Implementation
diff --git a/source/geometry/volumes/src/G4TransportationManager.cc b/source/geometry/volumes/src/G4TransportationManager.cc
index acaa6a7c70..1970894897 100644
--- a/source/geometry/volumes/src/G4TransportationManager.cc
+++ b/source/geometry/volumes/src/G4TransportationManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransportationManager.cc,v 1.5 1999/12/15 14:50:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransportationManager.cc,v 1.6.2.1 2001/06/28 19:09:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //  G4TransportationManager 
@@ -26,8 +42,8 @@ G4Allocator<G4NavigationLevel>     aNavigationLevelAllocator;
 G4Allocator<G4NavigationLevelRep>  aNavigLevelRepAllocator;
 
 // Ditto: correct order initialisation of class (class) data members
-const G4double G4PropagatorInField::fDefault_Delta_Intersection_Val= 0.1 * mm;
-const G4double G4PropagatorInField::fDefault_Delta_One_Step_Value = 0.25 * mm;
+const G4double G4FieldManager::fDefault_Delta_Intersection_Val= 0.1 * mm;
+const G4double G4FieldManager::fDefault_Delta_One_Step_Value = 0.25 * mm;
 
 
 G4TransportationManager* G4TransportationManager::fTransportationManager=0;
diff --git a/source/geometry/volumes/src/G4VoxelNavigation.cc b/source/geometry/volumes/src/G4VoxelNavigation.cc
index 72913678e9..e30139ad8a 100644
--- a/source/geometry/volumes/src/G4VoxelNavigation.cc
+++ b/source/geometry/volumes/src/G4VoxelNavigation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VoxelNavigation.cc,v 1.6 2000/11/20 19:06:01 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VoxelNavigation.cc,v 1.7.2.1 2001/06/28 19:09:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // class G4VoxelNavigation Implementation
@@ -217,10 +233,10 @@ G4double G4VoxelNavigation::ComputeVoxelSafety(const G4ThreeVector&localPoint) c
 
 	localVoxelDepth=fVoxelDepth;
 
-	curHeader=fVoxelHeaderStack(localVoxelDepth);
-	curHeaderAxis=fVoxelAxisStack(localVoxelDepth);
-	curNodeNo=fVoxelNodeNoStack(localVoxelDepth);
-	curNodeWidth=fVoxelSliceWidthStack(localVoxelDepth);
+	curHeader=fVoxelHeaderStack[localVoxelDepth];
+	curHeaderAxis=fVoxelAxisStack[localVoxelDepth];
+	curNodeNo=fVoxelNodeNoStack[localVoxelDepth];
+	curNodeWidth=fVoxelSliceWidthStack[localVoxelDepth];
 	
 // Compute linear intersection distance to boundaries of max/min
 // to collected nodes at current level
@@ -254,10 +270,10 @@ G4double G4VoxelNavigation::ComputeVoxelSafety(const G4ThreeVector&localPoint) c
 	    	{
 		localVoxelDepth--;
 
-		curHeader=fVoxelHeaderStack(localVoxelDepth);
-		curHeaderAxis=fVoxelAxisStack(localVoxelDepth);
-		curNodeNo=fVoxelNodeNoStack(localVoxelDepth);
-		curNodeWidth=fVoxelSliceWidthStack(localVoxelDepth);
+		curHeader=fVoxelHeaderStack[localVoxelDepth];
+		curHeaderAxis=fVoxelAxisStack[localVoxelDepth];
+		curNodeNo=fVoxelNodeNoStack[localVoxelDepth];
+		curNodeWidth=fVoxelSliceWidthStack[localVoxelDepth];
 		curNodeOffset=curNodeNo*curNodeWidth;
 		minCurCommonDelta=localPoint(curHeaderAxis)
 		    -curHeader->GetMinExtent()
@@ -314,10 +330,10 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
 	    {
 		targetPoint=localPoint+localDirection*currentDistance;
 	        newDistance= currentDistance;
-		workHeader=fVoxelHeaderStack(depth);
-		workHeaderAxis=fVoxelAxisStack(depth);
-		workNodeNo=fVoxelNodeNoStack(depth);
-		workNodeWidth=fVoxelSliceWidthStack(depth);
+		workHeader=fVoxelHeaderStack[depth];
+		workHeaderAxis=fVoxelAxisStack[depth];
+		workNodeNo=fVoxelNodeNoStack[depth];
+		workNodeWidth=fVoxelSliceWidthStack[depth];
 		workMinExtent=workHeader->GetMinExtent();
 		    
 		workCoord=targetPoint(workHeaderAxis);
@@ -350,10 +366,10 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
 // Check if end of Step within collected boundaries of current voxel
 	depth=fVoxelDepth;
 	    {
-		workHeader=fVoxelHeaderStack(depth);
-		workHeaderAxis=fVoxelAxisStack(depth);
-		workNodeNo=fVoxelNodeNoStack(depth);
-		workNodeWidth=fVoxelSliceWidthStack(depth);
+		workHeader=fVoxelHeaderStack[depth];
+		workHeaderAxis=fVoxelAxisStack[depth];
+		workNodeNo=fVoxelNodeNoStack[depth];
+		workNodeWidth=fVoxelSliceWidthStack[depth];
 		workMinExtent=workHeader->GetMinExtent();
 		    
 		workCoord=targetPoint(workHeaderAxis);
@@ -400,7 +416,7 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
 		    {
 // Compute intersection point on the least refined voxel boundary that is Hit
 			voxelPoint=localPoint+localDirection*newDistance;
-			fVoxelNodeNoStack(newDepth)=newNodeNo;
+			fVoxelNodeNoStack[newDepth]=newNodeNo;
 			fVoxelDepth=newDepth;
 			newVoxelNode=0;
 
@@ -430,11 +446,11 @@ G4bool G4VoxelNavigation::LocateNextVoxel(const G4ThreeVector& localPoint,
 						newNodeNo=newHeaderNoSlices-1;
 					    }
 // Stack info for stepping
-					fVoxelAxisStack(fVoxelDepth)=newHeaderAxis;
-					fVoxelNoSlicesStack(fVoxelDepth)=newHeaderNoSlices;
-					fVoxelSliceWidthStack(fVoxelDepth)=newHeaderNodeWidth;
-					fVoxelNodeNoStack(fVoxelDepth)=newNodeNo;
-					fVoxelHeaderStack(fVoxelDepth)=newHeader;
+					fVoxelAxisStack[fVoxelDepth]=newHeaderAxis;
+					fVoxelNoSlicesStack[fVoxelDepth]=newHeaderNoSlices;
+					fVoxelSliceWidthStack[fVoxelDepth]=newHeaderNodeWidth;
+					fVoxelNodeNoStack[fVoxelDepth]=newNodeNo;
+					fVoxelHeaderStack[fVoxelDepth]=newHeader;
 				    }
 		
 			    }
diff --git a/source/global/HEPGeometry/include/G4LorentzRotation.hh b/source/global/HEPGeometry/include/G4LorentzRotation.hh
index 10cbf71e6c..21cadfe15d 100644
--- a/source/global/HEPGeometry/include/G4LorentzRotation.hh
+++ b/source/global/HEPGeometry/include/G4LorentzRotation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LorentzRotation.hh,v 1.2 1999/11/16 17:29:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LorentzRotation.hh,v 1.2.8.1 2001/06/28 19:09:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4LorentzRotation_hh
 #define G4LorentzRotation_hh
diff --git a/source/global/HEPGeometry/include/G4LorentzVector.hh b/source/global/HEPGeometry/include/G4LorentzVector.hh
index 476678dfb1..2a0356345a 100644
--- a/source/global/HEPGeometry/include/G4LorentzVector.hh
+++ b/source/global/HEPGeometry/include/G4LorentzVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LorentzVector.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LorentzVector.hh,v 1.2.8.1 2001/06/28 19:09:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4LorentzVector_hh
 #define G4LorentzVector_hh
diff --git a/source/global/HEPGeometry/include/G4Normal3D.hh b/source/global/HEPGeometry/include/G4Normal3D.hh
index 17fa2e72fb..b800a8ddb8 100644
--- a/source/global/HEPGeometry/include/G4Normal3D.hh
+++ b/source/global/HEPGeometry/include/G4Normal3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Normal3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Normal3D.hh,v 1.2.8.1 2001/06/28 19:09:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NORMAL3D_HH
 #define G4NORMAL3D_HH
diff --git a/source/global/HEPGeometry/include/G4Plane3D.hh b/source/global/HEPGeometry/include/G4Plane3D.hh
index efc8efbf3f..869d8ed667 100644
--- a/source/global/HEPGeometry/include/G4Plane3D.hh
+++ b/source/global/HEPGeometry/include/G4Plane3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Plane3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Plane3D.hh,v 1.2.8.1 2001/06/28 19:09:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4PLANE3D_HH
 #define G4PLANE3D_HH
diff --git a/source/global/HEPGeometry/include/G4Point3D.hh b/source/global/HEPGeometry/include/G4Point3D.hh
index d8e487cbdb..18ca244a73 100644
--- a/source/global/HEPGeometry/include/G4Point3D.hh
+++ b/source/global/HEPGeometry/include/G4Point3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Point3D.hh,v 1.2 1999/11/16 17:29:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Point3D.hh,v 1.2.8.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4POINT3D_HH
 #define G4POINT3D_HH
diff --git a/source/global/HEPGeometry/include/G4Transform3D.hh b/source/global/HEPGeometry/include/G4Transform3D.hh
index 8558e383c4..f0bfc10969 100644
--- a/source/global/HEPGeometry/include/G4Transform3D.hh
+++ b/source/global/HEPGeometry/include/G4Transform3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Transform3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Transform3D.hh,v 1.2.8.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4TRANSFORM3D_HH
 #define G4TRANSFORM3D_HH
diff --git a/source/global/HEPGeometry/include/G4Vector3D.hh b/source/global/HEPGeometry/include/G4Vector3D.hh
index 1a82a63c73..fc7a248165 100644
--- a/source/global/HEPGeometry/include/G4Vector3D.hh
+++ b/source/global/HEPGeometry/include/G4Vector3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Vector3D.hh,v 1.2 1999/11/16 17:29:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Vector3D.hh,v 1.2.8.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VECTOR3D_HH
 #define G4VECTOR3D_HH
diff --git a/source/global/HEPGeometry/include/geomdefs.hh b/source/global/HEPGeometry/include/geomdefs.hh
index c1d21ba8d7..7a624ac728 100644
--- a/source/global/HEPGeometry/include/geomdefs.hh
+++ b/source/global/HEPGeometry/include/geomdefs.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: geomdefs.hh,v 1.3 2000/11/01 15:23:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: geomdefs.hh,v 1.3.4.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
index a33278340d..2c9505f550 100644
--- a/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
+++ b/source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChebyshevApproximation.hh,v 1.3 2000/11/20 17:26:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChebyshevApproximation.hh,v 1.3.4.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4DataInterpolation.hh b/source/global/HEPNumerics/include/G4DataInterpolation.hh
index d88c00e767..17cf73e72f 100644
--- a/source/global/HEPNumerics/include/G4DataInterpolation.hh
+++ b/source/global/HEPNumerics/include/G4DataInterpolation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DataInterpolation.hh,v 1.3 2000/11/20 17:26:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DataInterpolation.hh,v 1.3.4.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
index 1dd53bb966..6eb73fa8a6 100644
--- a/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussChebyshevQ.hh,v 1.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussChebyshevQ.hh,v 1.3.4.1 2001/06/28 19:09:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
index 9cff43c25c..85bac31ce6 100644
--- a/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussHermiteQ.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussHermiteQ.hh,v 1.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussHermiteQ.hh,v 1.3.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
index 10b6a01960..f0a980104b 100644
--- a/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussJacobiQ.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussJacobiQ.hh,v 1.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussJacobiQ.hh,v 1.3.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
index ebd0f04b80..187bed7589 100644
--- a/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussLaguerreQ.hh,v 1.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussLaguerreQ.hh,v 1.3.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
index e2d7d1e4be..96eb36e116 100644
--- a/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
+++ b/source/global/HEPNumerics/include/G4GaussLegendreQ.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussLegendreQ.hh,v 1.3 2000/11/20 17:26:42 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussLegendreQ.hh,v 1.3.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.hh b/source/global/HEPNumerics/include/G4Integrator.hh
index 6340ce14ec..49f88d62bf 100644
--- a/source/global/HEPNumerics/include/G4Integrator.hh
+++ b/source/global/HEPNumerics/include/G4Integrator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Integrator.hh,v 1.4 2000/06/15 17:31:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Integrator.hh,v 1.4.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4Integrator.icc b/source/global/HEPNumerics/include/G4Integrator.icc
index 2a31a0e95d..31229e9b85 100644
--- a/source/global/HEPNumerics/include/G4Integrator.icc
+++ b/source/global/HEPNumerics/include/G4Integrator.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Integrator.icc,v 1.6 2000/06/15 17:31:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Integrator.icc,v 1.6.4.1 2001/06/28 19:09:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation of G4Integrator methods. 
 //
diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.hh b/source/global/HEPNumerics/include/G4PolynomialSolver.hh
index eb4a37e789..7b32b6ff97 100644
--- a/source/global/HEPNumerics/include/G4PolynomialSolver.hh
+++ b/source/global/HEPNumerics/include/G4PolynomialSolver.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolynomialSolver.hh,v 1.2 2001/01/29 09:49:54 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolynomialSolver.hh,v 1.2.2.1 2001/06/28 19:09:52 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // class G4PolynomialSolver
 //
diff --git a/source/global/HEPNumerics/include/G4PolynomialSolver.icc b/source/global/HEPNumerics/include/G4PolynomialSolver.icc
index a9586f2f1c..29d680eb12 100644
--- a/source/global/HEPNumerics/include/G4PolynomialSolver.icc
+++ b/source/global/HEPNumerics/include/G4PolynomialSolver.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolynomialSolver.icc,v 1.5 2001/01/29 13:13:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolynomialSolver.icc,v 1.5.2.1 2001/06/28 19:09:52 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // class G4PolynomialSolver
 //
diff --git a/source/global/HEPNumerics/include/G4SimpleIntegration.hh b/source/global/HEPNumerics/include/G4SimpleIntegration.hh
index ef79715acd..a403626c4d 100644
--- a/source/global/HEPNumerics/include/G4SimpleIntegration.hh
+++ b/source/global/HEPNumerics/include/G4SimpleIntegration.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleIntegration.hh,v 1.2 1999/11/16 17:30:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleIntegration.hh,v 1.2.8.1 2001/06/28 19:09:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
index 0df9c006f3..62f4870ebc 100644
--- a/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
+++ b/source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGaussianQuadrature.hh,v 1.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGaussianQuadrature.hh,v 1.3.4.1 2001/06/28 19:09:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class description:
 //
diff --git a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
index 0ec74d7643..01688ebee0 100644
--- a/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
+++ b/source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChebyshevApproximation.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChebyshevApproximation.cc,v 1.2.8.1 2001/06/28 19:09:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4ChebyshevApproximation.hh"
diff --git a/source/global/HEPNumerics/src/G4DataInterpolation.cc b/source/global/HEPNumerics/src/G4DataInterpolation.cc
index f6197d6768..753e2681e6 100644
--- a/source/global/HEPNumerics/src/G4DataInterpolation.cc
+++ b/source/global/HEPNumerics/src/G4DataInterpolation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DataInterpolation.cc,v 1.3 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DataInterpolation.cc,v 1.3.8.1 2001/06/28 19:09:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4DataInterpolation.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
index e6b2988bb7..9cf23631f6 100644
--- a/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussChebyshevQ.cc,v 1.2 1999/11/16 17:31:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussChebyshevQ.cc,v 1.2.8.1 2001/06/28 19:09:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4GaussChebyshevQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
index a8d9c9bcdf..0958cc0241 100644
--- a/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussHermiteQ.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussHermiteQ.cc,v 1.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussHermiteQ.cc,v 1.3.4.1 2001/06/28 19:09:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4GaussHermiteQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
index 93958d30e0..3814297f53 100644
--- a/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussJacobiQ.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussJacobiQ.cc,v 1.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussJacobiQ.cc,v 1.3.4.1 2001/06/28 19:09:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4GaussJacobiQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
index 07eb958168..38e9ca1806 100644
--- a/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussLaguerreQ.cc,v 1.3 2000/11/20 17:26:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussLaguerreQ.cc,v 1.3.4.1 2001/06/28 19:09:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4GaussLaguerreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
index 31b2a46795..645f72a06c 100644
--- a/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
+++ b/source/global/HEPNumerics/src/G4GaussLegendreQ.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GaussLegendreQ.cc,v 1.2 1999/11/16 17:31:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GaussLegendreQ.cc,v 1.2.8.1 2001/06/28 19:09:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4GaussLegendreQ.hh"
 
diff --git a/source/global/HEPNumerics/src/G4SimpleIntegration.cc b/source/global/HEPNumerics/src/G4SimpleIntegration.cc
index 9cb1887b5b..b987bab7d7 100644
--- a/source/global/HEPNumerics/src/G4SimpleIntegration.cc
+++ b/source/global/HEPNumerics/src/G4SimpleIntegration.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SimpleIntegration.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SimpleIntegration.cc,v 1.2.8.1 2001/06/28 19:09:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation file for simple integration methods
 //
diff --git a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
index 0ce47885e8..473556f318 100644
--- a/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
+++ b/source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGaussianQuadrature.cc,v 1.2 1999/11/16 17:31:11 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGaussianQuadrature.cc,v 1.2.8.1 2001/06/28 19:09:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Implementation file for G4VGaussianQuadrature virtual base class
 //
diff --git a/source/global/HEPRandom/include/G4Poisson.hh b/source/global/HEPRandom/include/G4Poisson.hh
index c92613c488..047b81e7d5 100644
--- a/source/global/HEPRandom/include/G4Poisson.hh
+++ b/source/global/HEPRandom/include/G4Poisson.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Poisson.hh,v 1.5 2000/01/06 14:13:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Poisson.hh,v 1.5.4.1 2001/06/28 19:09:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/HEPRandom/include/Randomize.hh b/source/global/HEPRandom/include/Randomize.hh
index c3e0570e9e..37cb981cac 100644
--- a/source/global/HEPRandom/include/Randomize.hh
+++ b/source/global/HEPRandom/include/Randomize.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: Randomize.hh,v 1.4 2000/08/02 15:21:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: Randomize.hh,v 1.4.4.1 2001/06/28 19:09:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef randomize_h
 #define randomize_h 1
diff --git a/source/global/History b/source/global/History
index 3f85cd7372..292adf153d 100644
--- a/source/global/History
+++ b/source/global/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.78 2001/04/05 09:05:37 gcosmo Exp $
+$Id: History,v 1.81 2001/06/15 12:57:01 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,18 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+June 15, 2001 G.Cosmo (global-V03-01-02)
+- globals.hh: removed definition of cbrt() to allow ANSI compilation on
+  Linux-g++ architecture with new compiler gcc-2.95-2.
+
+June 06, 2001 G.Cosmo (global-V03-01-01)
+- G4DataVector: added constructor with argument for initialise values in
+  collection.
+
+May 30, 2001 G.Cosmo (global-V03-01-00)
+- Defined 'str_size' as G4std::string::size_type and replaced usage of 'size_t'
+  in G4String and G4SubString. Fixes problem report #40.
+
 April 05, 2001 G.Cosmo (global-V03-00-11)
 - Added patch to management/GNUmakefile for allowing compilation of G4UnitsTable.cc
   on SUN-CC5 (CC 5.2 Patch 109508-02), removing optimisation.
diff --git a/source/global/STLInterface/History b/source/global/STLInterface/History
index 09c7519568..b095059bed 100644
--- a/source/global/STLInterface/History
+++ b/source/global/STLInterface/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.24 2000/11/20 17:26:44 gcosmo Exp $
+$Id: History,v 1.25 2001/05/30 08:16:18 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -21,6 +21,10 @@ committal in the CVS repository !
                          STL Interface
                          -------------
 
+May 30, 2001 G.Cosmo
+- Defined 'str_size' as G4std::string::size_type and replaced usage of 'size_t'
+  in G4String and G4SubString. Fixes problem report #40.
+
 November 20, 2000 G.Cosmo
 - Fixes to remove warnings from "-Wall -ansi -pedantic" g++ compiler options:
   o fixed usage of unsigned-int (size_t) for indeces.
diff --git a/source/global/STLInterface/g4rw/cstring.h b/source/global/STLInterface/g4rw/cstring.h
index ecadad0010..f46b08a9ab 100644
--- a/source/global/STLInterface/g4rw/cstring.h
+++ b/source/global/STLInterface/g4rw/cstring.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: cstring.h,v 1.9 2000/11/20 17:26:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: cstring.h,v 1.10.2.1 2001/06/28 19:09:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
@@ -35,6 +51,8 @@
   #define strcasecmp _stricmp
 #endif
 
+typedef G4std::string::size_type str_size;
+
 class G4String;
 
 class G4SubString
@@ -48,10 +66,10 @@ public:
   inline G4SubString& operator=(const G4String&);
   inline G4SubString& operator=(const G4SubString&);
  
-  inline char& operator()(size_t);
-  inline char  operator()(size_t) const;
-  inline char& operator[](size_t);
-  inline char  operator[](size_t) const;
+  inline char& operator()(str_size);
+  inline char  operator()(str_size) const;
+  inline char& operator[](str_size);
+  inline char  operator[](str_size) const;
 
   inline G4int operator!() const;
 
@@ -60,8 +78,8 @@ public:
   inline G4bool operator!=(G4String) const;
   inline G4bool operator!=(const char*) const;
 
-  inline size_t length() const;
-  inline size_t start() const;
+  inline str_size length() const;
+  inline str_size start() const;
 
   // For detecting null substrings
   //
@@ -69,11 +87,11 @@ public:
 
 private:
 
-  inline G4SubString(G4String&, size_t, size_t);
+  inline G4SubString(G4String&, str_size, str_size);
 
   G4String*    mystring;     
-  size_t        mystart;
-  size_t        extent;
+  str_size     mystart;
+  str_size     extent;
 
   friend class G4String;
 
@@ -102,8 +120,8 @@ public:
   inline G4String& operator=(const std_string&);
   inline G4String& operator=(const char*);
 
-  inline char operator () (size_t) const; 
-  inline char& operator () (size_t);
+  inline char operator () (str_size) const; 
+  inline char& operator () (str_size);
 
   inline G4String& operator+=(const G4SubString&);
   inline G4String& operator+=(const char*);
@@ -116,7 +134,7 @@ public:
 
   //inline G4String operator () (unsigned int, unsigned int);
   inline operator const char*() const;
-  inline G4SubString operator()(size_t, size_t);
+  inline G4SubString operator()(str_size, str_size);
 
   inline G4int compareTo(const char*, caseCompare mode=exact);
   inline G4int compareTo(const G4String&, caseCompare mode=exact);
@@ -128,10 +146,10 @@ public:
   
   inline G4String& replace (unsigned int, unsigned int, 
                              const char*, unsigned int );
-  inline G4String& replace(size_t, size_t, const char*);
+  inline G4String& replace(str_size, str_size, const char*);
 
-  inline G4String& remove(size_t);
-  inline G4String& remove(size_t, size_t);
+  inline G4String& remove(str_size);
+  inline G4String& remove(str_size, str_size);
 
   inline G4int first(char) const;
   inline G4int last(char) const;
@@ -150,9 +168,9 @@ public:
 
   inline G4bool isNull() const;
 
-  inline size_t index (const char*, G4int pos=0) const; 
-  inline size_t index (char, G4int pos=0) const; 
-  inline size_t index (const G4String&, size_t, size_t, caseCompare) const;
+  inline str_size index (const char*, G4int pos=0) const; 
+  inline str_size index (char, G4int pos=0) const; 
+  inline str_size index (const G4String&, str_size, str_size, caseCompare) const;
 
   inline const char* data() const;
 
diff --git a/source/global/STLInterface/g4rw/cstring.icc b/source/global/STLInterface/g4rw/cstring.icc
index 32fd56820b..9e4c200387 100644
--- a/source/global/STLInterface/g4rw/cstring.icc
+++ b/source/global/STLInterface/g4rw/cstring.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: cstring.icc,v 1.9 2000/11/20 20:03:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: cstring.icc,v 1.10.2.1 2001/06/28 19:09:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
@@ -26,7 +42,7 @@ G4SubString::G4SubString(const G4SubString&s)
   extent=s.extent;
 }
 
-G4SubString::G4SubString(G4String& str, size_t s, size_t e)
+G4SubString::G4SubString(G4String& str, str_size s, str_size e)
   : mystring(&str),mystart(s),extent(e)
 {
 } 
@@ -51,22 +67,22 @@ G4SubString& G4SubString::operator=(const char*s)
   return *this;
 }
 
-char& G4SubString::operator()(size_t i)
+char& G4SubString::operator()(str_size i)
 {
   return mystring->operator[](mystart+i);
 }
 
-char  G4SubString::operator()(size_t i) const
+char  G4SubString::operator()(str_size i) const
 {
   return mystring->operator[](mystart+i);
 }
 
-char&  G4SubString::operator[](size_t i)
+char&  G4SubString::operator[](str_size i)
 {
   return mystring->operator[](mystart+i);
 }
 
-char  G4SubString::operator[](size_t i) const
+char  G4SubString::operator[](str_size i) const
 {
   return mystring->operator[](mystart+i);
 }
@@ -96,12 +112,12 @@ G4bool G4SubString::operator!=(const char* s) const
   return mystring->substr(mystart,extent) != G4std::string(s) ? true:false;
 }
 
-size_t G4SubString::length() const
+str_size G4SubString::length() const
 {
   return extent;
 }
 
-size_t G4SubString::start() const
+str_size G4SubString::start() const
 {
   return mystart;
 }
@@ -160,12 +176,12 @@ G4String& G4String::operator=(const char* s)
 //       one returned by the original RW function.
 //       Users should not rely on the specific return value.
 //
-char G4String::operator () (size_t i) const
+char G4String::operator () (str_size i) const
 {
   return operator[](i);
 }
 
-char& G4String::operator () (size_t i)
+char& G4String::operator () (str_size i)
 {
   return std_string::operator[](i);
 }
@@ -236,9 +252,9 @@ G4int G4String::strcasecompare(const char* s1, const char* s2) const
   char* buf1 = new char[strlen(s1)+1];
   char* buf2 = new char[strlen(s2)+1];
 
-  for (size_t i=0; i<=strlen(s1); i++)
+  for (str_size i=0; i<=strlen(s1); i++)
     buf1[i] = tolower(s1[i]);
-  for (size_t j=0; j<=strlen(s2); j++)
+  for (str_size j=0; j<=strlen(s2); j++)
     buf2[j] = tolower(s2[j]);
 
   G4int res = strcmp(buf1, buf2);
@@ -299,20 +315,20 @@ G4String& G4String::replace (unsigned int start, unsigned int nbytes,
   return *this;                                                              
 }                                                                          
 
-G4String& G4String::replace(size_t pos, size_t n, const char* s)
+G4String& G4String::replace(str_size pos, str_size n, const char* s)
 {
   std_string::replace(pos,n,s);
   return *this;
 }
 
-G4String& G4String::remove(size_t n)
+G4String& G4String::remove(str_size n)
 {
   if(n<size())
     erase(n,size()-n);
   return *this;
 }
 
-G4String& G4String::remove(size_t pos, size_t N)
+G4String& G4String::remove(str_size pos, str_size N)
 {
   erase(pos,N+pos);
   return *this;
@@ -350,7 +366,7 @@ G4String G4String::strip (G4int stripType, char c)
 {
   G4String retVal = *this;
   if(length()==0) return retVal;
-  size_t i;
+  str_size i;
   switch ( stripType ) {
   case leading: 
     {
@@ -383,7 +399,7 @@ G4String G4String::strip (G4int stripType, char c)
 
 void G4String::toLower ( void )
 {
-  for (size_t i=0; i<size();i++)
+  for (str_size i=0; i<size();i++)
   {
     //GB:HP-UX-aCC,Linux-KCC 
     std_string::operator[](i) = tolower(std_string::operator[](i));
@@ -393,7 +409,7 @@ void G4String::toLower ( void )
 
 void G4String::toUpper ( void )
 {
-  for (size_t i=0; i<size();i++)
+  for (str_size i=0; i<size();i++)
   {
     //GB:HP-UX-aCC,Linux-KCC 
     std_string::operator[](i) = toupper(std_string::operator[](i));
@@ -408,23 +424,23 @@ G4bool G4String::isNull() const
 
 // "cs" optional parameter is NOT implemented !
 //
-size_t G4String::index( const G4String& s, size_t ln, 
-                        size_t st, G4String::caseCompare cs ) const
+str_size G4String::index( const G4String& s, str_size ln, 
+                          str_size st, G4String::caseCompare cs ) const
 {
   return std_string::find( s.c_str(), st, ln );
 }
 
-size_t G4String::index (const char* str, G4int pos) const
+str_size G4String::index (const char* str, G4int pos) const
 {
   return std_string::find(str,pos);
 }
 
-size_t G4String::index (char c, G4int pos) const
+str_size G4String::index (char c, G4int pos) const
 {
   return std_string::find(c,pos);
 }
 
-G4SubString G4String::operator()(size_t start, size_t extent)
+G4SubString G4String::operator()(str_size start, str_size extent)
 {
   return G4SubString(*this,start,extent);
 }
@@ -441,7 +457,7 @@ unsigned int G4String::hash( caseCompare cmp ) const
   for ( ; *s; ++s)
     h = 5*h + *s;
 
-  return size_t(h);
+  return str_size(h);
 }
 
 unsigned int G4String::stlhash() const
@@ -451,7 +467,7 @@ unsigned int G4String::stlhash() const
   for ( ; *s; ++s)
     h = 5*h + *s;
 
-  return size_t(h);
+  return str_size(h);
 }
 
 unsigned G4String::hash(const G4String& s)
diff --git a/source/global/STLInterface/g4rw/ctoken.h b/source/global/STLInterface/g4rw/ctoken.h
index 0538c6a8a4..791f2a2ba7 100644
--- a/source/global/STLInterface/g4rw/ctoken.h
+++ b/source/global/STLInterface/g4rw/ctoken.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: ctoken.h,v 1.5 1999/11/29 10:17:41 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: ctoken.h,v 1.5.8.1 2001/06/28 19:09:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/defs.h b/source/global/STLInterface/g4rw/defs.h
index 176e720f36..75c4c0130d 100644
--- a/source/global/STLInterface/g4rw/defs.h
+++ b/source/global/STLInterface/g4rw/defs.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: defs.h,v 1.8 2000/06/26 16:25:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: defs.h,v 1.8.4.1 2001/06/28 19:09:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rstream.h b/source/global/STLInterface/g4rw/rstream.h
index 5ff8c85abc..891911cf78 100644
--- a/source/global/STLInterface/g4rw/rstream.h
+++ b/source/global/STLInterface/g4rw/rstream.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: rstream.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: rstream.h,v 1.4.8.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/rw2stl_algo.h b/source/global/STLInterface/g4rw/rw2stl_algo.h
index 08baf0397f..a9fefc1730 100644
--- a/source/global/STLInterface/g4rw/rw2stl_algo.h
+++ b/source/global/STLInterface/g4rw/rw2stl_algo.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: rw2stl_algo.h,v 1.4 1999/11/25 10:14:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: rw2stl_algo.h,v 1.4.8.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.h b/source/global/STLInterface/g4rw/tpordvec.h
index c0a4551b04..4432e2d105 100644
--- a/source/global/STLInterface/g4rw/tpordvec.h
+++ b/source/global/STLInterface/g4rw/tpordvec.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpordvec.h,v 1.7 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpordvec.h,v 1.7.8.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpordvec.icc b/source/global/STLInterface/g4rw/tpordvec.icc
index c5caf08d86..d0f17a8915 100644
--- a/source/global/STLInterface/g4rw/tpordvec.icc
+++ b/source/global/STLInterface/g4rw/tpordvec.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpordvec.icc,v 1.5 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpordvec.icc,v 1.5.4.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.h b/source/global/STLInterface/g4rw/tpsrtvec.h
index 5881871188..f2036cc63d 100644
--- a/source/global/STLInterface/g4rw/tpsrtvec.h
+++ b/source/global/STLInterface/g4rw/tpsrtvec.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpsrtvec.h,v 1.8 1999/11/26 17:17:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpsrtvec.h,v 1.8.8.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpsrtvec.icc b/source/global/STLInterface/g4rw/tpsrtvec.icc
index 7515ebcc7a..b46bb89054 100644
--- a/source/global/STLInterface/g4rw/tpsrtvec.icc
+++ b/source/global/STLInterface/g4rw/tpsrtvec.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpsrtvec.icc,v 1.7 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpsrtvec.icc,v 1.7.4.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpvector.h b/source/global/STLInterface/g4rw/tpvector.h
index 817f20eb90..9bf4b93857 100644
--- a/source/global/STLInterface/g4rw/tpvector.h
+++ b/source/global/STLInterface/g4rw/tpvector.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpvector.h,v 1.9 2000/02/11 14:09:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpvector.h,v 1.9.4.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tpvector.icc b/source/global/STLInterface/g4rw/tpvector.icc
index 24ff2d8649..5ff332a64b 100644
--- a/source/global/STLInterface/g4rw/tpvector.icc
+++ b/source/global/STLInterface/g4rw/tpvector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tpvector.icc,v 1.8 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tpvector.icc,v 1.8.4.1 2001/06/28 19:09:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvordvec.h b/source/global/STLInterface/g4rw/tvordvec.h
index 785c722bae..1d7f33f0f5 100644
--- a/source/global/STLInterface/g4rw/tvordvec.h
+++ b/source/global/STLInterface/g4rw/tvordvec.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tvordvec.h,v 1.8 2000/03/10 15:53:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tvordvec.h,v 1.8.4.1 2001/06/28 19:09:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvordvec.icc b/source/global/STLInterface/g4rw/tvordvec.icc
index ee962b3660..0062c17414 100644
--- a/source/global/STLInterface/g4rw/tvordvec.icc
+++ b/source/global/STLInterface/g4rw/tvordvec.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tvordvec.icc,v 1.6 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tvordvec.icc,v 1.6.4.1 2001/06/28 19:09:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvvector.h b/source/global/STLInterface/g4rw/tvvector.h
index 49d0ebdcdf..e806f892fb 100644
--- a/source/global/STLInterface/g4rw/tvvector.h
+++ b/source/global/STLInterface/g4rw/tvvector.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tvvector.h,v 1.8 2000/03/10 15:53:24 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tvvector.h,v 1.8.4.1 2001/06/28 19:09:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/STLInterface/g4rw/tvvector.icc b/source/global/STLInterface/g4rw/tvvector.icc
index 1426cf3597..5ab02a4a76 100644
--- a/source/global/STLInterface/g4rw/tvvector.icc
+++ b/source/global/STLInterface/g4rw/tvvector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: tvvector.icc,v 1.4 2000/11/20 17:26:45 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: tvvector.icc,v 1.4.4.1 2001/06/28 19:09:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/include/G4Allocator.hh b/source/global/management/include/G4Allocator.hh
index a9fc3da540..d182e96905 100644
--- a/source/global/management/include/G4Allocator.hh
+++ b/source/global/management/include/G4Allocator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Allocator.hh,v 1.6 2001/01/09 07:50:57 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Allocator.hh,v 1.6.2.1 2001/06/28 19:10:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4AllocatorPage.hh b/source/global/management/include/G4AllocatorPage.hh
index 6b3cd3993e..5bdbb56a9b 100644
--- a/source/global/management/include/G4AllocatorPage.hh
+++ b/source/global/management/include/G4AllocatorPage.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AllocatorPage.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AllocatorPage.hh,v 1.2.8.1 2001/06/28 19:10:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4AllocatorUnit.hh b/source/global/management/include/G4AllocatorUnit.hh
index 696f6a4cba..8c55e7c2c5 100644
--- a/source/global/management/include/G4AllocatorUnit.hh
+++ b/source/global/management/include/G4AllocatorUnit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AllocatorUnit.hh,v 1.2 1999/11/16 17:40:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AllocatorUnit.hh,v 1.2.8.1 2001/06/28 19:10:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4ApplicationState.hh b/source/global/management/include/G4ApplicationState.hh
index 0913be5e02..d9cb016004 100644
--- a/source/global/management/include/G4ApplicationState.hh
+++ b/source/global/management/include/G4ApplicationState.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ApplicationState.hh,v 1.1 2000/07/22 10:45:34 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ApplicationState.hh,v 1.1.4.1 2001/06/28 19:10:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4APPLICATIONSTATE_H
diff --git a/source/global/management/include/G4DataVector.hh b/source/global/management/include/G4DataVector.hh
index 4d337bd193..c85cccdc7b 100644
--- a/source/global/management/include/G4DataVector.hh
+++ b/source/global/management/include/G4DataVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DataVector.hh,v 1.7 2001/03/06 15:56:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DataVector.hh,v 1.8.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
@@ -37,6 +53,10 @@ class G4DataVector : public G4std::vector<G4double>
   G4DataVector(size_t capacity);
    // Constructor given a 'capacity' defining the initial number of elements.
 
+  G4DataVector(size_t capacity, G4double value);
+   // Constructor given a 'capacity' defining the initial number of elements
+   // and initialising them to 'value'.
+
   virtual ~G4DataVector(){;}
    // Empty destructor
 
@@ -68,6 +88,12 @@ G4DataVector::G4DataVector(size_t capacity)
 {
 }
 
+inline
+G4DataVector::G4DataVector(size_t capacity, G4double value)
+  : G4std::vector<G4double>(capacity, value)
+{
+}
+
 inline
 void G4DataVector::insertAt(size_t pos, const G4double& a) 
 { 
diff --git a/source/global/management/include/G4FastVector.hh b/source/global/management/include/G4FastVector.hh
index 3367bae22e..3cf83d4450 100644
--- a/source/global/management/include/G4FastVector.hh
+++ b/source/global/management/include/G4FastVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastVector.hh,v 1.3 1999/11/23 15:00:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastVector.hh,v 1.3.8.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4LPhysicsFreeVector.hh b/source/global/management/include/G4LPhysicsFreeVector.hh
index 9104eeb0bc..3d4681795d 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.hh
+++ b/source/global/management/include/G4LPhysicsFreeVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LPhysicsFreeVector.hh,v 1.6 2001/03/09 12:08:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LPhysicsFreeVector.hh,v 1.6.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------------
diff --git a/source/global/management/include/G4LPhysicsFreeVector.icc b/source/global/management/include/G4LPhysicsFreeVector.icc
index 6ab9e7e532..be15889c40 100644
--- a/source/global/management/include/G4LPhysicsFreeVector.icc
+++ b/source/global/management/include/G4LPhysicsFreeVector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LPhysicsFreeVector.icc,v 1.4 2001/01/09 11:26:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LPhysicsFreeVector.icc,v 1.4.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------------
diff --git a/source/global/management/include/G4OrderedTable.hh b/source/global/management/include/G4OrderedTable.hh
index 155bc252a4..4e113ff151 100644
--- a/source/global/management/include/G4OrderedTable.hh
+++ b/source/global/management/include/G4OrderedTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OrderedTable.hh,v 1.7 2001/03/06 15:56:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OrderedTable.hh,v 1.7.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsFreeVector.hh b/source/global/management/include/G4PhysicsFreeVector.hh
index 337041342e..15a820de69 100644
--- a/source/global/management/include/G4PhysicsFreeVector.hh
+++ b/source/global/management/include/G4PhysicsFreeVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsFreeVector.hh,v 1.7 2001/03/09 12:08:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsFreeVector.hh,v 1.7.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsLinearVector.hh b/source/global/management/include/G4PhysicsLinearVector.hh
index 6d9b7803be..1e2ce4b0da 100644
--- a/source/global/management/include/G4PhysicsLinearVector.hh
+++ b/source/global/management/include/G4PhysicsLinearVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLinearVector.hh,v 1.6 2001/03/09 12:08:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLinearVector.hh,v 1.6.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsLnVector.hh b/source/global/management/include/G4PhysicsLnVector.hh
index 4112cb83c1..d17f7dd2ae 100644
--- a/source/global/management/include/G4PhysicsLnVector.hh
+++ b/source/global/management/include/G4PhysicsLnVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLnVector.hh,v 1.7 2001/03/09 12:08:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLnVector.hh,v 1.7.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsLogVector.hh b/source/global/management/include/G4PhysicsLogVector.hh
index e051321c72..7d12a9b247 100644
--- a/source/global/management/include/G4PhysicsLogVector.hh
+++ b/source/global/management/include/G4PhysicsLogVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLogVector.hh,v 1.6 2001/03/09 12:08:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLogVector.hh,v 1.6.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.hh b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
index 467214a114..36d0fe2453 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.hh
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsOrderedFreeVector.hh,v 1.7 2001/03/09 12:08:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsOrderedFreeVector.hh,v 1.7.2.1 2001/06/28 19:10:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Definition
diff --git a/source/global/management/include/G4PhysicsOrderedFreeVector.icc b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
index d6f92f29d1..9c7cf9bf05 100644
--- a/source/global/management/include/G4PhysicsOrderedFreeVector.icc
+++ b/source/global/management/include/G4PhysicsOrderedFreeVector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsOrderedFreeVector.icc,v 1.5 2001/01/09 11:26:59 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsOrderedFreeVector.icc,v 1.5.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Inline Functions Definitions
diff --git a/source/global/management/include/G4PhysicsTable.hh b/source/global/management/include/G4PhysicsTable.hh
index d8ff62aead..854b09e6b1 100644
--- a/source/global/management/include/G4PhysicsTable.hh
+++ b/source/global/management/include/G4PhysicsTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsTable.hh,v 1.10 2001/04/03 07:26:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsTable.hh,v 1.10.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsTable.icc b/source/global/management/include/G4PhysicsTable.icc
index cd0fbfaf6c..4bf0dc3203 100644
--- a/source/global/management/include/G4PhysicsTable.icc
+++ b/source/global/management/include/G4PhysicsTable.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsTable.icc,v 1.3 2001/04/03 07:26:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsTable.icc,v 1.3.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsVector.hh b/source/global/management/include/G4PhysicsVector.hh
index 5b6121743f..36fcb0b9fe 100644
--- a/source/global/management/include/G4PhysicsVector.hh
+++ b/source/global/management/include/G4PhysicsVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsVector.hh,v 1.9 2001/03/09 12:08:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsVector.hh,v 1.9.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsVector.icc b/source/global/management/include/G4PhysicsVector.icc
index c96fd1c83b..a2e5aa4f9d 100644
--- a/source/global/management/include/G4PhysicsVector.icc
+++ b/source/global/management/include/G4PhysicsVector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsVector.icc,v 1.6 2001/03/09 12:08:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsVector.icc,v 1.6.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/global/management/include/G4PhysicsVectorType.hh b/source/global/management/include/G4PhysicsVectorType.hh
index d518033d01..725eadfa92 100644
--- a/source/global/management/include/G4PhysicsVectorType.hh
+++ b/source/global/management/include/G4PhysicsVectorType.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsVectorType.hh,v 1.2 2001/03/09 12:08:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsVectorType.hh,v 1.2.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //
diff --git a/source/global/management/include/G4RotationMatrix.hh b/source/global/management/include/G4RotationMatrix.hh
index f1fb135fd6..177ca52cd4 100644
--- a/source/global/management/include/G4RotationMatrix.hh
+++ b/source/global/management/include/G4RotationMatrix.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RotationMatrix.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RotationMatrix.hh,v 1.2.8.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4SIunits.hh b/source/global/management/include/G4SIunits.hh
index aef0514be0..6757a735f8 100644
--- a/source/global/management/include/G4SIunits.hh
+++ b/source/global/management/include/G4SIunits.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SIunits.hh,v 1.1 2001/03/02 11:01:51 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SIunits.hh,v 1.1.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/G4StateManager.hh b/source/global/management/include/G4StateManager.hh
index b1f265b39e..bc26c35474 100644
--- a/source/global/management/include/G4StateManager.hh
+++ b/source/global/management/include/G4StateManager.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StateManager.hh,v 1.3 2001/03/06 15:56:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StateManager.hh,v 1.3.2.2 2001/06/28 20:18:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      Geant4 Collaboration
 //
 //       ---------------- G4StateManager ----------------
 //
diff --git a/source/global/management/include/G4ThreeVector.hh b/source/global/management/include/G4ThreeVector.hh
index c6fc850298..afd885c80d 100644
--- a/source/global/management/include/G4ThreeVector.hh
+++ b/source/global/management/include/G4ThreeVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ThreeVector.hh,v 1.2 1999/11/16 17:40:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ThreeVector.hh,v 1.2.8.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4Timer.hh b/source/global/management/include/G4Timer.hh
index 734a61299d..1134f5ffb6 100644
--- a/source/global/management/include/G4Timer.hh
+++ b/source/global/management/include/G4Timer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Timer.hh,v 1.10 2000/01/06 14:27:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Timer.hh,v 1.10.4.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/include/G4Types.hh b/source/global/management/include/G4Types.hh
index 20379390c5..537427f4e9 100644
--- a/source/global/management/include/G4Types.hh
+++ b/source/global/management/include/G4Types.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Types.hh,v 1.4 1999/12/15 18:05:19 gracia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Types.hh,v 1.4.4.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // GEANT4 native types
diff --git a/source/global/management/include/G4UnitsTable.hh b/source/global/management/include/G4UnitsTable.hh
index 367885fd25..733c795168 100644
--- a/source/global/management/include/G4UnitsTable.hh
+++ b/source/global/management/include/G4UnitsTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnitsTable.hh,v 1.10 2001/03/06 15:56:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnitsTable.hh,v 1.10.2.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // -----------------------------------------------------------------
diff --git a/source/global/management/include/G4UserLimits.hh b/source/global/management/include/G4UserLimits.hh
index b41b46bfb9..3f601a86e5 100644
--- a/source/global/management/include/G4UserLimits.hh
+++ b/source/global/management/include/G4UserLimits.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserLimits.hh,v 1.6 2000/02/17 16:13:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserLimits.hh,v 1.6.4.1 2001/06/28 19:10:03 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //
 // class G4UserLimits
diff --git a/source/global/management/include/G4UserLimits.icc b/source/global/management/include/G4UserLimits.icc
index f26edb3ff5..95022adb96 100644
--- a/source/global/management/include/G4UserLimits.icc
+++ b/source/global/management/include/G4UserLimits.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserLimits.icc,v 1.5 2000/02/17 16:13:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserLimits.icc,v 1.5.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/source/global/management/include/G4VStateDependent.hh b/source/global/management/include/G4VStateDependent.hh
index 13957d0fc3..ec66898f67 100644
--- a/source/global/management/include/G4VStateDependent.hh
+++ b/source/global/management/include/G4VStateDependent.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VStateDependent.hh,v 1.2 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VStateDependent.hh,v 1.2.4.2 2001/06/28 20:18:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      Geant4 Collaboration
 //
 //      ---------------- G4VStateDependent ----------------
 //
diff --git a/source/global/management/include/G4coutDestination.hh b/source/global/management/include/G4coutDestination.hh
index 293a19bfd8..fef404f863 100644
--- a/source/global/management/include/G4coutDestination.hh
+++ b/source/global/management/include/G4coutDestination.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4coutDestination.hh,v 1.3 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4coutDestination.hh,v 1.3.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4ios.hh b/source/global/management/include/G4ios.hh
index 79dc50ae32..470b0b8023 100644
--- a/source/global/management/include/G4ios.hh
+++ b/source/global/management/include/G4ios.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ios.hh,v 1.5 1999/12/15 18:05:18 gracia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ios.hh,v 1.5.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4strstreambuf.hh b/source/global/management/include/G4strstreambuf.hh
index e4581dcf42..4ede05cc5f 100644
--- a/source/global/management/include/G4strstreambuf.hh
+++ b/source/global/management/include/G4strstreambuf.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4strstreambuf.hh,v 1.7 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4strstreambuf.hh,v 1.7.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/G4strstreambuf.icc b/source/global/management/include/G4strstreambuf.icc
index e95ec7970d..f6329c1d48 100644
--- a/source/global/management/include/G4strstreambuf.icc
+++ b/source/global/management/include/G4strstreambuf.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4strstreambuf.icc,v 1.1 2000/11/20 17:26:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4strstreambuf.icc,v 1.1.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
diff --git a/source/global/management/include/PhysicalConstants.h b/source/global/management/include/PhysicalConstants.h
index 8c3b8c27f6..7462bbe486 100644
--- a/source/global/management/include/PhysicalConstants.h
+++ b/source/global/management/include/PhysicalConstants.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: PhysicalConstants.h,v 1.5 2001/03/02 11:28:29 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: PhysicalConstants.h,v 1.5.2.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/SystemOfUnits.h b/source/global/management/include/SystemOfUnits.h
index 90e6967bcc..fe52873a5b 100644
--- a/source/global/management/include/SystemOfUnits.h
+++ b/source/global/management/include/SystemOfUnits.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: SystemOfUnits.h,v 1.6 2001/03/05 13:25:22 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: SystemOfUnits.h,v 1.6.2.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // ----------------------------------------------------------------------
 //
diff --git a/source/global/management/include/g4std/algorithm b/source/global/management/include/g4std/algorithm
index f6d9f2c0f5..b320e58549 100644
--- a/source/global/management/include/g4std/algorithm
+++ b/source/global/management/include/g4std/algorithm
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: algorithm,v 1.3 1999/11/16 17:42:57 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- algorithm ----------------
 //
diff --git a/source/global/management/include/g4std/complex b/source/global/management/include/g4std/complex
index e146d9f58f..df93b9785d 100644
--- a/source/global/management/include/g4std/complex
+++ b/source/global/management/include/g4std/complex
@@ -7,7 +7,7 @@
 //
 //
 // $Id: complex,v 1.3 2000/06/15 17:32:10 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-01-ref-08 $
 //
 //      ---------------- complex ----------------
 //
diff --git a/source/global/management/include/g4std/fstream b/source/global/management/include/g4std/fstream
index 91d39e83f4..af62d1b9be 100644
--- a/source/global/management/include/g4std/fstream
+++ b/source/global/management/include/g4std/fstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: fstream,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- fstream ----------------
 //
diff --git a/source/global/management/include/g4std/functional b/source/global/management/include/g4std/functional
index acead15fc0..5fb0e2de07 100644
--- a/source/global/management/include/g4std/functional
+++ b/source/global/management/include/g4std/functional
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: functional,v 1.3 1999/11/16 17:43:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- functional ----------------
 //
diff --git a/source/global/management/include/g4std/iomanip b/source/global/management/include/g4std/iomanip
index 7d2d7fa167..01848699ae 100644
--- a/source/global/management/include/g4std/iomanip
+++ b/source/global/management/include/g4std/iomanip
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iomanip,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- iomanip ----------------
 //
diff --git a/source/global/management/include/g4std/iostream b/source/global/management/include/g4std/iostream
index c04e079f8b..e824b0f9d4 100644
--- a/source/global/management/include/g4std/iostream
+++ b/source/global/management/include/g4std/iostream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: iostream,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- iostream ----------------
 //
diff --git a/source/global/management/include/g4std/list b/source/global/management/include/g4std/list
index 0031ec4672..5a5ea3b28b 100644
--- a/source/global/management/include/g4std/list
+++ b/source/global/management/include/g4std/list
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: list,v 1.1 2000/08/22 07:54:26 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name:  $
 //
 //      ---------------- list ----------------
 //
diff --git a/source/global/management/include/g4std/map b/source/global/management/include/g4std/map
index 4c87a5bfa9..c7bb3e59af 100644
--- a/source/global/management/include/g4std/map
+++ b/source/global/management/include/g4std/map
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: map,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- map ----------------
 //
diff --git a/source/global/management/include/g4std/queue b/source/global/management/include/g4std/queue
index 0777a6cbf6..f3fd5d4594 100644
--- a/source/global/management/include/g4std/queue
+++ b/source/global/management/include/g4std/queue
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: queue,v 1.1 2000/08/02 09:49:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name:  $
 //
 //      ---------------- queue ----------------
 //
diff --git a/source/global/management/include/g4std/set b/source/global/management/include/g4std/set
index 76fb2f237e..bd5a3858d1 100644
--- a/source/global/management/include/g4std/set
+++ b/source/global/management/include/g4std/set
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: set,v 1.3 1999/11/16 17:43:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- set ----------------
 //
diff --git a/source/global/management/include/g4std/streambuf b/source/global/management/include/g4std/streambuf
index 69ea22605c..00e1406001 100644
--- a/source/global/management/include/g4std/streambuf
+++ b/source/global/management/include/g4std/streambuf
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: streambuf,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- streambuf ----------------
 //
diff --git a/source/global/management/include/g4std/strstream b/source/global/management/include/g4std/strstream
index 92586fff8c..938b1a9d20 100644
--- a/source/global/management/include/g4std/strstream
+++ b/source/global/management/include/g4std/strstream
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: strstream,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- strstream ----------------
 //
diff --git a/source/global/management/include/g4std/vector b/source/global/management/include/g4std/vector
index 0234e5ef50..e99bec1da6 100644
--- a/source/global/management/include/g4std/vector
+++ b/source/global/management/include/g4std/vector
@@ -6,7 +6,7 @@
 // and all its terms.
 //
 // $Id: vector,v 1.3 1999/11/16 17:43:09 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// GEANT4 tag $Name: geant4-01-00-ref-01 $
 //
 //      ---------------- vector ----------------
 //
diff --git a/source/global/management/include/globals.hh b/source/global/management/include/globals.hh
index 36109c3685..76a2b6d162 100644
--- a/source/global/management/include/globals.hh
+++ b/source/global/management/include/globals.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: globals.hh,v 1.15 2000/01/19 11:12:44 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: globals.hh,v 1.16.2.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Global Constants and typedefs
@@ -23,6 +39,7 @@
 // 22.09.98 G.Cosmo - Removed min/max/sqr/abs functions and replaced with
 //                    inclusion of CLHEP/config/TemplateFunctions.h for CLHEP-1.3
 // 15.12.99 G.Gracia - Included min, max definitions for NT with ISO standard
+// 15.06.01 G.Cosmo - Removed cbrt() definition
 
 #ifndef GLOBALS_HH
 #define GLOBALS_HH
@@ -70,11 +87,6 @@
 // Includes some additional definitions
 #include "templates.hh"
 
-// cbrt() function - define G4_NO_CBRT if the function is not available
-#ifdef G4_NO_CBRT
-  static double cbrt(double x) { return pow(x,1./3.); }
-#endif
-
 // System of Units and Physical Constants
 ////#include <CLHEP/Units/PhysicalConstants.h>
 #include "PhysicalConstants.h"
diff --git a/source/global/management/include/templates.hh b/source/global/management/include/templates.hh
index f1ea2c0f6b..2d7cb6ae66 100644
--- a/source/global/management/include/templates.hh
+++ b/source/global/management/include/templates.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: templates.hh,v 1.5 2000/01/03 11:39:39 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: templates.hh,v 1.5.4.1 2001/06/28 19:10:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // -*- C++ -*-
diff --git a/source/global/management/src/G4Exception.cc b/source/global/management/src/G4Exception.cc
index 39dcb902b4..3112e0a71d 100644
--- a/source/global/management/src/G4Exception.cc
+++ b/source/global/management/src/G4Exception.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Exception.cc,v 1.9 2000/07/22 10:45:35 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Exception.cc,v 1.9.4.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/src/G4LPhysicsFreeVector.cc b/source/global/management/src/G4LPhysicsFreeVector.cc
index 4f2b38cdef..cff45f546d 100644
--- a/source/global/management/src/G4LPhysicsFreeVector.cc
+++ b/source/global/management/src/G4LPhysicsFreeVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LPhysicsFreeVector.cc,v 1.7 2001/03/09 03:39:30 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LPhysicsFreeVector.cc,v 1.7.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsFreeVector.cc b/source/global/management/src/G4PhysicsFreeVector.cc
index 24d3219b06..4ca3d3d165 100644
--- a/source/global/management/src/G4PhysicsFreeVector.cc
+++ b/source/global/management/src/G4PhysicsFreeVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsFreeVector.cc,v 1.7 2001/03/09 03:39:30 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsFreeVector.cc,v 1.7.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsLinearVector.cc b/source/global/management/src/G4PhysicsLinearVector.cc
index 6746571fc6..c09f3a3916 100644
--- a/source/global/management/src/G4PhysicsLinearVector.cc
+++ b/source/global/management/src/G4PhysicsLinearVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLinearVector.cc,v 1.8 2001/04/03 09:15:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLinearVector.cc,v 1.8.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //--------------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsLnVector.cc b/source/global/management/src/G4PhysicsLnVector.cc
index d69520582b..3a95ab2d1c 100644
--- a/source/global/management/src/G4PhysicsLnVector.cc
+++ b/source/global/management/src/G4PhysicsLnVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLnVector.cc,v 1.10 2001/04/03 09:15:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLnVector.cc,v 1.10.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsLogVector.cc b/source/global/management/src/G4PhysicsLogVector.cc
index ac3cfadb24..aca48a232c 100644
--- a/source/global/management/src/G4PhysicsLogVector.cc
+++ b/source/global/management/src/G4PhysicsLogVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsLogVector.cc,v 1.8 2001/04/03 09:15:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsLogVector.cc,v 1.8.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsOrderedFreeVector.cc b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
index bb0e1721d5..0021dd2d10 100644
--- a/source/global/management/src/G4PhysicsOrderedFreeVector.cc
+++ b/source/global/management/src/G4PhysicsOrderedFreeVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsOrderedFreeVector.cc,v 1.7 2001/03/09 03:39:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsOrderedFreeVector.cc,v 1.7.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // PhysicsOrderedFreeVector Class Implementation
diff --git a/source/global/management/src/G4PhysicsTable.cc b/source/global/management/src/G4PhysicsTable.cc
index e57408e1c5..d62485b845 100644
--- a/source/global/management/src/G4PhysicsTable.cc
+++ b/source/global/management/src/G4PhysicsTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsTable.cc,v 1.5 2001/04/03 07:26:38 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsTable.cc,v 1.5.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/global/management/src/G4PhysicsVector.cc b/source/global/management/src/G4PhysicsVector.cc
index 4c718221d5..b659c32282 100644
--- a/source/global/management/src/G4PhysicsVector.cc
+++ b/source/global/management/src/G4PhysicsVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicsVector.cc,v 1.11 2001/03/09 13:36:56 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicsVector.cc,v 1.11.2.1 2001/06/28 19:10:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/global/management/src/G4StateManager.cc b/source/global/management/src/G4StateManager.cc
index b9e9f9db16..7f637f8fe5 100644
--- a/source/global/management/src/G4StateManager.cc
+++ b/source/global/management/src/G4StateManager.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StateManager.cc,v 1.3 2001/03/06 15:56:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StateManager.cc,v 1.3.2.2 2001/06/28 20:18:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      Geant4 Collaboration
 //      ---------------- G4StateManager ----------------
 //             by Gabriele Cosmo, November 1996
 // ------------------------------------------------------------
diff --git a/source/global/management/src/G4Timer.cc b/source/global/management/src/G4Timer.cc
index ca417168ca..89036b0b06 100644
--- a/source/global/management/src/G4Timer.cc
+++ b/source/global/management/src/G4Timer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Timer.cc,v 1.8 2000/06/26 16:27:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Timer.cc,v 1.8.4.1 2001/06/28 19:10:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
diff --git a/source/global/management/src/G4UnitsTable.cc b/source/global/management/src/G4UnitsTable.cc
index 1939dbcb0f..6dcc6ada70 100644
--- a/source/global/management/src/G4UnitsTable.cc
+++ b/source/global/management/src/G4UnitsTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnitsTable.cc,v 1.14 2001/04/02 14:29:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnitsTable.cc,v 1.14.2.1 2001/06/28 19:10:06 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
 //
diff --git a/source/global/management/src/G4VStateDependent.cc b/source/global/management/src/G4VStateDependent.cc
index 4197cdf3c3..96c53d1248 100644
--- a/source/global/management/src/G4VStateDependent.cc
+++ b/source/global/management/src/G4VStateDependent.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VStateDependent.cc,v 1.2 2000/11/20 17:26:49 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VStateDependent.cc,v 1.2.4.2 2001/06/28 20:18:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      Geant4 Collaboration
 //      ---------------- G4VStateDependent ----------------
 //             by Gabriele Cosmo, November 1996
 // ------------------------------------------------------------
diff --git a/source/global/management/src/G4ios.cc b/source/global/management/src/G4ios.cc
index 640470d7ab..0f597d5046 100644
--- a/source/global/management/src/G4ios.cc
+++ b/source/global/management/src/G4ios.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ios.cc,v 1.4 1999/11/23 15:00:06 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ios.cc,v 1.4.8.1 2001/06/28 19:10:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/graphics_reps/History b/source/graphics_reps/History
index f382b28340..3e5720ffa5 100644
--- a/source/graphics_reps/History
+++ b/source/graphics_reps/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.27 2001/02/06 22:07:17 johna Exp $
+$Id: History,v 1.32 2001/05/25 13:38:51 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,25 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+25th May 2001  John Allison  (greps-V03-01-02)
+- Added GetSurfaceArea() and GetVolume() to HepPolyhedron (Evgeni).
+- Bug fix in BooleanProcessor.src (Guy, Evgeni).
+
+3rd May 2001  John Allison  (greps-V03-01-01)
+- Replaced G4RWTValOrderedVector by G4std::vector in G4PlacedPolyhedron
+  and G4Point3DList.  Forces co-working tags in categories:
+    geommng-V03-01-02
+    tracking-V03-01-00
+    vis-V03-01-01
+
+11th April 2001  John Allison  (greps-V03-01-00)
+- Some code has been added to cover unforeseen earlier situation
+  during preselection of faces without intersection (Evgeni).
+- Moved #include <CLHEP/config/TemplateFunctions.h> and others from
+  HepPolyhedron.h to HepPolyhedron.cc (Evgeni).
+- Fixed stupid warnings about possible use of uninitialized variables (Evgeni).
+- Made GetNumberOfRotationSteps() static and public (John).
+
 6th February 2001  John Allison  (greps-V03-00-01)
 - More tidying for CodeWizard.  Added virtual destructors to
   HepPolyhedronBox, etc.  Also made all constructors non-inline.
diff --git a/source/graphics_reps/include/G4Circle.hh b/source/graphics_reps/include/G4Circle.hh
index 72dfd9f014..dbd39cf33d 100644
--- a/source/graphics_reps/include/G4Circle.hh
+++ b/source/graphics_reps/include/G4Circle.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Circle.hh,v 1.5 2001/02/03 18:29:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Circle.hh,v 1.5.2.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Color.hh b/source/graphics_reps/include/G4Color.hh
index 667bf47eb2..51c96d2a8a 100644
--- a/source/graphics_reps/include/G4Color.hh
+++ b/source/graphics_reps/include/G4Color.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Color.hh,v 1.3 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Color.hh,v 1.3.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/include/G4Colour.hh b/source/graphics_reps/include/G4Colour.hh
index 8d82c2ee98..d12e274340 100644
--- a/source/graphics_reps/include/G4Colour.hh
+++ b/source/graphics_reps/include/G4Colour.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Colour.hh,v 1.5 1999/12/15 16:46:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Colour.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/include/G4NURBS.hh b/source/graphics_reps/include/G4NURBS.hh
index 5379910ea9..b9168eeccc 100644
--- a/source/graphics_reps/include/G4NURBS.hh
+++ b/source/graphics_reps/include/G4NURBS.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBS.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBS.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // Olivier Crumeyrolle  12 September 1996
 
diff --git a/source/graphics_reps/include/G4NURBSbox.hh b/source/graphics_reps/include/G4NURBSbox.hh
index e83a67f0ac..db632e586b 100644
--- a/source/graphics_reps/include/G4NURBSbox.hh
+++ b/source/graphics_reps/include/G4NURBSbox.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBSbox.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBSbox.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBScylinder.hh b/source/graphics_reps/include/G4NURBScylinder.hh
index 751adba0d6..e9d30d6f89 100644
--- a/source/graphics_reps/include/G4NURBScylinder.hh
+++ b/source/graphics_reps/include/G4NURBScylinder.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBScylinder.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBScylinder.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBShexahedron.hh b/source/graphics_reps/include/G4NURBShexahedron.hh
index 40f0950134..a1002cb678 100644
--- a/source/graphics_reps/include/G4NURBShexahedron.hh
+++ b/source/graphics_reps/include/G4NURBShexahedron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBShexahedron.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBShexahedron.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hexa hedron builder prototype
 // OC 17 9 96
diff --git a/source/graphics_reps/include/G4NURBStube.hh b/source/graphics_reps/include/G4NURBStube.hh
index 1b6681b9ec..139d468881 100644
--- a/source/graphics_reps/include/G4NURBStube.hh
+++ b/source/graphics_reps/include/G4NURBStube.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBStube.hh,v 1.5 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBStube.hh,v 1.5.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4NURBStubesector.hh b/source/graphics_reps/include/G4NURBStubesector.hh
index 069df9ec5b..651f23fa13 100644
--- a/source/graphics_reps/include/G4NURBStubesector.hh
+++ b/source/graphics_reps/include/G4NURBStubesector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBStubesector.hh,v 1.4 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBStubesector.hh,v 1.4.4.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/include/G4PlacedPolyhedron.hh b/source/graphics_reps/include/G4PlacedPolyhedron.hh
index 8acaffa3e7..fbfcb778bd 100644
--- a/source/graphics_reps/include/G4PlacedPolyhedron.hh
+++ b/source/graphics_reps/include/G4PlacedPolyhedron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacedPolyhedron.hh,v 1.7 1999/12/15 14:50:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacedPolyhedron.hh,v 1.8.2.1 2001/06/28 19:10:08 gunter Exp $
+// GEANT4 tag $Name:  $
 
 
 // Class Description:
@@ -20,7 +36,7 @@
 
 #include "G4Polyhedron.hh"
 #include "G4Transform3D.hh"
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 
 class G4PlacedPolyhedron {
 
@@ -52,6 +68,6 @@ private:
 
 };
 
-typedef G4RWTValOrderedVector<G4PlacedPolyhedron> G4PlacedPolyhedronList;
+typedef G4std::vector<G4PlacedPolyhedron> G4PlacedPolyhedronList;
 
 #endif /* G4PLACEDPOLYHEDRON_HH */
diff --git a/source/graphics_reps/include/G4Point3DList.hh b/source/graphics_reps/include/G4Point3DList.hh
index a72d9d1247..7f06815ee1 100644
--- a/source/graphics_reps/include/G4Point3DList.hh
+++ b/source/graphics_reps/include/G4Point3DList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Point3DList.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Point3DList.hh,v 1.7.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  July 1995
@@ -18,11 +34,11 @@
 #ifndef G4POINT3DLIST_HH
 #define G4POINT3DLIST_HH
 
-#include "g4rw/tvordvec.h"
+#include "g4std/vector"
 #include "G4Point3D.hh"
 #include "g4std/iostream"
 
-class G4Point3DList: public G4RWTValOrderedVector<G4Point3D> {
+class G4Point3DList: public G4std::vector<G4Point3D> {
 
 friend G4std::ostream& operator << (G4std::ostream& os, const G4Point3DList& points);
 
diff --git a/source/graphics_reps/include/G4Polyhedron.hh b/source/graphics_reps/include/G4Polyhedron.hh
index 34ad3741bb..de412fc34b 100644
--- a/source/graphics_reps/include/G4Polyhedron.hh
+++ b/source/graphics_reps/include/G4Polyhedron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyhedron.hh,v 1.9 2001/02/03 18:29:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyhedron.hh,v 1.9.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #ifndef G4POLYHEDRON_HH
 #define G4POLYHEDRON_HH
diff --git a/source/graphics_reps/include/G4Polyline.hh b/source/graphics_reps/include/G4Polyline.hh
index 189db1e7a2..2f04c79f10 100644
--- a/source/graphics_reps/include/G4Polyline.hh
+++ b/source/graphics_reps/include/G4Polyline.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyline.hh,v 1.6 2001/02/03 18:29:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyline.hh,v 1.6.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  July 1995
diff --git a/source/graphics_reps/include/G4Polymarker.hh b/source/graphics_reps/include/G4Polymarker.hh
index 6ed2f77df3..47b040d03a 100644
--- a/source/graphics_reps/include/G4Polymarker.hh
+++ b/source/graphics_reps/include/G4Polymarker.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polymarker.hh,v 1.6 2001/02/03 18:29:43 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polymarker.hh,v 1.6.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  November 1996
diff --git a/source/graphics_reps/include/G4Polymarker.icc b/source/graphics_reps/include/G4Polymarker.icc
index 817f625fd5..ed0d11f31e 100644
--- a/source/graphics_reps/include/G4Polymarker.icc
+++ b/source/graphics_reps/include/G4Polymarker.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polymarker.icc,v 1.2 1999/12/15 14:50:33 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polymarker.icc,v 1.2.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  November 1996
diff --git a/source/graphics_reps/include/G4Square.hh b/source/graphics_reps/include/G4Square.hh
index 6dcf53504b..7fecd6f74b 100644
--- a/source/graphics_reps/include/G4Square.hh
+++ b/source/graphics_reps/include/G4Square.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Square.hh,v 1.4 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Square.hh,v 1.4.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Square.icc b/source/graphics_reps/include/G4Square.icc
index 3ea310b230..f19623817e 100644
--- a/source/graphics_reps/include/G4Square.icc
+++ b/source/graphics_reps/include/G4Square.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Square.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Square.icc,v 1.2.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Text.hh b/source/graphics_reps/include/G4Text.hh
index f33bab2313..130bb98eca 100644
--- a/source/graphics_reps/include/G4Text.hh
+++ b/source/graphics_reps/include/G4Text.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Text.hh,v 1.6 2001/02/03 18:29:45 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Text.hh,v 1.6.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4Text.icc b/source/graphics_reps/include/G4Text.icc
index 0208203551..7972fb1514 100644
--- a/source/graphics_reps/include/G4Text.icc
+++ b/source/graphics_reps/include/G4Text.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Text.icc,v 1.2 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Text.icc,v 1.2.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/include/G4VMarker.hh b/source/graphics_reps/include/G4VMarker.hh
index 1645adb022..b6f8fb1df2 100644
--- a/source/graphics_reps/include/G4VMarker.hh
+++ b/source/graphics_reps/include/G4VMarker.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMarker.hh,v 1.6 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMarker.hh,v 1.6.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4VMarker - base class for markers - circles, squares, etc.
diff --git a/source/graphics_reps/include/G4VMarker.icc b/source/graphics_reps/include/G4VMarker.icc
index 8d920f1c4b..5827decffe 100644
--- a/source/graphics_reps/include/G4VMarker.icc
+++ b/source/graphics_reps/include/G4VMarker.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMarker.icc,v 1.5 2001/02/03 18:29:46 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMarker.icc,v 1.5.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/graphics_reps/include/G4VVisPrim.hh b/source/graphics_reps/include/G4VVisPrim.hh
index 452ce56a87..79ea79a7f4 100644
--- a/source/graphics_reps/include/G4VVisPrim.hh
+++ b/source/graphics_reps/include/G4VVisPrim.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisPrim.hh,v 1.7 2001/02/03 18:29:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisPrim.hh,v 1.7.2.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  August 1995
diff --git a/source/graphics_reps/include/G4VisAttributes.hh b/source/graphics_reps/include/G4VisAttributes.hh
index fc5e3fd96b..d49fcbdf52 100644
--- a/source/graphics_reps/include/G4VisAttributes.hh
+++ b/source/graphics_reps/include/G4VisAttributes.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisAttributes.hh,v 1.6 2000/05/13 09:33:37 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisAttributes.hh,v 1.6.4.1 2001/06/28 19:10:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  23rd October 1996
diff --git a/source/graphics_reps/include/G4VisAttributes.icc b/source/graphics_reps/include/G4VisAttributes.icc
index dd9b11f53e..142e7b6b83 100644
--- a/source/graphics_reps/include/G4VisAttributes.icc
+++ b/source/graphics_reps/include/G4VisAttributes.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisAttributes.icc,v 1.3 1999/12/15 14:50:34 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisAttributes.icc,v 1.3.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  18th November 1996
diff --git a/source/graphics_reps/include/G4VisExtent.hh b/source/graphics_reps/include/G4VisExtent.hh
index 7cae918fd6..c2ca288e5a 100644
--- a/source/graphics_reps/include/G4VisExtent.hh
+++ b/source/graphics_reps/include/G4VisExtent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisExtent.hh,v 1.4 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisExtent.hh,v 1.4.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // A.Walkden 28/11/95
diff --git a/source/graphics_reps/include/G4Visible.hh b/source/graphics_reps/include/G4Visible.hh
index 404b8d7075..31c7a4a15a 100644
--- a/source/graphics_reps/include/G4Visible.hh
+++ b/source/graphics_reps/include/G4Visible.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Visible.hh,v 1.6 1999/12/15 16:46:08 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Visible.hh,v 1.6.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/include/G4Visible.icc b/source/graphics_reps/include/G4Visible.icc
index 23086d6c87..b9d3427597 100644
--- a/source/graphics_reps/include/G4Visible.icc
+++ b/source/graphics_reps/include/G4Visible.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Visible.icc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Visible.icc,v 1.3.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/include/HepPolyhedron.h b/source/graphics_reps/include/HepPolyhedron.h
index 0c15c4f385..92666cf1c1 100644
--- a/source/graphics_reps/include/HepPolyhedron.h
+++ b/source/graphics_reps/include/HepPolyhedron.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: HepPolyhedron.h,v 1.5 2001/02/06 22:07:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: HepPolyhedron.h,v 1.8.2.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Class Description:
@@ -79,6 +95,9 @@
 //                            returns false when finished all faces;
 //   GetNextUnitNormal (normal) - get normals of unit length of each face
 //                            in order; returns false when finished all faces;
+//   GetSurfaceArea()       - get surface area of the polyhedron;
+//   GetVolume()            - get volume of the polyhedron;
+//   GetNumberOfRotationSteps()   - get number of steps for whole circle;
 //   SetNumberOfRotationSteps (n) - set number of steps for whole circle;
 //   ResetNumberOfRotationSteps() - reset number of steps for whole circle
 //                            to default value;
@@ -126,19 +145,14 @@
 // 19.03.00 E.Chernyaev
 // - added boolean operations (add, subtract, intersect) on polyhedra;
 //
+// 25.05.01 E.Chernyaev
+// - added GetSurfaceArea() and GetVolume();
+//
 
 #ifndef HEP_POLYHEDRON_HH
 #define HEP_POLYHEDRON_HH
 
-#include <CLHEP/config/CLHEP.h>
-#include <CLHEP/config/iostream.h>
-#include <CLHEP/config/TemplateFunctions.h>
-#include <CLHEP/Units/SystemOfUnits.h>
 #include <CLHEP/Geometry/Point3D.h>
-#include <CLHEP/Geometry/Vector3D.h>
-#include <CLHEP/Geometry/Normal3D.h>
-#include <CLHEP/Geometry/Plane3D.h>
-#include <CLHEP/Geometry/Transform3D.h>
 
 #ifndef HepStd
 #ifndef HEP_USE_STD
@@ -190,9 +204,6 @@ class HepPolyhedron {
   // Create HepPolyhedron for prism with quadrilateral base
   void CreatePrism();
 
-  // Get number of steps for whole circle
-  int GetNumberOfRotationSteps() { return fNumberOfRotationSteps; }
-
   // Generate facets by revolving an edge around Z-axis
   void RotateEdge(int k1, int k2, HepDouble r1, HepDouble r2,
                   int v1, int v2, int vEdge,
@@ -296,6 +307,15 @@ class HepPolyhedron {
   HepPolyhedron subtract(const HepPolyhedron &p) const;
   HepPolyhedron intersect(const HepPolyhedron &p) const;
 
+  // Get area of the surface of the polyhedron
+  double GetSurfaceArea() const;
+
+  // Get volume of the polyhedron
+  double GetVolume() const;
+
+  // Get number of steps for whole circle
+  static int GetNumberOfRotationSteps() { return fNumberOfRotationSteps; }
+
   // Set number of steps for whole circle
   static void SetNumberOfRotationSteps(int n);
 
diff --git a/source/graphics_reps/src/BooleanProcessor.src b/source/graphics_reps/src/BooleanProcessor.src
index f8be6cb3ac..3b0d1dbc18 100755
--- a/source/graphics_reps/src/BooleanProcessor.src
+++ b/source/graphics_reps/src/BooleanProcessor.src
@@ -8,6 +8,8 @@
  *                                                                     *
  ***********************************************************************/
 
+#include <CLHEP/Geometry/Plane3D.h>
+
 #define INITIAL_SIZE 200
 #define CRAZY_POINT  HepPoint3D(-10.e+6, -10.e+6, -10.e+6)
 #define GRANULARITY  10.e+5;
@@ -71,7 +73,8 @@ class ExtNode {
   int        s;
 
  public: 
-  ExtNode(HepPoint3D vertex=0, int status=0) : v(vertex), s(status) {}
+  ExtNode(HepPoint3D vertex=HepPoint3D(), int status=0)
+    : v(vertex), s(status) {}
   ~ExtNode() {}
 
   ExtNode(const ExtNode & node) : v(node.v), s(node.s) {}
@@ -214,6 +217,7 @@ class BooleanProcessor {
   int             operation;  // 0 (union), 1 (intersection), 2 (subtraction)
   int             ifaces1, ifaces2;  // lists of faces
   int             iout1,   iout2;    // lists of faces with status "out"
+  int             iunk1,   iunk2;    // lists of faces with status "unknown"
   double          rmin[3], rmax[3];  // intersection of bounding boxes
   double          del;               // precision (tolerance)   
 
@@ -268,6 +272,8 @@ class BooleanProcessor {
   void draw_edge(int, int);
   void draw_contour(int, int, int);
   void draw_faces(int, int, int);
+  void print_face(int);
+  void print_edge(int);
 };
 
 inline void ExtFace::invert()
@@ -550,7 +556,7 @@ int BooleanProcessor::testFaceVsPlane(ExtEdge & edge)
 
   //   F I N D   I N T E R S E C T I O N
 
-  int       ie1, ie2, s1, s2, status, nint = 0; 
+  int       ie1 = 0, ie2 = 0, s1 = 0, s2 = 0, status, nint = 0; 
   enum      { PLUS_MINUS, MINUS_PLUS, ZERO_ZERO, ZERO_PLUS, ZERO_MINUS };
 
   dd[nnode] = dd[0];
@@ -581,8 +587,8 @@ int BooleanProcessor::testFaceVsPlane(ExtEdge & edge)
 
   if (s1 != ZERO_ZERO && s2 != ZERO_ZERO) {
     if (s1 == s2)                       return NON_PLANAR_FACE;
-    int     iedge, i1, i2, ii[2];
-    double  d1, d2, dd ;
+    int     iedge, i1 = 0, i2 = 0, ii[2];
+    double  d1 = 0., d2 = 0., dd ;
     ii[0] = ie1; ii[1] = ie2;
     for (i=0; i<2; i++) {
       iedge = faces[iface].iedges[ii[i]];
@@ -663,7 +669,7 @@ int BooleanProcessor::testEdgeVsEdge(ExtEdge & edge1, ExtEdge & edge2)
  *                                                                     *
  ***********************************************************************/
 {
-  int    i, ii;
+  int    i, ii = 0;
   double d, dd = 0.;
 
   for (i=0; i<3; i++) {
@@ -1066,6 +1072,21 @@ void BooleanProcessor::initiateLists()
       faces[i].inew = UNSUITABLE_FACE;
     }
   }
+
+  iface = iunk1;
+  while (iface > 0) {
+    i     = iface;
+    iface = faces[i].inext;
+    unknown_faces.push_back(i);
+  }
+  iface = iunk2;
+  while (iface > 0) {
+    i     = iface;
+    iface = faces[i].inext;
+    if (operation == OP_SUBTRACTION) faces[i].invert();
+    unknown_faces.push_back(i);
+  }
+
   iface = ifaces1;
   while (iface > 0) {
     i     = iface;
@@ -1107,7 +1128,7 @@ void BooleanProcessor::initiateLists()
       break;
     }
   }
-  ifaces1 = ifaces2 = iout1 = iout2 = 0;
+  ifaces1 = ifaces2 = iout1 = iout2 = iunk1 = iunk2 = 0;
 }
 
 void BooleanProcessor::assemblePolyhedra()
@@ -1440,14 +1461,13 @@ void BooleanProcessor::triangulateContour(int ix, int iy, int ihead)
     
   //   C L O S E   C O N T O U R
   
-  int *pnext, nnode = 0;
-  pnext = &ihead;
+  int ipnext = ihead, nnode = 1;
   for (;;) {
-    if (*pnext > 0) {
-      pnext = &edges[*pnext].inext;
+    if (edges[ipnext].inext > 0) {
+      ipnext = edges[ipnext].inext;
       nnode++; 
     }else{
-      *pnext = ihead;
+      edges[ipnext].inext = ihead;
       break;
     }
   }
@@ -1456,7 +1476,7 @@ void BooleanProcessor::triangulateContour(int ix, int iy, int ihead)
 
   int iedge1, iedge2, iedge3, istart = 0;
   for (;;) {
-    iedge1 = *pnext;
+    iedge1 = edges[ipnext].inext;
     iedge2 = edges[iedge1].inext;
     if (istart == 0) {
       istart = iedge1;
@@ -1486,19 +1506,18 @@ void BooleanProcessor::triangulateContour(int ix, int iy, int ihead)
     //   C H E C K   C O R E C T N E S S   O F   T H E   T R I A N G L E
 
     if (checkTriangle(iedge1,iedge2,ix,iy) != 0) {
-      pnext  = &edges[*pnext].inext;
+      ipnext  = edges[ipnext].inext;
       continue; 
     }
 
     //   M O D I F Y   C O N T O U R  
     
     int i1 = edges[iedge1].i1;
-    int i2 = edges[iedge1].i2;
     int i3 = edges[iedge2].i2;
     int iface1 = edges[iedge1].iface1;
     int iface2 = faces.size();
 
-    *pnext = edges.size();
+    edges[ipnext].inext = edges.size();
     edges.push_back(ExtEdge(i1, i3, iface1, -(edges.size()+1), -1));
     edges.back().inext = edges[iedge2].inext;
 
@@ -1511,7 +1530,7 @@ void BooleanProcessor::triangulateContour(int ix, int iy, int ihead)
     faces.back().inew   = ORIGINAL_FACE;
     edges[iedge1].iface1 = iface2;
     edges[iedge2].iface1 = iface2;
-    pnext  = &edges[*pnext].inext;
+    ipnext  = edges[ipnext].inext;
     istart = 0;
     nnode--; 
 
@@ -1640,18 +1659,18 @@ void BooleanProcessor::triangulateFace(int iface)
 
   //   M O D I F Y   R E F E R E N C E S
 
-  for (iface=nface; iface<faces.size(); iface++) {
-    iedge = faces[iface].iold;
+  for (int ifa=nface; ifa<faces.size(); ifa++) {
+    iedge = faces[ifa].iold;
     while (iedge > 0) {
-      if (edges[iedge].iface1 != iface) {
+      if (edges[iedge].iface1 != ifa) {
 	processor_error = 1;
 	HepStd::cerr
 	  << "BooleanProcessor::triangulateFace : wrong reference to itself, "
-	  << "iface=" << iface << ", iface1=" << edges[iedge].iface1
+	  << "iface=" << ifa << ", iface1=" << edges[iedge].iface1
 	  << HepStd::endl;
       }else if (edges[iedge].iface2 > 0) {
 	modifyReference(edges[iedge].iface2,
-			edges[iedge].i1, edges[iedge].i2, iface);
+			edges[iedge].i1, edges[iedge].i2, ifa);
       }else if (edges[iedge].iface2 < 0) {
 	edges[iedge].iface2 = edges[-edges[iedge].iface2].iface1;
       }
@@ -1833,15 +1852,23 @@ HepPolyhedron BooleanProcessor::execute(int op,
 
   //   P R E S E L E C T   O U T S I D E   F A C E S
 
-  int ifa1, ifa2;
   iout1 = iout2 = 0;
-  for(;;) {
-    ifa1 = iout1;
-    ifa2 = iout2;
-    selectOutsideFaces(ifaces1, iout1);
-    selectOutsideFaces(ifaces2, iout2);
-    if (iout1 == ifa1 && iout2 == ifa2) break;
-    findMinMax();
+  selectOutsideFaces(ifaces1, iout1);
+  selectOutsideFaces(ifaces2, iout2);
+
+  //   P R E S E L E C T   N O   I N T E R S E C T I O N   F A C E S
+
+  int ifa1, ifa2;
+  iunk1 = iunk2 = 0;
+  if (iout1 != 0 || iout2 != 0) {
+    for(;;) {
+      ifa1 = iunk1;
+      ifa2 = iunk2;
+      selectOutsideFaces(ifaces1, iunk1);
+      selectOutsideFaces(ifaces2, iunk2);
+      if (iunk1 == ifa1 && iunk2 == ifa2) break;
+      findMinMax();
+    }
   }
 
 #define PROCESSOR_ERROR \
@@ -1896,7 +1923,7 @@ return a;
   }
 
   //   C R E A T E   P O L Y H E D R O N
-
+  
   return createPolyhedron();
 }
 
@@ -2042,4 +2069,81 @@ BooleanProcessor::draw_contour(int i1col, int i2col, int ihead) {
   int i; 
   std::cin >> i; 
 }
+
+//--------------------------------------------------------------------
+void
+BooleanProcessor::print_face(int iface) {
+  cout.precision(3);
+  cout << "\n====== Face N " << iface << endl;
+  cout << "iedges[4] = "
+       << faces[iface].iedges[0] << ", "
+       << faces[iface].iedges[1] << ", "
+       << faces[iface].iedges[2] << ", "
+       << faces[iface].iedges[3] << endl;
+  cout << "rmin[3] = "
+       << faces[iface].rmin[0] << ", "
+       << faces[iface].rmin[1] << ", "
+       << faces[iface].rmin[2] << endl;
+  cout << "rmax[3] = "
+       << faces[iface].rmax[0] << ", "
+       << faces[iface].rmax[1] << ", "
+       << faces[iface].rmax[2] << endl;
+  cout << "iprev,inext = "
+       << faces[iface].iprev << ", "
+       << faces[iface].inext << endl;
+  cout << "iold = " << faces[iface].iold << endl;
+  for(int i = faces[iface].iold; i != 0;) {
+    print_edge(i);
+    i = edges[abs(i)].inext;
+  }
+
+  cout << "inew = ";
+  switch (faces[iface].inew) {
+  case UNKNOWN_FACE:
+    cout << "UNKNOWN_FACE" << endl;
+    break;
+  case ORIGINAL_FACE:
+    cout << "ORIGINAL_FACE" << endl;
+    break;
+  case NEW_FACE:
+    cout << "NEW_FACE" << endl;
+    break;
+  case UNSUITABLE_FACE:
+    cout << "UNSUITABLE_FACE" << endl;
+    break;
+  case DEFECTIVE_FACE:
+    cout << "DEFECTIVE_FACE" << endl;
+    break;
+  default:
+    cout << faces[iface].inew << endl;
+    for(int k = faces[iface].inew; k != 0;) {
+      print_edge(k);
+      k = edges[abs(k)].inext;
+    }
+  }
+}
+
+//--------------------------------------------------------------------
+void
+BooleanProcessor::print_edge(int iedge) {
+  cout << "==== Edge N " << iedge << endl;
+  int i = abs(iedge);
+  int i1 = edges[i].i1;
+  int i2 = edges[i].i2;
+  cout << "node[" << i1 << "] = " 
+       << nodes[i1].v.x() << ", "
+       << nodes[i1].v.y() << ", "
+       << nodes[i1].v.z() << endl;
+
+  cout << "node[" << i2 << "] = " 
+       << nodes[i2].v.x() << ", "
+       << nodes[i2].v.y() << ", "
+       << nodes[i2].v.z() << endl;
+
+  cout << "iface1,iface2,ivis,inext = "
+       << edges[i].iface1 << ", "
+       << edges[i].iface2 << ", "
+       << edges[i].ivis   << ", "
+       << edges[i].inext  << endl;
+}
 */
diff --git a/source/graphics_reps/src/G4Circle.cc b/source/graphics_reps/src/G4Circle.cc
index ea069dfb33..0adffeea8c 100644
--- a/source/graphics_reps/src/G4Circle.cc
+++ b/source/graphics_reps/src/G4Circle.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Circle.cc,v 1.3 2001/02/03 18:29:52 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Circle.cc,v 1.3.2.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4Colour.cc b/source/graphics_reps/src/G4Colour.cc
index 2ddbd56b99..c1ba01408a 100644
--- a/source/graphics_reps/src/G4Colour.cc
+++ b/source/graphics_reps/src/G4Colour.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Colour.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Colour.cc,v 1.3.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 20th October 1996
diff --git a/source/graphics_reps/src/G4NURBS.cc b/source/graphics_reps/src/G4NURBS.cc
index c26a324109..c1b2d032f1 100644
--- a/source/graphics_reps/src/G4NURBS.cc
+++ b/source/graphics_reps/src/G4NURBS.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBS.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBS.cc,v 1.3.4.1 2001/06/28 19:10:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBSbox.cc b/source/graphics_reps/src/G4NURBSbox.cc
index 43dcc0d28d..ff1e9345d8 100644
--- a/source/graphics_reps/src/G4NURBSbox.cc
+++ b/source/graphics_reps/src/G4NURBSbox.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBSbox.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBSbox.cc,v 1.3.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBScylinder.cc b/source/graphics_reps/src/G4NURBScylinder.cc
index ada70bd025..833edb0571 100644
--- a/source/graphics_reps/src/G4NURBScylinder.cc
+++ b/source/graphics_reps/src/G4NURBScylinder.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBScylinder.cc,v 1.3 1999/12/15 14:50:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBScylinder.cc,v 1.3.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBShexahedron.cc b/source/graphics_reps/src/G4NURBShexahedron.cc
index 6fca9ab29f..cd68962189 100644
--- a/source/graphics_reps/src/G4NURBShexahedron.cc
+++ b/source/graphics_reps/src/G4NURBShexahedron.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBShexahedron.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBShexahedron.cc,v 1.3.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // hexahedron implementation
 //  OC 17 9 96
diff --git a/source/graphics_reps/src/G4NURBStube.cc b/source/graphics_reps/src/G4NURBStube.cc
index ec2d71df40..90086a3918 100644
--- a/source/graphics_reps/src/G4NURBStube.cc
+++ b/source/graphics_reps/src/G4NURBStube.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBStube.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBStube.cc,v 1.3.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4NURBStubesector.cc b/source/graphics_reps/src/G4NURBStubesector.cc
index d6402a81b2..e412a70cd8 100644
--- a/source/graphics_reps/src/G4NURBStubesector.cc
+++ b/source/graphics_reps/src/G4NURBStubesector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NURBStubesector.cc,v 1.4 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NURBStubesector.cc,v 1.4.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Olivier Crumeyrolle  12 September 1996
diff --git a/source/graphics_reps/src/G4PlacedPolyhedron.cc b/source/graphics_reps/src/G4PlacedPolyhedron.cc
index 5718f94d76..f2180566c2 100644
--- a/source/graphics_reps/src/G4PlacedPolyhedron.cc
+++ b/source/graphics_reps/src/G4PlacedPolyhedron.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlacedPolyhedron.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlacedPolyhedron.cc,v 1.2.4.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4PlacedPolyhedron.hh"
 
diff --git a/source/graphics_reps/src/G4Point3DList.cc b/source/graphics_reps/src/G4Point3DList.cc
index eaf82898c5..463cd1129f 100644
--- a/source/graphics_reps/src/G4Point3DList.cc
+++ b/source/graphics_reps/src/G4Point3DList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Point3DList.cc,v 1.3 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Point3DList.cc,v 1.4.2.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  July 1995
@@ -19,7 +35,7 @@ G4Point3DList::~G4Point3DList () {}
 
 G4std::ostream& operator << (G4std::ostream& os, const G4Point3DList& points)
 {
-  os << "G4Point3DList[" << points.entries() << "]: ";
-  for (int i = 0; i < points.entries(); i++) os << points(i);
+  os << "G4Point3DList[" << points.size() << "]: ";
+  for (size_t i = 0; i < points.size(); i++) os << points[i];
   return os;
 }
diff --git a/source/graphics_reps/src/G4Polyhedron.cc b/source/graphics_reps/src/G4Polyhedron.cc
index 91b11fb6e1..e554dc77aa 100644
--- a/source/graphics_reps/src/G4Polyhedron.cc
+++ b/source/graphics_reps/src/G4Polyhedron.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyhedron.cc,v 1.10 2001/02/03 18:29:53 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyhedron.cc,v 1.10.2.1 2001/06/28 19:10:11 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4Polyhedron.hh"
 
diff --git a/source/graphics_reps/src/G4Polyline.cc b/source/graphics_reps/src/G4Polyline.cc
index 03ce92ed1f..35a54d45db 100644
--- a/source/graphics_reps/src/G4Polyline.cc
+++ b/source/graphics_reps/src/G4Polyline.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polyline.cc,v 1.5 2001/02/03 18:29:55 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polyline.cc,v 1.5.2.1 2001/06/28 19:10:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  July 1995
diff --git a/source/graphics_reps/src/G4Polymarker.cc b/source/graphics_reps/src/G4Polymarker.cc
index 17fed8a306..2f00649f32 100644
--- a/source/graphics_reps/src/G4Polymarker.cc
+++ b/source/graphics_reps/src/G4Polymarker.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Polymarker.cc,v 1.6 2001/02/03 18:29:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Polymarker.cc,v 1.6.2.1 2001/06/28 19:10:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  November 1996
diff --git a/source/graphics_reps/src/G4Square.cc b/source/graphics_reps/src/G4Square.cc
index a67db5a9a6..fd0885f5af 100644
--- a/source/graphics_reps/src/G4Square.cc
+++ b/source/graphics_reps/src/G4Square.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Square.cc,v 1.2 1999/12/15 14:50:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Square.cc,v 1.2.4.1 2001/06/28 19:10:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4Text.cc b/source/graphics_reps/src/G4Text.cc
index 964385a89a..b68c65516c 100644
--- a/source/graphics_reps/src/G4Text.cc
+++ b/source/graphics_reps/src/G4Text.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Text.cc,v 1.5 2001/02/03 18:29:58 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Text.cc,v 1.5.2.1 2001/06/28 19:10:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  17/11/96.
diff --git a/source/graphics_reps/src/G4VMarker.cc b/source/graphics_reps/src/G4VMarker.cc
index 44a26ab814..1616300bf0 100644
--- a/source/graphics_reps/src/G4VMarker.cc
+++ b/source/graphics_reps/src/G4VMarker.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMarker.cc,v 1.6 2001/02/03 18:29:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMarker.cc,v 1.6.2.1 2001/06/28 19:10:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/graphics_reps/src/G4VVisPrim.cc b/source/graphics_reps/src/G4VVisPrim.cc
index d70e247f13..b5e35d9a4e 100644
--- a/source/graphics_reps/src/G4VVisPrim.cc
+++ b/source/graphics_reps/src/G4VVisPrim.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisPrim.cc,v 1.6 2001/02/03 18:30:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisPrim.cc,v 1.6.2.1 2001/06/28 19:10:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  August 1995
diff --git a/source/graphics_reps/src/G4VisAttributes.cc b/source/graphics_reps/src/G4VisAttributes.cc
index 5990cdb443..5df9808285 100644
--- a/source/graphics_reps/src/G4VisAttributes.cc
+++ b/source/graphics_reps/src/G4VisAttributes.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisAttributes.cc,v 1.5 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisAttributes.cc,v 1.5.4.1 2001/06/28 19:10:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  23rd October 1996
diff --git a/source/graphics_reps/src/G4VisExtent.cc b/source/graphics_reps/src/G4VisExtent.cc
index 25fdfa4c29..c3d15cfba5 100644
--- a/source/graphics_reps/src/G4VisExtent.cc
+++ b/source/graphics_reps/src/G4VisExtent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisExtent.cc,v 1.4 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisExtent.cc,v 1.4.4.1 2001/06/28 19:10:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // A.Walkden 28/11/95
diff --git a/source/graphics_reps/src/G4Visible.cc b/source/graphics_reps/src/G4Visible.cc
index 85bc85a2ee..7db724ebdb 100644
--- a/source/graphics_reps/src/G4Visible.cc
+++ b/source/graphics_reps/src/G4Visible.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Visible.cc,v 1.3 1999/12/15 14:50:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Visible.cc,v 1.3.4.1 2001/06/28 19:10:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  30th October 1996
diff --git a/source/graphics_reps/src/HepPolyhedron.cc b/source/graphics_reps/src/HepPolyhedron.cc
index cc39feb41e..fed969a554 100644
--- a/source/graphics_reps/src/HepPolyhedron.cc
+++ b/source/graphics_reps/src/HepPolyhedron.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: HepPolyhedron.cc,v 1.5 2001/02/06 22:07:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: HepPolyhedron.cc,v 1.8.2.1 2001/06/28 19:10:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
@@ -30,8 +46,13 @@
 // 19.03.00 E.Chernyaev
 // - implemented boolean operations (add, subtract, intersect) on polyhedra;
 //
+// 25.05.01 E.Chernyaev
+// - added GetSurfaceArea() and GetVolume();
+//
   
 #include "HepPolyhedron.h"
+#include <CLHEP/Units/SystemOfUnits.h>
+#include <CLHEP/config/TemplateFunctions.h>
 
 /***********************************************************************
  *                                                                     *
@@ -1174,6 +1195,56 @@ HepBoolean HepPolyhedron::GetNextUnitNormal(HepNormal3D &normal) const
   return rep;
 }
 
+double HepPolyhedron::GetSurfaceArea() const
+/***********************************************************************
+ *                                                                     *
+ * Name: HepPolyhedron::GetSurfaceArea              Date:    25.05.01  *
+ * Author: E.Chernyaev                              Revised:           *
+ *                                                                     *
+ * Function: Returns area of the surface of the polyhedron.            *
+ *                                                                     *
+ ***********************************************************************/
+{
+  double s = 0.;
+  for (int iFace=1; iFace<=nface; iFace++) {
+    int i0 = abs(pF[iFace].edge[0].v);
+    int i1 = abs(pF[iFace].edge[1].v);
+    int i2 = abs(pF[iFace].edge[2].v);
+    int i3 = abs(pF[iFace].edge[3].v);
+    if (i3 == 0) i3 = i0;
+    s += ((pV[i2] - pV[i0]).cross(pV[i3] - pV[i1])).mag();
+  }
+  return s/2.;
+}
+
+double HepPolyhedron::GetVolume() const
+/***********************************************************************
+ *                                                                     *
+ * Name: HepPolyhedron::GetVolume                   Date:    25.05.01  *
+ * Author: E.Chernyaev                              Revised:           *
+ *                                                                     *
+ * Function: Returns volume of the polyhedron.                         *
+ *                                                                     *
+ ***********************************************************************/
+{
+  double v = 0.;
+  for (int iFace=1; iFace<=nface; iFace++) {
+    int i0 = abs(pF[iFace].edge[0].v);
+    int i1 = abs(pF[iFace].edge[1].v);
+    int i2 = abs(pF[iFace].edge[2].v);
+    int i3 = abs(pF[iFace].edge[3].v);
+    HepPoint3D g;
+    if (i3 == 0) {
+      i3 = i0;
+      g  = (pV[i0]+pV[i1]+pV[i2]) * (1./3.);
+    }else{
+      g  = (pV[i0]+pV[i1]+pV[i2]+pV[i3]) * 0.25;
+    }
+    v += ((pV[i2] - pV[i0]).cross(pV[i3] - pV[i1])).dot(g);
+  }
+  return v/6.;
+}
+
 HepPolyhedronTrd2::HepPolyhedronTrd2(HepDouble Dx1, HepDouble Dx2,
 				     HepDouble Dy1, HepDouble Dy2,
 				     HepDouble Dz)
diff --git a/source/intercoms/History b/source/intercoms/History
index 593b432546..94150cf16e 100644
--- a/source/intercoms/History
+++ b/source/intercoms/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.17 2001/03/08 17:00:46 gcosmo Exp $
+$Id: History,v 1.18 2001/05/18 17:08:19 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 18, 2001, G.Cosmo (intercoms-V03-01-00)
+- Cleared pedantic warnings detected in Linux-g++ with ISO/ANSI setup.
+
 Mar 8, 2001, G.Cosmo (intercoms-V03-00-02)
 - G4UIcommand.cc: replaced calls to entries() with size(), according
   to migration to STL vectors for G4UnitsTable and related in tag
diff --git a/source/intercoms/include/G4UIbatch.hh b/source/intercoms/include/G4UIbatch.hh
index 311a2cd8e8..c2fb44de08 100644
--- a/source/intercoms/include/G4UIbatch.hh
+++ b/source/intercoms/include/G4UIbatch.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIbatch.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIbatch.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $id$
 
diff --git a/source/intercoms/include/G4UIcmdWith3Vector.hh b/source/intercoms/include/G4UIcmdWith3Vector.hh
index 0c7e067ffa..cb645b16b8 100644
--- a/source/intercoms/include/G4UIcmdWith3Vector.hh
+++ b/source/intercoms/include/G4UIcmdWith3Vector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWith3Vector.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWith3Vector.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
index 70094bca98..0345780a1e 100644
--- a/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWith3VectorAndUnit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithABool.hh b/source/intercoms/include/G4UIcmdWithABool.hh
index a32f840c4b..b7233d5ae2 100644
--- a/source/intercoms/include/G4UIcmdWithABool.hh
+++ b/source/intercoms/include/G4UIcmdWithABool.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithABool.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithABool.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADouble.hh b/source/intercoms/include/G4UIcmdWithADouble.hh
index 337b6d9d1a..91ca27938c 100644
--- a/source/intercoms/include/G4UIcmdWithADouble.hh
+++ b/source/intercoms/include/G4UIcmdWithADouble.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithADouble.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithADouble.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
index 3071b90005..040d08fccd 100644
--- a/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
+++ b/source/intercoms/include/G4UIcmdWithADoubleAndUnit.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAString.hh b/source/intercoms/include/G4UIcmdWithAString.hh
index 9ca515aed6..8f91a7a49e 100644
--- a/source/intercoms/include/G4UIcmdWithAString.hh
+++ b/source/intercoms/include/G4UIcmdWithAString.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithAString.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithAString.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithAnInteger.hh b/source/intercoms/include/G4UIcmdWithAnInteger.hh
index db88cd40dd..2b92be4d08 100644
--- a/source/intercoms/include/G4UIcmdWithAnInteger.hh
+++ b/source/intercoms/include/G4UIcmdWithAnInteger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithAnInteger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithAnInteger.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcmdWithoutParameter.hh b/source/intercoms/include/G4UIcmdWithoutParameter.hh
index 6f1af1eeeb..55c28df77f 100644
--- a/source/intercoms/include/G4UIcmdWithoutParameter.hh
+++ b/source/intercoms/include/G4UIcmdWithoutParameter.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithoutParameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithoutParameter.hh,v 1.3.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UIcommand.hh b/source/intercoms/include/G4UIcommand.hh
index 25f956f1b3..b3180c69d5 100644
--- a/source/intercoms/include/G4UIcommand.hh
+++ b/source/intercoms/include/G4UIcommand.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcommand.hh,v 1.6 2001/02/08 06:07:18 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcommand.hh,v 1.6.2.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/intercoms/include/G4UIcommandStatus.hh b/source/intercoms/include/G4UIcommandStatus.hh
index 8ea2cf09fc..effec61cdd 100644
--- a/source/intercoms/include/G4UIcommandStatus.hh
+++ b/source/intercoms/include/G4UIcommandStatus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcommandStatus.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcommandStatus.hh,v 1.2.4.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIcommandStatus_h
diff --git a/source/intercoms/include/G4UIcommandTree.hh b/source/intercoms/include/G4UIcommandTree.hh
index 35528520d2..84f389f6e5 100644
--- a/source/intercoms/include/G4UIcommandTree.hh
+++ b/source/intercoms/include/G4UIcommandTree.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcommandTree.hh,v 1.6 2001/02/08 06:07:18 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcommandTree.hh,v 1.7.2.1 2001/06/28 19:10:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIcommandTree_h
@@ -61,7 +77,7 @@ class G4UIcommandTree
       { return tree[i-1]; };
       inline G4UIcommandTree * GetTree(G4String comName)
       { 
-        for( int i=0; i < tree.size(); i++)
+        for( size_t i=0; i < tree.size(); i++)
         {
           if( comName == tree[i]->GetPathName() )
           { return tree[i]; }
diff --git a/source/intercoms/include/G4UIcontrolMessenger.hh b/source/intercoms/include/G4UIcontrolMessenger.hh
index 07bd95a824..8a9e5ad1e0 100644
--- a/source/intercoms/include/G4UIcontrolMessenger.hh
+++ b/source/intercoms/include/G4UIcontrolMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcontrolMessenger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcontrolMessenger.hh,v 1.3.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIcontrolMessenger_h
diff --git a/source/intercoms/include/G4UIdirectory.hh b/source/intercoms/include/G4UIdirectory.hh
index afca83e534..fa43a548c7 100644
--- a/source/intercoms/include/G4UIdirectory.hh
+++ b/source/intercoms/include/G4UIdirectory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIdirectory.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIdirectory.hh,v 1.3.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/include/G4UImanager.hh b/source/intercoms/include/G4UImanager.hh
index cf708f03c3..9a258c1475 100644
--- a/source/intercoms/include/G4UImanager.hh
+++ b/source/intercoms/include/G4UImanager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UImanager.hh,v 1.7 2001/02/08 06:07:18 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UImanager.hh,v 1.8.2.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UImanager_h
@@ -172,7 +188,7 @@ class G4UImanager : public G4VStateDependent
       inline G4String GetPreviousCommand(G4int i) const
       { 
         G4String st;
-        if(i>=0 && i<histVec.size())
+        if(i>=0 && i<G4int(histVec.size()))
         { st = histVec[i]; }
         return st;
       }
diff --git a/source/intercoms/include/G4UImessenger.hh b/source/intercoms/include/G4UImessenger.hh
index 68cf253807..ed4fd1ec93 100644
--- a/source/intercoms/include/G4UImessenger.hh
+++ b/source/intercoms/include/G4UImessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UImessenger.hh,v 1.4 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UImessenger.hh,v 1.4.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UImessenger_h
diff --git a/source/intercoms/include/G4UIparameter.hh b/source/intercoms/include/G4UIparameter.hh
index f84351afb2..962700f83d 100644
--- a/source/intercoms/include/G4UIparameter.hh
+++ b/source/intercoms/include/G4UIparameter.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIparameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIparameter.hh,v 1.3.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------------
diff --git a/source/intercoms/include/G4UIsession.hh b/source/intercoms/include/G4UIsession.hh
index 232157cd37..ef42b0ebe7 100644
--- a/source/intercoms/include/G4UIsession.hh
+++ b/source/intercoms/include/G4UIsession.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIsession.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIsession.hh,v 1.3.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $id$
 
diff --git a/source/intercoms/include/G4UItokenNum.hh b/source/intercoms/include/G4UItokenNum.hh
index 9ad24b2669..543c444435 100644
--- a/source/intercoms/include/G4UItokenNum.hh
+++ b/source/intercoms/include/G4UItokenNum.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UItokenNum.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UItokenNum.hh,v 1.2.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4UItokenNum.hh
 
diff --git a/source/intercoms/include/G4UnitsMessenger.hh b/source/intercoms/include/G4UnitsMessenger.hh
index 0dcd5a492e..56e0edf245 100644
--- a/source/intercoms/include/G4UnitsMessenger.hh
+++ b/source/intercoms/include/G4UnitsMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnitsMessenger.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnitsMessenger.hh,v 1.3.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class description
 //
diff --git a/source/intercoms/include/G4VFlavoredParallelWorld.hh b/source/intercoms/include/G4VFlavoredParallelWorld.hh
index d4d439446d..4b82577c1c 100644
--- a/source/intercoms/include/G4VFlavoredParallelWorld.hh
+++ b/source/intercoms/include/G4VFlavoredParallelWorld.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFlavoredParallelWorld.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFlavoredParallelWorld.hh,v 1.2.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Abstract interface for GEANT4 Flavored Parallel World.
diff --git a/source/intercoms/include/G4VGlobalFastSimulationManager.hh b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
index 0689615345..b291197820 100644
--- a/source/intercoms/include/G4VGlobalFastSimulationManager.hh
+++ b/source/intercoms/include/G4VGlobalFastSimulationManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGlobalFastSimulationManager.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGlobalFastSimulationManager.hh,v 1.2.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/include/G4VGraphicsScene.hh b/source/intercoms/include/G4VGraphicsScene.hh
index f996b54c15..7c79c16357 100644
--- a/source/intercoms/include/G4VGraphicsScene.hh
+++ b/source/intercoms/include/G4VGraphicsScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGraphicsScene.hh,v 1.5 2000/05/19 06:29:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGraphicsScene.hh,v 1.5.4.1 2001/06/28 19:10:16 gunter Exp $
+// GEANT4 tag $Name:  $
 // John Allison  19th July 1996
 //
 // Class Description:
diff --git a/source/intercoms/include/G4VVisManager.hh b/source/intercoms/include/G4VVisManager.hh
index 3097c762e7..e0217d6773 100644
--- a/source/intercoms/include/G4VVisManager.hh
+++ b/source/intercoms/include/G4VVisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisManager.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisManager.hh,v 1.4.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 // John Allison 19/Oct/1996.
 // 
 // Class Description:
diff --git a/source/intercoms/src/G4UIbatch.cc b/source/intercoms/src/G4UIbatch.cc
index 80d3e92250..5e8c84960f 100644
--- a/source/intercoms/src/G4UIbatch.cc
+++ b/source/intercoms/src/G4UIbatch.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIbatch.cc,v 1.2 1999/12/15 14:50:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIbatch.cc,v 1.3.2.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UIbatch.hh"
@@ -14,8 +30,8 @@
 #include "G4ios.hh"
 
 G4UIbatch::G4UIbatch(G4String fileName,G4UIsession* prevSession) 
-:macroFileName(fileName),previousSession(prevSession),
- openFailed(false)
+ : previousSession(prevSession), macroFileName(fileName),
+   openFailed(false)
 {
   const char* theFileName = fileName;
   UImanager = G4UImanager::GetUIpointer();
diff --git a/source/intercoms/src/G4UIcmdWith3Vector.cc b/source/intercoms/src/G4UIcmdWith3Vector.cc
index 7d42f20dcc..2c21aa5c00 100644
--- a/source/intercoms/src/G4UIcmdWith3Vector.cc
+++ b/source/intercoms/src/G4UIcmdWith3Vector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWith3Vector.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWith3Vector.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
index 153d99bbde..2698df8f32 100644
--- a/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithABool.cc b/source/intercoms/src/G4UIcmdWithABool.cc
index c5e03cadda..4a76f33fe2 100644
--- a/source/intercoms/src/G4UIcmdWithABool.cc
+++ b/source/intercoms/src/G4UIcmdWithABool.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithABool.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithABool.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithADouble.cc b/source/intercoms/src/G4UIcmdWithADouble.cc
index fce0c1a258..6ee0335eb6 100644
--- a/source/intercoms/src/G4UIcmdWithADouble.cc
+++ b/source/intercoms/src/G4UIcmdWithADouble.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithADouble.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithADouble.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
index 96f44e8707..97f6885b23 100644
--- a/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
+++ b/source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithAString.cc b/source/intercoms/src/G4UIcmdWithAString.cc
index 6c9507a567..b0b5b031c4 100644
--- a/source/intercoms/src/G4UIcmdWithAString.cc
+++ b/source/intercoms/src/G4UIcmdWithAString.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithAString.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithAString.cc,v 1.2.4.1 2001/06/28 19:10:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithAnInteger.cc b/source/intercoms/src/G4UIcmdWithAnInteger.cc
index 0181feed30..e86ed6b65a 100644
--- a/source/intercoms/src/G4UIcmdWithAnInteger.cc
+++ b/source/intercoms/src/G4UIcmdWithAnInteger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithAnInteger.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithAnInteger.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcmdWithoutParameter.cc b/source/intercoms/src/G4UIcmdWithoutParameter.cc
index b3fc1063dc..9576effdb3 100644
--- a/source/intercoms/src/G4UIcmdWithoutParameter.cc
+++ b/source/intercoms/src/G4UIcmdWithoutParameter.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcmdWithoutParameter.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcmdWithoutParameter.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UIcommand.cc b/source/intercoms/src/G4UIcommand.cc
index 2f5ed026f6..d210259c9c 100644
--- a/source/intercoms/src/G4UIcommand.cc
+++ b/source/intercoms/src/G4UIcommand.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcommand.cc,v 1.7 2001/03/08 17:00:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcommand.cc,v 1.8.2.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -243,7 +259,7 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
 {
   G4String retStr;
   G4UnitsTable& UTbl = G4UnitDefinition::GetUnitsTable();
-  G4int i;
+  size_t i;
   for(i=0;i<UTbl.size();i++)
   { if(UTbl[i]->GetName()==unitCategory) break; }
   if(i==UTbl.size())
@@ -777,7 +793,7 @@ Eval2(yystype arg1, int op, yystype arg2)
 int G4UIcommand::
 CompareInt(int arg1, int op, int arg2)
 {   
-    int result;
+    int result=-1;
     G4String opr;
     switch (op) {
        case GT:  result = ( arg1 >  arg2); opr= ">" ;  break;
@@ -802,7 +818,7 @@ CompareInt(int arg1, int op, int arg2)
 int G4UIcommand::
 CompareDouble(double arg1, int op, double arg2)
 {   
-    int result;
+    int result=-1;
     G4String opr;
     switch (op) {
         case GT:  result = ( arg1 >  arg2); opr= ">";   break;
diff --git a/source/intercoms/src/G4UIcommandTree.cc b/source/intercoms/src/G4UIcommandTree.cc
index acc1bf7551..4d24a32708 100644
--- a/source/intercoms/src/G4UIcommandTree.cc
+++ b/source/intercoms/src/G4UIcommandTree.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcommandTree.cc,v 1.5 2001/02/08 06:07:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcommandTree.cc,v 1.6.2.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UIcommandTree.hh"
@@ -57,7 +73,7 @@ void G4UIcommandTree::AddNewCommand(G4UIcommand *newCommand)
     return;
   }
   int i = remainingPath.first('/');
-  if( i == G4std::string::npos )
+  if( i == int(G4std::string::npos) )
   {
     // Find command
     int n_commandEntry = command.size();
@@ -102,7 +118,7 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
   else
   {
     int i = remainingPath.first('/');
-    if( i == G4std::string::npos )
+    if( i == int(G4std::string::npos) )
     {
       // Find command
       int n_commandEntry = command.size();
@@ -147,7 +163,7 @@ G4UIcommand * G4UIcommandTree::FindPath(G4String commandPath)
   G4String remainingPath = commandPath;
   remainingPath.remove(0,pathName.length());
   int i = remainingPath.first('/');
-  if( i == G4std::string::npos )
+  if( i == int(G4std::string::npos) )
   {
     // Find command
     int n_commandEntry = command.size();
@@ -176,7 +192,6 @@ void G4UIcommandTree::ListCurrent()
 {
   G4cout << "Command directory path : " << pathName << G4endl;
   if( guidance != NULL ) guidance->List();
-  int i = 0;
   G4cout << " Sub-directories : " << G4endl;
   int n_treeEntry = tree.size();
   for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
diff --git a/source/intercoms/src/G4UIcontrolMessenger.cc b/source/intercoms/src/G4UIcontrolMessenger.cc
index b629860ff0..e573db9b50 100644
--- a/source/intercoms/src/G4UIcontrolMessenger.cc
+++ b/source/intercoms/src/G4UIcontrolMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcontrolMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcontrolMessenger.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UIcontrolMessenger.hh"
diff --git a/source/intercoms/src/G4UIdirectory.cc b/source/intercoms/src/G4UIdirectory.cc
index ed454e8762..750f56530e 100644
--- a/source/intercoms/src/G4UIdirectory.cc
+++ b/source/intercoms/src/G4UIdirectory.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIdirectory.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIdirectory.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/intercoms/src/G4UImanager.cc b/source/intercoms/src/G4UImanager.cc
index 47b993c0c4..d5e3fee4e0 100644
--- a/source/intercoms/src/G4UImanager.cc
+++ b/source/intercoms/src/G4UImanager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UImanager.cc,v 1.7 2001/02/08 06:07:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UImanager.cc,v 1.8.2.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------------
@@ -212,7 +228,7 @@ int G4UImanager::ApplyCommand(G4String aCommand)
   G4String commandString;
   G4String commandParameter;
   int i = aCommand.index(" ");
-  if( i != G4std::string::npos )
+  if( i != int(G4std::string::npos) )
   {
     commandString = aCommand(0,i);
     commandParameter = aCommand(i+1,aCommand.length()-(i+1));
@@ -282,7 +298,7 @@ G4UIcommandTree* G4UImanager::FindDirectory(const char* dirName)
   if( targetDir == "/" )
   { return comTree; }
   int idx = 1;
-  while( idx < targetDir.length()-1 )
+  while( idx < int(targetDir.length())-1 )
   {
     int i = targetDir.index("/",idx);
     comTree = comTree->GetTree(targetDir(0,i+1));
diff --git a/source/intercoms/src/G4UImessenger.cc b/source/intercoms/src/G4UImessenger.cc
index 0a785c476a..b48a0132ab 100644
--- a/source/intercoms/src/G4UImessenger.cc
+++ b/source/intercoms/src/G4UImessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UImessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UImessenger.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UImessenger.hh"
diff --git a/source/intercoms/src/G4UIparameter.cc b/source/intercoms/src/G4UIparameter.cc
index e199dfdca9..aa31d5c508 100644
--- a/source/intercoms/src/G4UIparameter.cc
+++ b/source/intercoms/src/G4UIparameter.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIparameter.cc,v 1.4 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIparameter.cc,v 1.5.2.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UIparameter.hh"
@@ -537,7 +553,7 @@ Eval2(yystype arg1, int op, yystype arg2)
     if( (arg1.type != IDENTIFIER) && (arg2.type != IDENTIFIER)) {
         G4cerr << parameterName
              << ": meaningless comparison "
-             << arg1.type << " " << arg2.type << G4endl;
+             << int(arg1.type) << " " << int(arg2.type) << G4endl;
         paramERR = 1;
     }
     char type = toupper( parameterType );
@@ -590,7 +606,7 @@ Eval2(yystype arg1, int op, yystype arg2)
 int G4UIparameter::
 CompareInt(int arg1, int op, int arg2)
 {   
-    int result;
+    int result=-1;
     G4String opr;
     switch (op) {
        case GT:  result = ( arg1 >  arg2); opr= ">" ;  break;
@@ -615,7 +631,7 @@ CompareInt(int arg1, int op, int arg2)
 int G4UIparameter::
 CompareDouble(double arg1, int op, double arg2)
 {   
-    int result;
+    int result=-1;
     G4String opr;
     switch (op) {
         case GT:  result = ( arg1 >  arg2); opr= ">";   break;
diff --git a/source/intercoms/src/G4UIsession.cc b/source/intercoms/src/G4UIsession.cc
index ce7baebf02..d21f45b74c 100644
--- a/source/intercoms/src/G4UIsession.cc
+++ b/source/intercoms/src/G4UIsession.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIsession.cc,v 1.3 1999/12/15 17:52:03 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIsession.cc,v 1.3.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------------
diff --git a/source/intercoms/src/G4UnitsMessenger.cc b/source/intercoms/src/G4UnitsMessenger.cc
index 625b92f0c8..dd67c75f29 100644
--- a/source/intercoms/src/G4UnitsMessenger.cc
+++ b/source/intercoms/src/G4UnitsMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UnitsMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UnitsMessenger.cc,v 1.2.4.1 2001/06/28 19:10:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/intercoms/src/G4VGlobalFastSimulationManager.cc b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
index 9a2980a3c9..db4a9139b3 100644
--- a/source/intercoms/src/G4VGlobalFastSimulationManager.cc
+++ b/source/intercoms/src/G4VGlobalFastSimulationManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGlobalFastSimulationManager.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGlobalFastSimulationManager.cc,v 1.2.4.1 2001/06/28 19:10:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Abstract interface for GEANT4 Global Fast Simulation Manager.
diff --git a/source/intercoms/src/G4VVisManager.cc b/source/intercoms/src/G4VVisManager.cc
index 08aba6cf8c..61d98ae110 100644
--- a/source/intercoms/src/G4VVisManager.cc
+++ b/source/intercoms/src/G4VVisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisManager.cc,v 1.3 1999/12/15 14:50:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisManager.cc,v 1.3.4.1 2001/06/28 19:10:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Abstract interface for GEANT4 Visualization Manager.
diff --git a/source/interfaces/GAG/include/G4UIGAG.hh b/source/interfaces/GAG/include/G4UIGAG.hh
index 38f01eef92..f6e7f5bf2e 100644
--- a/source/interfaces/GAG/include/G4UIGAG.hh
+++ b/source/interfaces/GAG/include/G4UIGAG.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIGAG.hh,v 1.4 1999/12/15 14:50:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIGAG.hh,v 1.4.4.1 2001/06/28 19:10:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4UIGAG.hh
 // GAG(Geant4 adaptive GUI) interface class
diff --git a/source/interfaces/GAG/src/G4UIGAG.cc b/source/interfaces/GAG/src/G4UIGAG.cc
index c4c9937fa0..c470ef1b6d 100644
--- a/source/interfaces/GAG/src/G4UIGAG.cc
+++ b/source/interfaces/GAG/src/G4UIGAG.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIGAG.cc,v 1.9 1999/12/17 12:09:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIGAG.cc,v 1.9.4.1 2001/06/28 19:10:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4UIGAG.cc
 // 18.Feb.98 M.Nagamatu and T.Kodama created G4UIGAG from G4UIterminal
diff --git a/source/interfaces/OPACS/include/G4UIWo.hh b/source/interfaces/OPACS/include/G4UIWo.hh
index e92fc7fb9b..15fcfb9948 100644
--- a/source/interfaces/OPACS/include/G4UIWo.hh
+++ b/source/interfaces/OPACS/include/G4UIWo.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIWo.hh,v 1.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIWo.hh,v 1.3.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4UIWo_h
 #define G4UIWo_h 
diff --git a/source/interfaces/OPACS/include/G4WoMessenger.hh b/source/interfaces/OPACS/include/G4WoMessenger.hh
index 7ac8154cec..7f25bad800 100644
--- a/source/interfaces/OPACS/include/G4WoMessenger.hh
+++ b/source/interfaces/OPACS/include/G4WoMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4WoMessenger.hh,v 1.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4WoMessenger.hh,v 1.3.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4WoMessenger_h
 #define G4WoMessenger_h 1
diff --git a/source/interfaces/OPACS/include/G4oCommon.hh b/source/interfaces/OPACS/include/G4oCommon.hh
index 822cc80ad9..b7155a762e 100644
--- a/source/interfaces/OPACS/include/G4oCommon.hh
+++ b/source/interfaces/OPACS/include/G4oCommon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oCommon.hh,v 1.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oCommon.hh,v 1.3.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
    Included by G4o.h.
diff --git a/source/interfaces/OPACS/include/G4oCommon.icc b/source/interfaces/OPACS/include/G4oCommon.icc
index f7a9a06010..77d33dfa26 100644
--- a/source/interfaces/OPACS/include/G4oCommon.icc
+++ b/source/interfaces/OPACS/include/G4oCommon.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4oCommon.icc,v 1.3 1999/12/15 14:50:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4oCommon.icc,v 1.3.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
    Included by G4o.cc.
diff --git a/source/interfaces/OPACS/src/G4UIWo.cc b/source/interfaces/OPACS/src/G4UIWo.cc
index 6c74eda79c..dfb2931e19 100644
--- a/source/interfaces/OPACS/src/G4UIWo.cc
+++ b/source/interfaces/OPACS/src/G4UIWo.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIWo.cc,v 1.4 2000/08/11 09:56:50 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIWo.cc,v 1.4.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //G4UIWo.cc   -- copied from G4UIterminal.cc
 
diff --git a/source/interfaces/OPACS/src/G4WoMessenger.cc b/source/interfaces/OPACS/src/G4WoMessenger.cc
index 7a205abb69..acf8b01fe5 100644
--- a/source/interfaces/OPACS/src/G4WoMessenger.cc
+++ b/source/interfaces/OPACS/src/G4WoMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4WoMessenger.cc,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4WoMessenger.cc,v 1.3.4.1 2001/06/28 19:10:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifdef G4UI_BUILD_WO_SESSION
 
diff --git a/source/interfaces/XVT/include/G4UIxvt.hh b/source/interfaces/XVT/include/G4UIxvt.hh
index fff0663518..e523efd4b5 100644
--- a/source/interfaces/XVT/include/G4UIxvt.hh
+++ b/source/interfaces/XVT/include/G4UIxvt.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIxvt.hh,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIxvt.hh,v 1.3.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 //                     XVT driver class header                        //
diff --git a/source/interfaces/XVT/include/G4UIxvtMessenger.hh b/source/interfaces/XVT/include/G4UIxvtMessenger.hh
index e11ee5c7e9..1735a8b865 100644
--- a/source/interfaces/XVT/include/G4UIxvtMessenger.hh
+++ b/source/interfaces/XVT/include/G4UIxvtMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIxvtMessenger.hh,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIxvtMessenger.hh,v 1.3.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //////////////////////////////////////////////////////////////////////////////
 //                                                                          //
diff --git a/source/interfaces/XVT/src/G4UIxvt.cc b/source/interfaces/XVT/src/G4UIxvt.cc
index 360063a1be..11b723f526 100644
--- a/source/interfaces/XVT/src/G4UIxvt.cc
+++ b/source/interfaces/XVT/src/G4UIxvt.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIxvt.cc,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIxvt.cc,v 1.3.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
diff --git a/source/interfaces/XVT/src/G4UIxvtMessenger.cc b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
index b29cf5715e..dcf157de36 100644
--- a/source/interfaces/XVT/src/G4UIxvtMessenger.cc
+++ b/source/interfaces/XVT/src/G4UIxvtMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIxvtMessenger.cc,v 1.3 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIxvtMessenger.cc,v 1.3.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifdef G4UI_BUILD_XVT_SESSION
 
diff --git a/source/interfaces/basic/include/G4UIArrayString.hh b/source/interfaces/basic/include/G4UIArrayString.hh
index e2e608e4af..5196e4f26f 100644
--- a/source/interfaces/basic/include/G4UIArrayString.hh
+++ b/source/interfaces/basic/include/G4UIArrayString.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIArrayString.hh,v 1.1 2000/03/26 23:02:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIArrayString.hh,v 1.1.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIArrayString_h
diff --git a/source/interfaces/basic/include/G4UIWin32.hh b/source/interfaces/basic/include/G4UIWin32.hh
index 6f61922e75..ef01e15d00 100644
--- a/source/interfaces/basic/include/G4UIWin32.hh
+++ b/source/interfaces/basic/include/G4UIWin32.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIWin32.hh,v 1.9 2000/05/26 14:58:29 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIWin32.hh,v 1.9.4.1 2001/06/28 19:10:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 
diff --git a/source/interfaces/basic/include/G4UIXaw.hh b/source/interfaces/basic/include/G4UIXaw.hh
index 3b053bbfe9..293c3df1b3 100644
--- a/source/interfaces/basic/include/G4UIXaw.hh
+++ b/source/interfaces/basic/include/G4UIXaw.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIXaw.hh,v 1.4 1999/12/15 14:50:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIXaw.hh,v 1.4.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 
diff --git a/source/interfaces/basic/include/G4UIXm.hh b/source/interfaces/basic/include/G4UIXm.hh
index 1a19fc78cc..5df7ec409a 100644
--- a/source/interfaces/basic/include/G4UIXm.hh
+++ b/source/interfaces/basic/include/G4UIXm.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIXm.hh,v 1.10 2000/05/26 14:58:30 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIXm.hh,v 1.10.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 
diff --git a/source/interfaces/basic/include/G4UIcsh.hh b/source/interfaces/basic/include/G4UIcsh.hh
index 62aeedfdb3..d292c4a875 100644
--- a/source/interfaces/basic/include/G4UIcsh.hh
+++ b/source/interfaces/basic/include/G4UIcsh.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcsh.hh,v 1.2 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcsh.hh,v 1.2.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIcsh_h
diff --git a/source/interfaces/basic/include/G4UItcsh.hh b/source/interfaces/basic/include/G4UItcsh.hh
index abc6a82a1e..e80eb0ff31 100644
--- a/source/interfaces/basic/include/G4UItcsh.hh
+++ b/source/interfaces/basic/include/G4UItcsh.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UItcsh.hh,v 1.2 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UItcsh.hh,v 1.2.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UItcsh_h
diff --git a/source/interfaces/basic/include/G4UIterminal.hh b/source/interfaces/basic/include/G4UIterminal.hh
index a6b19fe787..3e5689c843 100644
--- a/source/interfaces/basic/include/G4UIterminal.hh
+++ b/source/interfaces/basic/include/G4UIterminal.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIterminal.hh,v 1.6 2000/07/22 10:52:28 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIterminal.hh,v 1.6.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UIterminal_h
diff --git a/source/interfaces/basic/include/G4VUIshell.hh b/source/interfaces/basic/include/G4VUIshell.hh
index 3279b81f97..fa7235c698 100644
--- a/source/interfaces/basic/include/G4VUIshell.hh
+++ b/source/interfaces/basic/include/G4VUIshell.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUIshell.hh,v 1.3 2000/11/27 11:01:51 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUIshell.hh,v 1.3.4.1 2001/06/28 19:10:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VUIshell_h
diff --git a/source/interfaces/basic/src/G4UIArrayString.cc b/source/interfaces/basic/src/G4UIArrayString.cc
index 7325a63580..4ab3347c43 100644
--- a/source/interfaces/basic/src/G4UIArrayString.cc
+++ b/source/interfaces/basic/src/G4UIArrayString.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIArrayString.cc,v 1.3 2000/07/31 08:00:01 gracia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIArrayString.cc,v 1.3.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/iomanip"
diff --git a/source/interfaces/basic/src/G4UIWin32.cc b/source/interfaces/basic/src/G4UIWin32.cc
index adaaa22bd0..4d91624c95 100644
--- a/source/interfaces/basic/src/G4UIWin32.cc
+++ b/source/interfaces/basic/src/G4UIWin32.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIWin32.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIWin32.cc,v 1.6.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIXaw.cc b/source/interfaces/basic/src/G4UIXaw.cc
index c3c1171476..dfded3edd9 100644
--- a/source/interfaces/basic/src/G4UIXaw.cc
+++ b/source/interfaces/basic/src/G4UIXaw.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIXaw.cc,v 1.3 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIXaw.cc,v 1.3.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIXm.cc b/source/interfaces/basic/src/G4UIXm.cc
index 93128b7890..82cac60cf7 100644
--- a/source/interfaces/basic/src/G4UIXm.cc
+++ b/source/interfaces/basic/src/G4UIXm.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIXm.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIXm.cc,v 1.6.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/basic/src/G4UIcsh.cc b/source/interfaces/basic/src/G4UIcsh.cc
index 072814f74a..516319ce21 100644
--- a/source/interfaces/basic/src/G4UIcsh.cc
+++ b/source/interfaces/basic/src/G4UIcsh.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIcsh.cc,v 1.4 2000/07/22 10:52:29 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIcsh.cc,v 1.4.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UIcsh.hh"
diff --git a/source/interfaces/basic/src/G4UItcsh.cc b/source/interfaces/basic/src/G4UItcsh.cc
index 203dbadd2b..d21814d21f 100644
--- a/source/interfaces/basic/src/G4UItcsh.cc
+++ b/source/interfaces/basic/src/G4UItcsh.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UItcsh.cc,v 1.5 2000/08/01 08:02:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UItcsh.cc,v 1.5.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef WIN32
diff --git a/source/interfaces/basic/src/G4UIterminal.cc b/source/interfaces/basic/src/G4UIterminal.cc
index 31ab3fe841..69f0eecdd1 100644
--- a/source/interfaces/basic/src/G4UIterminal.cc
+++ b/source/interfaces/basic/src/G4UIterminal.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UIterminal.cc,v 1.14 2000/07/22 10:52:29 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UIterminal.cc,v 1.14.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/strstream"
diff --git a/source/interfaces/basic/src/G4VUIshell.cc b/source/interfaces/basic/src/G4VUIshell.cc
index 75f494ab9d..20e077db3d 100644
--- a/source/interfaces/basic/src/G4VUIshell.cc
+++ b/source/interfaces/basic/src/G4VUIshell.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUIshell.cc,v 1.4 2000/07/31 08:00:01 gracia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUIshell.cc,v 1.4.4.1 2001/06/28 19:10:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UImanager.hh"
diff --git a/source/interfaces/common/include/G4InteractorMessenger.hh b/source/interfaces/common/include/G4InteractorMessenger.hh
index a2af6c7534..5a5e7058cc 100644
--- a/source/interfaces/common/include/G4InteractorMessenger.hh
+++ b/source/interfaces/common/include/G4InteractorMessenger.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef G4InteractorMessenger_h
diff --git a/source/interfaces/common/include/G4VBasicShell.hh b/source/interfaces/common/include/G4VBasicShell.hh
index 4f6b999b65..63326ab677 100644
--- a/source/interfaces/common/include/G4VBasicShell.hh
+++ b/source/interfaces/common/include/G4VBasicShell.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBasicShell.hh,v 1.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBasicShell.hh,v 1.5.4.1 2001/06/28 19:10:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VBasicShell_H
diff --git a/source/interfaces/common/include/G4VInteractiveSession.hh b/source/interfaces/common/include/G4VInteractiveSession.hh
index 2ed1ad3532..68c80b446a 100644
--- a/source/interfaces/common/include/G4VInteractiveSession.hh
+++ b/source/interfaces/common/include/G4VInteractiveSession.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #ifndef G4VInteractiveSession_H
diff --git a/source/interfaces/common/include/G4VInteractorManager.hh b/source/interfaces/common/include/G4VInteractorManager.hh
index 5690e0f4f0..9e638ee544 100644
--- a/source/interfaces/common/include/G4VInteractorManager.hh
+++ b/source/interfaces/common/include/G4VInteractorManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VInteractorManager.hh,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VInteractorManager.hh,v 1.6.4.1 2001/06/28 19:10:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/include/G4Win32.hh b/source/interfaces/common/include/G4Win32.hh
index 60951ec00d..a273a60afd 100644
--- a/source/interfaces/common/include/G4Win32.hh
+++ b/source/interfaces/common/include/G4Win32.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Win32.hh,v 1.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Win32.hh,v 1.5.4.1 2001/06/28 19:10:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  To unify Windows message treatment between 
 // G4/interfaces Windows sessions and G4/visualizations Windows drivers.
diff --git a/source/interfaces/common/include/G4Xt.hh b/source/interfaces/common/include/G4Xt.hh
index e38400a730..2b2404ce73 100644
--- a/source/interfaces/common/include/G4Xt.hh
+++ b/source/interfaces/common/include/G4Xt.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Xt.hh,v 1.4 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Xt.hh,v 1.4.4.1 2001/06/28 19:10:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  To unify X11 event treatment between 
 // G4/interfaces Xt sessions and G4/visualizations Xt drivers.
diff --git a/source/interfaces/common/src/G4InteractorMessenger.cc b/source/interfaces/common/src/G4InteractorMessenger.cc
index c27559ab44..f4eb2bb308 100644
--- a/source/interfaces/common/src/G4InteractorMessenger.cc
+++ b/source/interfaces/common/src/G4InteractorMessenger.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #include <string.h>
diff --git a/source/interfaces/common/src/G4VBasicShell.cc b/source/interfaces/common/src/G4VBasicShell.cc
index b33eae6971..2615ddd7b0 100644
--- a/source/interfaces/common/src/G4VBasicShell.cc
+++ b/source/interfaces/common/src/G4VBasicShell.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBasicShell.cc,v 1.6 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBasicShell.cc,v 1.6.4.1 2001/06/28 19:10:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/vector"
diff --git a/source/interfaces/common/src/G4VInteractiveSession.cc b/source/interfaces/common/src/G4VInteractiveSession.cc
index 477bb24eb1..907afdf5a9 100644
--- a/source/interfaces/common/src/G4VInteractiveSession.cc
+++ b/source/interfaces/common/src/G4VInteractiveSession.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 
 #include "G4InteractorMessenger.hh"
diff --git a/source/interfaces/common/src/G4VInteractorManager.cc b/source/interfaces/common/src/G4VInteractorManager.cc
index 55d5cdfb24..7aec4d8b9e 100644
--- a/source/interfaces/common/src/G4VInteractorManager.cc
+++ b/source/interfaces/common/src/G4VInteractorManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VInteractorManager.cc,v 1.8 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VInteractorManager.cc,v 1.8.4.1 2001/06/28 19:10:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/src/G4Win32.cc b/source/interfaces/common/src/G4Win32.cc
index 39e445b617..253e31883f 100644
--- a/source/interfaces/common/src/G4Win32.cc
+++ b/source/interfaces/common/src/G4Win32.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Win32.cc,v 1.5 1999/12/15 14:50:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Win32.cc,v 1.5.4.1 2001/06/28 19:10:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/interfaces/common/src/G4Xt.cc b/source/interfaces/common/src/G4Xt.cc
index 7a02bec7c7..80c917bff2 100644
--- a/source/interfaces/common/src/G4Xt.cc
+++ b/source/interfaces/common/src/G4Xt.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Xt.cc,v 1.6 2000/11/28 08:13:54 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Xt.cc,v 1.6.4.1 2001/06/28 19:10:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G.Barrand
 
diff --git a/source/materials/History b/source/materials/History
index 0795a5e1fe..b787e1bf93 100644
--- a/source/materials/History
+++ b/source/materials/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.18 2001/04/03 14:37:36 gcosmo Exp $
+$Id: History,v 1.22 2001/06/06 09:20:25 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,7 +16,22 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+06.06.01 G.Cosmo - materials-V03-01-01
+         Explicitly initialise to zero values of G4DataVector used to create
+         sandia-matrix in method ComputeMatSandiaMatrix().
+         This fix clears warnings detected on HP-aCC.
+         Coworks with tag "global-V03-01-01".
+
+18.05.01 G.Cosmo - materials-V03-01-00
+         Cleared pedantic warnings detected by Linux-g++ with ISO/ANSI setup.
      
+03.05.01 M.Maire
+         precision(prec) at begin/end of operator<<  Isotope,Element,Material
+     
+02.05.01 Marc+mma
+         protection added in G4Element::AddIsotope() against no coherent Z
+
 03.04.01 M.Maire - materials-V03-00-07
          removed warning to cerr in GetIsotope(name), GetElement(name),
 	 and GetMaterial(name).
diff --git a/source/materials/include/G4AtomicShells.hh b/source/materials/include/G4AtomicShells.hh
index 51af432e11..5953366643 100644
--- a/source/materials/include/G4AtomicShells.hh
+++ b/source/materials/include/G4AtomicShells.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AtomicShells.hh,v 1.3 1999/12/16 18:11:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AtomicShells.hh,v 1.3.4.1 2001/06/28 19:10:28 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // class description
 //
diff --git a/source/materials/include/G4Element.hh b/source/materials/include/G4Element.hh
index 5ff2a846c5..e8df238806 100644
--- a/source/materials/include/G4Element.hh
+++ b/source/materials/include/G4Element.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Element.hh,v 1.7 2001/03/30 14:43:15 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Element.hh,v 1.8.2.1 2001/06/28 19:10:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description
@@ -200,7 +216,7 @@ inline
 G4Element* G4Element::GetElement(G4String elementName)
 {  
   // search the element by its name 
-  for (G4int J=0 ; J<theElementTable.length() ; J++)
+  for (size_t J=0 ; J<theElementTable.length() ; J++)
    {
     if(theElementTable[J]->GetName() == elementName)
       return theElementTable[J];
diff --git a/source/materials/include/G4ElementTable.hh b/source/materials/include/G4ElementTable.hh
index b2c4e279bf..b8b7b554c7 100644
--- a/source/materials/include/G4ElementTable.hh
+++ b/source/materials/include/G4ElementTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ElementTable.hh,v 1.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ElementTable.hh,v 1.2.4.2 2001/06/28 20:18:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ----------------  G4ElementTable  ----------------
 // History:
 // First implementation: Torre Wenaus, November 1995
diff --git a/source/materials/include/G4ElementVector.hh b/source/materials/include/G4ElementVector.hh
index 5a8e4b7e25..bfa5735b14 100644
--- a/source/materials/include/G4ElementVector.hh
+++ b/source/materials/include/G4ElementVector.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ElementVector.hh,v 1.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ElementVector.hh,v 1.2.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //      ----------------  G4ElementVector  ----------------
 // History:
 // First implementation: Torre Wenaus, November 1995
diff --git a/source/materials/include/G4IonisParamElm.hh b/source/materials/include/G4IonisParamElm.hh
index 1bb9063aef..9fac4cadac 100644
--- a/source/materials/include/G4IonisParamElm.hh
+++ b/source/materials/include/G4IonisParamElm.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonisParamElm.hh,v 1.5 2001/03/12 17:48:47 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonisParamElm.hh,v 1.5.2.1 2001/06/28 19:10:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description
diff --git a/source/materials/include/G4IonisParamMat.hh b/source/materials/include/G4IonisParamMat.hh
index 51de958487..042ebb291b 100644
--- a/source/materials/include/G4IonisParamMat.hh
+++ b/source/materials/include/G4IonisParamMat.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonisParamMat.hh,v 1.5 2001/03/12 17:48:47 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonisParamMat.hh,v 1.5.2.1 2001/06/28 19:10:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description
diff --git a/source/materials/include/G4Isotope.hh b/source/materials/include/G4Isotope.hh
index fd1ceaacbe..404f9f51f6 100644
--- a/source/materials/include/G4Isotope.hh
+++ b/source/materials/include/G4Isotope.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Isotope.hh,v 1.6 2001/03/30 14:43:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Isotope.hh,v 1.7.2.1 2001/06/28 19:10:28 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -106,7 +122,7 @@ inline
 G4Isotope* G4Isotope::GetIsotope(G4String isotopeName)
 {  
   // search the isotope by its name 
-  for (G4int J=0 ; J<theIsotopeTable.length() ; J++)
+  for (size_t J=0 ; J<theIsotopeTable.length() ; J++)
    {
     if(theIsotopeTable[J]->GetName() == isotopeName)
       return theIsotopeTable[J];
diff --git a/source/materials/include/G4IsotopeVector.hh b/source/materials/include/G4IsotopeVector.hh
index 27fc8d561c..3472a1bec6 100644
--- a/source/materials/include/G4IsotopeVector.hh
+++ b/source/materials/include/G4IsotopeVector.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IsotopeVector.hh,v 1.2 1999/12/15 14:50:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IsotopeVector.hh,v 1.2.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //      ----------------  G4IsotopeVector  ----------------
 // History:
 // First implementation: Torre Wenaus, November 1995
diff --git a/source/materials/include/G4MPVEntry.hh b/source/materials/include/G4MPVEntry.hh
index 3ae41b6f8f..a76927e80c 100644
--- a/source/materials/include/G4MPVEntry.hh
+++ b/source/materials/include/G4MPVEntry.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MPVEntry.hh,v 1.4 1999/11/11 15:36:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MPVEntry.hh,v 1.4.4.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4Material.hh b/source/materials/include/G4Material.hh
index 7368555caf..df386b992a 100644
--- a/source/materials/include/G4Material.hh
+++ b/source/materials/include/G4Material.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Material.hh,v 1.10 2001/03/30 14:43:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Material.hh,v 1.11.2.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description
@@ -302,7 +318,7 @@ inline
 G4Material* G4Material::GetMaterial(G4String materialName)
 {  
   // search the material by its name 
-  for (G4int J=0 ; J<theMaterialTable.length() ; J++)
+  for (size_t J=0 ; J<theMaterialTable.length() ; J++)
    {
     if(theMaterialTable[J]->GetName() == materialName)
       return theMaterialTable[J];
diff --git a/source/materials/include/G4MaterialPropertiesTable.hh b/source/materials/include/G4MaterialPropertiesTable.hh
index 2ef921d294..f3724d3495 100644
--- a/source/materials/include/G4MaterialPropertiesTable.hh
+++ b/source/materials/include/G4MaterialPropertiesTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MaterialPropertiesTable.hh,v 1.9 2000/03/03 10:21:00 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MaterialPropertiesTable.hh,v 1.9.4.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4MaterialPropertyVector.hh b/source/materials/include/G4MaterialPropertyVector.hh
index cd6d0a8d28..86c3f5c246 100644
--- a/source/materials/include/G4MaterialPropertyVector.hh
+++ b/source/materials/include/G4MaterialPropertyVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MaterialPropertyVector.hh,v 1.4 1999/11/11 15:36:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MaterialPropertyVector.hh,v 1.4.4.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4MaterialTable.hh b/source/materials/include/G4MaterialTable.hh
index 56bf3aeea3..2a1a5a6f2a 100644
--- a/source/materials/include/G4MaterialTable.hh
+++ b/source/materials/include/G4MaterialTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MaterialTable.hh,v 1.2 1999/12/15 14:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MaterialTable.hh,v 1.2.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //      ----------------  G4MaterialTable  ----------------
 // History:
 // First implementation: Torre Wenaus, November 1995
diff --git a/source/materials/include/G4OpticalSurface.hh b/source/materials/include/G4OpticalSurface.hh
index bb93a15bd9..2413aa327f 100644
--- a/source/materials/include/G4OpticalSurface.hh
+++ b/source/materials/include/G4OpticalSurface.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpticalSurface.hh,v 1.4 1999/11/05 21:12:05 gum Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpticalSurface.hh,v 1.4.10.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/include/G4SandiaTable.hh b/source/materials/include/G4SandiaTable.hh
index f5c12bd400..9f34748788 100644
--- a/source/materials/include/G4SandiaTable.hh
+++ b/source/materials/include/G4SandiaTable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SandiaTable.hh,v 1.8 2001/04/03 12:32:54 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SandiaTable.hh,v 1.8.2.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // class description
 //
diff --git a/source/materials/include/G4StaticSandiaData.hh b/source/materials/include/G4StaticSandiaData.hh
index 79fd3f5be4..f648500f6f 100644
--- a/source/materials/include/G4StaticSandiaData.hh
+++ b/source/materials/include/G4StaticSandiaData.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StaticSandiaData.hh,v 1.4 1999/12/16 18:11:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StaticSandiaData.hh,v 1.4.4.1 2001/06/28 19:10:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4AtomicShells.cc b/source/materials/src/G4AtomicShells.cc
index 32c5b207e6..4aede1c7c5 100644
--- a/source/materials/src/G4AtomicShells.cc
+++ b/source/materials/src/G4AtomicShells.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AtomicShells.cc,v 1.2 1999/12/15 14:50:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AtomicShells.cc,v 1.2.4.1 2001/06/28 19:10:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
diff --git a/source/materials/src/G4Element.cc b/source/materials/src/G4Element.cc
index e6d1d9f086..834cb8f627 100644
--- a/source/materials/src/G4Element.cc
+++ b/source/materials/src/G4Element.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Element.cc,v 1.4 2001/03/12 17:48:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Element.cc,v 1.7.2.1 2001/06/28 19:10:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -23,6 +39,8 @@
 // 09-07-98: Ionisation parameters removed from the class, M.Maire
 // 16-11-98: name Subshell -> Shell; GetBindingEnergy() (mma)
 // 09-03-01: assignement operator revised (mma)
+// 02-05-01: check identical Z in AddIsotope (marc)
+// 03-05-01, flux.precision(prec) at begin/end of operator<<
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -39,16 +57,16 @@ G4Element::G4Element(const G4String& name, const G4String& symbol,
                      G4double zeff, G4double aeff)
 :fName(name),fSymbol(symbol)		     
 {
-    if (zeff<1.) G4Exception
-      (" ERROR! It is not allowed to create an Element with Z < 1" );
+    if (zeff<1.) G4Exception (" ERROR from G4Element::G4Element !"
+       " It is not allowed to create an Element with Z < 1" );
 
-    if (aeff/(g/mole)<zeff) G4Exception
-      (" ERROR! Attempt to create an Element with N < Z !!!" );
+    if (aeff/(g/mole)<zeff) G4Exception (" ERROR from G4Element::G4Element !"
+       " Attempt to create an Element with N < Z !!!" );
 
     if ((zeff-G4int(zeff)) > perMillion)
-      G4cerr << name <<
-      " : WARNING ! Trying to define an element as a mixture directly via effective Z."
-           << G4endl;
+      G4cerr << name << " : WARNING from G4Element::G4Element !"  
+         " Trying to define an element as a mixture directly via effective Z."
+         << G4endl;
 
     InitializePointers();
 
@@ -96,27 +114,31 @@ G4Element::G4Element(const G4String& name, const G4String& symbol, G4int nIsotop
 void G4Element::AddIsotope(G4Isotope* isotope, G4double abundance)
 {
     if (theIsotopeVector == NULL)
-       G4Exception("ERROR!!! - Trying to add an Isotope before contructing the element.");
+       G4Exception ("ERROR from G4Element::AddIsotope!"
+       " Trying to add an Isotope before contructing the element.");
 
     // filling ...
     if ( fNumberOfIsotopes < theIsotopeVector->length() ) {
+       // check same Z
+       if (fNumberOfIsotopes==0) fZeff = G4double(isotope->GetZ());
+       else if (G4double(isotope->GetZ()) != fZeff) 
+          G4Exception ("ERROR from G4Element::AddIsotope!"
+	   " Try to add isotopes with different Z");
+       //Z ok   
        fRelativeAbundanceVector[fNumberOfIsotopes] = abundance;
        (*theIsotopeVector)(fNumberOfIsotopes) = isotope;
-       fNumberOfIsotopes ++;
+       ++fNumberOfIsotopes;
       } 
-    else
-       G4Exception
-      ("ERROR!!! - Attempt to add more than the declared number of constituent isotopes.");
+    else G4Exception ("ERROR from G4Element::AddIsotope!"  
+       " Attempt to add more than the declared number of isotopes.");
 
     // filled.
     if ( fNumberOfIsotopes == theIsotopeVector->length() ) {
-      // Compute Zeff, Neff, Aeff
-      G4int i;
+      // Compute Neff, Aeff
       G4double wtSum=0.0;
 
-      fZeff = G4double( (*theIsotopeVector)(0)->GetZ() );
       fNeff = fAeff = 0.0;
-      for (i=0;i<fNumberOfIsotopes;i++) {
+      for (size_t i=0;i<fNumberOfIsotopes;i++) {
         fNeff +=  fRelativeAbundanceVector[i]*(*theIsotopeVector)(i)->GetN();
         fAeff +=  fRelativeAbundanceVector[i]*(*theIsotopeVector)(i)->GetA();
         wtSum +=  fRelativeAbundanceVector[i];
@@ -126,8 +148,8 @@ void G4Element::AddIsotope(G4Isotope* isotope, G4double abundance)
       
       fNbOfAtomicShells = G4AtomicShells::GetNumberOfShells((G4int)fZeff);
       fAtomicShells     = new G4double[fNbOfAtomicShells];
-      for (i=0;i<fNbOfAtomicShells;i++)
-         fAtomicShells[i] = G4AtomicShells::GetBindingEnergy((G4int)fZeff,i);
+      for (G4int j=0;j<fNbOfAtomicShells;j++)
+         fAtomicShells[j] = G4AtomicShells::GetBindingEnergy((G4int)fZeff,j);
          
       ComputeDerivedQuantities();
 
@@ -255,7 +277,7 @@ const G4Element& G4Element::operator=(const G4Element& right)
         {
 	 theIsotopeVector         = new G4IsotopeVector(fNumberOfIsotopes);
 	 fRelativeAbundanceVector = new G4double[fNumberOfIsotopes];
-	 for (G4int i=0;i<fNumberOfIsotopes;i++)
+	 for (size_t i=0;i<fNumberOfIsotopes;i++)
 	    {
              (*theIsotopeVector)[i]      = (*right.theIsotopeVector)[i];
              fRelativeAbundanceVector[i] = right.fRelativeAbundanceVector[i];
@@ -286,6 +308,7 @@ G4int G4Element::operator!=(const G4Element& right) const
 G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
 { 
   long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
+  long prec = flux.precision(3);
   
   flux
     << " Element: " << G4std::setw(8) << element->fName << G4std::setw(3) << element->fSymbol
@@ -294,12 +317,13 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Element* element)
     << "   A = " << G4std::setw(6) << G4std::setprecision(2) << (element->fAeff)/(g/mole) 
     << " g/mole";
    
-  for (G4int i=0; i<element->fNumberOfIsotopes; i++)
+  for (size_t i=0; i<element->fNumberOfIsotopes; i++)
   flux 
     << "\n   ---> " << (*(element->theIsotopeVector))[i] 
     << "   abundance: " << G4std::setw(6) << G4std::setprecision(2) 
     << (element->fRelativeAbundanceVector[i])/perCent << " %";
     
+  flux.precision(prec);        
   flux.setf(mode,G4std::ios::floatfield);         
   return flux;
 }
@@ -320,7 +344,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4ElementTable ElementTable)
    flux << "\n***** Table : Nb of elements = " << ElementTable.length() 
         << " *****\n" << G4endl;
         
-   for (G4int i=0; i<ElementTable.length(); i++) flux << ElementTable[i] 
+   for (size_t i=0; i<ElementTable.length(); i++) flux << ElementTable[i] 
                                                       << G4endl << G4endl;
 
    return flux;
diff --git a/source/materials/src/G4IonisParamElm.cc b/source/materials/src/G4IonisParamElm.cc
index aeff771e8a..490c70b9a9 100644
--- a/source/materials/src/G4IonisParamElm.cc
+++ b/source/materials/src/G4IonisParamElm.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonisParamElm.cc,v 1.6 2001/03/12 17:48:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonisParamElm.cc,v 1.6.2.1 2001/06/28 19:10:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
diff --git a/source/materials/src/G4IonisParamMat.cc b/source/materials/src/G4IonisParamMat.cc
index 55665da910..81c22a3404 100644
--- a/source/materials/src/G4IonisParamMat.cc
+++ b/source/materials/src/G4IonisParamMat.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonisParamMat.cc,v 1.6 2001/03/12 17:48:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonisParamMat.cc,v 1.7.2.1 2001/06/28 19:10:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
@@ -40,7 +56,7 @@ void G4IonisParamMat::ComputeMeanParameters()
   fTaul = (*(fMaterial->GetElementVector()))[0]->GetIonisation()->GetTaul();
   fLogMeanExcEnergy = 0.;
 
-  for (G4int i=0; i < fMaterial->GetNumberOfElements(); i++)
+  for (size_t i=0; i < fMaterial->GetNumberOfElements(); i++)
     fLogMeanExcEnergy += (fMaterial->GetVecNbOfAtomsPerVolume())[i]
                    *((*(fMaterial->GetElementVector()))[i]->GetZ())
                    *log((*(fMaterial->GetElementVector()))[i]->GetIonisation()
@@ -54,7 +70,7 @@ void G4IonisParamMat::ComputeMeanParameters()
   {
     fShellCorrectionVector[j] = 0.;
 
-    for (G4int k=0; k<fMaterial->GetNumberOfElements(); k++)
+    for (size_t k=0; k<fMaterial->GetNumberOfElements(); k++)
       fShellCorrectionVector[j] += (fMaterial->GetVecNbOfAtomsPerVolume())[k] 
               *((*(fMaterial->GetElementVector()))[k]->GetIonisation()
                                                      ->GetShellCorrectionVector()[j]);
@@ -157,7 +173,7 @@ void G4IonisParamMat::ComputeFluctModel()
 
   // need an 'effective Z' ?????
   G4double Zeff = 0.;
-  for (G4int i=0;i<fMaterial->GetNumberOfElements();i++) 
+  for (size_t i=0;i<fMaterial->GetNumberOfElements();i++) 
      Zeff += (fMaterial->GetFractionVector())[i]
              *((*(fMaterial->GetElementVector()))[i]->GetZ());
 
diff --git a/source/materials/src/G4Isotope.cc b/source/materials/src/G4Isotope.cc
index 4be402bb1e..248bb95f52 100644
--- a/source/materials/src/G4Isotope.cc
+++ b/source/materials/src/G4Isotope.cc
@@ -1,15 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Isotope.cc,v 1.3 2001/03/12 17:48:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Isotope.cc,v 1.5.2.1 2001/06/28 19:10:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
+// 03-05-01, flux.precision(prec) at begin/end of operator<<
 // 29-01-97: Forbidden to create Isotope with Z<1 or N<Z, M.Maire
 // 26-06-96: Code uses operators (+=, *=, ++, -> etc.) correctly, P. Urban
 
@@ -85,14 +102,16 @@ G4int G4Isotope::operator!=(const G4Isotope &right) const
 G4std::ostream& operator<<(G4std::ostream& flux, G4Isotope* isotope)
 {
   long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
-  
+  long prec = flux.precision(3);
+    
   flux
     << " Isotope: " << G4std::setw(5) << isotope->fName 
     << "   Z = " << G4std::setw(2) <<  isotope->fZ 
     << "   N = " << G4std::setw(3) <<  isotope->fN
     << "   A = " << G4std::setw(6) << G4std::setprecision(2) 
     << (isotope->fA)/(g/mole) << " g/mole";
-    
+
+  flux.precision(prec);       
   flux.setf(mode,G4std::ios::floatfield);       
   return flux;
 }
@@ -114,7 +133,8 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4IsotopeTable IsotopeTable)
      << "\n***** Table : Nb of isotopes = " << IsotopeTable.length() 
      << " *****\n" << G4endl;
         
-   for (G4int i=0; i<IsotopeTable.length(); i++) flux << IsotopeTable[i] << G4endl;
+   for (size_t i=0; i<IsotopeTable.length(); i++)
+     flux << IsotopeTable[i] << G4endl;
 
    return flux;
 }
diff --git a/source/materials/src/G4MPVEntry.cc b/source/materials/src/G4MPVEntry.cc
index 78a9b15b3f..d25f7ea6ab 100644
--- a/source/materials/src/G4MPVEntry.cc
+++ b/source/materials/src/G4MPVEntry.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MPVEntry.cc,v 1.5 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MPVEntry.cc,v 1.5.4.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4Material.cc b/source/materials/src/G4Material.cc
index c721a93f0e..35258529a6 100644
--- a/source/materials/src/G4Material.cc
+++ b/source/materials/src/G4Material.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Material.cc,v 1.8 2001/03/12 17:48:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Material.cc,v 1.10.2.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
@@ -33,6 +49,7 @@
 // 16-01-01, Nuclear interaction length, M.Maire
 // 12-03-01, G4bool fImplicitElement;
 //           copy constructor and assignement operator revised (mma)
+// 03-05-01, flux.precision(prec) at begin/end of operator<<
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 
@@ -230,7 +247,7 @@ void G4Material::AddElement(G4Element* element, G4int nAtoms)
     }
 
     // filling ...
-    if ( fNumberOfElements < maxNbComponents ) {
+    if ( G4int(fNumberOfElements) < maxNbComponents ) {
        (*theElementVector)[fNumberOfElements] = element;
        fAtomsVector       [fNumberOfElements] = nAtoms;
        fNumberOfComponents = ++fNumberOfElements;
@@ -240,9 +257,9 @@ void G4Material::AddElement(G4Element* element, G4int nAtoms)
       ("ERROR!!! - Attempt to add more than the declared number of elements.");
 
     // filled.
-    if ( fNumberOfElements == maxNbComponents ) {     
+    if ( G4int(fNumberOfElements) == maxNbComponents ) {     
        // compute proportion by mass
-       G4int i=0;
+       size_t i=0;
        G4double Zmol(0.), Amol(0.);
        for (i=0;i<fNumberOfElements;i++) {
          Zmol +=  fAtomsVector[i]*(*theElementVector)[i]->GetZ();
@@ -279,7 +296,7 @@ void G4Material::AddElement(G4Element* element, G4double fraction)
     }
 
     // filling ...
-    if (fNumberOfComponents < maxNbComponents) {
+    if (G4int(fNumberOfComponents) < maxNbComponents) {
         size_t el = 0;
         while ((el<fNumberOfElements)&&(element!=(*theElementVector)[el])) el++;
         if (el<fNumberOfElements) fMassFractionVector[el] += fraction;
@@ -296,11 +313,10 @@ void G4Material::AddElement(G4Element* element, G4double fraction)
       ("ERROR!!! - Attempt to add more than the declared number of components.");
 
     // filled.
-    if (fNumberOfComponents == maxNbComponents) {
+    if (G4int(fNumberOfComponents) == maxNbComponents) {
        // check sum of weights -- OK?
-       G4int i;
        G4double wtSum(0.0);
-       for (i=0;i<fNumberOfElements;i++) { wtSum +=  fMassFractionVector[i]; }
+       for (size_t i=0;i<fNumberOfElements;i++) { wtSum +=  fMassFractionVector[i]; }
        if (abs(1.-wtSum) > perThousand) {
          G4cerr << "WARNING !! - Fractional masses do not sum to 1 :the Delta is > 0.001"
               << "( the weights are NOT renormalized; the results may be wrong)" 
@@ -333,8 +349,8 @@ void G4Material::AddMaterial(G4Material* material, G4double fraction)
     }
 
     // filling ...
-    if (fNumberOfComponents < maxNbComponents) {
-       for (G4int elm=0; elm < material->GetNumberOfElements(); elm++)
+    if (G4int(fNumberOfComponents) < maxNbComponents) {
+       for (size_t elm=0; elm < material->GetNumberOfElements(); elm++)
           { G4Element* element = (*(material->GetElementVector()))[elm];
             size_t el = 0;
             while ((el<fNumberOfElements)&&(element!=(*theElementVector)[el])) el++;
@@ -354,11 +370,11 @@ void G4Material::AddMaterial(G4Material* material, G4double fraction)
       ("ERROR!!! - Attempt to add more than the declared number of components.");
 
     // filled.
-    if (fNumberOfComponents == maxNbComponents) {
+    if (G4int(fNumberOfComponents) == maxNbComponents) {
        // check sum of weights -- OK?
-       G4int i;
        G4double wtSum(0.0);
-       for (i=0;i<fNumberOfElements;i++) { wtSum +=  fMassFractionVector[i]; }
+       for (size_t i=0;i<fNumberOfElements;i++)
+        { wtSum +=  fMassFractionVector[i]; }
        if (abs(1.-wtSum) > perThousand) {
          G4cerr << "WARNING !! - Fractional masses do not sum to 1 :the Delta is > 0.001"
               << "( the weights are NOT renormalized; the results may be wrong)" 
@@ -386,7 +402,7 @@ void G4Material::ComputeDerivedQuantities()
   if (VecNbOfAtomsPerVolume) delete [] VecNbOfAtomsPerVolume;
   VecNbOfAtomsPerVolume = new G4double[fNumberOfElements];
   TotNbOfElectPerVolume = 0.;
-  for (G4int i=0;i<fNumberOfElements;i++) {
+  for (size_t i=0;i<fNumberOfElements;i++) {
      Zi = (*theElementVector)[i]->GetZ();
      Ai = (*theElementVector)[i]->GetA();
      VecNbOfAtomsPerVolume[i] = Avogadro*fDensity*fMassFractionVector[i]/Ai;
@@ -423,7 +439,7 @@ void G4Material::ComputeDerivedQuantities()
 void G4Material::ComputeRadiationLength()
 {
   G4double radinv = 0.0 ;
-  for (G4int i=0;i<fNumberOfElements;i++) {
+  for (size_t i=0;i<fNumberOfElements;i++) {
      radinv += VecNbOfAtomsPerVolume[i]*((*theElementVector)[i]->GetfRadTsai()); 
    }
   fRadlen = (radinv <= 0.0 ? DBL_MAX : 1./radinv);
@@ -435,7 +451,7 @@ void G4Material::ComputeNuclearInterLength()
 {
   const G4double lambda0 = 35*g/cm2;
   G4double NILinv = 0.0;
-  for (G4int i=0;i<fNumberOfElements;i++) {
+  for (size_t i=0;i<fNumberOfElements;i++) {
      NILinv +=
      VecNbOfAtomsPerVolume[i]*pow(((*theElementVector)[i]->GetN()),2./3.); 
    }
@@ -515,7 +531,7 @@ const G4Material& G4Material::operator=(const G4Material& right)
       } else {		
         theElementVector       = new G4ElementVector(fNumberOfElements);
         fMassFractionVector    = new G4double[fNumberOfElements];     
-        for (G4int i=0; i<fNumberOfElements; i++) {
+        for (size_t i=0; i<fNumberOfElements; i++) {
            (*theElementVector)[i]= (*right.theElementVector)[i];
            fMassFractionVector[i]= right.fMassFractionVector[i];
         }
@@ -523,7 +539,7 @@ const G4Material& G4Material::operator=(const G4Material& right)
       
       if (right.fAtomsVector) { 
         fAtomsVector       = new G4int[fNumberOfElements];
-        for (G4int i=0; i<fNumberOfElements; i++)              
+        for (size_t i=0; i<fNumberOfElements; i++)              
            fAtomsVector[i] = right.fAtomsVector[i];
       }
       	   
@@ -555,6 +571,7 @@ G4int G4Material::operator!=(const G4Material& right) const
 G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
 {
   long mode = flux.setf(G4std::ios::fixed,G4std::ios::floatfield);
+  long prec = flux.precision(3);
   
   flux
     << " Material: "      << G4std::setw(8) <<  material->fName
@@ -568,7 +585,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
     << "  RadLength: "   << G4std::setw(7)  << G4std::setprecision(3)  
                           << G4BestUnit(material->fRadlen,"Length");
 
-  for (G4int i=0; i<material->fNumberOfElements; i++)
+  for (size_t i=0; i<material->fNumberOfElements; i++)
   flux 
     << "\n   ---> " << (*(material->theElementVector))[i] 
     << "  fractionMass: " << G4std::setw(6)<< G4std::setprecision(2) 
@@ -577,7 +594,8 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4Material* material)
                           << 100*(material->VecNbOfAtomsPerVolume[i])/
                                  (material->TotNbOfAtomsPerVolume)
                           << " %";
-    
+
+  flux.precision(prec);    
   flux.setf(mode,G4std::ios::floatfield);
             
   return flux;
@@ -599,7 +617,7 @@ G4std::ostream& operator<<(G4std::ostream& flux, G4MaterialTable MaterialTable)
    flux << "\n***** Table : Nb of materials = " << MaterialTable.length() 
         << " *****\n" << G4endl;
         
-   for (G4int i=0; i<MaterialTable.length(); i++) flux << MaterialTable[i] 
+   for (size_t i=0; i<MaterialTable.length(); i++) flux << MaterialTable[i] 
                                                        << G4endl << G4endl;
 
    return flux;
diff --git a/source/materials/src/G4MaterialPropertiesTable.cc b/source/materials/src/G4MaterialPropertiesTable.cc
index 9c283dff10..e5b0d2f1f7 100644
--- a/source/materials/src/G4MaterialPropertiesTable.cc
+++ b/source/materials/src/G4MaterialPropertiesTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MaterialPropertiesTable.cc,v 1.9 2000/03/03 10:21:02 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MaterialPropertiesTable.cc,v 1.9.4.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4MaterialPropertyVector.cc b/source/materials/src/G4MaterialPropertyVector.cc
index dfd8052401..9bd5f0e74c 100644
--- a/source/materials/src/G4MaterialPropertyVector.cc
+++ b/source/materials/src/G4MaterialPropertyVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MaterialPropertyVector.cc,v 1.5 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MaterialPropertyVector.cc,v 1.5.4.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/materials/src/G4OpticalSurface.cc b/source/materials/src/G4OpticalSurface.cc
index 67ebf59f2f..fbae56491d 100644
--- a/source/materials/src/G4OpticalSurface.cc
+++ b/source/materials/src/G4OpticalSurface.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpticalSurface.cc,v 1.4 1999/12/15 14:50:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpticalSurface.cc,v 1.5.2.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
@@ -105,9 +121,9 @@ void G4OpticalSurface::DumpInfo() const
 	// Dump info for surface
 
 	G4cout << 
-        "  Surface type   = " << theType   << G4endl <<
-	"  Surface finish = " << theFinish << G4endl <<
-	"  Surface model  = " << theModel  << G4endl;
+        "  Surface type   = " << G4int(theType)   << G4endl <<
+	"  Surface finish = " << G4int(theFinish) << G4endl <<
+	"  Surface model  = " << G4int(theModel)  << G4endl;
 
 	G4cout << G4endl;
 
diff --git a/source/materials/src/G4SandiaTable.cc b/source/materials/src/G4SandiaTable.cc
index 3c1ce640b1..0692c5f234 100644
--- a/source/materials/src/G4SandiaTable.cc
+++ b/source/materials/src/G4SandiaTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SandiaTable.cc,v 1.10 2001/04/03 12:32:54 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SandiaTable.cc,v 1.11.2.1 2001/06/28 19:10:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
 //
@@ -122,7 +138,7 @@ void G4SandiaTable::ComputeMatSandiaMatrix()
   fMatSandiaMatrix = new G4OrderedTable();
   G4int interval;
   for (interval=0; interval<interval2; interval++)
-     fMatSandiaMatrix->push_back(new G4DataVector(5));
+     fMatSandiaMatrix->push_back(new G4DataVector(5,0.));
         	         	
   //
   //ready to compute the Sandia coefs for the material
diff --git a/source/parameterisations/include/G4FoamXrayTRmodel.hh b/source/parameterisations/include/G4FoamXrayTRmodel.hh
index 7259c29f28..9f55428267 100644
--- a/source/parameterisations/include/G4FoamXrayTRmodel.hh
+++ b/source/parameterisations/include/G4FoamXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FoamXrayTRmodel.hh,v 1.1 2000/11/14 16:05:14 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FoamXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4GamDistrXrayTRmodel.hh b/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
index 3078f5f69b..9a8aaa4303 100644
--- a/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
+++ b/source/parameterisations/include/G4GamDistrXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GamDistrXrayTRmodel.hh,v 1.1 2000/11/14 16:05:31 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GamDistrXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4IrregularXrayTRmodel.hh b/source/parameterisations/include/G4IrregularXrayTRmodel.hh
index a697856684..f46678f174 100644
--- a/source/parameterisations/include/G4IrregularXrayTRmodel.hh
+++ b/source/parameterisations/include/G4IrregularXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IrregularXrayTRmodel.hh,v 1.1 2000/11/14 16:05:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IrregularXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PAIclusterModel.hh b/source/parameterisations/include/G4PAIclusterModel.hh
index 208feca698..919ddc4235 100644
--- a/source/parameterisations/include/G4PAIclusterModel.hh
+++ b/source/parameterisations/include/G4PAIclusterModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIclusterModel.hh,v 1.1 2000/11/14 16:06:00 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIclusterModel.hh,v 1.1.4.1 2001/06/28 19:10:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PhotoClusterModel.hh b/source/parameterisations/include/G4PhotoClusterModel.hh
index 2e202047d4..c7ba49cc32 100644
--- a/source/parameterisations/include/G4PhotoClusterModel.hh
+++ b/source/parameterisations/include/G4PhotoClusterModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhotoClusterModel.hh,v 1.1 2000/11/14 16:06:17 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhotoClusterModel.hh,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh b/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
index fd2fc7ded1..252ffbe6d7 100644
--- a/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
+++ b/source/parameterisations/include/G4PlateIrrGasXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlateIrrGasXrayTRmodel.hh,v 1.1 2000/11/14 16:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlateIrrGasXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4RegularXrayTRmodel.hh b/source/parameterisations/include/G4RegularXrayTRmodel.hh
index 699350aabb..342c9d9912 100644
--- a/source/parameterisations/include/G4RegularXrayTRmodel.hh
+++ b/source/parameterisations/include/G4RegularXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RegularXrayTRmodel.hh,v 1.1 2000/11/14 16:06:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RegularXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4VClusterModel.hh b/source/parameterisations/include/G4VClusterModel.hh
index 135b5b992a..9959b56a3f 100644
--- a/source/parameterisations/include/G4VClusterModel.hh
+++ b/source/parameterisations/include/G4VClusterModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VClusterModel.hh,v 1.1 2000/11/14 16:07:02 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VClusterModel.hh,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/include/G4VXrayTRmodel.hh b/source/parameterisations/include/G4VXrayTRmodel.hh
index 9e3610d4b0..17555ab6db 100644
--- a/source/parameterisations/include/G4VXrayTRmodel.hh
+++ b/source/parameterisations/include/G4VXrayTRmodel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VXrayTRmodel.hh,v 1.1 2000/11/14 16:07:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VXrayTRmodel.hh,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/source/parameterisations/src/G4FoamXrayTRmodel.cc b/source/parameterisations/src/G4FoamXrayTRmodel.cc
index bfd9f50d18..5789d8eaf0 100644
--- a/source/parameterisations/src/G4FoamXrayTRmodel.cc
+++ b/source/parameterisations/src/G4FoamXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FoamXrayTRmodel.cc,v 1.1 2000/11/14 16:07:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FoamXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4GamDistrXrayTRmodel.cc b/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
index 6e19dad3b3..848c244d18 100644
--- a/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
+++ b/source/parameterisations/src/G4GamDistrXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GamDistrXrayTRmodel.cc,v 1.1 2000/11/14 16:07:53 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GamDistrXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4IrregularXrayTRmodel.cc b/source/parameterisations/src/G4IrregularXrayTRmodel.cc
index f987b58409..7c1aa6817f 100644
--- a/source/parameterisations/src/G4IrregularXrayTRmodel.cc
+++ b/source/parameterisations/src/G4IrregularXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IrregularXrayTRmodel.cc,v 1.1 2000/11/14 16:08:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IrregularXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 
diff --git a/source/parameterisations/src/G4PAIclusterModel.cc b/source/parameterisations/src/G4PAIclusterModel.cc
index 4bb4acd266..22309edbcc 100644
--- a/source/parameterisations/src/G4PAIclusterModel.cc
+++ b/source/parameterisations/src/G4PAIclusterModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIclusterModel.cc,v 1.1 2000/11/14 16:08:23 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIclusterModel.cc,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4PhotoClusterModel.cc b/source/parameterisations/src/G4PhotoClusterModel.cc
index b17641aa52..5627f59cb8 100644
--- a/source/parameterisations/src/G4PhotoClusterModel.cc
+++ b/source/parameterisations/src/G4PhotoClusterModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhotoClusterModel.cc,v 1.1 2000/11/14 16:08:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhotoClusterModel.cc,v 1.1.4.1 2001/06/28 19:10:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc b/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
index faaece911d..4e12f9b68b 100644
--- a/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
+++ b/source/parameterisations/src/G4PlateIrrGasXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PlateIrrGasXrayTRmodel.cc,v 1.1 2000/11/14 16:08:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PlateIrrGasXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4RegularXrayTRmodel.cc b/source/parameterisations/src/G4RegularXrayTRmodel.cc
index 24283f8ba3..db43b069e8 100644
--- a/source/parameterisations/src/G4RegularXrayTRmodel.cc
+++ b/source/parameterisations/src/G4RegularXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RegularXrayTRmodel.cc,v 1.1 2000/11/14 16:09:07 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RegularXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "g4std/complex"
diff --git a/source/parameterisations/src/G4VClusterModel.cc b/source/parameterisations/src/G4VClusterModel.cc
index 0cd612d4a9..dca713c55e 100644
--- a/source/parameterisations/src/G4VClusterModel.cc
+++ b/source/parameterisations/src/G4VClusterModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VClusterModel.cc,v 1.1 2000/11/14 16:09:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VClusterModel.cc,v 1.1.4.1 2001/06/28 19:10:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Timer.hh"
diff --git a/source/parameterisations/src/G4VXrayTRmodel.cc b/source/parameterisations/src/G4VXrayTRmodel.cc
index 30c96400e4..4748c5919a 100644
--- a/source/parameterisations/src/G4VXrayTRmodel.cc
+++ b/source/parameterisations/src/G4VXrayTRmodel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VXrayTRmodel.cc,v 1.1 2000/11/14 16:09:34 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VXrayTRmodel.cc,v 1.1.4.1 2001/06/28 19:10:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Timer.hh"
diff --git a/source/particles/History b/source/particles/History
index 4d9b21cee9..4c23032f0d 100644
--- a/source/particles/History
+++ b/source/particles/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.49 2001/03/12 06:10:49 kurasige Exp $
+$Id: History,v 1.53 2001/05/18 16:41:37 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,19 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+- May 18, 01 G.Cosmo (particles-V03-01-00)
+- Cleared pedantic warnings from Linux-g++ ISO/ANSI setup.
+
+- Apr. 03, 01 H.Kurashige (particles-V03-00-04)
+------- partman-V03-00-04
+- Fixed bugs in G4ParticleDefinition::GetPDGIsospin()
+- Fixed element name in G4IonTable
+- Added special treatment for Lamdas in G4PDGCodeChecker
+------- shortlived-V03-00-01
+- Added a0(980),f0(400-1200), f0(980)
+- Fixed PDG encoding for excited Lambdas
+
 -  Mar. 09, 01 H.Kurashige   (particles-V03-00-03)
 ------- partman-V03-00-03
 - Added RestoreCuts methods to G4ParticleWithCuts 
diff --git a/source/particles/bosons/include/G4BosonConstructor.hh b/source/particles/bosons/include/G4BosonConstructor.hh
index eb94f0f061..3284dcc8aa 100644
--- a/source/particles/bosons/include/G4BosonConstructor.hh
+++ b/source/particles/bosons/include/G4BosonConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BosonConstructor.hh,v 1.2 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BosonConstructor.hh,v 1.2.4.1 2001/06/28 19:10:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/include/G4ChargedGeantino.hh b/source/particles/bosons/include/G4ChargedGeantino.hh
index b77ba005be..75af6e4f9c 100644
--- a/source/particles/bosons/include/G4ChargedGeantino.hh
+++ b/source/particles/bosons/include/G4ChargedGeantino.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChargedGeantino.hh,v 1.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChargedGeantino.hh,v 1.3.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/bosons/include/G4Gamma.hh b/source/particles/bosons/include/G4Gamma.hh
index 1f1e760f6a..e161af8dfb 100644
--- a/source/particles/bosons/include/G4Gamma.hh
+++ b/source/particles/bosons/include/G4Gamma.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Gamma.hh,v 1.4 2001/03/12 05:49:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Gamma.hh,v 1.4.2.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/bosons/include/G4Geantino.hh b/source/particles/bosons/include/G4Geantino.hh
index 724948752d..e14260b6df 100644
--- a/source/particles/bosons/include/G4Geantino.hh
+++ b/source/particles/bosons/include/G4Geantino.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Geantino.hh,v 1.3 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Geantino.hh,v 1.3.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/bosons/include/G4OpticalPhoton.hh b/source/particles/bosons/include/G4OpticalPhoton.hh
index eb3a05c5da..a8e6b86d89 100644
--- a/source/particles/bosons/include/G4OpticalPhoton.hh
+++ b/source/particles/bosons/include/G4OpticalPhoton.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpticalPhoton.hh,v 1.4 2001/03/12 05:49:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpticalPhoton.hh,v 1.4.2.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/bosons/include/G4VBoson.hh b/source/particles/bosons/include/G4VBoson.hh
index c9839b1a49..aa235fadba 100644
--- a/source/particles/bosons/include/G4VBoson.hh
+++ b/source/particles/bosons/include/G4VBoson.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBoson.hh,v 1.2 1999/12/15 14:50:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBoson.hh,v 1.2.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //  Revised, Hisaya Kurashige, 15 Dec 1996
diff --git a/source/particles/bosons/src/G4BosonConstructor.cc b/source/particles/bosons/src/G4BosonConstructor.cc
index 2e81d6f88d..e37d3b3e62 100644
--- a/source/particles/bosons/src/G4BosonConstructor.cc
+++ b/source/particles/bosons/src/G4BosonConstructor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BosonConstructor.cc,v 1.2 1999/12/15 14:50:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BosonConstructor.cc,v 1.2.4.1 2001/06/28 19:10:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/bosons/src/G4ChargedGeantino.cc b/source/particles/bosons/src/G4ChargedGeantino.cc
index 722b83e74a..5293402db4 100644
--- a/source/particles/bosons/src/G4ChargedGeantino.cc
+++ b/source/particles/bosons/src/G4ChargedGeantino.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ChargedGeantino.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ChargedGeantino.cc,v 1.4.2.1 2001/06/28 19:10:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -91,14 +105,11 @@ void G4ChargedGeantino::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theChargedGeantinoLengthCut = theCutInMaxInteractionLength;  
   theChargedGeantinoKineticEnergyCuts = theKineticEnergyCuts;
   // Rebuild the physics tables for every process for this particle type
-  
-
 }
diff --git a/source/particles/bosons/src/G4Gamma.cc b/source/particles/bosons/src/G4Gamma.cc
index 8ce8407e6b..fa8ebe8862 100644
--- a/source/particles/bosons/src/G4Gamma.cc
+++ b/source/particles/bosons/src/G4Gamma.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Gamma.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Gamma.cc,v 1.3.4.2 2001/06/28 20:18:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/bosons/src/G4Geantino.cc b/source/particles/bosons/src/G4Geantino.cc
index 12f88cf751..9f4e66c16e 100644
--- a/source/particles/bosons/src/G4Geantino.cc
+++ b/source/particles/bosons/src/G4Geantino.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Geantino.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Geantino.cc,v 1.4.2.1 2001/06/28 19:10:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -94,9 +108,8 @@ void G4Geantino::SetCuts(G4double aCut)
   // fill theKineticEnergyCuts and delete the range vector
   theGeantinoLengthCut = theCutInMaxInteractionLength;  
   theGeantinoKineticEnergyCuts = theKineticEnergyCuts;
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   // Rebuild the physics tables for every process for this particle type
diff --git a/source/particles/bosons/src/G4OpticalPhoton.cc b/source/particles/bosons/src/G4OpticalPhoton.cc
index c28b5476d3..8798ce7108 100644
--- a/source/particles/bosons/src/G4OpticalPhoton.cc
+++ b/source/particles/bosons/src/G4OpticalPhoton.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpticalPhoton.cc,v 1.3 2000/02/27 06:27:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpticalPhoton.cc,v 1.4.2.1 2001/06/28 19:10:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,17 Oct. 1996
@@ -93,9 +107,8 @@ void G4OpticalPhoton::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0;
   }
   theOpticalPhotonLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/bosons/src/G4VBoson.cc b/source/particles/bosons/src/G4VBoson.cc
index 02c9e1e586..79cb64fbd4 100644
--- a/source/particles/bosons/src/G4VBoson.cc
+++ b/source/particles/bosons/src/G4VBoson.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBoson.cc,v 1.2 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBoson.cc,v 1.2.4.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4AntiLambda.hh b/source/particles/hadrons/barions/include/G4AntiLambda.hh
index 9490dc9d75..6c4b48f063 100644
--- a/source/particles/hadrons/barions/include/G4AntiLambda.hh
+++ b/source/particles/hadrons/barions/include/G4AntiLambda.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiLambda.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiLambda.hh,v 1.4.4.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
index 33fe6d7691..0cd679feb5 100644
--- a/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiLambdacPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiLambdacPlus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiLambdacPlus.hh,v 1.4.4.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiNeutron.hh b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
index 56e67be90d..1f585ca901 100644
--- a/source/particles/hadrons/barions/include/G4AntiNeutron.hh
+++ b/source/particles/hadrons/barions/include/G4AntiNeutron.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutron.hh,v 1.5 2001/03/12 05:45:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutron.hh,v 1.5.2.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
index 9108bd918f..0d9afc64d2 100644
--- a/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiOmegaMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiOmegaMinus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiOmegaMinus.hh,v 1.4.4.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
index ef0978382a..608f833a3a 100644
--- a/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiOmegacZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiOmegacZero.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiOmegacZero.hh,v 1.4.4.2 2001/06/28 20:18:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiProton.hh b/source/particles/hadrons/barions/include/G4AntiProton.hh
index 72f17d857f..e09beed73c 100644
--- a/source/particles/hadrons/barions/include/G4AntiProton.hh
+++ b/source/particles/hadrons/barions/include/G4AntiProton.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiProton.hh,v 1.5 2001/03/12 05:45:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiProton.hh,v 1.5.2.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
index afc1d88322..2d60d47de8 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaMinus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaMinus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
index 6c8f0b754f..e18d3ec756 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaPlus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaPlus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
index 84911ad326..9551949ea2 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmaZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaZero.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaZero.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
index 47c8426efe..fe0661ba44 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacPlus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacPlus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
index 07d1b21ed8..c44efdf616 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacPlusPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacPlusPlus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacPlusPlus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
index f70cc04b32..24965f7738 100644
--- a/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiSigmacZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacZero.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacZero.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
index d6548a37a6..18629c2f85 100644
--- a/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXiMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiMinus.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiMinus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiXiZero.hh b/source/particles/hadrons/barions/include/G4AntiXiZero.hh
index 371f67b9a3..027c8d1d88 100644
--- a/source/particles/hadrons/barions/include/G4AntiXiZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXiZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiZero.hh,v 1.4 1999/12/15 14:50:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiZero.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
index 9167e7e152..b220ff1b4d 100644
--- a/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXicPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXicPlus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXicPlus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4AntiXicZero.hh b/source/particles/hadrons/barions/include/G4AntiXicZero.hh
index 39e90017d5..6a7e5ba7d5 100644
--- a/source/particles/hadrons/barions/include/G4AntiXicZero.hh
+++ b/source/particles/hadrons/barions/include/G4AntiXicZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXicZero.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXicZero.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
index 5e12a691cd..0c7a1715d0 100644
--- a/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
+++ b/source/particles/hadrons/barions/include/G4BaryonConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BaryonConstructor.hh,v 1.2 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BaryonConstructor.hh,v 1.2.4.1 2001/06/28 19:10:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4Lambda.hh b/source/particles/hadrons/barions/include/G4Lambda.hh
index 71c0ab865a..5f2b38e33b 100644
--- a/source/particles/hadrons/barions/include/G4Lambda.hh
+++ b/source/particles/hadrons/barions/include/G4Lambda.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Lambda.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Lambda.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4LambdacPlus.hh b/source/particles/hadrons/barions/include/G4LambdacPlus.hh
index 956751aec2..59f15f14d5 100644
--- a/source/particles/hadrons/barions/include/G4LambdacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4LambdacPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LambdacPlus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LambdacPlus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4Neutron.hh b/source/particles/hadrons/barions/include/G4Neutron.hh
index 849453b7cf..56e70ce444 100644
--- a/source/particles/hadrons/barions/include/G4Neutron.hh
+++ b/source/particles/hadrons/barions/include/G4Neutron.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Neutron.hh,v 1.6 2001/03/12 05:45:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Neutron.hh,v 1.6.2.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4OmegaMinus.hh b/source/particles/hadrons/barions/include/G4OmegaMinus.hh
index 756c63bf5f..179fb832ea 100644
--- a/source/particles/hadrons/barions/include/G4OmegaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4OmegaMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OmegaMinus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OmegaMinus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4OmegacZero.hh b/source/particles/hadrons/barions/include/G4OmegacZero.hh
index ecf7243f60..600c743938 100644
--- a/source/particles/hadrons/barions/include/G4OmegacZero.hh
+++ b/source/particles/hadrons/barions/include/G4OmegacZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OmegacZero.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OmegacZero.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4Proton.hh b/source/particles/hadrons/barions/include/G4Proton.hh
index 1a089f5177..02b35852f5 100644
--- a/source/particles/hadrons/barions/include/G4Proton.hh
+++ b/source/particles/hadrons/barions/include/G4Proton.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Proton.hh,v 1.6 2001/03/12 05:45:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Proton.hh,v 1.6.2.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmaMinus.hh b/source/particles/hadrons/barions/include/G4SigmaMinus.hh
index bcbd842c5a..3d0b092365 100644
--- a/source/particles/hadrons/barions/include/G4SigmaMinus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaMinus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaMinus.hh,v 1.4.4.2 2001/06/28 20:18:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmaPlus.hh b/source/particles/hadrons/barions/include/G4SigmaPlus.hh
index 769e662356..0a3a8b6b97 100644
--- a/source/particles/hadrons/barions/include/G4SigmaPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaPlus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaPlus.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmaZero.hh b/source/particles/hadrons/barions/include/G4SigmaZero.hh
index 70c5fdf0e8..87d7edc494 100644
--- a/source/particles/hadrons/barions/include/G4SigmaZero.hh
+++ b/source/particles/hadrons/barions/include/G4SigmaZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaZero.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaZero.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlus.hh
index 6aabd28fcd..58a0ef72a3 100644
--- a/source/particles/hadrons/barions/include/G4SigmacPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacPlus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacPlus.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
index e867761541..856e61ff44 100644
--- a/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacPlusPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacPlusPlus.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacPlusPlus.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4SigmacZero.hh b/source/particles/hadrons/barions/include/G4SigmacZero.hh
index 16405e7dbb..7b9ad4df27 100644
--- a/source/particles/hadrons/barions/include/G4SigmacZero.hh
+++ b/source/particles/hadrons/barions/include/G4SigmacZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacZero.hh,v 1.4 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacZero.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4VBaryon.hh b/source/particles/hadrons/barions/include/G4VBaryon.hh
index d84699c15d..3d5a3d5806 100644
--- a/source/particles/hadrons/barions/include/G4VBaryon.hh
+++ b/source/particles/hadrons/barions/include/G4VBaryon.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBaryon.hh,v 1.2 1999/12/15 14:50:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBaryon.hh,v 1.2.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/include/G4XiMinus.hh b/source/particles/hadrons/barions/include/G4XiMinus.hh
index 4cbdb172e2..1ca30fc119 100644
--- a/source/particles/hadrons/barions/include/G4XiMinus.hh
+++ b/source/particles/hadrons/barions/include/G4XiMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiMinus.hh,v 1.4 1999/12/15 14:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiMinus.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4XiZero.hh b/source/particles/hadrons/barions/include/G4XiZero.hh
index cf863f4831..9e19bde886 100644
--- a/source/particles/hadrons/barions/include/G4XiZero.hh
+++ b/source/particles/hadrons/barions/include/G4XiZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiZero.hh,v 1.4 1999/12/15 14:50:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiZero.hh,v 1.4.4.2 2001/06/28 20:18:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4XicPlus.hh b/source/particles/hadrons/barions/include/G4XicPlus.hh
index e93387a201..00248ccb78 100644
--- a/source/particles/hadrons/barions/include/G4XicPlus.hh
+++ b/source/particles/hadrons/barions/include/G4XicPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XicPlus.hh,v 1.4 1999/12/15 14:50:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XicPlus.hh,v 1.4.4.2 2001/06/28 20:18:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/include/G4XicZero.hh b/source/particles/hadrons/barions/include/G4XicZero.hh
index 2fefd395cf..706308a8ce 100644
--- a/source/particles/hadrons/barions/include/G4XicZero.hh
+++ b/source/particles/hadrons/barions/include/G4XicZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XicZero.hh,v 1.4 1999/12/15 14:50:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XicZero.hh,v 1.4.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiLambda.cc b/source/particles/hadrons/barions/src/G4AntiLambda.cc
index b748ed7326..74b4367e98 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambda.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambda.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiLambda.cc,v 1.5 2000/02/27 06:17:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiLambda.cc,v 1.6.2.1 2001/06/28 19:10:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -106,9 +120,8 @@ void G4AntiLambda::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiLambdaLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
index 6922068e6f..ac9344bd39 100644
--- a/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiLambdacPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiLambdacPlus.cc,v 1.5 2000/02/27 06:17:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiLambdacPlus.cc,v 1.5.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiNeutron.cc b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
index 9c3028b9a1..3bad44c624 100644
--- a/source/particles/hadrons/barions/src/G4AntiNeutron.cc
+++ b/source/particles/hadrons/barions/src/G4AntiNeutron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutron.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutron.cc,v 1.5.2.1 2001/06/28 19:10:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                          H.Kurashige 7 July 1996
@@ -84,9 +98,8 @@ void G4AntiNeutron::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiNeutronLengthCut = theCutInMaxInteractionLength;  
@@ -94,13 +107,3 @@ void G4AntiNeutron::SetCuts(G4double aCut)
   // Rebuild the physics tables for every process for this particle type
   
 }
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
index 129fb5142c..333802b7c2 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegaMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiOmegaMinus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiOmegaMinus.cc,v 1.5.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
index 58c26be1f0..a7e3111f85 100644
--- a/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiOmegacZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiOmegacZero.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiOmegacZero.cc,v 1.6.2.1 2001/06/28 19:10:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -93,9 +107,8 @@ void G4AntiOmegacZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiOmegacZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4AntiProton.cc b/source/particles/hadrons/barions/src/G4AntiProton.cc
index 072a20459c..5173ed0cb3 100644
--- a/source/particles/hadrons/barions/src/G4AntiProton.cc
+++ b/source/particles/hadrons/barions/src/G4AntiProton.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiProton.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiProton.cc,v 1.4.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                          H.Kurashige 7 July 1996
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
index dc06bc2f00..44a675001c 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaMinus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaMinus.cc,v 1.5.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
index eaed076ea1..0b1ae217f0 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaPlus.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaPlus.cc,v 1.5.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
index a9e7652cbc..63396f812b 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmaZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaZero.cc,v 1.5 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaZero.cc,v 1.6.2.1 2001/06/28 19:10:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -106,9 +120,8 @@ void G4AntiSigmaZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiSigmaZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
index c6a322adfb..26925f973b 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacPlus.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacPlus.cc,v 1.4.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
index 10b41f9126..e8463c94fc 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacPlusPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacPlusPlus.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacPlusPlus.cc,v 1.4.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
index 261eb77358..e06b4c2f53 100644
--- a/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiSigmacZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmacZero.cc,v 1.4 2000/02/27 06:17:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmacZero.cc,v 1.5.2.1 2001/06/28 19:10:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -107,9 +121,8 @@ void G4AntiSigmacZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiSigmacZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
index 061f2b9b2b..631cc31ae0 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiMinus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiMinus.cc,v 1.5.4.2 2001/06/28 20:19:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiXiZero.cc b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
index d92d831806..0063c930e8 100644
--- a/source/particles/hadrons/barions/src/G4AntiXiZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXiZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiZero.cc,v 1.6.2.1 2001/06/28 19:10:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -104,9 +118,8 @@ void G4AntiXiZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiXiZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
index 53baefe434..9f023cc01c 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXicPlus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXicPlus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4AntiXicZero.cc b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
index ea0ce77cfa..48a4028a1a 100644
--- a/source/particles/hadrons/barions/src/G4AntiXicZero.cc
+++ b/source/particles/hadrons/barions/src/G4AntiXicZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXicZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXicZero.cc,v 1.6.2.1 2001/06/28 19:10:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -93,9 +107,8 @@ void G4AntiXicZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiXicZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
index 9c47483a73..fa1cdf57d6 100644
--- a/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
+++ b/source/particles/hadrons/barions/src/G4BaryonConstructor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BaryonConstructor.cc,v 1.2 1999/12/15 14:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BaryonConstructor.cc,v 1.2.4.1 2001/06/28 19:10:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4Lambda.cc b/source/particles/hadrons/barions/src/G4Lambda.cc
index 13c57cf7ca..41aff00bf8 100644
--- a/source/particles/hadrons/barions/src/G4Lambda.cc
+++ b/source/particles/hadrons/barions/src/G4Lambda.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Lambda.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Lambda.cc,v 1.6.2.1 2001/06/28 19:10:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -106,9 +120,8 @@ void G4Lambda::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theLambdaLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4LambdacPlus.cc b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
index 04e262cca7..00d17678c5 100644
--- a/source/particles/hadrons/barions/src/G4LambdacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4LambdacPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LambdacPlus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LambdacPlus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4Neutron.cc b/source/particles/hadrons/barions/src/G4Neutron.cc
index 2d999dbad1..a2504c4256 100644
--- a/source/particles/hadrons/barions/src/G4Neutron.cc
+++ b/source/particles/hadrons/barions/src/G4Neutron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Neutron.cc,v 1.5 2000/10/17 12:24:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Neutron.cc,v 1.6.2.1 2001/06/28 19:10:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                          H.Kurashige 7 July 1996
@@ -86,9 +100,8 @@ void G4Neutron::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theNeutronLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4OmegaMinus.cc b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
index a82b4066c7..72fb3931b6 100644
--- a/source/particles/hadrons/barions/src/G4OmegaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4OmegaMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OmegaMinus.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OmegaMinus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4OmegacZero.cc b/source/particles/hadrons/barions/src/G4OmegacZero.cc
index 2af6da99c2..f0dfa6fd3e 100644
--- a/source/particles/hadrons/barions/src/G4OmegacZero.cc
+++ b/source/particles/hadrons/barions/src/G4OmegacZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OmegacZero.cc,v 1.5 2000/02/27 06:17:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OmegacZero.cc,v 1.6.2.1 2001/06/28 19:10:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -93,9 +107,8 @@ void G4OmegacZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theOmegacZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4Proton.cc b/source/particles/hadrons/barions/src/G4Proton.cc
index d66613f8bf..2603d72074 100644
--- a/source/particles/hadrons/barions/src/G4Proton.cc
+++ b/source/particles/hadrons/barions/src/G4Proton.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Proton.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Proton.cc,v 1.4.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4SigmaMinus.cc b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
index ae5d9600fd..ff142a66d1 100644
--- a/source/particles/hadrons/barions/src/G4SigmaMinus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaMinus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaMinus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4SigmaPlus.cc b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
index f552e0dc74..fd7798d305 100644
--- a/source/particles/hadrons/barions/src/G4SigmaPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaPlus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaPlus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4SigmaZero.cc b/source/particles/hadrons/barions/src/G4SigmaZero.cc
index f72cf9b78a..3b57e733d9 100644
--- a/source/particles/hadrons/barions/src/G4SigmaZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmaZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaZero.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaZero.cc,v 1.6.2.1 2001/06/28 19:10:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -101,9 +115,8 @@ void G4SigmaZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theSigmaZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
index 3394a1b2d9..6c6399f90c 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacPlus.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacPlus.cc,v 1.4.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
index e869a44945..f90fd77fbe 100644
--- a/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacPlusPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacPlusPlus.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacPlusPlus.cc,v 1.4.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4SigmacZero.cc b/source/particles/hadrons/barions/src/G4SigmacZero.cc
index 5164b2e4c1..30a7438280 100644
--- a/source/particles/hadrons/barions/src/G4SigmacZero.cc
+++ b/source/particles/hadrons/barions/src/G4SigmacZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmacZero.cc,v 1.4 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmacZero.cc,v 1.5.2.1 2001/06/28 19:10:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -107,9 +121,8 @@ void G4SigmacZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theSigmacZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4VBaryon.cc b/source/particles/hadrons/barions/src/G4VBaryon.cc
index 875d58650d..92de50d967 100644
--- a/source/particles/hadrons/barions/src/G4VBaryon.cc
+++ b/source/particles/hadrons/barions/src/G4VBaryon.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VBaryon.cc,v 1.2 1999/12/15 14:51:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VBaryon.cc,v 1.2.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/barions/src/G4XiMinus.cc b/source/particles/hadrons/barions/src/G4XiMinus.cc
index e0154d8eec..daba4f3107 100644
--- a/source/particles/hadrons/barions/src/G4XiMinus.cc
+++ b/source/particles/hadrons/barions/src/G4XiMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiMinus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiMinus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4XiZero.cc b/source/particles/hadrons/barions/src/G4XiZero.cc
index 026e3a273d..e888a3f7ea 100644
--- a/source/particles/hadrons/barions/src/G4XiZero.cc
+++ b/source/particles/hadrons/barions/src/G4XiZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiZero.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiZero.cc,v 1.6.2.1 2001/06/28 19:10:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -104,9 +118,8 @@ void G4XiZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theXiZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/barions/src/G4XicPlus.cc b/source/particles/hadrons/barions/src/G4XicPlus.cc
index 986c332d99..bb754610da 100644
--- a/source/particles/hadrons/barions/src/G4XicPlus.cc
+++ b/source/particles/hadrons/barions/src/G4XicPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XicPlus.cc,v 1.5 2000/02/27 06:17:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XicPlus.cc,v 1.5.4.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/barions/src/G4XicZero.cc b/source/particles/hadrons/barions/src/G4XicZero.cc
index 74f0cd9cc2..4148eacb9a 100644
--- a/source/particles/hadrons/barions/src/G4XicZero.cc
+++ b/source/particles/hadrons/barions/src/G4XicZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XicZero.cc,v 1.5 2000/02/27 06:17:06 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XicZero.cc,v 1.6.2.1 2001/06/28 19:10:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -93,9 +107,8 @@ void G4XicZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theXicZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/ions/include/G4Alpha.hh b/source/particles/hadrons/ions/include/G4Alpha.hh
index a3c1ac6914..24c7948a49 100644
--- a/source/particles/hadrons/ions/include/G4Alpha.hh
+++ b/source/particles/hadrons/ions/include/G4Alpha.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Alpha.hh,v 1.4 2001/03/12 05:45:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Alpha.hh,v 1.4.2.2 2001/06/28 20:19:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/ions/include/G4Deuteron.hh b/source/particles/hadrons/ions/include/G4Deuteron.hh
index a605f4baa0..2f6bf7c66f 100644
--- a/source/particles/hadrons/ions/include/G4Deuteron.hh
+++ b/source/particles/hadrons/ions/include/G4Deuteron.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Deuteron.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Deuteron.hh,v 1.4.2.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/ions/include/G4GenericIon.hh b/source/particles/hadrons/ions/include/G4GenericIon.hh
index 81cf8ec7bb..8634fefd06 100644
--- a/source/particles/hadrons/ions/include/G4GenericIon.hh
+++ b/source/particles/hadrons/ions/include/G4GenericIon.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GenericIon.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GenericIon.hh,v 1.4.2.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th Dec 1998, H.Kurashige
 // ****************************************************************
diff --git a/source/particles/hadrons/ions/include/G4He3.hh b/source/particles/hadrons/ions/include/G4He3.hh
index e89fb4abc8..22ca08c59e 100644
--- a/source/particles/hadrons/ions/include/G4He3.hh
+++ b/source/particles/hadrons/ions/include/G4He3.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4He3.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4He3.hh,v 1.4.2.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      24-th April 1998,H.Kurashige
 // ****************************************************************
diff --git a/source/particles/hadrons/ions/include/G4IonConstructor.hh b/source/particles/hadrons/ions/include/G4IonConstructor.hh
index 6fd475c73e..7404637856 100644
--- a/source/particles/hadrons/ions/include/G4IonConstructor.hh
+++ b/source/particles/hadrons/ions/include/G4IonConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonConstructor.hh,v 1.2 1999/12/15 14:51:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonConstructor.hh,v 1.2.4.1 2001/06/28 19:10:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/include/G4Triton.hh b/source/particles/hadrons/ions/include/G4Triton.hh
index f4e13c26d8..728a2dd6c7 100644
--- a/source/particles/hadrons/ions/include/G4Triton.hh
+++ b/source/particles/hadrons/ions/include/G4Triton.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Triton.hh,v 1.4 2001/03/12 05:45:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Triton.hh,v 1.4.2.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/ions/include/G4VIon.hh b/source/particles/hadrons/ions/include/G4VIon.hh
index eb11ffe247..73b6dbe33b 100644
--- a/source/particles/hadrons/ions/include/G4VIon.hh
+++ b/source/particles/hadrons/ions/include/G4VIon.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIon.hh,v 1.3 2000/02/25 07:37:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIon.hh,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Alpha.cc b/source/particles/hadrons/ions/src/G4Alpha.cc
index 568735ed7f..749b9024d1 100644
--- a/source/particles/hadrons/ions/src/G4Alpha.cc
+++ b/source/particles/hadrons/ions/src/G4Alpha.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Alpha.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Alpha.cc,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/ions/src/G4Deuteron.cc b/source/particles/hadrons/ions/src/G4Deuteron.cc
index 7c066bc4e9..773cc75948 100644
--- a/source/particles/hadrons/ions/src/G4Deuteron.cc
+++ b/source/particles/hadrons/ions/src/G4Deuteron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Deuteron.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Deuteron.cc,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/ions/src/G4GenericIon.cc b/source/particles/hadrons/ions/src/G4GenericIon.cc
index 4bbd8ac9df..3a6dec714c 100644
--- a/source/particles/hadrons/ions/src/G4GenericIon.cc
+++ b/source/particles/hadrons/ions/src/G4GenericIon.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GenericIon.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GenericIon.cc,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4 Dec. 98 by H.Kurashige
 // ----------------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4He3.cc b/source/particles/hadrons/ions/src/G4He3.cc
index 03fbee06b8..40c714068b 100644
--- a/source/particles/hadrons/ions/src/G4He3.cc
+++ b/source/particles/hadrons/ions/src/G4He3.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4He3.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4He3.cc,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      24th April 1998, H.Kurashige
 // **********************************************************************
diff --git a/source/particles/hadrons/ions/src/G4IonConstructor.cc b/source/particles/hadrons/ions/src/G4IonConstructor.cc
index b137cae597..ca3dfb3e0a 100644
--- a/source/particles/hadrons/ions/src/G4IonConstructor.cc
+++ b/source/particles/hadrons/ions/src/G4IonConstructor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonConstructor.cc,v 1.2 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonConstructor.cc,v 1.2.4.1 2001/06/28 19:10:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/ions/src/G4Triton.cc b/source/particles/hadrons/ions/src/G4Triton.cc
index 6de83a8552..627b1e7839 100644
--- a/source/particles/hadrons/ions/src/G4Triton.cc
+++ b/source/particles/hadrons/ions/src/G4Triton.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Triton.cc,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Triton.cc,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/ions/src/G4VIon.cc b/source/particles/hadrons/ions/src/G4VIon.cc
index 74fbb88b0f..60afa4d51b 100644
--- a/source/particles/hadrons/ions/src/G4VIon.cc
+++ b/source/particles/hadrons/ions/src/G4VIon.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIon.cc,v 1.2 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIon.cc,v 1.2.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
index a9f7c4c731..f583833259 100644
--- a/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiBMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiBMesonZero.hh,v 1.3 1999/12/15 14:51:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiBMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
index e6fad2961e..a32fdf964e 100644
--- a/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiBsMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiBsMesonZero.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiBsMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
index d617d3b2fc..4cdfe56168 100644
--- a/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiDMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiDMesonZero.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiDMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
index 1c0b2b9af7..04273e81f8 100644
--- a/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4AntiKaonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiKaonZero.hh,v 1.4 2001/03/12 05:45:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiKaonZero.hh,v 1.4.2.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
index 9dd147a917..2e097c42c0 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonMinus.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonMinus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
index 5f3db5833b..3679994e1a 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonPlus.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonPlus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4BMesonZero.hh b/source/particles/hadrons/mesons/include/G4BMesonZero.hh
index f035b5efb2..bff2b04f62 100644
--- a/source/particles/hadrons/mesons/include/G4BMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4BMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonZero.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
index a0bbe64839..8ade2fd949 100644
--- a/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4BsMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BsMesonZero.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BsMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
index 4026aa2983..b600014f49 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonMinus.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonMinus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
index d957f6c995..e2baaf0a10 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonPlus.hh,v 1.3 1999/12/15 14:51:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonPlus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4DMesonZero.hh b/source/particles/hadrons/mesons/include/G4DMesonZero.hh
index f19aa5f388..8610cc09e4 100644
--- a/source/particles/hadrons/mesons/include/G4DMesonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4DMesonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonZero.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonZero.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
index ab913e4944..456e78135b 100644
--- a/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4DsMesonMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DsMesonMinus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DsMesonMinus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
index ee33c6ecda..07e2ec8bab 100644
--- a/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4DsMesonPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DsMesonPlus.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DsMesonPlus.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4Eta.hh b/source/particles/hadrons/mesons/include/G4Eta.hh
index 773bd9b362..926f4ba47b 100644
--- a/source/particles/hadrons/mesons/include/G4Eta.hh
+++ b/source/particles/hadrons/mesons/include/G4Eta.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Eta.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Eta.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4EtaPrime.hh b/source/particles/hadrons/mesons/include/G4EtaPrime.hh
index 23abc10dc9..e161813b9e 100644
--- a/source/particles/hadrons/mesons/include/G4EtaPrime.hh
+++ b/source/particles/hadrons/mesons/include/G4EtaPrime.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EtaPrime.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EtaPrime.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, 8 June 1998 Hisaya Kurashige
 // **********************************************************************
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4JPsi.hh b/source/particles/hadrons/mesons/include/G4JPsi.hh
index a6ae7babe3..0fbea829d2 100644
--- a/source/particles/hadrons/mesons/include/G4JPsi.hh
+++ b/source/particles/hadrons/mesons/include/G4JPsi.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4JPsi.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4JPsi.hh,v 1.3.4.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 //      Created,             Hisaya Kurashige, 15 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4KaonMinus.hh b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
index a356bd6fc5..a9ed4a54fc 100644
--- a/source/particles/hadrons/mesons/include/G4KaonMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinus.hh,v 1.4.2.2 2001/06/28 20:19:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4KaonPlus.hh b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
index f6240e04dc..7643331459 100644
--- a/source/particles/hadrons/mesons/include/G4KaonPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonPlus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonPlus.hh,v 1.4.2.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4KaonZero.hh b/source/particles/hadrons/mesons/include/G4KaonZero.hh
index 1c5a830e70..f1c2d6673d 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZero.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZero.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZero.hh,v 1.4.2.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
index 3824fec562..76aac4e585 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZeroLong.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroLong.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroLong.hh,v 1.3.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
index eda7ba9c34..7d54396b7d 100644
--- a/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
+++ b/source/particles/hadrons/mesons/include/G4KaonZeroShort.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroShort.hh,v 1.3 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroShort.hh,v 1.3.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
index d4247a61f4..4e92f7a044 100644
--- a/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
+++ b/source/particles/hadrons/mesons/include/G4MesonConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MesonConstructor.hh,v 1.2 1999/12/15 14:51:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MesonConstructor.hh,v 1.2.4.1 2001/06/28 19:10:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/include/G4PionMinus.hh b/source/particles/hadrons/mesons/include/G4PionMinus.hh
index 7ad48dcba7..eab2aeb78f 100644
--- a/source/particles/hadrons/mesons/include/G4PionMinus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionMinus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionMinus.hh,v 1.4.2.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4PionPlus.hh b/source/particles/hadrons/mesons/include/G4PionPlus.hh
index 4ff338c7ed..766ccc6357 100644
--- a/source/particles/hadrons/mesons/include/G4PionPlus.hh
+++ b/source/particles/hadrons/mesons/include/G4PionPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionPlus.hh,v 1.4 2001/03/12 05:45:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionPlus.hh,v 1.4.2.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4PionZero.hh b/source/particles/hadrons/mesons/include/G4PionZero.hh
index 7f4e6451bc..e0e59c59e4 100644
--- a/source/particles/hadrons/mesons/include/G4PionZero.hh
+++ b/source/particles/hadrons/mesons/include/G4PionZero.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionZero.hh,v 1.4 2001/03/12 05:45:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionZero.hh,v 1.4.2.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/hadrons/mesons/include/G4VMeson.hh b/source/particles/hadrons/mesons/include/G4VMeson.hh
index 44df1b85ae..b498b0d093 100644
--- a/source/particles/hadrons/mesons/include/G4VMeson.hh
+++ b/source/particles/hadrons/mesons/include/G4VMeson.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMeson.hh,v 1.2 1999/12/15 14:51:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMeson.hh,v 1.2.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
index 46e1fa6a36..107a11ec8d 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiBMesonZero.cc,v 1.4 2000/02/27 05:56:30 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiBMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -86,9 +99,8 @@ void G4AntiBMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiBMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
index c2e8067f6e..fe7395c98b 100644
--- a/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiBsMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiBsMesonZero.cc,v 1.4 2000/02/27 05:57:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiBsMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -86,9 +99,8 @@ void G4AntiBsMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiBsMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
index e459f5f4bc..a6d8aac027 100644
--- a/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiDMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiDMesonZero.cc,v 1.4 2000/02/27 05:57:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiDMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -86,9 +99,8 @@ void G4AntiDMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiDMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
index 00430abffb..7ab3aac5b8 100644
--- a/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4AntiKaonZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiKaonZero.cc,v 1.3 2000/02/27 05:57:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiKaonZero.cc,v 1.4.2.1 2001/06/28 19:10:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
@@ -107,9 +121,8 @@ void G4AntiKaonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theAntiKaonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
index 5e65db9483..93c648f4cd 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonMinus.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonMinus.cc,v 1.4.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
index b50f3a9e51..2594faa852 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonPlus.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonPlus.cc,v 1.4.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4BMesonZero.cc b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
index c5a2d5c0d4..571839c0fa 100644
--- a/source/particles/hadrons/mesons/src/G4BMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BMesonZero.cc,v 1.4 2000/02/27 05:57:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -93,9 +106,8 @@ void G4BMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theBMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
index 868da1919d..a81827e9ea 100644
--- a/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4BsMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BsMesonZero.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BsMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -92,9 +105,8 @@ void G4BsMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theBsMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
index ee701bb48c..48434e7d7f 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonMinus.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonMinus.cc,v 1.4.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
index e1ce763483..88d6fd28e7 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonPlus.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonPlus.cc,v 1.4.4.2 2001/06/28 20:19:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4DMesonZero.cc b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
index dddfb9f93b..dc10a53dd5 100644
--- a/source/particles/hadrons/mesons/src/G4DMesonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4DMesonZero.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMesonZero.cc,v 1.4 2000/02/27 05:57:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMesonZero.cc,v 1.5.2.1 2001/06/28 19:10:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -92,9 +105,8 @@ void G4DMesonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theDMesonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
index 6c5754f87c..e2b1c90081 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DsMesonMinus.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DsMesonMinus.cc,v 1.4.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
index 918cb7248d..2cf092605b 100644
--- a/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4DsMesonPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DsMesonPlus.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DsMesonPlus.cc,v 1.4.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4Eta.cc b/source/particles/hadrons/mesons/src/G4Eta.cc
index 4edee6d6ab..3d05420348 100644
--- a/source/particles/hadrons/mesons/src/G4Eta.cc
+++ b/source/particles/hadrons/mesons/src/G4Eta.cc
@@ -1,23 +1,36 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Eta.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Eta.cc,v 1.5.2.1 2001/06/28 19:10:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
-// **********************************************************************
 // ------------------------------------------------------------
 
 #include "g4std/fstream"
@@ -114,9 +127,8 @@ void G4Eta::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theEtaLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4EtaPrime.cc b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
index e140a9eadb..e55cec727b 100644
--- a/source/particles/hadrons/mesons/src/G4EtaPrime.cc
+++ b/source/particles/hadrons/mesons/src/G4EtaPrime.cc
@@ -1,21 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EtaPrime.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EtaPrime.cc,v 1.5.2.1 2001/06/28 19:10:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
-// ----------------------------------------------------------------------
+// ----------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, 8 June 1998 Hisaya Kurashige
-// ****************************************************************
 // ----------------------------------------------------------------
 
 #include "g4std/fstream"
@@ -111,9 +124,8 @@ void G4EtaPrime::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theEtaPrimeLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4JPsi.cc b/source/particles/hadrons/mesons/src/G4JPsi.cc
index cc5b6ab522..0041685edf 100644
--- a/source/particles/hadrons/mesons/src/G4JPsi.cc
+++ b/source/particles/hadrons/mesons/src/G4JPsi.cc
@@ -1,20 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4JPsi.cc,v 1.4 2000/02/27 05:57:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4JPsi.cc,v 1.5.2.1 2001/06/28 19:10:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//
 //      Created                 Hisaya Kurashige, 16 June 1997
 // **********************************************************************
 //  Change both methods to get the pointer into non-inlined H.Kurashige 4 Aug. 1998
@@ -96,9 +109,8 @@ void G4JPsi::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theJPsiLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4KaonMinus.cc b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
index bd1914f933..9cf62f30dc 100644
--- a/source/particles/hadrons/mesons/src/G4KaonMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinus.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinus.cc,v 1.4.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
diff --git a/source/particles/hadrons/mesons/src/G4KaonPlus.cc b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
index e2eeabc7a1..617363b033 100644
--- a/source/particles/hadrons/mesons/src/G4KaonPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonPlus.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonPlus.cc,v 1.4.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
diff --git a/source/particles/hadrons/mesons/src/G4KaonZero.cc b/source/particles/hadrons/mesons/src/G4KaonZero.cc
index 7bed68d2f6..a2263a875b 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZero.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZero.cc,v 1.3 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZero.cc,v 1.4.2.1 2001/06/28 19:10:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
@@ -106,9 +120,8 @@ void G4KaonZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theKaonZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
index 942847de87..0f2bd90744 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroLong.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroLong.cc,v 1.4 2000/02/27 05:57:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroLong.cc,v 1.5.2.1 2001/06/28 19:10:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
@@ -116,9 +130,8 @@ void G4KaonZeroLong::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theKaonZeroLongLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
index 09625c5af8..d0cca595d0 100644
--- a/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
+++ b/source/particles/hadrons/mesons/src/G4KaonZeroShort.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroShort.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroShort.cc,v 1.5.2.1 2001/06/28 19:10:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //                              H.Kurashige   7 Jul 96
@@ -110,9 +124,8 @@ void G4KaonZeroShort::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   theKaonZeroShortLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
index fb7744b436..8493161b8b 100644
--- a/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
+++ b/source/particles/hadrons/mesons/src/G4MesonConstructor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MesonConstructor.cc,v 1.3 2000/02/25 11:38:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MesonConstructor.cc,v 1.3.4.1 2001/06/28 19:10:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/hadrons/mesons/src/G4PionMinus.cc b/source/particles/hadrons/mesons/src/G4PionMinus.cc
index 924df58e31..a5e39dacb3 100644
--- a/source/particles/hadrons/mesons/src/G4PionMinus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionMinus.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionMinus.cc,v 1.4.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4PionPlus.cc b/source/particles/hadrons/mesons/src/G4PionPlus.cc
index 57256cf92a..4375956075 100644
--- a/source/particles/hadrons/mesons/src/G4PionPlus.cc
+++ b/source/particles/hadrons/mesons/src/G4PionPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionPlus.cc,v 1.5 2000/06/28 06:54:01 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionPlus.cc,v 1.5.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/hadrons/mesons/src/G4PionZero.cc b/source/particles/hadrons/mesons/src/G4PionZero.cc
index 7ac0532567..d2402f0ae8 100644
--- a/source/particles/hadrons/mesons/src/G4PionZero.cc
+++ b/source/particles/hadrons/mesons/src/G4PionZero.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionZero.cc,v 1.4 2000/02/27 05:57:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionZero.cc,v 1.5.2.1 2001/06/28 19:10:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -114,9 +128,8 @@ void G4PionZero::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = LowestEnergy;
   }
   thePionZeroLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/hadrons/mesons/src/G4VMeson.cc b/source/particles/hadrons/mesons/src/G4VMeson.cc
index c09ab3ee81..30fbb71757 100644
--- a/source/particles/hadrons/mesons/src/G4VMeson.cc
+++ b/source/particles/hadrons/mesons/src/G4VMeson.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMeson.cc,v 1.2 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMeson.cc,v 1.2.4.2 2001/06/28 20:19:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4AntiNeutrinoE.hh b/source/particles/leptons/include/G4AntiNeutrinoE.hh
index a7845754bf..92f8ad243b 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoE.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoE.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoE.hh,v 1.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoE.hh,v 1.3.4.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4AntiNeutrinoMu.hh b/source/particles/leptons/include/G4AntiNeutrinoMu.hh
index 144c2a5851..3c4715ad6e 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoMu.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoMu.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoMu.hh,v 1.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoMu.hh,v 1.3.4.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4AntiNeutrinoTau.hh b/source/particles/leptons/include/G4AntiNeutrinoTau.hh
index dd24ad3ba3..cc149cfe64 100644
--- a/source/particles/leptons/include/G4AntiNeutrinoTau.hh
+++ b/source/particles/leptons/include/G4AntiNeutrinoTau.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoTau.hh,v 1.3 1999/12/15 14:51:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoTau.hh,v 1.3.4.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4Electron.hh b/source/particles/leptons/include/G4Electron.hh
index cac4e48022..89af29e7a0 100644
--- a/source/particles/leptons/include/G4Electron.hh
+++ b/source/particles/leptons/include/G4Electron.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Electron.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Electron.hh,v 1.4.2.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4LeptonConstructor.hh b/source/particles/leptons/include/G4LeptonConstructor.hh
index 682123b389..0c80e2b9a8 100644
--- a/source/particles/leptons/include/G4LeptonConstructor.hh
+++ b/source/particles/leptons/include/G4LeptonConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LeptonConstructor.hh,v 1.2 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LeptonConstructor.hh,v 1.2.4.1 2001/06/28 19:10:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/include/G4MuonMinus.hh b/source/particles/leptons/include/G4MuonMinus.hh
index ae421ec61e..64d76aa281 100644
--- a/source/particles/leptons/include/G4MuonMinus.hh
+++ b/source/particles/leptons/include/G4MuonMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonMinus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonMinus.hh,v 1.4.2.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4MuonPlus.hh b/source/particles/leptons/include/G4MuonPlus.hh
index 1b5b1bb5f0..56e8586c8a 100644
--- a/source/particles/leptons/include/G4MuonPlus.hh
+++ b/source/particles/leptons/include/G4MuonPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonPlus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonPlus.hh,v 1.4.2.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4NeutrinoE.hh b/source/particles/leptons/include/G4NeutrinoE.hh
index dcafe55780..0f16f462b3 100644
--- a/source/particles/leptons/include/G4NeutrinoE.hh
+++ b/source/particles/leptons/include/G4NeutrinoE.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoE.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoE.hh,v 1.3.4.2 2001/06/28 20:19:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4NeutrinoMu.hh b/source/particles/leptons/include/G4NeutrinoMu.hh
index 69e234250a..ae77eb391e 100644
--- a/source/particles/leptons/include/G4NeutrinoMu.hh
+++ b/source/particles/leptons/include/G4NeutrinoMu.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoMu.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoMu.hh,v 1.3.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4NeutrinoTau.hh b/source/particles/leptons/include/G4NeutrinoTau.hh
index fee175a47b..e10e7280f3 100644
--- a/source/particles/leptons/include/G4NeutrinoTau.hh
+++ b/source/particles/leptons/include/G4NeutrinoTau.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoTau.hh,v 1.3 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoTau.hh,v 1.3.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4Positron.hh b/source/particles/leptons/include/G4Positron.hh
index 1e5f6ad5aa..57ee0b03a6 100644
--- a/source/particles/leptons/include/G4Positron.hh
+++ b/source/particles/leptons/include/G4Positron.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Positron.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Positron.hh,v 1.4.2.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4TauMinus.hh b/source/particles/leptons/include/G4TauMinus.hh
index 162d07a3bb..a1ee1e60bd 100644
--- a/source/particles/leptons/include/G4TauMinus.hh
+++ b/source/particles/leptons/include/G4TauMinus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TauMinus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TauMinus.hh,v 1.4.2.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4TauPlus.hh b/source/particles/leptons/include/G4TauPlus.hh
index d47dec90af..ad45faacb1 100644
--- a/source/particles/leptons/include/G4TauPlus.hh
+++ b/source/particles/leptons/include/G4TauPlus.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TauPlus.hh,v 1.4 2001/03/12 05:47:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TauPlus.hh,v 1.4.2.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 // ****************************************************************
diff --git a/source/particles/leptons/include/G4VLepton.hh b/source/particles/leptons/include/G4VLepton.hh
index bd9fa7eee1..4149e3901d 100644
--- a/source/particles/leptons/include/G4VLepton.hh
+++ b/source/particles/leptons/include/G4VLepton.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VLepton.hh,v 1.2 1999/12/15 14:51:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VLepton.hh,v 1.2.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //  Revised, Hisaya Kurashige, 15 Dec 1996
diff --git a/source/particles/leptons/src/G4AntiNeutrinoE.cc b/source/particles/leptons/src/G4AntiNeutrinoE.cc
index 0519ee5ac3..b53edb2261 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoE.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoE.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoE.cc,v 1.3 2000/02/27 06:23:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoE.cc,v 1.4.2.1 2001/06/28 19:11:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo        by H.Kurashige,7  July 1996
 // **********************************************************************
@@ -85,9 +99,8 @@ void G4AntiNeutrinoE::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theAntiNeutrinoELengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4AntiNeutrinoMu.cc b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
index 8ee740112e..eb4517d523 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoMu.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoMu.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoMu.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoMu.cc,v 1.4.2.1 2001/06/28 19:11:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,7  July 1996
@@ -88,9 +102,8 @@ void G4AntiNeutrinoMu::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theAntiNeutrinoMuLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4AntiNeutrinoTau.cc b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
index 9f7fbde9c6..d4afd24b06 100644
--- a/source/particles/leptons/src/G4AntiNeutrinoTau.cc
+++ b/source/particles/leptons/src/G4AntiNeutrinoTau.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutrinoTau.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutrinoTau.cc,v 1.4.2.1 2001/06/28 19:11:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,7  July 1996
@@ -88,9 +102,8 @@ void G4AntiNeutrinoTau::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theAntiNeutrinoTauLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4Electron.cc b/source/particles/leptons/src/G4Electron.cc
index 8d8059f160..8d9d4303d1 100644
--- a/source/particles/leptons/src/G4Electron.cc
+++ b/source/particles/leptons/src/G4Electron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Electron.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Electron.cc,v 1.3.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/leptons/src/G4LeptonConstructor.cc b/source/particles/leptons/src/G4LeptonConstructor.cc
index 447cd350ef..dd33530ef2 100644
--- a/source/particles/leptons/src/G4LeptonConstructor.cc
+++ b/source/particles/leptons/src/G4LeptonConstructor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LeptonConstructor.cc,v 1.2 1999/12/15 14:51:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LeptonConstructor.cc,v 1.2.4.1 2001/06/28 19:11:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/leptons/src/G4MuonMinus.cc b/source/particles/leptons/src/G4MuonMinus.cc
index 0140a6afda..447ec17c69 100644
--- a/source/particles/leptons/src/G4MuonMinus.cc
+++ b/source/particles/leptons/src/G4MuonMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonMinus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonMinus.cc,v 1.4.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/leptons/src/G4MuonPlus.cc b/source/particles/leptons/src/G4MuonPlus.cc
index 7d9245c998..eef3d6584d 100644
--- a/source/particles/leptons/src/G4MuonPlus.cc
+++ b/source/particles/leptons/src/G4MuonPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonPlus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonPlus.cc,v 1.4.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/leptons/src/G4NeutrinoE.cc b/source/particles/leptons/src/G4NeutrinoE.cc
index dc1ecafc8a..c4e208275e 100644
--- a/source/particles/leptons/src/G4NeutrinoE.cc
+++ b/source/particles/leptons/src/G4NeutrinoE.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoE.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoE.cc,v 1.4.2.1 2001/06/28 19:11:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,7  July 1996
@@ -86,9 +100,8 @@ void G4NeutrinoE::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theNeutrinoELengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4NeutrinoMu.cc b/source/particles/leptons/src/G4NeutrinoMu.cc
index 796e86e1f1..e0bbae44f9 100644
--- a/source/particles/leptons/src/G4NeutrinoMu.cc
+++ b/source/particles/leptons/src/G4NeutrinoMu.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoMu.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoMu.cc,v 1.4.2.1 2001/06/28 19:11:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,7  July 1996
@@ -86,9 +100,8 @@ void G4NeutrinoMu::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theNeutrinoMuLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4NeutrinoTau.cc b/source/particles/leptons/src/G4NeutrinoTau.cc
index 563c288216..be2042b4c4 100644
--- a/source/particles/leptons/src/G4NeutrinoTau.cc
+++ b/source/particles/leptons/src/G4NeutrinoTau.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutrinoTau.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutrinoTau.cc,v 1.4.2.1 2001/06/28 19:11:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo 
 //      by             H.Kurashige,7  July 1996
@@ -84,9 +98,8 @@ void G4NeutrinoTau::SetCuts(G4double aCut)
 
   // Build range vector for every material, convert cut into energy-cut,
   // fill theKineticEnergyCuts and delete the range vector
-  for (G4int J=0; J<materialTable->length(); J++)
+  for (size_t J=0; J<materialTable->length(); J++)
   {
-    G4Material* aMaterial = (*materialTable)[J];
     theKineticEnergyCuts[J] = 0.0*keV;
   }
   theNeutrinoTauLengthCut = theCutInMaxInteractionLength;  
diff --git a/source/particles/leptons/src/G4Positron.cc b/source/particles/leptons/src/G4Positron.cc
index 8d2a3a3f3d..ab2594bbe4 100644
--- a/source/particles/leptons/src/G4Positron.cc
+++ b/source/particles/leptons/src/G4Positron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Positron.cc,v 1.3 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Positron.cc,v 1.3.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/leptons/src/G4TauMinus.cc b/source/particles/leptons/src/G4TauMinus.cc
index 7dcb0ff9f5..081dd53dc0 100644
--- a/source/particles/leptons/src/G4TauMinus.cc
+++ b/source/particles/leptons/src/G4TauMinus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TauMinus.cc,v 1.4 2000/02/27 06:23:41 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TauMinus.cc,v 1.4.4.2 2001/06/28 20:19:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //      7 July 1996                   H.Kurashige 
diff --git a/source/particles/leptons/src/G4TauPlus.cc b/source/particles/leptons/src/G4TauPlus.cc
index 04502e2481..19d7dab21e 100644
--- a/source/particles/leptons/src/G4TauPlus.cc
+++ b/source/particles/leptons/src/G4TauPlus.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TauPlus.cc,v 1.4 2000/02/27 06:23:42 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TauPlus.cc,v 1.4.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 //      7 July 1996                   H.Kurashige 
diff --git a/source/particles/leptons/src/G4VLepton.cc b/source/particles/leptons/src/G4VLepton.cc
index 352d4351dc..d48c9c2882 100644
--- a/source/particles/leptons/src/G4VLepton.cc
+++ b/source/particles/leptons/src/G4VLepton.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VLepton.cc,v 1.2 1999/12/15 14:51:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VLepton.cc,v 1.2.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/particles/management/include/G4DalitzDecayChannel.hh b/source/particles/management/include/G4DalitzDecayChannel.hh
index fbfa4a90a0..36632f563c 100644
--- a/source/particles/management/include/G4DalitzDecayChannel.hh
+++ b/source/particles/management/include/G4DalitzDecayChannel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DalitzDecayChannel.hh,v 1.3 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DalitzDecayChannel.hh,v 1.3.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May 1997 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DecayProducts.hh b/source/particles/management/include/G4DecayProducts.hh
index 465975be61..138a74cce7 100644
--- a/source/particles/management/include/G4DecayProducts.hh
+++ b/source/particles/management/include/G4DecayProducts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayProducts.hh,v 1.6 2000/10/20 11:34:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayProducts.hh,v 1.7.2.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      12 Dec 1997 H.Kurashige
 // ------------------------------------------------------------
@@ -81,8 +95,8 @@ class G4DecayProducts
     enum {MaxNumberOfProducts = 64};
 
   private: 
-    G4DynamicParticle*            theParentParticle;
     G4int                         numberOfProducts;
+    G4DynamicParticle*            theParentParticle;
     G4DynamicParticle*            theProductVector[MaxNumberOfProducts];
 
 };
diff --git a/source/particles/management/include/G4DecayTable.hh b/source/particles/management/include/G4DecayTable.hh
index 036ec8dbbc..c929217fdc 100644
--- a/source/particles/management/include/G4DecayTable.hh
+++ b/source/particles/management/include/G4DecayTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayTable.hh,v 1.5 2000/02/25 07:36:14 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayTable.hh,v 1.6.2.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      7 July 1996 H.Kurashige
 //
@@ -97,7 +111,7 @@ inline
  G4VDecayChannel* G4DecayTable::GetDecayChannel(G4int index) const
 {
   G4VDecayChannel* selectedChannel = 0;
-  if ( (index>=0) && (index<channels->size()) ){
+  if ( (index>=0) && (index<G4int(channels->size())) ){
     selectedChannel = (*channels)[index];
   }
   return selectedChannel;
diff --git a/source/particles/management/include/G4DecayTableMessenger.hh b/source/particles/management/include/G4DecayTableMessenger.hh
index e1b039cf02..6afd1ccd5e 100644
--- a/source/particles/management/include/G4DecayTableMessenger.hh
+++ b/source/particles/management/include/G4DecayTableMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayTableMessenger.hh,v 1.5 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayTableMessenger.hh,v 1.5.4.1 2001/06/28 19:11:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticle.hh b/source/particles/management/include/G4DynamicParticle.hh
index 0f2cc9c096..516553a19d 100644
--- a/source/particles/management/include/G4DynamicParticle.hh
+++ b/source/particles/management/include/G4DynamicParticle.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DynamicParticle.hh,v 1.9 2001/01/18 12:46:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DynamicParticle.hh,v 1.10.2.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //      ---------------- G4DynamicParticle  ----------------
@@ -213,13 +227,3 @@ class G4DynamicParticle
 #include "G4DynamicParticle.icc"
 
 #endif
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/management/include/G4DynamicParticle.icc b/source/particles/management/include/G4DynamicParticle.icc
index 347bb7d85f..0d886de9c1 100644
--- a/source/particles/management/include/G4DynamicParticle.icc
+++ b/source/particles/management/include/G4DynamicParticle.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DynamicParticle.icc,v 1.7 2001/03/05 08:32:16 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DynamicParticle.icc,v 1.7.2.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //                             17 AUg. 1999   H.Kurashige  
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4DynamicParticleFastVector.hh b/source/particles/management/include/G4DynamicParticleFastVector.hh
index 9f1f57755a..4b6a1932d3 100644
--- a/source/particles/management/include/G4DynamicParticleFastVector.hh
+++ b/source/particles/management/include/G4DynamicParticleFastVector.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DynamicParticleFastVector.hh,v 1.2 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DynamicParticleFastVector.hh,v 1.2.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ElectronOccupancy.hh b/source/particles/management/include/G4ElectronOccupancy.hh
index 9284b9ef7d..0fc7c63f8f 100644
--- a/source/particles/management/include/G4ElectronOccupancy.hh
+++ b/source/particles/management/include/G4ElectronOccupancy.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ElectronOccupancy.hh,v 1.4 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ElectronOccupancy.hh,v 1.4.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 17 Aug 1999
 // ----------------------------------------------------------------
diff --git a/source/particles/management/include/G4IonTable.hh b/source/particles/management/include/G4IonTable.hh
index 6e50666969..b8bc92639e 100644
--- a/source/particles/management/include/G4IonTable.hh
+++ b/source/particles/management/include/G4IonTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonTable.hh,v 1.17 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonTable.hh,v 1.17.4.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, 
 //      based on object model of June 27, 98 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4Ions.hh b/source/particles/management/include/G4Ions.hh
index 093db79acd..d507c35aea 100644
--- a/source/particles/management/include/G4Ions.hh
+++ b/source/particles/management/include/G4Ions.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ions.hh,v 1.6 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ions.hh,v 1.7.2.2 2001/06/28 20:19:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
@@ -86,18 +100,6 @@ inline
   return this;
 }
 
-inline
- G4int G4Ions::GetAtomicNumber() const 
-{
-  return int(GetPDGCharge()/eplus); 
-}
-
-inline
- G4int G4Ions::GetAtomicMass() const 
-{
-  return GetBaryonNumber();
-}
-
 inline
  G4double G4Ions::GetExcitationEnergy() const 
 {
@@ -119,9 +121,3 @@ inline
 }
 
 #endif
-
-
-
-
-
-
diff --git a/source/particles/management/include/G4IsotopeProperty.hh b/source/particles/management/include/G4IsotopeProperty.hh
index 523cf462bb..4a75789863 100644
--- a/source/particles/management/include/G4IsotopeProperty.hh
+++ b/source/particles/management/include/G4IsotopeProperty.hh
@@ -1,19 +1,33 @@
- // This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IsotopeProperty.hh,v 1.2 1999/10/28 23:24:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IsotopeProperty.hh,v 1.2.10.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 // ------------------------------------------------------------
 //      New design using G4VIsotopeTable          5 Oct. 99 H.Kurashige
 
diff --git a/source/particles/management/include/G4KL3DecayChannel.hh b/source/particles/management/include/G4KL3DecayChannel.hh
index 49e7b3ee46..7c1586789c 100644
--- a/source/particles/management/include/G4KL3DecayChannel.hh
+++ b/source/particles/management/include/G4KL3DecayChannel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KL3DecayChannel.hh,v 1.3 1999/12/15 14:51:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KL3DecayChannel.hh,v 1.3.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //       7 June 1997 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4MuonDecayChannel.hh b/source/particles/management/include/G4MuonDecayChannel.hh
index e618c2c3fb..2befa79636 100644
--- a/source/particles/management/include/G4MuonDecayChannel.hh
+++ b/source/particles/management/include/G4MuonDecayChannel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonDecayChannel.hh,v 1.4 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonDecayChannel.hh,v 1.4.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May 1997 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4NucleiProperties.hh b/source/particles/management/include/G4NucleiProperties.hh
index 152f8a5a73..07d6fded16 100644
--- a/source/particles/management/include/G4NucleiProperties.hh
+++ b/source/particles/management/include/G4NucleiProperties.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NucleiProperties.hh,v 1.10 2000/02/04 03:05:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NucleiProperties.hh,v 1.10.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 // ------------------------------------------------------------
 // Hadronic Process: Nuclear De-excitations by V. Lara (Oct 1998)
 // Migrate into particles category by H.Kurashige (17 Nov. 98)
diff --git a/source/particles/management/include/G4NucleiPropertiesTable.hh b/source/particles/management/include/G4NucleiPropertiesTable.hh
index 332daeb7a9..e3822771a6 100644
--- a/source/particles/management/include/G4NucleiPropertiesTable.hh
+++ b/source/particles/management/include/G4NucleiPropertiesTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NucleiPropertiesTable.hh,v 1.8 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NucleiPropertiesTable.hh,v 1.8.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4NucleiPropertiesTable.cc 
 //
diff --git a/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh b/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh
index 0dd9b0c6ad..9918800df3 100644
--- a/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh
+++ b/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh
@@ -1,16 +1,44 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4NucleiPropertiesTheoreticalTable.hh,v 1.3.2.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//
+// ----------------------------------------------------------------
+// Class Description
+//   Encapsulates Data from W.D. Myers, W.J. Swiatecki, P. Moller
+//   and J.R. Nix, 1. Jan. 1995.
+//   Atomic Mass Excess.
 
-#include "globals.hh"
-
-
+// ----------------------------------------------------------------
 #ifndef G4NucleiPropertiesTheoreticalTable_h
 #define G4NucleiPropertiesTheoreticalTable_h 1
 
-// Class Description
-//	Encapsulates Data from W.D. Myers, W.J. Swiatecki, P. Moller and J.R. Nix, 
-//	1. Jan. 1995.
-//	Atomic Mass Excess
-// 
-
+#include "globals.hh"
 
 class G4NucleiPropertiesTheoreticalTable 
 {
diff --git a/source/particles/management/include/G4PDGCodeChecker.hh b/source/particles/management/include/G4PDGCodeChecker.hh
index e2d6dd8b06..449b4b8403 100644
--- a/source/particles/management/include/G4PDGCodeChecker.hh
+++ b/source/particles/management/include/G4PDGCodeChecker.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PDGCodeChecker.hh,v 1.5 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PDGCodeChecker.hh,v 1.5.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige,  17 Aug. 1999
 //
diff --git a/source/particles/management/include/G4ParticleDefinition.hh b/source/particles/management/include/G4ParticleDefinition.hh
index 053933cdea..a9d5d4a17e 100644
--- a/source/particles/management/include/G4ParticleDefinition.hh
+++ b/source/particles/management/include/G4ParticleDefinition.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleDefinition.hh,v 1.8 2001/03/12 05:58:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleDefinition.hh,v 1.10.2.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // ---------------- G4ParticleDefinition ----------------
@@ -120,8 +134,8 @@ class G4ParticleDefinition
       G4int    GetPDGiSpin() const { return thePDGiSpin; }
       G4int    GetPDGiParity() const { return thePDGiParity; }
       G4int    GetPDGiConjugation() const { return thePDGiConjugation; }
-      G4double GetPDGIsospin() const { return thePDGiIsospin; }
-      G4double GetPDGIsospin3() const { return thePDGiIsospin3; }
+      G4double GetPDGIsospin() const { return thePDGIsospin; }
+      G4double GetPDGIsospin3() const { return thePDGIsospin3; }
       G4int    GetPDGiIsospin() const { return thePDGiIsospin; }
       G4int    GetPDGiIsospin3() const { return thePDGiIsospin3; }
       G4int    GetPDGiGParity() const { return thePDGiGParity; }
@@ -236,6 +250,9 @@ class G4ParticleDefinition
       G4int thePDGiConjugation;
       //  This charge conjugation quantum number in units of 1.
 
+      G4int thePDGiGParity;
+      //  The value of the G-parity quantum number.
+
       G4int thePDGiIsospin;
       G4int thePDGiIsospin3;
       //  The isospin and its 3rd-component in units of 1/2.
@@ -243,9 +260,6 @@ class G4ParticleDefinition
       G4double thePDGIsospin3;
       //  The isospin quantum number in units of 1.
 
-      G4int thePDGiGParity;
-      //  The value of the G-parity quantum number.
-
       G4int theLeptonNumber;
       //  The lepton quantum number.
 
@@ -416,24 +430,3 @@ inline void             G4ParticleDefinition::SetAntiPDGEncoding(G4int aEncoding
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/management/include/G4ParticleMessenger.hh b/source/particles/management/include/G4ParticleMessenger.hh
index 98d77327b0..e0c704ea3d 100644
--- a/source/particles/management/include/G4ParticleMessenger.hh
+++ b/source/particles/management/include/G4ParticleMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleMessenger.hh,v 1.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleMessenger.hh,v 1.4.4.1 2001/06/28 19:11:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleMomentum.hh b/source/particles/management/include/G4ParticleMomentum.hh
index 732f45f9d8..c7fe0f65ac 100644
--- a/source/particles/management/include/G4ParticleMomentum.hh
+++ b/source/particles/management/include/G4ParticleMomentum.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleMomentum.hh,v 1.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleMomentum.hh,v 1.4.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticlePropertyMessenger.hh b/source/particles/management/include/G4ParticlePropertyMessenger.hh
index ab7e8162a4..e1d11701fa 100644
--- a/source/particles/management/include/G4ParticlePropertyMessenger.hh
+++ b/source/particles/management/include/G4ParticlePropertyMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticlePropertyMessenger.hh,v 1.4 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticlePropertyMessenger.hh,v 1.4.4.1 2001/06/28 19:11:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.hh b/source/particles/management/include/G4ParticleTable.hh
index 86520b0f0b..a1f87d5ce5 100644
--- a/source/particles/management/include/G4ParticleTable.hh
+++ b/source/particles/management/include/G4ParticleTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleTable.hh,v 1.14 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleTable.hh,v 1.14.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	27 June 1996, H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTable.icc b/source/particles/management/include/G4ParticleTable.icc
index 31fdbc6330..3374722576 100644
--- a/source/particles/management/include/G4ParticleTable.icc
+++ b/source/particles/management/include/G4ParticleTable.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleTable.icc,v 1.7 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleTable.icc,v 1.7.4.1 2001/06/28 19:11:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleTableIterator.hh b/source/particles/management/include/G4ParticleTableIterator.hh
index 4e9928f095..3d4ac7f8b3 100644
--- a/source/particles/management/include/G4ParticleTableIterator.hh
+++ b/source/particles/management/include/G4ParticleTableIterator.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleTableIterator.hh,v 1.4 2000/10/20 11:34:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleTableIterator.hh,v 1.4.4.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	28 Oct 1999, H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4ParticleWithCuts.hh b/source/particles/management/include/G4ParticleWithCuts.hh
index 77c2e06902..b51f558565 100644
--- a/source/particles/management/include/G4ParticleWithCuts.hh
+++ b/source/particles/management/include/G4ParticleWithCuts.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleWithCuts.hh,v 1.6 2001/03/12 05:58:21 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleWithCuts.hh,v 1.7.2.2 2001/06/28 20:19:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 21 Oct 1996
 //      Calculation of Range Table is based on 
diff --git a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
index e10fa394df..4d0acd15dd 100644
--- a/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
+++ b/source/particles/management/include/G4PhaseSpaceDecayChannel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhaseSpaceDecayChannel.hh,v 1.3 1999/12/15 14:51:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhaseSpaceDecayChannel.hh,v 1.3.4.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      27 July 1996 H.Kurashige
 //      30 May 1997 H.Kurashige
diff --git a/source/particles/management/include/G4ShortLivedTable.hh b/source/particles/management/include/G4ShortLivedTable.hh
index d050271b4b..7756805b2a 100644
--- a/source/particles/management/include/G4ShortLivedTable.hh
+++ b/source/particles/management/include/G4ShortLivedTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShortLivedTable.hh,v 1.9 2000/02/25 07:36:15 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShortLivedTable.hh,v 1.9.4.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, 
 //      based on object model of June 27, 98 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/include/G4VDecayChannel.hh b/source/particles/management/include/G4VDecayChannel.hh
index 2a67e56bb1..48f8302c7d 100644
--- a/source/particles/management/include/G4VDecayChannel.hh
+++ b/source/particles/management/include/G4VDecayChannel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDecayChannel.hh,v 1.7 2000/03/23 16:43:41 hweber Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDecayChannel.hh,v 1.8.2.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      27 July 1996 H.Kurashige
 //      30 May  1997 H.Kurashige
diff --git a/source/particles/management/include/G4VIsotopeTable.hh b/source/particles/management/include/G4VIsotopeTable.hh
index 69a48f58c0..07992548b9 100644
--- a/source/particles/management/include/G4VIsotopeTable.hh
+++ b/source/particles/management/include/G4VIsotopeTable.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIsotopeTable.hh,v 1.3 2000/01/26 10:52:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIsotopeTable.hh,v 1.4.2.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //----------------------------------------------------------
 //      New design                               5 Oct. 99 H.Kurashige
 #ifndef G4VIsotopeTable_h
@@ -60,15 +74,14 @@ class G4VIsotopeTable
   void                 SetVerboseLevel(G4int level);  
 
  private:
-  G4int                verboseLevel;
   G4String             fName;
+  G4int                verboseLevel;
 };
 
 inline
- G4VIsotopeTable::G4VIsotopeTable(const G4String& name):
-                 fName(name),verboseLevel(0)
+ G4VIsotopeTable::G4VIsotopeTable(const G4String& name)
+  : fName(name), verboseLevel(0)
 {
-
 }
 
 inline
@@ -89,13 +102,3 @@ inline
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/management/src/G4DalitzDecayChannel.cc b/source/particles/management/src/G4DalitzDecayChannel.cc
index da220b7661..dcbe5eb811 100644
--- a/source/particles/management/src/G4DalitzDecayChannel.cc
+++ b/source/particles/management/src/G4DalitzDecayChannel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DalitzDecayChannel.cc,v 1.4 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DalitzDecayChannel.cc,v 1.4.4.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May 1997 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4DecayProducts.cc b/source/particles/management/src/G4DecayProducts.cc
index d87d86ed66..6dcbf97447 100644
--- a/source/particles/management/src/G4DecayProducts.cc
+++ b/source/particles/management/src/G4DecayProducts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayProducts.cc,v 1.6 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayProducts.cc,v 1.7.2.1 2001/06/28 19:11:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
-//      GEANT 4 class header file
+//      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      10 July 1996 H.Kurashige
 //      21 Oct  1996 H.Kurashige
@@ -112,7 +126,8 @@ G4int G4DecayProducts::PushProducts(G4DynamicParticle *aParticle)
    } else {
 #ifdef G4VERBOSE
      G4cout << "G4DecayProducts::PushProducts ";
-     G4cout << " exceeds MaxNumberOfProducts(=" <<MaxNumberOfProducts << ")";
+     G4cout << " exceeds MaxNumberOfProducts(="
+            << G4int(MaxNumberOfProducts) << ")";
      G4cout << G4endl;
 #endif
    }
@@ -204,7 +219,6 @@ G4bool G4DecayProducts::IsChecked() const
   G4bool returnValue = true;
   // check parent 
   //   energy/momentum
-  G4double   parent_mass = theParentParticle->GetMass();
   G4double   parent_energy  = theParentParticle->GetTotalEnergy();
   G4ThreeVector direction = theParentParticle->GetMomentumDirection();
   G4ThreeVector parent_momentum = direction*(theParentParticle->GetTotalMomentum());
diff --git a/source/particles/management/src/G4DecayTable.cc b/source/particles/management/src/G4DecayTable.cc
index bf424793ee..5a0470df46 100644
--- a/source/particles/management/src/G4DecayTable.cc
+++ b/source/particles/management/src/G4DecayTable.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayTable.cc,v 1.6 2000/02/25 07:36:23 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayTable.cc,v 1.6.4.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      27 July 1996 H.Kurashige
 // ----------------------------------------
diff --git a/source/particles/management/src/G4DecayTableMessenger.cc b/source/particles/management/src/G4DecayTableMessenger.cc
index ced1739f18..528c9f060f 100644
--- a/source/particles/management/src/G4DecayTableMessenger.cc
+++ b/source/particles/management/src/G4DecayTableMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DecayTableMessenger.cc,v 1.3 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DecayTableMessenger.cc,v 1.3.4.1 2001/06/28 19:11:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4DynamicParticle.cc b/source/particles/management/src/G4DynamicParticle.cc
index 6159dd3378..8aba49b62b 100644
--- a/source/particles/management/src/G4DynamicParticle.cc
+++ b/source/particles/management/src/G4DynamicParticle.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DynamicParticle.cc,v 1.9 2001/03/05 08:32:38 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DynamicParticle.cc,v 1.10.2.1 2001/06/28 19:11:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //      ---------------- G4DynamicParticle  ----------------
@@ -51,8 +65,8 @@ static const G4double EnergyMomentumRelationAllowance = keV;
 
 ////////////////////
 G4DynamicParticle::G4DynamicParticle():
-		   theParticleDefinition(0),
 		   theMomentumDirection(),
+		   theParticleDefinition(0),
 		   theKineticEnergy(0.0),
  		   theProperTime(0.0),
                    thePreAssignedDecayProducts(0),
@@ -70,8 +84,8 @@ G4DynamicParticle::G4DynamicParticle():
 G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
 				     const G4ThreeVector& aMomentumDirection,
 				     G4double aKineticEnergy):
-		   theParticleDefinition(aParticleDefinition),
 		   theMomentumDirection(aMomentumDirection),
+		   theParticleDefinition(aParticleDefinition),
 		   theKineticEnergy(aKineticEnergy),
  		   theProperTime(0.0),
                    thePreAssignedDecayProducts(0),
@@ -118,8 +132,8 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
 				     const G4LorentzVector   &aParticleMomentum):
 		   theParticleDefinition(aParticleDefinition),
  		   theProperTime(0.0),
-                   thePreAssignedDecayTime(-1.0),
                    thePreAssignedDecayProducts(0),
+                   thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {
    // set dynamic charge/mass
@@ -155,8 +169,8 @@ G4DynamicParticle::G4DynamicParticle(G4ParticleDefinition * aParticleDefinition,
                                      G4double totalEnergy,  
 				     const G4ThreeVector &aParticleMomentum):
                    theParticleDefinition(aParticleDefinition),
-                   thePreAssignedDecayProducts(0),
                    theProperTime(0.0),
+                   thePreAssignedDecayProducts(0),
                    thePreAssignedDecayTime(-1.0),
 		   verboseLevel(1)
 {
@@ -405,7 +419,3 @@ G4double  G4DynamicParticle::GetElectronMass() const
 
   return electronMass;
 }
-
-
-
-
diff --git a/source/particles/management/src/G4ElectronOccupancy.cc b/source/particles/management/src/G4ElectronOccupancy.cc
index 0d4f3992ee..db1f19397f 100644
--- a/source/particles/management/src/G4ElectronOccupancy.cc
+++ b/source/particles/management/src/G4ElectronOccupancy.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ElectronOccupancy.cc,v 1.5 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ElectronOccupancy.cc,v 1.5.4.2 2001/06/28 20:19:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 17 Aug 1999
 // ----------------------------------------------------------------
diff --git a/source/particles/management/src/G4IonTable.cc b/source/particles/management/src/G4IonTable.cc
index 04dc74a2ec..11f405fa67 100644
--- a/source/particles/management/src/G4IonTable.cc
+++ b/source/particles/management/src/G4IonTable.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IonTable.cc,v 1.26 2000/09/14 10:00:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IonTable.cc,v 1.28.2.2 2001/06/28 20:19:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD Group
 //	History: first implementation, based on object model of
 //	27 June 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -25,6 +39,7 @@
 //          -----
 //      Modified GetIon methods         17 Aug. 99 H.Kurashige
 //      New design using G4VIsotopeTable          5 Oct. 99 H.Kurashige
+//      Modified Element Name for Z>103  06 Apr. 01 H.Kurashige
 
 
 #include "G4IonTable.hh"
@@ -204,7 +219,7 @@ G4ParticleDefinition* G4IonTable::FindIon(G4int Z, G4int A, G4double E, G4int J)
   }
   // Search ions with A, Z ,E
   //  !! J is moitted now !!
-  G4ParticleDefinition* ion;
+  G4ParticleDefinition* ion=0;
   G4bool isFound = false;
 
   // -- loop over all particles in Ion table
@@ -220,7 +235,7 @@ G4ParticleDefinition* G4IonTable::FindIon(G4int Z, G4int A, G4double E, G4int J)
     G4double anExcitaionEnergy =0.0;
 
     if ( IsLightIon(ion) ) {
-      anAtomicNumber = int(ion->GetPDGCharge()/eplus);
+      anAtomicNumber = G4int(ion->GetPDGCharge()/eplus);
       anAtomicMass = ion->GetBaryonNumber();
       anExcitaionEnergy = 0.0;
 
@@ -300,7 +315,6 @@ G4ParticleDefinition* G4IonTable::GetLightIon(G4int Z, G4int A) const
   // returns pointer to pre-defined ions 
 
   G4ParticleDefinition* ion=0;
-  G4double mass;
   if ( (Z<=2) ) {
     if ( (Z==1)&&(A==1) ) {
       ion = G4ParticleTable::GetParticleTable()->FindParticle("proton"); // proton 
@@ -429,7 +443,7 @@ const G4String G4IonTable::elementName[] = {
                    "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", 
   "Fr", "Ra", 
               "Ac", "Th", "Pa",  "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr",
-              "Db", "Jl", "Rf", "Bh", "Hn", "Mt", "Xa"
+              "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Xa"
   
 };
 
diff --git a/source/particles/management/src/G4Ions.cc b/source/particles/management/src/G4Ions.cc
index 9ff7b30477..b880b933f5 100644
--- a/source/particles/management/src/G4Ions.cc
+++ b/source/particles/management/src/G4Ions.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Ions.cc,v 1.4 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Ions.cc,v 1.5.2.1 2001/06/28 19:11:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
@@ -45,8 +59,17 @@ G4Ions::G4Ions(
    theExcitationEnergy = 0.0;
 }
 
-
 G4Ions* G4Ions::IonsDefinition()
 {
   return this;
 }
+
+G4int G4Ions::GetAtomicNumber() const 
+{
+  return G4int(GetPDGCharge()/eplus); 
+}
+
+G4int G4Ions::GetAtomicMass() const 
+{
+  return GetBaryonNumber();
+}
diff --git a/source/particles/management/src/G4IsotopeProperty.cc b/source/particles/management/src/G4IsotopeProperty.cc
index fdaac25ae2..bd33a99afb 100644
--- a/source/particles/management/src/G4IsotopeProperty.cc
+++ b/source/particles/management/src/G4IsotopeProperty.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IsotopeProperty.cc,v 1.2 1999/12/15 14:51:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IsotopeProperty.cc,v 1.2.4.2 2001/06/28 20:19:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 // **********************************************************************
 //      New design using G4VIsotopeTable          5 Oct. 99 H.Kurashige
 
diff --git a/source/particles/management/src/G4KL3DecayChannel.cc b/source/particles/management/src/G4KL3DecayChannel.cc
index 74fe74f040..eb82e44f0b 100644
--- a/source/particles/management/src/G4KL3DecayChannel.cc
+++ b/source/particles/management/src/G4KL3DecayChannel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KL3DecayChannel.cc,v 1.4 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KL3DecayChannel.cc,v 1.4.4.2 2001/06/28 20:19:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May 1997 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4MuonDecayChannel.cc b/source/particles/management/src/G4MuonDecayChannel.cc
index bcabad142d..703268adb3 100644
--- a/source/particles/management/src/G4MuonDecayChannel.cc
+++ b/source/particles/management/src/G4MuonDecayChannel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonDecayChannel.cc,v 1.7 2001/02/28 07:29:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonDecayChannel.cc,v 1.8.2.2 2001/06/28 20:19:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      30 May  1997 H.Kurashige
 //
@@ -95,7 +109,6 @@ G4DecayProducts *G4MuonDecayChannel::DecayIt(G4double)
 
   // calculate daughter momentum
   G4double daughtermomentum[3];
-  G4double momentumsum = 0.0;
   G4double energy;
   // calcurate electron energy
   G4double xmax = (1.0+daughtermass[0]*daughtermass[0]/parentmass/parentmass);
diff --git a/source/particles/management/src/G4NucleiProperties.cc b/source/particles/management/src/G4NucleiProperties.cc
index d627144f47..a1b8f53c35 100644
--- a/source/particles/management/src/G4NucleiProperties.cc
+++ b/source/particles/management/src/G4NucleiProperties.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NucleiProperties.cc,v 1.6 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NucleiProperties.cc,v 1.6.4.2 2001/06/28 20:19:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 // ------------------------------------------------------------
 //
 // Hadronic Process: Nuclear De-excitations
diff --git a/source/particles/management/src/G4NucleiPropertiesTableA.cc b/source/particles/management/src/G4NucleiPropertiesTableA.cc
index 3b4db27d26..f27728681f 100644
--- a/source/particles/management/src/G4NucleiPropertiesTableA.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTableA.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NucleiPropertiesTableA.cc,v 1.5 1999/12/15 14:51:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NucleiPropertiesTableA.cc,v 1.5.4.2 2001/06/28 20:19:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4NucleiPropertiesTable.cc 
 //
diff --git a/source/particles/management/src/G4NucleiPropertiesTableB.cc b/source/particles/management/src/G4NucleiPropertiesTableB.cc
index d7306ae881..58bf2467ae 100644
--- a/source/particles/management/src/G4NucleiPropertiesTableB.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTableB.cc
@@ -1,19 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NucleiPropertiesTableB.cc,v 1.4 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NucleiPropertiesTableB.cc,v 1.5.2.1 2001/06/28 19:11:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
-//      GEANT 4 class file --- Copyright CERN 1997
-//      CERN Geneva Switzerland
-//
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
+//      GEANT 4 class implementation file 
 //
 //      File name:     G4NucleiPropertiesTable.cc 
 //
diff --git a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc
index b1657e0d15..7f9c000558 100644
--- a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableA.cc
@@ -1,3 +1,34 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4NucleiPropertiesTheoreticalTableA.cc,v 1.2.2.1 2001/06/28 19:11:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//
+// ------------------------------------------------------------
 
 #include "G4NucleiPropertiesTheoreticalTable.hh"
 
@@ -9,7 +40,6 @@ G4NucleiPropertiesTheoreticalTable G4NucleiPropertiesTheoreticalTable::theInstan
 // Default constructor
 G4NucleiPropertiesTheoreticalTable::G4NucleiPropertiesTheoreticalTable(G4double dummy)
 {
-	G4double even_more_dummy = dummy;
 	G4int j = 0;
 	
 	for (G4int i = 0; i < G4NucleiPropertiesTheoreticalTable::nEntries; i++) {
diff --git a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableB.cc b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableB.cc
index 9a5146c090..3315d92f35 100644
--- a/source/particles/management/src/G4NucleiPropertiesTheoreticalTableB.cc
+++ b/source/particles/management/src/G4NucleiPropertiesTheoreticalTableB.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "G4NucleiPropertiesTheoreticalTable.hh"
 
diff --git a/source/particles/management/src/G4PDGCodeChecker.cc b/source/particles/management/src/G4PDGCodeChecker.cc
index 8574152833..8b6a682d5f 100644
--- a/source/particles/management/src/G4PDGCodeChecker.cc
+++ b/source/particles/management/src/G4PDGCodeChecker.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PDGCodeChecker.cc,v 1.3 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PDGCodeChecker.cc,v 1.4.2.2 2001/06/28 20:19:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      17 Aug 1999 H.Kurashige
 // **********************************************************************
@@ -89,6 +103,15 @@ G4int G4PDGCodeChecker::CheckForBaryons()
   if (abs(tempPDGcode)%10000 == 3122) { 
     // Lambda
     quark2=2;  quark3 = 1; spin = 1;
+  } else if (abs(tempPDGcode)%10000 == 3124) { 
+    // Lambda*
+    quark2=2;  quark3 = 1; spin = 3;
+  } else if (abs(tempPDGcode)%10000 == 3126) { 
+    // Lambda*
+    quark2=2;  quark3 = 1; spin = 5;
+  } else if (abs(tempPDGcode)%10000 == 3128) { 
+    // Lambda*
+    quark2=2;  quark3 = 1; spin = 7;
   } else if (abs(tempPDGcode)%10000 == 4122) { 
     // Lambda_c
     quark2=2;  quark3 = 1; spin = 1;
diff --git a/source/particles/management/src/G4ParticleDefinition.cc b/source/particles/management/src/G4ParticleDefinition.cc
index 2cf23e629a..97db7d38ea 100644
--- a/source/particles/management/src/G4ParticleDefinition.cc
+++ b/source/particles/management/src/G4ParticleDefinition.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleDefinition.cc,v 1.10 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleDefinition.cc,v 1.11.2.1 2001/06/28 19:11:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //      ---------------- G4ParticleDefinition -----------------
@@ -71,23 +85,23 @@ G4ParticleDefinition::G4ParticleDefinition(
 		   thePDGiIsospin3(iIsospin3),
 		   thePDGIsospin(iIsospin*0.5),
 		   thePDGIsospin3(iIsospin3*0.5),
-		   theParticleType(pType), 
-		   theParticleSubType(""), 
 		   theLeptonNumber(lepton),
 		   theBaryonNumber(baryon),
+		   theParticleType(pType), 
+		   theParticleSubType(""), 
 		   thePDGEncoding(encoding),
 		   theAntiPDGEncoding(-1*encoding),
+		   fShortLivedFlag(shortlived),
 		   thePDGStable(stable), 
 		   thePDGLifeTime(lifetime), 
                    theDecayTable(decaytable),
 		   theProcessManager(0),
-		   fShortLivedFlag(shortlived),
 		   fApplyCutsFlag(false),
                    verboseLevel(1)
 {
    // check name and register this particle into ParticleTable
    theParticleTable = G4ParticleTable::GetParticleTable();
-   G4ParticleDefinition *ptr = theParticleTable->Insert(this);
+   theParticleTable->Insert(this);
 
    // check quark contents
 #ifdef G4VERBOSE
diff --git a/source/particles/management/src/G4ParticleMessenger.cc b/source/particles/management/src/G4ParticleMessenger.cc
index c7b5fbec01..e40e406f48 100644
--- a/source/particles/management/src/G4ParticleMessenger.cc
+++ b/source/particles/management/src/G4ParticleMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleMessenger.cc,v 1.4 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleMessenger.cc,v 1.4.4.1 2001/06/28 19:11:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticlePropertyMessenger.cc b/source/particles/management/src/G4ParticlePropertyMessenger.cc
index 78b35dab9f..3af70fb339 100644
--- a/source/particles/management/src/G4ParticlePropertyMessenger.cc
+++ b/source/particles/management/src/G4ParticlePropertyMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticlePropertyMessenger.cc,v 1.3 1999/12/15 14:51:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticlePropertyMessenger.cc,v 1.3.4.1 2001/06/28 19:11:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/particles/management/src/G4ParticleTable.cc b/source/particles/management/src/G4ParticleTable.cc
index 4cabb52c03..cff066b28e 100644
--- a/source/particles/management/src/G4ParticleTable.cc
+++ b/source/particles/management/src/G4ParticleTable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleTable.cc,v 1.17 2000/10/20 11:35:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleTable.cc,v 1.17.4.1 2001/06/28 19:11:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4ParticleTable
 //
diff --git a/source/particles/management/src/G4ParticleWithCuts.cc b/source/particles/management/src/G4ParticleWithCuts.cc
index b628162291..bf1da4c2bf 100644
--- a/source/particles/management/src/G4ParticleWithCuts.cc
+++ b/source/particles/management/src/G4ParticleWithCuts.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleWithCuts.cc,v 1.8 2001/03/12 05:58:22 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleWithCuts.cc,v 1.9.2.1 2001/06/28 19:11:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      Hisaya Kurashige, 21 Oct 1996
 //      Hisaya Kurashige, 04 Jan 1997
 // --------------------------------------------------------------
@@ -63,11 +77,12 @@ G4ParticleWithCuts::G4ParticleWithCuts(
                                iConjugation, iIsospin, iIsospinZ, gParity,
                                pType, lepton, baryon, encoding, stable,
                                lifetime, decaytable, shortlived), 
-         NumberOfElements(0),
-	 theLossTable(0),
    //-- members initialisation for SetCuts ------------------------------
          theCutInMaxInteractionLength(-1.0),
-         theKineticEnergyCuts(0)
+         theKineticEnergyCuts(0),
+
+	 theLossTable(0),
+         NumberOfElements(0)
 {  		   
    // -- set ApplyCutsFlag in default   ----------
          SetApplyCutsFlag(false);
@@ -186,7 +201,7 @@ void G4ParticleWithCuts::BuildLossTable()
     }
 #endif
   } else {
-    if (NumberOfElements != G4Element::GetNumberOfElements()){
+    if (NumberOfElements != G4int(G4Element::GetNumberOfElements())){
       char errMsg[1024];
       G4std::ostrstream errOs(errMsg,1024);
       errOs << "Error in G4ParticlWithCuts::BuildLossTable()";
@@ -291,7 +306,7 @@ void  G4ParticleWithCuts::RestoreCuts(G4double cutInLength,
   // Restore the vector of cuts in energy corresponding to the range cut
   if(theKineticEnergyCuts) delete [] theKineticEnergyCuts;
   theKineticEnergyCuts = new G4double [materialTable->length()];
-  for (G4int j=0; j<materialTable->length(); j +=1) {
+  for (size_t j=0; j<materialTable->length(); j +=1) {
     theKineticEnergyCuts[j] = cutInEnergy[j];
   } 
 }
@@ -380,7 +395,7 @@ void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut)
     G4double ChargeSquare = Charge*Charge/(eplus*eplus) ;
     G4double massRatio = proton_mass_c2/(this->GetPDGMass()) ;
     
-    for (G4int J=0; J<materialTable->length(); J +=1) {
+    for (size_t J=0; J<materialTable->length(); J +=1) {
       G4double protonEnergyCut = (theProton->GetEnergyCuts())[J] ;           
       // cut energy is rescaled by using charge and mass ratio
       theKineticEnergyCuts[J] = ChargeSquare*protonEnergyCut/massRatio ; 
@@ -402,7 +417,7 @@ void  G4ParticleWithCuts::CalcEnergyCuts(G4double aCut)
     // fill theKineticEnergyCuts and delete the range vector
     G4double tune = 0.025*mm*g/cm3 ,lowen = 30.*keV ; 
     G4double density ;
-    for (G4int J=0; J<materialTable->length(); J +=1){
+    for (size_t J=0; J<materialTable->length(); J +=1){
       G4RangeVector* rangeVector = new
 	G4RangeVector(LowestEnergy, HighestEnergy, TotBin);
       G4Material* aMaterial = (*materialTable)[J];
@@ -528,7 +543,6 @@ void G4ParticleWithCuts::BuildRangeVector(
   G4double cba = cb/ca;
   G4double taulim = tlim/proton_mass_c2;
   G4double taumax = maxEnergy/aMass;
-  G4double ltaulim = log(taulim);
   G4double ltaumax = log(taumax);
 
   // now we can fill the range vector....
@@ -580,27 +594,4 @@ void G4ParticleWithCuts::BuildRangeVector(
     }
 #endif
   }
-} 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
diff --git a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
index dc0b76fd14..e2e4cc61b1 100644
--- a/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
+++ b/source/particles/management/src/G4PhaseSpaceDecayChannel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhaseSpaceDecayChannel.cc,v 1.4 1999/12/15 14:51:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhaseSpaceDecayChannel.cc,v 1.5.2.2 2001/06/28 20:19:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      27 July 1996 H.Kurashige
 //      20 Oct 1996 H.Kurashige
@@ -107,8 +121,6 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::OneBodyDecayIt()
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) G4cout << "G4PhaseSpaceDecayChannel::OneBodyDecayIt()"<<G4endl;
 #endif
-  G4double parentmass = parent_mass;
-  G4double daughtermass = daughters_mass[0];
 
   //create parent G4DynamicParticle at rest
   G4ThreeVector dummy;
@@ -144,7 +156,6 @@ G4DecayProducts *G4PhaseSpaceDecayChannel::TwoBodyDecayIt()
   G4double daughtermomentum;
   daughtermass[0] = daughters_mass[0];
   daughtermass[1] = daughters_mass[1];
-  G4double sumofdaughtermass =  daughtermass[0] + daughtermass[1];
 
   //create parent G4DynamicParticle at rest
   G4ThreeVector dummy;
diff --git a/source/particles/management/src/G4ShortLivedTable.cc b/source/particles/management/src/G4ShortLivedTable.cc
index fd542fa132..37b3aed9cd 100644
--- a/source/particles/management/src/G4ShortLivedTable.cc
+++ b/source/particles/management/src/G4ShortLivedTable.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShortLivedTable.cc,v 1.9 2000/02/25 07:36:24 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShortLivedTable.cc,v 1.9.4.2 2001/06/28 20:19:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD Group
 //	History: first implementation, based on object model of
 //	27 June 1998  H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/particles/management/src/G4VDecayChannel.cc b/source/particles/management/src/G4VDecayChannel.cc
index 99ac1fb735..cabb968076 100644
--- a/source/particles/management/src/G4VDecayChannel.cc
+++ b/source/particles/management/src/G4VDecayChannel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDecayChannel.cc,v 1.8 2000/05/29 01:30:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDecayChannel.cc,v 1.9.2.1 2001/06/28 19:11:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      27 July 1996 H.Kurashige
 //      30 May 1997  H.Kurashige
@@ -30,11 +44,13 @@ const G4String G4VDecayChannel::noName = " ";
 
 G4VDecayChannel::G4VDecayChannel(const G4String &aName, G4int Verbose)
                :kinematics_name(aName),
-		verboseLevel(Verbose),rbranch(0.0),
+		rbranch(0.0),
 		numberOfDaughters(0),
-		parent_name(0),parent(0),parent_mass(0.0),
-		daughters_name(0),daughters(0),daughters_mass(0),
-		particletable(0)		
+		parent_name(0), daughters_name(0),
+		particletable(0),
+		parent(0), daughters(0),
+		parent_mass(0.0), daughters_mass(0),
+		verboseLevel(Verbose)		
 {
   // set pointer to G4ParticleTable (static and singleton object)
   particletable = G4ParticleTable::GetParticleTable();
@@ -49,11 +65,13 @@ G4VDecayChannel::G4VDecayChannel(const G4String  &aName,
 			       const G4String& theDaughterName3,
 			       const G4String& theDaughterName4 )
                :kinematics_name(aName),
-		verboseLevel(1),rbranch(theBR),
+		rbranch(theBR),
 		numberOfDaughters(theNumberOfDaughters),
-		parent_name(0),parent(0),parent_mass(0.0),
-		daughters_name(0),daughters(0),daughters_mass(0),
-		particletable(0)		
+		parent_name(0), daughters_name(0),
+		particletable(0),
+		parent(0), daughters(0),
+		parent_mass(0.0), daughters_mass(0),
+		verboseLevel(1)		
 {
   // set pointer to G4ParticleTable (static and singleton object)
   particletable = G4ParticleTable::GetParticleTable();
diff --git a/source/particles/shortlived/include/G4DiQuarks.hh b/source/particles/shortlived/include/G4DiQuarks.hh
index b8ef2ddc95..d24e81624f 100644
--- a/source/particles/shortlived/include/G4DiQuarks.hh
+++ b/source/particles/shortlived/include/G4DiQuarks.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiQuarks.hh,v 1.3 1999/12/15 14:51:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DiQuarks.hh,v 1.3.4.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
index 30581be07c..edef69bdc5 100644
--- a/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedBaryonConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedBaryonConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedBaryonConstructor.hh,v 1.4.4.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedBaryons.hh b/source/particles/shortlived/include/G4ExcitedBaryons.hh
index 26458cfd37..c7057f7590 100644
--- a/source/particles/shortlived/include/G4ExcitedBaryons.hh
+++ b/source/particles/shortlived/include/G4ExcitedBaryons.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedBaryons.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedBaryons.hh,v 1.4.4.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
index abf3f387c7..5b34cc03d6 100644
--- a/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedDeltaConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedDeltaConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedDeltaConstructor.hh,v 1.4.4.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
index 68107c0288..16b97defbe 100644
--- a/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedLambdaConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedLambdaConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedLambdaConstructor.hh,v 1.5.2.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -124,11 +138,11 @@ inline
     // s-quark
     quark = 3;
   } else if ( iQ == 1 ){
-    // u-quark
-    quark = 2;
-  }  else if ( iQ == 2 ){
     // d-quark
     quark = 1;
+  }  else if ( iQ == 2 ){
+    // u-quark
+    quark = 2;
   } 
   return quark;
 }
diff --git a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
index 73122880a5..343dbd3e98 100644
--- a/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedMesonConstructor.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // This code plementation is the intellectual property of
 // the GEANT4 collaboration.
 //
@@ -5,15 +27,13 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4ExcitedMesonConstructor.hh,v 1.5 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4ExcitedMesonConstructor.hh,v 1.6.2.2 2001/06/28 20:19:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -184,29 +204,3 @@ inline
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/shortlived/include/G4ExcitedMesons.hh b/source/particles/shortlived/include/G4ExcitedMesons.hh
index 5853dcc455..741878216d 100644
--- a/source/particles/shortlived/include/G4ExcitedMesons.hh
+++ b/source/particles/shortlived/include/G4ExcitedMesons.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedMesons.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedMesons.hh,v 1.4.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
index 824b324835..9ca0abda26 100644
--- a/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedNucleonConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedNucleonConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedNucleonConstructor.hh,v 1.4.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
index 3dd0823305..89588a9364 100644
--- a/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedSigmaConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedSigmaConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedSigmaConstructor.hh,v 1.4.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
index a9f28019ab..dc08e02578 100644
--- a/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
+++ b/source/particles/shortlived/include/G4ExcitedXiConstructor.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedXiConstructor.hh,v 1.4 2000/02/27 07:48:50 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedXiConstructor.hh,v 1.4.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Gluons.hh b/source/particles/shortlived/include/G4Gluons.hh
index aa7048ffe3..b4a843bc60 100644
--- a/source/particles/shortlived/include/G4Gluons.hh
+++ b/source/particles/shortlived/include/G4Gluons.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Gluons.hh,v 1.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Gluons.hh,v 1.3.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4Quarks.hh b/source/particles/shortlived/include/G4Quarks.hh
index 29f9e9de80..fc9854e373 100644
--- a/source/particles/shortlived/include/G4Quarks.hh
+++ b/source/particles/shortlived/include/G4Quarks.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Quarks.hh,v 1.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Quarks.hh,v 1.3.4.2 2001/06/28 20:19:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4ShortLivedConstructor.hh b/source/particles/shortlived/include/G4ShortLivedConstructor.hh
index de651729f3..a7eee9ff26 100644
--- a/source/particles/shortlived/include/G4ShortLivedConstructor.hh
+++ b/source/particles/shortlived/include/G4ShortLivedConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShortLivedConstructor.hh,v 1.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShortLivedConstructor.hh,v 1.3.4.1 2001/06/28 19:11:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
diff --git a/source/particles/shortlived/include/G4VShortLivedParticle.hh b/source/particles/shortlived/include/G4VShortLivedParticle.hh
index 728c4fa2b9..b1f38bf16d 100644
--- a/source/particles/shortlived/include/G4VShortLivedParticle.hh
+++ b/source/particles/shortlived/include/G4VShortLivedParticle.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VShortLivedParticle.hh,v 1.3 1999/12/15 14:51:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VShortLivedParticle.hh,v 1.3.4.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      Hisaya Kurashige, 27 June 1998
 // ----------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4DiQuarks.cc b/source/particles/shortlived/src/G4DiQuarks.cc
index 900f867690..e5175e70b7 100644
--- a/source/particles/shortlived/src/G4DiQuarks.cc
+++ b/source/particles/shortlived/src/G4DiQuarks.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiQuarks.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DiQuarks.cc,v 1.3.4.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
index 26c3fa882e..c580bba5b0 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryonConstructor.cc
@@ -1,18 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedBaryonConstructor.cc,v 1.4 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedBaryonConstructor.cc,v 1.5.2.1 2001/06/28 19:11:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
+//
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -29,12 +44,10 @@
 
 
 G4ExcitedBaryonConstructor::G4ExcitedBaryonConstructor(G4int nStates,
-						       G4int isoSpin):
-         NumberOfStates(nStates),iIsoSpin(isoSpin),
-         iConjugation(0), iGParity(0), leptonNumber(0), baryonNumber(1),
-	 type("baryon")
+						       G4int isoSpin)
+    :    NumberOfStates(nStates), iIsoSpin(isoSpin), type("baryon"),
+         iConjugation(0), iGParity(0), leptonNumber(0), baryonNumber(1)
 {
- 
 }
 
 G4ExcitedBaryonConstructor::~G4ExcitedBaryonConstructor()
@@ -133,7 +146,6 @@ void G4ExcitedBaryonConstructor::ConstructAntiParticle(G4int idx)
 
 G4double  G4ExcitedBaryonConstructor::GetCharge(G4int iIsoSpin3)
 {
-  G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
   G4double charge = 0.0;
   static G4double quark_charge[7] = 
   {
@@ -159,22 +171,3 @@ G4int     G4ExcitedBaryonConstructor::GetEncoding(G4int iIsoSpin3, G4int idxStat
   }
   return encoding;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/source/particles/shortlived/src/G4ExcitedBaryons.cc b/source/particles/shortlived/src/G4ExcitedBaryons.cc
index 50b9ac0134..7612ff9de6 100644
--- a/source/particles/shortlived/src/G4ExcitedBaryons.cc
+++ b/source/particles/shortlived/src/G4ExcitedBaryons.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedBaryons.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedBaryons.cc,v 1.3.4.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
index ced03667e3..62f8e6dee5 100644
--- a/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedDeltaConstructor.cc
@@ -1,18 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedDeltaConstructor.cc,v 1.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedDeltaConstructor.cc,v 1.5.2.1 2001/06/28 19:11:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
+//
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -135,7 +150,7 @@ G4DecayTable*  G4ExcitedDeltaConstructor::AddNPiMode(
 
   G4String daughterN;
   G4String daughterPi;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N pi0 ------------ 
   // determine daughters
@@ -212,7 +227,7 @@ G4DecayTable*  G4ExcitedDeltaConstructor::AddNRhoMode(
 
   G4String daughterN;
   G4String daughterRho;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N Rho0 ------------ 
   // determine daughters
@@ -288,7 +303,7 @@ G4DecayTable*  G4ExcitedDeltaConstructor::AddNStarPiMode(
 
   G4String daughterN;
   G4String daughterPi;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N pi0 ------------ 
   // determine daughters
diff --git a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
index 25e83ebedb..d0d11de30b 100644
--- a/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedLambdaConstructor.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedLambdaConstructor.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedLambdaConstructor.cc,v 1.4.2.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
index 2382bbc5c5..15df0cd01f 100644
--- a/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesonConstructor.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedMesonConstructor.cc,v 1.8 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedMesonConstructor.cc,v 1.9.2.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -29,10 +43,9 @@
 
 
 G4ExcitedMesonConstructor::G4ExcitedMesonConstructor(G4int nStates,
-						       G4int isoSpin):
-         leptonNumber(0), baryonNumber(0),type("meson")
+						       G4int isoSpin)
+    :   type("meson"), leptonNumber(0), baryonNumber(0)
 {
- 
 }
 
 G4ExcitedMesonConstructor::~G4ExcitedMesonConstructor()
@@ -171,7 +184,6 @@ G4int  G4ExcitedMesonConstructor::GetQuarkContents(G4int iQ,
 
 G4double  G4ExcitedMesonConstructor::GetCharge(G4int iIsoSpin3, G4int idxType )
 {
-  G4ParticleTable* pTable = G4ParticleTable::GetParticleTable();
   static G4double quark_charge[7] = 
   {
     0., -1./3., +2./3., -1./3., +2./3., -1./3., +2./3.
diff --git a/source/particles/shortlived/src/G4ExcitedMesons.cc b/source/particles/shortlived/src/G4ExcitedMesons.cc
index 49648c71c8..23a71133f1 100644
--- a/source/particles/shortlived/src/G4ExcitedMesons.cc
+++ b/source/particles/shortlived/src/G4ExcitedMesons.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedMesons.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedMesons.cc,v 1.3.4.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
index b85513aa72..eedae0ebd4 100644
--- a/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedNucleonConstructor.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedNucleonConstructor.cc,v 1.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedNucleonConstructor.cc,v 1.4.4.2 2001/06/28 20:19:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
diff --git a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
index 8539f7014e..8cb5b47e36 100644
--- a/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedSigmaConstructor.cc
@@ -1,18 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedSigmaConstructor.cc,v 1.4 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedSigmaConstructor.cc,v 1.5.2.1 2001/06/28 19:11:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
+//
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -118,7 +133,7 @@ G4DecayTable*  G4ExcitedSigmaConstructor::AddNKMode(
 
   G4String daughterN;
   G4String daughterK;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N K- ------------ 
   // determine daughters
@@ -182,7 +197,7 @@ G4DecayTable*  G4ExcitedSigmaConstructor::AddDeltaKMode(
 
   G4String daughterN;
   G4String daughterK;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N K- ------------ 
   // determine daughters
@@ -250,7 +265,7 @@ G4DecayTable*  G4ExcitedSigmaConstructor::AddNKStarMode(
 
   G4String daughterN;
   G4String daughterK;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ N K- ------------ 
   // determine daughters
@@ -314,7 +329,7 @@ G4DecayTable*  G4ExcitedSigmaConstructor::AddSigmaPiMode(
 
   G4String daughterSigma;
   G4String daughterPi;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ Sigma+ pi - ------------ 
   // determine daughters
@@ -401,7 +416,7 @@ G4DecayTable*  G4ExcitedSigmaConstructor::AddSigmaStarPiMode(
 
   G4String daughterSigma;
   G4String daughterPi;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ Sigma+ pi - ------------ 
   // determine daughters
diff --git a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
index 4d2a84870a..7a3afa8b43 100644
--- a/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
+++ b/source/particles/shortlived/src/G4ExcitedXiConstructor.cc
@@ -1,18 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedXiConstructor.cc,v 1.3 1999/12/15 14:51:17 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedXiConstructor.cc,v 1.4.2.1 2001/06/28 19:11:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
-//      For information related to this code contact:
-//      CERN, IT Division, ASD Group
+//
 //      History: first implementation, based on object model of
 //      10 oct 1998  H.Kurashige
 // ---------------------------------------------------------------
@@ -100,7 +115,7 @@ G4DecayTable*  G4ExcitedXiConstructor::AddLambdaKMode(
 
   G4String lambda = "lambda";
   G4String daughterK;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ Lambda K- ------------ 
   // determine daughters
@@ -139,7 +154,7 @@ G4DecayTable*  G4ExcitedXiConstructor::AddSigmaKMode(
 
   G4String daughterH;
   G4String daughterK;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ Sigma K- ------------ 
   // determine daughters
@@ -198,7 +213,7 @@ G4DecayTable*  G4ExcitedXiConstructor::AddXiPiMode(
 
   G4String daughterXi;
   G4String daughterPi;
-  G4double r;
+  G4double r = 0.;
 
   // ------------ Xi pi-  ------------ 
   // determine daughters
diff --git a/source/particles/shortlived/src/G4Gluons.cc b/source/particles/shortlived/src/G4Gluons.cc
index 26a70da03d..84a14c36f2 100644
--- a/source/particles/shortlived/src/G4Gluons.cc
+++ b/source/particles/shortlived/src/G4Gluons.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Gluons.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Gluons.cc,v 1.3.4.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/shortlived/src/G4Quarks.cc b/source/particles/shortlived/src/G4Quarks.cc
index 4bda3ae21d..e5d5f9ea78 100644
--- a/source/particles/shortlived/src/G4Quarks.cc
+++ b/source/particles/shortlived/src/G4Quarks.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Quarks.cc,v 1.3 2000/02/27 07:48:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Quarks.cc,v 1.3.4.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ----------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      4th April 1996, G.Cosmo
 // **********************************************************************
diff --git a/source/particles/shortlived/src/G4ShortLivedConstructor.cc b/source/particles/shortlived/src/G4ShortLivedConstructor.cc
index 264806a53b..663a9f7d8a 100644
--- a/source/particles/shortlived/src/G4ShortLivedConstructor.cc
+++ b/source/particles/shortlived/src/G4ShortLivedConstructor.cc
@@ -1,18 +1,36 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ShortLivedConstructor.cc,v 1.7 2000/03/02 00:52:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ShortLivedConstructor.cc,v 1.8.2.1 2001/06/28 19:11:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
 //      Add "rho0"                         25  Feb. 2000 H.Kurashige
+//      Fix spin/isospin number for quarks 06  Apr. 2001 H.Kurashige
+
 #include "G4ShortLivedConstructor.hh"
 
 #include "G4ParticleDefinition.hh"
@@ -106,18 +124,18 @@ void G4ShortLivedConstructor::ConstructQuarks()
                     0,               0,             0,             
              "quarks",               0,             0,           6,
 		 true,            -1.0,          NULL);
-  // u-quark
+  // anti u-quark
   particle = new G4Quarks(            
        "anti_u_quark",         8.0*MeV,       0.0*MeV,   -2./3.*eplus, 
                     1,              +1,             0,          
-                    1,              +1,             0,             
+                    1,              -1,             0,             
              "quarks",               0,             0,          -2,
 		 true,            -1.0,          NULL);
-  // d-quark
+  // anti d-quark
   particle = new G4Quarks(            
        "anti_d_quark",        15.0*MeV,       0.0*MeV,   1./3.*eplus, 
                     1,              +1,             0,          
-                    1,              -1,             0,             
+                    1,              +1,             0,             
              "quarks",               0,             0,          -1,
 		 true,            -1.0,          NULL);
   // s-quark
@@ -167,7 +185,7 @@ void G4ShortLivedConstructor::ConstructQuarks()
   particle = new G4DiQuarks(            
 	"dd1_diquark",        30.0*MeV,       0.0*MeV,   -2./3.*eplus, 
                     2,              +1,             0,          
-                    2,              -1,             0,             
+                    2,              -2,             0,             
            "diquarks",               0,             0,         1103,
 		 true,            -1.0,          NULL);
    
@@ -182,7 +200,7 @@ void G4ShortLivedConstructor::ConstructQuarks()
    // sd1-Diquark
   particle = new G4DiQuarks(            
 	"sd1_diquark",       315.0*MeV,       0.0*MeV,   -2./3.*eplus, 
-                    1,              +1,             0,          
+                    2,              +1,             0,          
                     1,              -1,             0,             
            "diquarks",               0,             0,         3103,
 		 true,            -1.0,          NULL);
@@ -190,50 +208,50 @@ void G4ShortLivedConstructor::ConstructQuarks()
   // su1-Diquark
   particle = new G4DiQuarks(            
 	"su1_diquark",       308.0*MeV,       0.0*MeV,   1./3.*eplus, 
-                    1,              +1,             0,          
+                    2,              +1,             0,          
                     1,              +1,             0,             
            "diquarks",               0,             0,         3203,
 		 true,            -1.0,          NULL);
 
-    // sd1-Diquark
+    // sd0-Diquark
   particle = new G4DiQuarks(            
 	"sd0_diquark",       315.0*MeV,       0.0*MeV,   -2./3.*eplus, 
-                    1,              +1,             0,          
+                    0,              +1,             0,          
                     1,              -1,             0,             
            "diquarks",               0,             0,         3101,
 		 true,            -1.0,          NULL);
    
-  // su1-Diquark
+  // su0-Diquark
   particle = new G4DiQuarks(            
 	"su0_diquark",       308.0*MeV,       0.0*MeV,   1./3.*eplus, 
-                    1,              +1,             0,          
+                    0,              +1,             0,          
                     1,              +1,             0,             
            "diquarks",               0,             0,         3201,
 		 true,            -1.0,          NULL);
 
-   // uu1-Diquark
+   // anti uu1-Diquark
   particle = new G4DiQuarks(            
    "anti_uu1_diquark",        16.0*MeV,       0.0*MeV,  -4./3.*eplus, 
                     2,              +1,             0,          
-                    2,              +2,             0,             
+                    2,              -2,             0,             
            "diquarks",               0,             0,       -2203,
 		 true,            -1.0,          NULL);
-    // ud1-Diquark
+    // anti ud1-Diquark
   particle = new G4DiQuarks(            
    "anti_ud1_diquark",        23.0*MeV,       0.0*MeV,  -1./3.*eplus, 
                     2,              +1,             0,          
                     2,              +0,             0,             
            "diquarks",               0,             0,        -2103,
 		 true,            -1.0,          NULL);
-    // dd1-Diquark
+    // anti dd1-Diquark
   particle = new G4DiQuarks(            
    "anti_dd1_diquark",        30.0*MeV,       0.0*MeV,    2./3.*eplus, 
                     2,              +1,             0,          
-                    2,              -1,             0,             
+                    2,              +2,             0,             
            "diquarks",               0,             0,        -1103,
 		 true,            -1.0,          NULL);
    
-   // ud0-Diquark
+   // anti ud0-Diquark
   particle = new G4DiQuarks(            
    "anti_ud0_diquark",        23.0*MeV,       0.0*MeV,  -1./3.*eplus, 
                     0,              +1,             0,          
@@ -241,50 +259,50 @@ void G4ShortLivedConstructor::ConstructQuarks()
            "diquarks",               0,             0,        -2101,
 		 true,            -1.0,          NULL);
    
-   // sd1-Diquark
+   // anti  sd1-Diquark
   particle = new G4DiQuarks(            
    "anti_sd1_diquark",       315.0*MeV,       0.0*MeV,    2./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              -1,             0,             
+                    2,              +1,             0,          
+                    1,              +1,             0,             
            "diquarks",               0,             0,        -3103,
 		 true,            -1.0,          NULL);
    
-  // su1-Diquark
+  // anti su1-Diquark
   particle = new G4DiQuarks(            
    "anti_su1_diquark",       308.0*MeV,       0.0*MeV,  -1./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              +1,             0,             
+                    2,              +1,             0,          
+                    1,              -1,             0,             
            "diquarks",               0,             0,        -3203,
 		 true,            -1.0,          NULL);
 
-    // sd0-Diquark
+    // anti sd0-Diquark
   particle = new G4DiQuarks(            
    "anti_sd0_diquark",       315.0*MeV,       0.0*MeV,    2./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              -1,             0,             
+                    0,              +1,             0,          
+                    1,              +1,             0,             
            "diquarks",               0,             0,        -3101,
 		 true,            -1.0,          NULL);
    
-  // su1-Diquark
+  // anti su0-Diquark
   particle = new G4DiQuarks(            
    "anti_su0_diquark",       308.0*MeV,       0.0*MeV,  -1./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              +1,             0,             
+                    0,              +1,             0,          
+                    1,              -1,             0,             
            "diquarks",               0,             0,        -3201,
 		 true,            -1.0,          NULL);
-    // ss1-Diquark
+    // anti ss1-Diquark
   particle = new G4DiQuarks(            
 	"ss1_diquark",       600.0*MeV,       0.0*MeV,   -2./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              -1,             0,             
+                    2,              +1,             0,          
+                    0,               0,             0,             
            "diquarks",               0,             0,         3303,
 		 true,            -1.0,          NULL);
    
-    // ss1-Diquark
+    // anti ss1-Diquark
   particle = new G4DiQuarks(            
 	"anti_ss1_diquark",  600.0*MeV,       0.0*MeV,    2./3.*eplus, 
-                    1,              +1,             0,          
-                    1,              -1,             0,             
+                    2,              +1,             0,          
+                    0,               0,             0,             
            "diquarks",               0,             0,        -3303,
 		 true,            -1.0,          NULL);
 
@@ -654,6 +672,106 @@ void G4ShortLivedConstructor::ConstructMesons()
   decayTable->Insert(mode);
   particle->SetDecayTable(decayTable);
 
+  // a0(980)+
+  particle = new G4ExcitedMesons(            
+	   "a0(980)+",       984.8*MeV,      60.0*MeV,    +1.0*eplus, 
+                    0,              +1,            +1,          
+                    2,              +2,            -1,             
+              "meson",               0,             0,       9000211,
+		false,             0.0,          NULL);
+  // set sub type
+  particle->SetMultipletName("a0(980)");
+  // create decay table
+  decayTable =  new G4DecayTable();
+  // create decay channel of a0(980)+ -> eta + pi+
+  //                                   parent    BR     #daughters
+  mode  = new G4PhaseSpaceDecayChannel("a0(980)+",1.000, 2,
+				                    "pi+","eta");
+  // add decay table
+  decayTable->Insert(mode);
+  particle->SetDecayTable(decayTable);
+
+  // a0(980)-
+  particle = new G4ExcitedMesons(            
+	   "a0(980)-",       984.8*MeV,      60.0*MeV,    -1.0*eplus, 
+                    0,              +1,            +1,          
+                    2,              -2,            -1,             
+              "meson",               0,             0,      -9000211,
+		false,             0.0,          NULL);
+  // set sub type
+  particle->SetMultipletName("a0(980)");
+  // create decay table
+  decayTable =  new G4DecayTable();
+  // create decay channel of a0(980)- -> eta + pi-
+  //                                   parent    BR     #daughters
+  mode  = new G4PhaseSpaceDecayChannel("a0(980)-",1.000, 2,
+				                    "pi-","eta");
+  // add decay table
+  decayTable->Insert(mode);
+  particle->SetDecayTable(decayTable);
+
+  // a0(980)0
+  particle = new G4ExcitedMesons(            
+	   "a0(980)0",       984.8*MeV,      60.0*MeV,           0.0,
+                    0,              +1,            +1,          
+                    2,               0,            -1,             
+              "meson",               0,             0,       9000111,
+		false,             0.0,          NULL);
+  particle->SetAntiPDGEncoding(9000111);
+  // set sub type
+  particle->SetMultipletName("a0(980)");
+  // create decay table
+  decayTable =  new G4DecayTable();
+  // create decay channel of a0(980)0 -> eta + pi0
+  //                                   parent    BR     #daughters
+  mode  = new G4PhaseSpaceDecayChannel("a0(980)0",1.000, 2,
+				                    "pi0","eta");
+  // add decay table
+  decayTable->Insert(mode);
+  particle->SetDecayTable(decayTable);
+
+  // f0(400-1200)
+  particle = new G4ExcitedMesons(            
+       "f0(400-1200)",       470.0*MeV,     400.0*MeV,           0.0,
+                    0,              +1,            +1,          
+                    0,               0,            +1,             
+              "meson",               0,             0,       9000221,
+		false,             0.0,          NULL);
+  particle->SetAntiPDGEncoding(9000221);
+  // set sub type
+  particle->SetMultipletName("f0(400-1200)");
+  // create decay table
+  decayTable =  new G4DecayTable();
+  // create decay channel of f0(400-1200) -> pi + pi
+  //                                   parent    BR     #daughters
+  mode  = new G4PhaseSpaceDecayChannel("f0(400-1200)",1.000, 2,
+				                    "pi+","pi-");
+  // add decay table
+  decayTable->Insert(mode);
+  particle->SetDecayTable(decayTable);
+
+
+  // f0(980)
+  particle = new G4ExcitedMesons(            
+            "f0(980)",       980.0*MeV,      40.0*MeV,           0.0,
+                    0,              +1,            +1,          
+                    0,               0,            +1,             
+              "meson",               0,             0,       9010221,
+		false,             0.0,          NULL);
+  particle->SetAntiPDGEncoding(9010221);
+  // set sub type
+  particle->SetMultipletName("f0(980)");
+  // create decay table
+  decayTable =  new G4DecayTable();
+  // create decay channel of f0(980) -> pi + pi
+  //                                   parent    BR     #daughters
+  mode  = new G4PhaseSpaceDecayChannel("f0(980)",1.000, 2,
+				                    "pi+","pi-");
+  // add decay table
+  decayTable->Insert(mode);
+  particle->SetDecayTable(decayTable);
+
+
   // k_star+
   particle = new G4ExcitedMesons(            
 	    "k_star+",       891.6*MeV,      50.8*MeV,    +1.0*eplus, 
diff --git a/source/particles/shortlived/src/G4VShortLivedParticle.cc b/source/particles/shortlived/src/G4VShortLivedParticle.cc
index fb40143cb4..e3f54a5696 100644
--- a/source/particles/shortlived/src/G4VShortLivedParticle.cc
+++ b/source/particles/shortlived/src/G4VShortLivedParticle.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VShortLivedParticle.cc,v 1.3 1999/12/15 14:51:18 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VShortLivedParticle.cc,v 1.3.4.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, based on object model of
 //      28 June 1998 H.Kurashige
 // --------------------------------------------------------------
diff --git a/source/persistency/GNUmakefile b/source/persistency/GNUmakefile
index 944dd6216e..2feb3fa006 100644
--- a/source/persistency/GNUmakefile
+++ b/source/persistency/GNUmakefile
@@ -6,7 +6,7 @@
 # include/*.ddl -> $(G4TMP)/$(G4SYSTEM)/*.hh     -> $(G4SCHEMA_INCLUDE)/*.hh
 #                  $(G4TMP)/$(G4SYSTEM)/*_ref.hh -> $(G4SCHEMA_INCLUDE)/*.hh
 #                  $(G4TMP)/$(G4SYSTEM)/*_ddl.cc -> $(G4TMP)/$(G4SYSTEM)/*_ddl.o
-# (schema) ------> $(G4TMPSCHEMA_BOOT) -----------> $(G4SCHEMA_BOOT)
+# (schema) ------> $(G4SCHEMA_BOOT) --------------> $(G4SCHEMA_BOOT)
 #  src/*.cc --------------------------------------> $(G4TMP)/$(G4SYSTEM)/*.o
 #
 # You must have unique G4SCHEMA_FDID assigned by your local 
@@ -42,16 +42,15 @@ all:
 	exit 1
 endif
 
-cleandb:
-ifndef G4SCHEMA_FDID
-	@echo G4SCHEMA_FDID is not defined.  Stop.
-	exit 1
-endif
-	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) clean); done
-	@rm -f $(G4TMPSCHEMA_BOOT_DIR)/G4TMPSCHEMA
-	@rm -f $(G4TMPSCHEMA_BOOT_DIR)/G4TMPSCHEMA.FDDB
-	@rm -f $(G4TMPSCHEMA_BOOT_DIR)/*.G4TMPSCHEMA.DB
-	@echo Copying schema to $(G4TMPSCHEMA_BOOT) for FDID $(G4SCHEMA_FDID)
-	@$(HEP_ODBMS_DIR)/etc/getdb $(HEP_ODBMS_DIR)/schema/HEP_BASE \
-	  $(G4TMPSCHEMA_BOOT) $(G4SCHEMA_FDID)
+cleandb: cleanall newdb
+
+cleanall:
+	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) clean); done
+
+newdb:
+	@rm -f $(G4SCHEMA_BOOT_DIR)/G4SCHEMA
+	@rm -f $(G4SCHEMA_BOOT_DIR)/G4SCHEMA.FDDB
+	@rm -f $(G4SCHEMA_BOOT_DIR)/*.G4SCHEMA.DB
+	@$(HEP_ODBMS_DIR)/etc/getdb $(HEP_ODBMS_DIR)/schema/HEP_BASE \
+	  $(G4SCHEMA_BOOT) $(G4SCHEMA_FDID)
 
diff --git a/source/persistency/History b/source/persistency/History
index f2fd5d48fb..a923fdf28f 100644
--- a/source/persistency/History
+++ b/source/persistency/History
@@ -15,6 +15,20 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+21 June, 01    Y.Morita (persistency-V03-01-00)
+- new tag for release 3.2
+
+28 April, 01   Y.Morita
+- Change NULL to 0
+
+25 April, 01   G.Cosmo
+- Removed redundant declarations of G4ThreeVectorList in CSG schemas:
+  G4PPara.ddl, G4PSphere.ddl and G4PTrap.ddl.
+  Required to cowork with recent migration to STL vector of geometry code.
+
+15 March, 01   Y.Morita (persistency-V03-00-02)
+- Updated GNUmakefile for new config.
+
 14 March, 01   Y.Morita (persistency-V03-00-01)
 - G4PDCofThisEvent.ddl: fixed a bug in GetNumberOfCollections()
 
diff --git a/source/persistency/digits+hits/digits/GNUmakefile b/source/persistency/digits+hits/digits/GNUmakefile
index af1a901eed..0d853d5250 100644
--- a/source/persistency/digits+hits/digits/GNUmakefile
+++ b/source/persistency/digits+hits/digits/GNUmakefile
@@ -1,18 +1,19 @@
-# $Id: GNUmakefile,v 1.3 1999/11/24 20:28:06 morita Exp $
+# $Id: GNUmakefile,v 1.4 2001/03/15 22:58:53 morita Exp $
 
 name := G4pdigits
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4INSTALL)/source/persistency/global/include \
              -I$(G4INSTALL)/source/digits+hits/digits/include \
diff --git a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
index faf26a06c6..5c4962f4f3 100644
--- a/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PDCofThisEvent.ddl,v 1.5 2001/03/14 17:15:46 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PDCofThisEvent.ddl,v 1.6.2.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
@@ -60,7 +76,7 @@ class G4PDCofThisEvent
         G4int n = 0;
         for(int i=0;i<DC.size();i++)
         {
-          if( DC[i] != NULL ) n++;
+          if( DC[i] != 0 ) n++;
         }
         return n;
       }
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigit.ddl b/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
index a630c772d3..f2ee0785d5 100644
--- a/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PVDigit.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVDigit.ddl,v 1.3 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVDigit.ddl,v 1.3.4.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl b/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
index 6441334805..5b138507c6 100644
--- a/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
+++ b/source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVDigitsCollection.ddl,v 1.6 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVDigitsCollection.ddl,v 1.6.4.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh b/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
index ca48e1dca6..f988a1305f 100644
--- a/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
+++ b/source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentDigitMan.hh,v 1.7 2000/12/15 08:04:13 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentDigitMan.hh,v 1.7.4.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc b/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
index 5b8ccca714..7a1843fab5 100644
--- a/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
+++ b/source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PDCofThisEvent.cc,v 1.3 1999/12/02 16:10:20 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PDCofThisEvent.cc,v 1.3.8.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PDCofThisEvent.hh"
diff --git a/source/persistency/digits+hits/digits/src/G4PVDigit.cc b/source/persistency/digits+hits/digits/src/G4PVDigit.cc
index 345d988ecd..ea31141980 100644
--- a/source/persistency/digits+hits/digits/src/G4PVDigit.cc
+++ b/source/persistency/digits+hits/digits/src/G4PVDigit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVDigit.cc,v 1.2 1999/11/24 20:28:07 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVDigit.cc,v 1.2.8.1 2001/06/28 19:11:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PVDigit.hh"
diff --git a/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc b/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
index a75ec7c03c..0c7e2dbbcf 100644
--- a/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
+++ b/source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVDigitsCollection.cc,v 1.3 1999/11/29 20:11:17 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVDigitsCollection.cc,v 1.3.8.1 2001/06/28 19:11:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4PVDigitsCollection
diff --git a/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc b/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
index 1da72e909c..73dc7ee8f4 100644
--- a/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
+++ b/source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentDigitMan.cc,v 1.4 1999/11/28 21:54:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentDigitMan.cc,v 1.5.2.1 2001/06/28 19:11:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistentDigitMan 
 //
@@ -16,7 +32,7 @@
 #include "G4PersistentDigitMan.hh"
 
 
-G4PersistentDigitMan* G4PersistentDigitMan::f_PersistentDigitMan = NULL;
+G4PersistentDigitMan* G4PersistentDigitMan::f_PersistentDigitMan = 0;
 
 G4PersistentDigitMan* G4PersistentDigitMan::GetPersistentDigitMan()
 {
@@ -31,7 +47,7 @@ G4PersistentDigitMan* G4PersistentDigitMan::get_PersistentDigitManIfExist()
 { return f_PersistentDigitMan; }
 
 G4PersistentDigitMan::G4PersistentDigitMan()
- : f_CurrentPDCofThisEvent(NULL)
+ : f_CurrentPDCofThisEvent(0)
 {;}
 
 G4PersistentDigitMan::~G4PersistentDigitMan()
diff --git a/source/persistency/digits+hits/hits/GNUmakefile b/source/persistency/digits+hits/hits/GNUmakefile
index 5000e70161..5353f4715f 100644
--- a/source/persistency/digits+hits/hits/GNUmakefile
+++ b/source/persistency/digits+hits/hits/GNUmakefile
@@ -1,18 +1,19 @@
-# $Id: GNUmakefile,v 1.10 1999/11/24 20:27:23 morita Exp $
+# $Id: GNUmakefile,v 1.11 2001/03/15 22:58:54 morita Exp $
 
 name := G4phits
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4INSTALL)/source/persistency/global/include \
              -I$(G4INSTALL)/source/digits+hits/hits/include \
diff --git a/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl b/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
index 1e8f2c1bbf..87678846f4 100644
--- a/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PHCofThisEvent.ddl,v 1.9 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PHCofThisEvent.ddl,v 1.10.2.1 2001/06/28 19:11:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
@@ -60,7 +76,7 @@ class G4PHCofThisEvent
         G4int n = 0;
         for(int i=0;i<HC.size();i++)
         {
-          if( HC[i] != NULL ) n++;
+          if( HC[i] != 0 ) n++;
         }
         return n;
       }
diff --git a/source/persistency/digits+hits/hits/include/G4PVHit.ddl b/source/persistency/digits+hits/hits/include/G4PVHit.ddl
index b015552440..61c5e98cfd 100644
--- a/source/persistency/digits+hits/hits/include/G4PVHit.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PVHit.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVHit.ddl,v 1.7 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVHit.ddl,v 1.7.4.1 2001/06/28 19:11:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl b/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
index 42ade118b9..5cc1d1698d 100644
--- a/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
+++ b/source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVHitsCollection.ddl,v 1.14 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVHitsCollection.ddl,v 1.14.4.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh b/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
index 151b341ea9..60a41c3d2b 100644
--- a/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
+++ b/source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentHitMan.hh,v 1.6 2000/12/15 08:04:14 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentHitMan.hh,v 1.6.4.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc b/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
index 743ff70051..b182daff3b 100644
--- a/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
+++ b/source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PHCofThisEvent.cc,v 1.6 1999/12/02 16:10:22 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PHCofThisEvent.cc,v 1.6.8.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PHCofThisEvent.hh"
diff --git a/source/persistency/digits+hits/hits/src/G4PVHit.cc b/source/persistency/digits+hits/hits/src/G4PVHit.cc
index fb5c415192..e81b369997 100644
--- a/source/persistency/digits+hits/hits/src/G4PVHit.cc
+++ b/source/persistency/digits+hits/hits/src/G4PVHit.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVHit.cc,v 1.4 1999/11/24 20:27:24 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVHit.cc,v 1.4.8.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PVHit.hh"
diff --git a/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc b/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
index 6d350043e3..00615ba651 100644
--- a/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
+++ b/source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVHitsCollection.cc,v 1.8 1999/11/28 21:54:16 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVHitsCollection.cc,v 1.8.8.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4PVHitsCollection
diff --git a/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc b/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
index 61cbe29bb9..aaa720efa9 100644
--- a/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
+++ b/source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentHitMan.cc,v 1.4 1999/11/28 21:54:16 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentHitMan.cc,v 1.5.2.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistentHitMan 
 //
@@ -16,7 +32,7 @@
 #include "G4PersistentHitMan.hh"
 
 
-G4PersistentHitMan* G4PersistentHitMan::f_PersistentHitMan = NULL;
+G4PersistentHitMan* G4PersistentHitMan::f_PersistentHitMan = 0;
 
 G4PersistentHitMan* G4PersistentHitMan::GetPersistentHitMan()
 {
@@ -31,7 +47,7 @@ G4PersistentHitMan* G4PersistentHitMan::get_PersistentHitManIfExist()
 { return f_PersistentHitMan; }
 
 G4PersistentHitMan::G4PersistentHitMan()
- : f_CurrentPHCofThisEvent(NULL)
+ : f_CurrentPHCofThisEvent(0)
 {;}
 
 G4PersistentHitMan::~G4PersistentHitMan()
diff --git a/source/persistency/events/GNUmakefile b/source/persistency/events/GNUmakefile
index 0a18041359..c27caf3f1a 100644
--- a/source/persistency/events/GNUmakefile
+++ b/source/persistency/events/GNUmakefile
@@ -1,20 +1,20 @@
-# $Id: GNUmakefile,v 1.9 1999/12/01 15:21:05 morita Exp $
+# $Id: GNUmakefile,v 1.10 2001/03/15 22:58:54 morita Exp $
 
 name := G4pevents
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
-
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../..
+  G4INSTALL = $(PWD)/../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4phits \
              -I$(G4TMP)/$(G4SYSTEM)/G4pdigits \
diff --git a/source/persistency/events/include/G4PEvent.ddl b/source/persistency/events/include/G4PEvent.ddl
index ab507261f2..caf34b1249 100644
--- a/source/persistency/events/include/G4PEvent.ddl
+++ b/source/persistency/events/include/G4PEvent.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PEvent.ddl,v 1.10 2000/12/05 14:40:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PEvent.ddl,v 1.11.2.1 2001/06/28 19:11:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
@@ -80,7 +96,7 @@ class G4PEvent
 
       inline void AddPrimaryVertex( HepRef(G4PPrimaryVertex) aPrimaryVertex)
       {
-        if( thePrimaryVertex == NULL )
+        if( thePrimaryVertex == 0 )
         { thePrimaryVertex = aPrimaryVertex; }
         else
         { thePrimaryVertex->SetNext( aPrimaryVertex ); }
@@ -101,13 +117,13 @@ class G4PEvent
           HepRef(G4PPrimaryVertex) primaryVertex = thePrimaryVertex;
           for( int j=0; j<i; j++ )
           {
-            if( primaryVertex == NULL ) return NULL;
+            if( primaryVertex == 0 ) return 0;
             primaryVertex = primaryVertex->GetNext();
           }
           return primaryVertex;
         }
         else
-        { return NULL; }
+        { return 0; }
       }
       // returns a smart pointer of the i-th primary vertex.
 
diff --git a/source/persistency/events/include/G4PPrimaryParticle.ddl b/source/persistency/events/include/G4PPrimaryParticle.ddl
index 2d259e0a3f..63dfe6ef41 100644
--- a/source/persistency/events/include/G4PPrimaryParticle.ddl
+++ b/source/persistency/events/include/G4PPrimaryParticle.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPrimaryParticle.ddl,v 1.2 2000/11/02 12:41:59 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPrimaryParticle.ddl,v 1.2.4.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4PPrimaryParticle_h
diff --git a/source/persistency/events/include/G4PPrimaryVertex.ddl b/source/persistency/events/include/G4PPrimaryVertex.ddl
index 0870f73d5d..45867721eb 100644
--- a/source/persistency/events/include/G4PPrimaryVertex.ddl
+++ b/source/persistency/events/include/G4PPrimaryVertex.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPrimaryVertex.ddl,v 1.9 2000/12/05 14:40:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPrimaryVertex.ddl,v 1.10.2.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
@@ -70,7 +86,7 @@ class G4PPrimaryVertex
       HepRef(G4PPrimaryParticle) GetPrimary(G4int i) const;
       inline void SetNext(HepRef(G4PPrimaryVertex) nv)
       {
-        if(nextVertex == NULL)
+        if(nextVertex == 0)
         { nextVertex = nv; }
         else
         { nextVertex->SetNext(nv); }
diff --git a/source/persistency/events/include/G4PersistentEventMan.hh b/source/persistency/events/include/G4PersistentEventMan.hh
index 9dfd90cf13..46085dcc22 100644
--- a/source/persistency/events/include/G4PersistentEventMan.hh
+++ b/source/persistency/events/include/G4PersistentEventMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentEventMan.hh,v 1.11 2000/12/15 07:54:49 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentEventMan.hh,v 1.11.4.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/events/src/G4PEvent.cc b/source/persistency/events/src/G4PEvent.cc
index e1902ec157..19aaeac910 100644
--- a/source/persistency/events/src/G4PEvent.cc
+++ b/source/persistency/events/src/G4PEvent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PEvent.cc,v 1.11 1999/12/15 14:51:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PEvent.cc,v 1.12.2.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // G4PEvent
@@ -17,21 +33,21 @@
 
 G4PEvent::G4PEvent()
 :eventID(0),
- thePrimaryVertex(NULL),numberOfPrimaryVertex(0),HC(NULL),DC(NULL)
+ thePrimaryVertex(0),numberOfPrimaryVertex(0),HC(0),DC(0)
 {;}
 
 G4PEvent::G4PEvent(const G4Event *evt)
 :eventID(0),
- thePrimaryVertex(NULL),numberOfPrimaryVertex(0),HC(NULL),DC(NULL)
+ thePrimaryVertex(0),numberOfPrimaryVertex(0),HC(0),DC(0)
 {
-  InitPEvent(evt, NULL, NULL);
+  InitPEvent(evt, 0, 0);
 }
 
 G4PEvent::G4PEvent(const G4Event *evt,
                    HepRef(G4PHCofThisEvent) pHC,
                    HepRef(G4PDCofThisEvent) pDC)
 :eventID(0),
- thePrimaryVertex(NULL),numberOfPrimaryVertex(0),HC(NULL),DC(NULL)
+ thePrimaryVertex(0),numberOfPrimaryVertex(0),HC(0),DC(0)
 {
   InitPEvent(evt, pHC, pDC);
 }
@@ -46,9 +62,9 @@ void G4PEvent::InitPEvent(const G4Event *evt,
   if(PV) thePrimaryVertex = new(ooThis()) G4PPrimaryVertex(PV);
   numberOfPrimaryVertex = evt->GetNumberOfPrimaryVertex();
 
-  if(pHC!=NULL) HC = pHC;
+  if(pHC!=0) HC = pHC;
 
-  if(pDC!=NULL) DC = pDC;
+  if(pDC!=0) DC = pDC;
 
 //  const G4TrajectoryContainer* TC = evt->GetTrajectoryContainer();
 //  if(TC) trajectoryContainer = new G4PTrajectoryContainer(TC);
@@ -57,19 +73,19 @@ void G4PEvent::InitPEvent(const G4Event *evt,
 
 G4PEvent::~G4PEvent()
 {
-  if(thePrimaryVertex != NULL)
+  if(thePrimaryVertex != 0)
   {
     G4PPrimaryVertex* aPPV = (HepRef(G4PPrimaryVertex)) thePrimaryVertex;
     HepDelete(aPPV);
   }
 
-  if(HC != NULL)
+  if(HC != 0)
   {
     G4PHCofThisEvent* aHC = (HepRef(G4PHCofThisEvent)) HC;
     HepDelete(aHC);
   }
 
-  if(DC != NULL)
+  if(DC != 0)
   {
     G4PDCofThisEvent* aDC = (HepRef(G4PDCofThisEvent)) DC;
     HepDelete(aDC);
@@ -83,12 +99,12 @@ G4Event* G4PEvent::MakeTransientObject()
 {
   G4Event* anEvt = new G4Event(eventID);
 
-  if(thePrimaryVertex != NULL)
+  if(thePrimaryVertex != 0)
   {
     G4PrimaryVertex* aPV = thePrimaryVertex->MakeTransientObject();
     for( G4int i = 0; i<numberOfPrimaryVertex; i++ )
     {
-      if( aPV != NULL )
+      if( aPV != 0 )
       {
         anEvt->AddPrimaryVertex(aPV);
         aPV = aPV->GetNext();
@@ -100,9 +116,9 @@ G4Event* G4PEvent::MakeTransientObject()
   // to transient G4Event ... this requires an introduction of
   // G4VHCofThisEvent and G4VDCofThisEvent in G4Event
   // (will be implemented in next release)
-  // if(HC != NULL)
+  // if(HC != 0)
   //   anEvt->SetHCofThisEvent( HC );
-  // if(DC != NULL)
+  // if(DC != 0)
   //   anEvt->SetDCofThisEvent( DC );
 
   return anEvt;
diff --git a/source/persistency/events/src/G4PPrimaryParticle.cc b/source/persistency/events/src/G4PPrimaryParticle.cc
index 1738c677a7..1d2f21ed09 100644
--- a/source/persistency/events/src/G4PPrimaryParticle.cc
+++ b/source/persistency/events/src/G4PPrimaryParticle.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPrimaryParticle.cc,v 1.1 1999/12/05 22:32:26 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPrimaryParticle.cc,v 1.2.2.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PPrimaryParticle.hh"
@@ -18,7 +34,7 @@ G4PPrimaryParticle::G4PPrimaryParticle(G4PrimaryParticle* aParticle)
   PDGcode = aParticle->GetPDGcode();
 
   G4ParticleDefinition* ag4code  = aParticle->GetG4code();
-  // if( ag4code != NULL )
+  // if( ag4code != 0 )
   // { ...will look up G4PParticleDefinition and set the G4code...; }
 
   Px      = aParticle->GetPx(); 
@@ -26,11 +42,11 @@ G4PPrimaryParticle::G4PPrimaryParticle(G4PrimaryParticle* aParticle)
   Pz      = aParticle->GetPz(); 
 
   G4PrimaryParticle* aNext = aParticle->GetNext();
-  if( aNext != NULL )
+  if( aNext != 0 )
   { nextParticle = new(ooThis()) G4PPrimaryParticle( aNext ); }
 
   G4PrimaryParticle* aDaughter = aParticle->GetDaughter();
-  if( aDaughter != NULL )
+  if( aDaughter != 0 )
   { daughterParticle = new(ooThis()) G4PPrimaryParticle( aDaughter ); }
 
   trackID = aParticle->GetTrackID();
@@ -42,9 +58,9 @@ G4PPrimaryParticle::G4PPrimaryParticle(G4PrimaryParticle* aParticle)
 
 G4PPrimaryParticle::~G4PPrimaryParticle()
 {
-  if(nextParticle != NULL)
+  if(nextParticle != 0)
   { HepDelete(nextParticle); }
-  if(daughterParticle != NULL)
+  if(daughterParticle != 0)
   { HepDelete(daughterParticle); }
 }
 
@@ -54,9 +70,9 @@ G4PrimaryParticle* G4PPrimaryParticle::MakeTransientObject()
 
   // aParticle->SetG4Code(...will lookup G4ParticleDefinition and set it...;)
 
-  if(nextParticle != NULL)
+  if(nextParticle != 0)
   { aParticle->SetNext( nextParticle->MakeTransientObject() ); }
-  if(daughterParticle != NULL)
+  if(daughterParticle != 0)
   { aParticle->SetDaughter( daughterParticle->MakeTransientObject() ); }
 
   aParticle->SetTrackID( trackID );
diff --git a/source/persistency/events/src/G4PPrimaryVertex.cc b/source/persistency/events/src/G4PPrimaryVertex.cc
index 3ac0b98fbd..275d931961 100644
--- a/source/persistency/events/src/G4PPrimaryVertex.cc
+++ b/source/persistency/events/src/G4PPrimaryVertex.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPrimaryVertex.cc,v 1.7 1999/12/15 14:51:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPrimaryVertex.cc,v 1.8.2.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PPrimaryVertex.hh"
@@ -17,8 +33,8 @@
 #include "G4PPrimaryParticle.hh"
 
 G4PPrimaryVertex::G4PPrimaryVertex()
-:X0(0.),Y0(0.),Z0(0.),T0(0.),numberOfParticle(0),nextVertex(NULL)
-// ,theParticle(NULL)
+:X0(0.),Y0(0.),Z0(0.),T0(0.),numberOfParticle(0),nextVertex(0)
+// ,theParticle(0)
 {;}
 
 G4PPrimaryVertex::G4PPrimaryVertex(const G4PrimaryVertex* vertex)
@@ -35,7 +51,7 @@ G4PPrimaryVertex::G4PPrimaryVertex(const G4PrimaryVertex* vertex)
   HepRef(G4PPrimaryParticle) particle = theParticle;
   for (G4int i=0; i<numberOfParticle; i++)
   {
-    assert( particle != NULL );
+    assert( particle != 0 );
     particle = particle->GetNext();
   }
   theTail = particle;
@@ -44,26 +60,26 @@ G4PPrimaryVertex::G4PPrimaryVertex(const G4PrimaryVertex* vertex)
   if(nextVX)
   { nextVertex = new(ooThis()) G4PPrimaryVertex(nextVX); }
   else
-  { nextVertex = NULL; }
+  { nextVertex = 0; }
 }
 
 G4PPrimaryVertex::~G4PPrimaryVertex()
 {
-  if(theParticle != NULL)
+  if(theParticle != 0)
   {
     G4PPrimaryParticle* pp = (HepRef(G4PPrimaryParticle)) theParticle;
     HepDelete(pp);
   }
   { HepDelete(theParticle); }
 
-  if(theTail != NULL)
+  if(theTail != 0)
   {
     G4PPrimaryParticle* pt = (HepRef(G4PPrimaryParticle)) theTail;
     HepDelete(pt);
   }
   { HepDelete(theParticle); }
 
-  if(nextVertex != NULL)
+  if(nextVertex != 0)
   {
     G4PPrimaryVertex* nv = (HepRef(G4PPrimaryVertex)) nextVertex;
     HepDelete(nv);
@@ -74,7 +90,7 @@ G4PrimaryVertex* G4PPrimaryVertex::MakeTransientObject()
 {
   G4PrimaryVertex* aPV = new G4PrimaryVertex(X0,Y0,Z0,T0);
 
-  if(theParticle != NULL)
+  if(theParticle != 0)
   {
     G4PrimaryParticle* particle = theParticle->MakeTransientObject();
 
@@ -86,7 +102,7 @@ G4PrimaryVertex* G4PPrimaryVertex::MakeTransientObject()
     }
   }
 
-  if( nextVertex != NULL )
+  if( nextVertex != 0 )
     aPV->SetNext( nextVertex->MakeTransientObject() );
 
   return aPV;
@@ -101,12 +117,12 @@ HepRef(G4PPrimaryParticle) G4PPrimaryVertex::GetPrimary(G4int i=0) const
     HepRef(G4PPrimaryParticle) particle = theParticle;
     for( int j=0; j<i; j++ )
     {
-      if( particle == NULL ) return NULL;
+      if( particle == 0 ) return 0;
       particle = particle->GetNext();
     }
     return particle;
   }
   else
-  { return NULL; }
+  { return 0; }
 }
 
diff --git a/source/persistency/events/src/G4PersistentEventMan.cc b/source/persistency/events/src/G4PersistentEventMan.cc
index d3327b96a4..3bd77f53e5 100644
--- a/source/persistency/events/src/G4PersistentEventMan.cc
+++ b/source/persistency/events/src/G4PersistentEventMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentEventMan.cc,v 1.15 1999/12/02 19:40:51 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentEventMan.cc,v 1.16.2.1 2001/06/28 19:11:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistentEventMan 
 //
@@ -29,7 +45,7 @@
 #include "G4ios.hh"
 
 G4PersistentEventMan::G4PersistentEventMan()
- : f_PHCMan(NULL), f_PDCMan(NULL), f_currentEventID(0)
+ : f_PHCMan(0), f_PDCMan(0), f_currentEventID(0)
 {;}
 
 G4PersistentEventMan::G4PersistentEventMan(
@@ -52,13 +68,13 @@ G4bool G4PersistentEventMan::Store( HepDbApplication* dbApp,
   // Create persistent event
   f_currentPEvent = new(f_container) G4PEvent(anEvent, aPHC, aPDC);
 
-  if( aPHC != NULL )
-  { f_PHCMan->SetCurrentPHCofThisEvent(NULL); }
+  if( aPHC != 0 )
+  { f_PHCMan->SetCurrentPHCofThisEvent(0); }
 
-  if( aPDC != NULL )
-  { f_PDCMan->SetCurrentPDCofThisEvent(NULL); }
+  if( aPDC != 0 )
+  { f_PDCMan->SetCurrentPDCofThisEvent(0); }
 
-  if( f_currentPEvent != NULL )
+  if( f_currentPEvent != 0 )
   {
     f_currentEventID = anEvent->GetEventID();
     return true;
@@ -74,7 +90,7 @@ G4bool G4PersistentEventMan::Retrieve( HepDbApplication* dbApp,
                                        G4Event*& anEvent )
 {
   G4bool theStatus = false;
-  anEvent = NULL;
+  anEvent = 0;
 
   ooItr(G4PEvent) pevt_iterator;
 
@@ -90,7 +106,7 @@ G4bool G4PersistentEventMan::Retrieve( HepDbApplication* dbApp,
   if( pevt_iterator.next() )
   {
     G4Event* anEvt = pevt_iterator->MakeTransientObject();
-    if( anEvt != NULL )
+    if( anEvt != 0 )
     {
       anEvent = anEvt;
       theStatus = true;
diff --git a/source/persistency/geometry/global/GNUmakefile b/source/persistency/geometry/global/GNUmakefile
index 877513442b..f96f8f8fe2 100644
--- a/source/persistency/geometry/global/GNUmakefile
+++ b/source/persistency/geometry/global/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.5 1999/12/01 15:21:06 morita Exp $
+# $Id: GNUmakefile,v 1.6 2001/03/15 22:58:54 morita Exp $
 
 name := G4pgeomGlobal
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4TMPDIR) \
              -I$(G4INSTALL)/source/persistency/global/include \
              -I$(G4INSTALL)/source/global/management/include \
diff --git a/source/persistency/geometry/global/include/G4PAffineTransform.ddl b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
index 7d42443874..adc5849398 100644
--- a/source/persistency/geometry/global/include/G4PAffineTransform.ddl
+++ b/source/persistency/geometry/global/include/G4PAffineTransform.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAffineTransform.ddl,v 1.4 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAffineTransform.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // persistenet class of G4AffineTransform
 //
diff --git a/source/persistency/geometry/global/include/G4PVSolid.ddl b/source/persistency/geometry/global/include/G4PVSolid.ddl
index 0d979e58b8..395c302cd8 100644
--- a/source/persistency/geometry/global/include/G4PVSolid.ddl
+++ b/source/persistency/geometry/global/include/G4PVSolid.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVSolid.ddl,v 1.4 2000/11/02 12:42:06 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVSolid.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVSolid
diff --git a/source/persistency/geometry/global/src/G4PAffineTransform.cc b/source/persistency/geometry/global/src/G4PAffineTransform.cc
index f84366c6e1..173c118a43 100644
--- a/source/persistency/geometry/global/src/G4PAffineTransform.cc
+++ b/source/persistency/geometry/global/src/G4PAffineTransform.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAffineTransform.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAffineTransform.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PAffineTransform
 //
diff --git a/source/persistency/geometry/global/src/G4PVSolid.cc b/source/persistency/geometry/global/src/G4PVSolid.cc
index 25b207a784..253a9b5231 100644
--- a/source/persistency/geometry/global/src/G4PVSolid.cc
+++ b/source/persistency/geometry/global/src/G4PVSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVSolid.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVSolid.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PVSolid
 //
diff --git a/source/persistency/geometry/management/GNUmakefile b/source/persistency/geometry/management/GNUmakefile
index fcbb7d094c..80b8331de9 100644
--- a/source/persistency/geometry/management/GNUmakefile
+++ b/source/persistency/geometry/management/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.12 2000/06/08 11:46:43 morita Exp $
+# $Id: GNUmakefile,v 1.13 2001/03/15 22:58:54 morita Exp $
 
 name := G4pgeomn
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../..
+  G4INSTALL = $(PWD)/../../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
              -I$(G4TMP)/$(G4SYSTEM)/G4pcsg \
diff --git a/source/persistency/geometry/management/include/G4LogVolRefArray.hh b/source/persistency/geometry/management/include/G4LogVolRefArray.hh
index f023933080..64fc77d5da 100644
--- a/source/persistency/geometry/management/include/G4LogVolRefArray.hh
+++ b/source/persistency/geometry/management/include/G4LogVolRefArray.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogVolRefArray.hh,v 1.1 2000/11/17 05:10:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
index 14a6ed1cca..c07901af82 100644
--- a/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
+++ b/source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PGeometryObjectMap.ddl,v 1.7 2000/11/22 15:29:39 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PGeometryObjectMap.ddl,v 1.7.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
index f6e0d265b7..ad8c4eba3d 100644
--- a/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PLogicalVolume.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PLogicalVolume.ddl,v 1.9 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PLogicalVolume.ddl,v 1.9.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PLogicalVolume
diff --git a/source/persistency/geometry/management/include/G4PPVParameterised.ddl b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
index e6d3060a18..879cda90fa 100644
--- a/source/persistency/geometry/management/include/G4PPVParameterised.ddl
+++ b/source/persistency/geometry/management/include/G4PPVParameterised.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVParameterised.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVParameterised.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PPVParameterised
 //
diff --git a/source/persistency/geometry/management/include/G4PPVPlacement.ddl b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
index ffb9a9bd12..a8ff8605ca 100644
--- a/source/persistency/geometry/management/include/G4PPVPlacement.ddl
+++ b/source/persistency/geometry/management/include/G4PPVPlacement.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVPlacement.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVPlacement.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //          P-versieon of G4PVPlacement      Takashi.Sasaki@kek.jp
diff --git a/source/persistency/geometry/management/include/G4PPVReplica.ddl b/source/persistency/geometry/management/include/G4PPVReplica.ddl
index bc1df195ec..83e8f0c762 100644
--- a/source/persistency/geometry/management/include/G4PPVReplica.ddl
+++ b/source/persistency/geometry/management/include/G4PPVReplica.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVReplica.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVReplica.ddl,v 1.5.4.1 2001/06/28 19:11:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PPVReplica
diff --git a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
index 081213c2c3..27c258049f 100644
--- a/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+++ b/source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVPhysicalVolume.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVPhysicalVolume.ddl,v 1.5.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PVPhysicalVolume
diff --git a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
index 2d28c09a49..1d0e68a88c 100644
--- a/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+++ b/source/persistency/geometry/management/include/G4PersistentGeomMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentGeomMan.hh,v 1.10 2000/12/15 07:56:35 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentGeomMan.hh,v 1.10.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh b/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
index a1bab9f6c2..16cf5bcee1 100644
--- a/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
+++ b/source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPhysVolRefArray.hh,v 1.1 2000/11/17 05:10:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPhysVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/include/G4VSolidRefArray.hh b/source/persistency/geometry/management/include/G4VSolidRefArray.hh
index 2017850c3b..64fa1f83fc 100644
--- a/source/persistency/geometry/management/include/G4VSolidRefArray.hh
+++ b/source/persistency/geometry/management/include/G4VSolidRefArray.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSolidRefArray.hh,v 1.1 2000/11/17 05:10:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSolidRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
index bf120c6b0c..c66092d7bf 100644
--- a/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+++ b/source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PGeometryObjectMap.cc,v 1.6 2000/11/17 05:10:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PGeometryObjectMap.cc,v 1.7.2.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PGeometryObjectMap 
 //
@@ -56,7 +72,7 @@ G4PGeometryObjectMap::~G4PGeometryObjectMap()
 HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
                                       G4VPhysicalVolume* inGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noPhysVol;i++)
   {
     if( transPhysVolPtrs->Get(i) == inGeomObj )
@@ -65,15 +81,15 @@ HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add(         G4VPhysicalVolume*  inGeomObj,
                                 HepRef(G4PVPhysicalVolume) outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   HepRef(G4PVPhysicalVolume) aGeomObj = LookUp( inGeomObj );
-  if( aGeomObj == NULL )
+  if( aGeomObj == 0 )
   {
 //    assert( inGeomObj == aGeomObj );
     noPhysVol++;
@@ -88,7 +104,7 @@ void G4PGeometryObjectMap::Add(         G4VPhysicalVolume*  inGeomObj,
 G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
                                HepRef(G4PVPhysicalVolume) inGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noPhysVol;i++)
   {
     if( persPhysVolPtrs[i] == inGeomObj )
@@ -97,13 +113,13 @@ G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume)  inGeomObj,
                                         G4VPhysicalVolume* outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noPhysVol;i++)
   {
     if( persPhysVolPtrs[i] == inGeomObj )
@@ -120,7 +136,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume)  inGeomObj,
 HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
                                       G4LogicalVolume* inGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noLogVol;i++)
   {
     if( transLogVolPtrs->Get(i) == inGeomObj )
@@ -129,15 +145,15 @@ HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add(         G4LogicalVolume*  inGeomObj,
                                 HepRef(G4PLogicalVolume) outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   HepRef(G4PLogicalVolume) aGeomObj = LookUp( inGeomObj );
-  if( aGeomObj == NULL )
+  if( aGeomObj == 0 )
   {
 //    assert( inGeomObj == aGeomObj );
     noLogVol++;
@@ -152,7 +168,7 @@ void G4PGeometryObjectMap::Add(         G4LogicalVolume*  inGeomObj,
 G4LogicalVolume* G4PGeometryObjectMap::LookUp(
                                HepRef(G4PLogicalVolume) inGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noLogVol;i++)
   {
     if( persLogVolPtrs[i] == inGeomObj )
@@ -161,13 +177,13 @@ G4LogicalVolume* G4PGeometryObjectMap::LookUp(
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume)  inGeomObj,
                                         G4LogicalVolume* outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noLogVol;i++)
   {
     if( persLogVolPtrs[i] == inGeomObj )
@@ -189,7 +205,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
   cout << "  G4VSolid info: " << inGeomObj << G4endl;
 #endif
 
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noSolids;i++)
   {
 #ifdef G4PERSISTENCY_DEBUG
@@ -206,15 +222,15 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add(         G4VSolid*  inGeomObj,
                                 HepRef(G4PVSolid) outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   HepRef(G4PVSolid) aGeomObj = LookUp( inGeomObj );
-  if( aGeomObj == NULL )
+  if( aGeomObj == 0 )
   {
 //    assert( inGeomObj == aGeomObj );
     noSolids++;
@@ -237,7 +253,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
   inGeomObj.print(stdout);
 #endif
 
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noSolids;i++)
   {
 #ifdef G4PERSISTENCY_DEBUG
@@ -253,13 +269,13 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
     }
   }
 
-  return NULL;
+  return 0;
 }
 
 void G4PGeometryObjectMap::Add( HepRef(G4PVSolid)  inGeomObj,
                                         G4VSolid* outGeomObj )
 {
-  assert(inGeomObj != NULL);
+  assert(inGeomObj != 0);
   for(G4int i=0;i<noSolids;i++)
   {
     if( persSolidPtrs[i] == inGeomObj )
@@ -281,7 +297,7 @@ G4VSolid* G4PGeometryObjectMap::GetSolid(G4int i)
   }
   else
   {
-    return NULL;
+    return 0;
   }
 }
 
@@ -293,7 +309,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::GetPSolid(G4int i)
   }
   else
   {
-    return NULL;
+    return 0;
   }
 }
 
@@ -314,15 +330,15 @@ void G4PGeometryObjectMap::InitTransientMap()
   G4int i;
   for(i=0;i<noPhysVol;i++)
   {
-    transPhysVolPtrs->Insert(i, NULL);
+    transPhysVolPtrs->Insert(i, 0);
   }
   for(i=0;i<noLogVol;i++)
   {
-    transLogVolPtrs->Insert(i, NULL);
+    transLogVolPtrs->Insert(i, 0);
   }
   for(i=0;i<noSolids;i++)
   {
-    transSolidPtrs->Insert(i, NULL);
+    transSolidPtrs->Insert(i, 0);
   }
 
 }
diff --git a/source/persistency/geometry/management/src/G4PLogicalVolume.cc b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
index 08cafe5331..66f7783783 100644
--- a/source/persistency/geometry/management/src/G4PLogicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PLogicalVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PLogicalVolume.cc,v 1.5 2000/06/09 12:56:44 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PLogicalVolume.cc,v 1.6.2.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //                                      Takashi.Sasaki@kek.jp
@@ -81,8 +97,8 @@ G4LogicalVolume* G4PLogicalVolume::MakeTransientObject(
                                              G4Material* theMaterial)
 {
   // These are null poineters temporaly 
-  G4SmartVoxelHeader*    fVoxel = NULL;
-  const G4VisAttributes* fVisAttributes = NULL;
+  G4SmartVoxelHeader*    fVoxel = 0;
+  const G4VisAttributes* fVisAttributes = 0;
 
 //    G4LogicalVolume(G4VSolid *pSolid, G4Material *pMaterial,
 //		    const G4String& name,
@@ -132,7 +148,7 @@ void G4PLogicalVolume::RemoveDaughter(const HepRef(G4PVPhysicalVolume) p)
   for ( G4int i=0; i<NoOfDaughters; i++) 
     if ( fDaughters[i] == p )
     {
-      fDaughters.replace_element_at(NULL,i);
+      fDaughters.replace_element_at(0,i);
       NoOfDaughters--; 
     }
 }
diff --git a/source/persistency/geometry/management/src/G4PPVParameterised.cc b/source/persistency/geometry/management/src/G4PPVParameterised.cc
index c32d90b224..c2e033ee81 100644
--- a/source/persistency/geometry/management/src/G4PPVParameterised.cc
+++ b/source/persistency/geometry/management/src/G4PPVParameterised.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVParameterised.cc,v 1.3.2.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
@@ -30,7 +46,7 @@ G4PPVParameterised::G4PPVParameterised( G4VPhysicalVolume* PhysVol,
  :  G4PPVReplica(PhysVol, persLogVol)
 {
   // G4VPVParameterisation class has no data member
-  //  fparam = NULL;
+  //  fparam = 0;
 }
 
 G4PPVParameterised::~G4PPVParameterised()
@@ -46,7 +62,7 @@ G4VPhysicalVolume* G4PPVParameterised::MakeTransientObject(
   G4int nReplicas = fnReplicas;
 
   G4VPhysicalVolume* aPhysVol = new G4PVParameterised(
-       pName, aLogical, aMother, pAxis, nReplicas, NULL);
+       pName, aLogical, aMother, pAxis, nReplicas, 0);
 
   return aPhysVol;
 }
diff --git a/source/persistency/geometry/management/src/G4PPVPlacement.cc b/source/persistency/geometry/management/src/G4PPVPlacement.cc
index f27bb68bc3..db5ad484fc 100644
--- a/source/persistency/geometry/management/src/G4PPVPlacement.cc
+++ b/source/persistency/geometry/management/src/G4PPVPlacement.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVPlacement.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PPVReplica.cc b/source/persistency/geometry/management/src/G4PPVReplica.cc
index 118a9c135b..036dc46a9f 100644
--- a/source/persistency/geometry/management/src/G4PPVReplica.cc
+++ b/source/persistency/geometry/management/src/G4PPVReplica.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPVReplica.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
index 01181e8e55..0e0224567f 100644
--- a/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+++ b/source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PVPhysicalVolume.cc,v 1.4.2.1 2001/06/28 19:11:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //                         Takashi.Sasaki@kek.jp
@@ -24,7 +40,7 @@
 #include "G4PLogicalVolume.hh"
 
 G4PVPhysicalVolume::G4PVPhysicalVolume()
-: flogical(NULL), fname(NULL), fmother(NULL)
+: flogical(0), fname(0), fmother(0)
 {
   frot.resize(9);
   ftrans.resize(3);
@@ -68,7 +84,7 @@ G4VPhysicalVolume* G4PVPhysicalVolume::MakeTransientObject(
   // quick solution.
 
   G4VPhysicalVolume* aPhysVol = new G4PVPlacement(
-                     pRot, tlate, pName = fname, aLogical, NULL, false, 0);
+                     pRot, tlate, pName = fname, aLogical, 0, false, 0);
   aPhysVol->SetMother(aMother);
 
   return aPhysVol;
diff --git a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
index 4d0a825542..5c9fd78a5f 100644
--- a/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+++ b/source/persistency/geometry/management/src/G4PersistentGeomMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentGeomMan.cc,v 1.14 2000/06/09 12:56:44 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentGeomMan.cc,v 1.15.2.1 2001/06/28 19:11:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistentGeomMan 
 //
@@ -58,7 +74,7 @@
 #include "G4ios.hh"
 
 G4PersistentGeomMan::G4PersistentGeomMan()
- : f_GeomMap(NULL), f_GeomMapScopeName("Geant4 Geometry Object Map")
+ : f_GeomMap(0), f_GeomMapScopeName("Geant4 Geometry Object Map")
 {;}
 
 G4PersistentGeomMan::~G4PersistentGeomMan()
@@ -110,7 +126,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
   HepRef(G4PVPhysicalVolume) persWorld =
                   MakePersistentObject( (G4VPhysicalVolume*)aWorld );
 
-  if ( persWorld != NULL )
+  if ( persWorld != 0 )
   {
     // set the persistent World Volume to f_GeomMap
     f_GeomMap->SetWorldVolume( persWorld );
@@ -127,7 +143,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
 G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
                                       G4VPhysicalVolume*& theWorld)
 {
-  theWorld = NULL;
+  theWorld = 0;
 
   G4VMaterialMap* f_Materialmap = G4VMaterialMap::GetMaterialMap();
   if(f_verboseLevel>0)
@@ -148,7 +164,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   }
   // ----------------------- Objectivity Feature ----------------------- //
 
-  if ( f_GeomMap == NULL )
+  if ( f_GeomMap == 0 )
   {
     G4cerr << "G4PersistentGeomMan::Retrieve()"
            << " -- error in searching the geometry object map: "
@@ -186,7 +202,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   // Locate the persistent world physics volume
   HepRef(G4PVPhysicalVolume) persWorld = f_GeomMap->GetWorldVolume();
 
-  if ( persWorld == NULL )
+  if ( persWorld == 0 )
   {
     G4cerr << "G4PersistentGeomMan::Retrieve"
            << " -- geometry object map does not have world volume."
@@ -197,10 +213,10 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
   // start the recursive data member copy
   // to create the transient geometry object tree
 
-  HepRef(G4PVPhysicalVolume) persMother = NULL;
+  HepRef(G4PVPhysicalVolume) persMother = 0;
   theWorld = MakeTransientObject( persWorld, persMother );
   
-  if ( theWorld == NULL )
+  if ( theWorld == 0 )
   {
     G4cerr << "G4PersistentGeomMan::Retrieve"
            << " -- transient world volume is empty."
@@ -221,7 +237,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
      G4cerr << "G4PersistentGeomMan::MakePersistentObject" <<
       " -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
        << G4endl;
-    return NULL;
+    return 0;
   }
 
   if( f_verboseLevel>2 && f_nRecursive % 1000 == 0 )
@@ -231,7 +247,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
 
   // check if the persistent version of thePhysVol exists
   HepRef(G4PVPhysicalVolume) persPhysVol = f_GeomMap->LookUp(thePhysVol);
-  if (  persPhysVol == NULL )
+  if (  persPhysVol == 0 )
   {
     // Get the Logical Volume in thePhysVol
     G4LogicalVolume* theLogVol = thePhysVol->GetLogicalVolume();
@@ -240,7 +256,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
     HepRef(G4PLogicalVolume) persLogVol =
                                MakePersistentObject( theLogVol );
 #ifdef G4DEBUG
-    assert( persLogVol != NULL );
+    assert( persLogVol != 0 );
 #endif
 
     // Construct the persistent version of thePhysVol for each type of volume
@@ -261,7 +277,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
         break;
       }
 #ifdef G4DEBUG
-    assert( persPhysVol != NULL );
+    assert( persPhysVol != 0 );
 #endif
 
     // register persPhysVol to the geometry object lookup table
@@ -278,7 +294,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
 {
   // check if the persistent version of theLogVol exists
   HepRef(G4PLogicalVolume) persLogVol = f_GeomMap->LookUp(theLogVol);
-  if ( persLogVol == NULL )
+  if ( persLogVol == 0 )
   {
     // get the solid of the transient logical volume
     G4VSolid* theSolid = theLogVol->GetSolid();
@@ -289,7 +305,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
     // Construct the persistent version of theLogVol
     persLogVol = new(f_container) G4PLogicalVolume(theLogVol, persSolid);
 #ifdef G4DEBUG
-    assert( persLogVol != NULL );
+    assert( persLogVol != 0 );
 #endif
 
     // register persLogVol to the geometry object lookup table
@@ -307,7 +323,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
             MakePersistentObject( dPhysVol );
 
       // add persistent daughter volume to the persistent logical volume
-      if ( persDaughterPhysVol != NULL )
+      if ( persDaughterPhysVol != 0 )
         persLogVol->AddDaughter( persDaughterPhysVol );
 
     } // end of for(G4int i=0;i<nDaughters;i++)
@@ -322,7 +338,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
 {
   // check if the persistent version of theSolid exists
   HepRef(G4PVSolid) persSolid = f_GeomMap->LookUp(theSolid);
-  if ( persSolid == NULL )
+  if ( persSolid == 0 )
   {
     G4GeometryType theSolidType = theSolid->GetEntityType();
 
@@ -375,8 +391,8 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
       G4VSolid* aSolidA = boolSolid->GetConstituentSolid(0);
       G4VSolid* aSolidB = boolSolid->GetConstituentSolid(1);
 #ifdef G4DEBUG
-      assert(aSolidA!=NULL);
-      assert(aSolidB!=NULL);
+      assert(aSolidA!=0);
+      assert(aSolidB!=0);
 #endif
       HepRef(G4PVSolid) persSolidA = MakePersistentObject(aSolidA);
       HepRef(G4PVSolid) persSolidB = MakePersistentObject(aSolidB);
@@ -407,7 +423,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
       G4DisplacedSolid* dispSolid = (G4DisplacedSolid*) theSolid;
       G4VSolid* movedSolid = dispSolid->GetConstituentMovedSolid();
 #ifdef G4DEBUG
-      assert(movedSolid!=NULL);
+      assert(movedSolid!=0);
 #endif
       HepRef(G4PVSolid) persMovedSolid = MakePersistentObject(movedSolid);
 
@@ -426,7 +442,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
 #endif
 
     // register persSolid to the geometry object lookup table
-    if ( persSolid != NULL )
+    if ( persSolid != 0 )
       f_GeomMap->Add( theSolid, persSolid );
 
   } // end of if f_GeomMap->LookUp(theSolid)
@@ -446,7 +462,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
      G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
       " -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
        << G4endl;
-    return NULL;
+    return 0;
   }
 
   if( f_verboseLevel>2 && f_tRecursive % 1000 == 0 )
@@ -456,7 +472,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
 
   // check if the transient version of persPhysVol exists
   G4VPhysicalVolume* thePhysVol = f_GeomMap->LookUp(persPhysVol);
-  if (  thePhysVol == NULL )
+  if (  thePhysVol == 0 )
   {
     // Get the Logical Volume in persPhysVol
     HepRef(G4PLogicalVolume) persLogVol = persPhysVol->GetLogicalVolume();
@@ -465,7 +481,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
     G4LogicalVolume* theLogVol =
          MakeTransientObject( persLogVol, persPhysVol );
 #ifdef G4DEBUG
-    assert( theLogVol != NULL );
+    assert( theLogVol != 0 );
 #endif
 
     // Construct the transient version of persPhysVol
@@ -473,7 +489,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
         thePhysVol = persPhysVol->MakeTransientObject(
                          theLogVol, f_GeomMap->LookUp(persMotherVol) );
 #ifdef G4DEBUG
-    assert( thePhysVol != NULL );
+    assert( thePhysVol != 0 );
 #endif
 
     // register thePhysVol to the geometry object lookup table
@@ -490,19 +506,19 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
 {
   // check if the transient version of persLogVol exists
   G4LogicalVolume* theLogVol = f_GeomMap->LookUp(persLogVol);
-  if ( theLogVol == NULL )
+  if ( theLogVol == 0 )
   {
     // get the solid of the persistent logical volume
     HepRef(G4PVSolid) persSolid = persLogVol->GetSolid();
 #ifdef G4DEBUG
-    assert( persSolid != NULL );
+    assert( persSolid != 0 );
 #endif
 
     // check if the transient version of persSolid exists
     G4VSolid* theSolid = f_GeomMap->LookUp(persSolid);
 
 #ifdef G4DEBUG
-    if ( theSolid == NULL )
+    if ( theSolid == 0 )
     {
       G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
        " -- transient Solid not found for the persistent Solid" << G4endl;
@@ -510,7 +526,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
 #endif
 
     // Lookup the material from name
-    G4Material* theMaterial = NULL;
+    G4Material* theMaterial = 0;
     if( f_MaterialMap )
     {
       theMaterial = f_MaterialMap->LookUp(persLogVol->GetMaterialName());
@@ -519,7 +535,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
     // Construct the persistent version of theLogVol with theSolid
     theLogVol = persLogVol->MakeTransientObject(theSolid, theMaterial);
 #ifdef G4DEBUG
-    assert( theLogVol != NULL );
+    assert( theLogVol != 0 );
 #endif
 
     // register theLogVol to the geometry object lookup table
@@ -538,7 +554,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
             MakeTransientObject( persDaughterPhysVol, persMotherVol );
 
       // add transient daughter volume to the transient logical volume
-      if ( theDaughterPhysVol != NULL )
+      if ( theDaughterPhysVol != 0 )
         theLogVol->AddDaughter( theDaughterPhysVol );
 
     } // end of for(G4int i=0;i<nDaughters;i++)
@@ -553,7 +569,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
 {
   // check if the persistent version of theSolid exists
   G4VSolid* transSolid = f_GeomMap->LookUp(persSolid);
-  if ( transSolid == NULL )
+  if ( transSolid == 0 )
   {
     G4GeometryType theSolidType = persSolid->GetEntityType();
 
@@ -568,8 +584,8 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
       HepRef(G4PVSolid) aSolidA = boolSolid->GetConstituentSolid(0);
       HepRef(G4PVSolid) aSolidB = boolSolid->GetConstituentSolid(1);
 #ifdef G4DEBUG
-      assert(aSolidA!=NULL);
-      assert(aSolidB!=NULL);
+      assert(aSolidA!=0);
+      assert(aSolidB!=0);
 #endif
       G4VSolid* transSolidA = MakeTransientObject(aSolidA);
       G4VSolid* transSolidB = MakeTransientObject(aSolidB);
@@ -584,7 +600,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
                             (HepRef(G4PDisplacedSolid)) persSolid;
       HepRef(G4PVSolid) movedSolid = dispSolid->GetConstituentMovedSolid();
 #ifdef G4DEBUG
-      assert(movedSolid!=NULL);
+      assert(movedSolid!=0);
 #endif
       G4VSolid* transMovedSolid = MakeTransientObject(movedSolid);
       transSolid = dispSolid->MakeTransientDisplacedSolid( transMovedSolid );
@@ -595,7 +611,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
       transSolid = persSolid->MakeTransientObject();
     }
 #ifdef G4DEBUG
-    assert( transSolid != NULL );
+    assert( transSolid != 0 );
 #endif
     f_GeomMap->Add( persSolid, transSolid );
   }
diff --git a/source/persistency/geometry/solids/Boolean/GNUmakefile b/source/persistency/geometry/solids/Boolean/GNUmakefile
index 214c872487..f61480a492 100644
--- a/source/persistency/geometry/solids/Boolean/GNUmakefile
+++ b/source/persistency/geometry/solids/Boolean/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.7 1999/12/01 15:21:07 morita Exp $
+# $Id: GNUmakefile,v 1.8 2001/03/15 22:58:54 morita Exp $
 
 name := G4pgeomBoolean
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../../..
+  G4INSTALL = $(PWD)/../../../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
              -I$(G4BASE)/persistency/global/include \
diff --git a/source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl b/source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl
index 80cfae7896..d66ac07c4e 100644
--- a/source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl
+++ b/source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent base class for solids created by boolean operations
 // between other solids
 //
diff --git a/source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl b/source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl
index 1cffdfa253..0fd2d8b61d 100644
--- a/source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl
+++ b/source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class describing solid placements for boolean operations
 //
 // History:
diff --git a/source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl b/source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl
index 1e78e89e7b..b0f3f75a1b 100644
--- a/source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl
+++ b/source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of intersection of two CSG solids
 //
 // History: 
diff --git a/source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl b/source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl
index 4784b6403f..bb95421d34 100644
--- a/source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl
+++ b/source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of subtraction of two CSG solids: A - B
 //
 // History: 
diff --git a/source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl b/source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl
index d1191e2c4a..3a6dcb8b16 100644
--- a/source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl
+++ b/source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of intersection of two CSG solids
 //
 // History: 
diff --git a/source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc b/source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc
index 0c924d3692..18d4d1304c 100644
--- a/source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc
+++ b/source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent base class for solids created by boolean operations
 // between other solids
 //
diff --git a/source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc b/source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc
index efcb9d0f6c..ed4436ca06 100644
--- a/source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc
+++ b/source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class describing solid placements for boolean operations
 //
 // History:
diff --git a/source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc b/source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc
index e556946a4d..07abd9c647 100644
--- a/source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc
+++ b/source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of intersection of two CSG solids
 //
 // History: 
diff --git a/source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc b/source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc
index 5ec7b88558..15009605d3 100644
--- a/source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc
+++ b/source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of subtraction of two CSG solids: A - B
 //
 // History: 
diff --git a/source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc b/source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc
index 731e9a559d..c7c80e3fae 100644
--- a/source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc
+++ b/source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Persistent class for description of intersection of two CSG solids
 //
 // History: 
diff --git a/source/persistency/geometry/solids/CSG/GNUmakefile b/source/persistency/geometry/solids/CSG/GNUmakefile
index 6ed98918ba..cc370a65ee 100644
--- a/source/persistency/geometry/solids/CSG/GNUmakefile
+++ b/source/persistency/geometry/solids/CSG/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.8 1999/12/01 15:21:07 morita Exp $
+# $Id: GNUmakefile,v 1.9 2001/03/15 22:58:54 morita Exp $
 
 name := G4pcsg
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../../..
+  G4INSTALL = $(PWD)/../../../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
              -I$(G4BASE)/persistency/global/include \
diff --git a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
index 930fd67105..29e6ad31e4 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PBox.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PBox.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PBox.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PBox
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
index 17847306b5..bdd1eb056c 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PCSGSolid.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PCSGSolid.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 // class G4CSGSolid
diff --git a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
index 368d07fab5..f8dfa6cb22 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PCons.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PCons.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PCons.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4Cons
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
index 66735737b9..851a148a29 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PPara.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPara.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPara.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PPara
 //
@@ -24,8 +40,6 @@ class G4Para;
 class G4VSolid;
 
 #include "G4ThreeVector.hh"
-#include "g4rw/tvordvec.h"
-typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
 
 class G4PPara : public G4PCSGSolid {
 public:
diff --git a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
index 0e88be4eaf..ea1686e9d7 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PSphere.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PSphere.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PSphere
 //
@@ -23,8 +39,6 @@ class G4VSolid;
 class G4Sphere;
 
 #include "G4ThreeVector.hh"
-#include "g4rw/tvordvec.h"
-typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
 
 class G4PSphere : public G4PCSGSolid {
 public:
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
index 1eb887ff31..c1ede6777a 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTorus.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTorus.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
index 726c12f4ff..e5c47adf13 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTrap.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTrap.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PTrap
 //
@@ -23,8 +39,6 @@ class G4VSolid;
 class G4Trap;
 
 #include "G4ThreeVector.hh"
-#include "g4rw/tvordvec.h"
-typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
 
 struct PTrapSidePlane
 {
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
index 2d3b92f7e7..fc2c3c143f 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTrd.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTrd.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PTrd
 //
diff --git a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
index 7b2584dfe9..46f7f494ba 100644
--- a/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+++ b/source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTubs.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTubs.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/geometry/solids/CSG/src/G4PBox.cc b/source/persistency/geometry/solids/CSG/src/G4PBox.cc
index d6eb9f3999..019e7d219a 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PBox.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PBox.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PBox.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PBox.cc,v 1.2.8.1 2001/06/28 19:11:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc b/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
index 1ee76064da..25fa0f5ea7 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PCSGSolid.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PCSGSolid.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // History:
diff --git a/source/persistency/geometry/solids/CSG/src/G4PCons.cc b/source/persistency/geometry/solids/CSG/src/G4PCons.cc
index 3f6e3148cc..fa7e735932 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PCons.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PCons.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PCons.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PCons.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PCons
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PPara.cc b/source/persistency/geometry/solids/CSG/src/G4PPara.cc
index 3488d6918c..22abb25b43 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PPara.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PPara.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PPara.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PPara.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PPara
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PSphere.cc b/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
index 3b00137ff7..e50f5d8b4a 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PSphere.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PSphere.cc,v 1.3 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PSphere.cc,v 1.3.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PSphere
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
index 38911e5a3c..7954c2870e 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTorus.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTorus.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTorus.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PTorus
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrap.cc b/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
index e2affbd210..e07f0e3cf2 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTrap.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTrap.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTrap.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PTrap
 //
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
index 8cf7b27e86..668ee1f1ab 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTrd.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTrd.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTrd.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Implementation for G4Trd class
diff --git a/source/persistency/geometry/solids/CSG/src/G4PTubs.cc b/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
index 869188cf41..ba2471c623 100644
--- a/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
+++ b/source/persistency/geometry/solids/CSG/src/G4PTubs.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PTubs.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PTubs.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // class G4PTubs
diff --git a/source/persistency/geometry/solids/specific/GNUmakefile b/source/persistency/geometry/solids/specific/GNUmakefile
index 917a0a1124..22bc029243 100644
--- a/source/persistency/geometry/solids/specific/GNUmakefile
+++ b/source/persistency/geometry/solids/specific/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.1 2000/05/11 10:09:07 morita Exp $
+# $Id: GNUmakefile,v 1.2 2001/03/15 22:58:54 morita Exp $
 
 name := G4pspecsolids
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../../../..
+  G4INSTALL = $(PWD)/../../../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
              -I$(G4TMP)/$(G4SYSTEM)/G4pcsg \
diff --git a/source/persistency/geometry/solids/specific/include/G4PHype.ddl b/source/persistency/geometry/solids/specific/include/G4PHype.ddl
index 505a70e940..a7a6b26778 100644
--- a/source/persistency/geometry/solids/specific/include/G4PHype.ddl
+++ b/source/persistency/geometry/solids/specific/include/G4PHype.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PHype.ddl,v 1.1 2000/05/11 10:10:11 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PHype.ddl,v 1.1.4.1 2001/06/28 19:11:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PHype
 //
diff --git a/source/persistency/geometry/solids/specific/src/G4PHype.cc b/source/persistency/geometry/solids/specific/src/G4PHype.cc
index 65ad13575a..396e81cca5 100644
--- a/source/persistency/geometry/solids/specific/src/G4PHype.cc
+++ b/source/persistency/geometry/solids/specific/src/G4PHype.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PHype.cc,v 1.1 2000/05/11 10:10:16 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PHype.cc,v 1.1.4.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PHype
 //
diff --git a/source/persistency/global/GNUmakefile b/source/persistency/global/GNUmakefile
index 2da5dcf6d4..300e829518 100644
--- a/source/persistency/global/GNUmakefile
+++ b/source/persistency/global/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.5 2000/06/09 12:54:38 morita Exp $
+# $Id: GNUmakefile,v 1.6 2001/03/15 22:58:55 morita Exp $
 
 name := G4pglobal
 G4ODBMS := true
@@ -9,7 +9,7 @@ endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 # $(G4TMPDIR) will be overrided in common.gmk later.
 G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
diff --git a/source/persistency/global/include/G4DatabaseTypes.hh b/source/persistency/global/include/G4DatabaseTypes.hh
index 7137edb7f2..8015d7ecde 100644
--- a/source/persistency/global/include/G4DatabaseTypes.hh
+++ b/source/persistency/global/include/G4DatabaseTypes.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DatabaseTypes.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DatabaseTypes.hh,v 1.3.8.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // file description:
diff --git a/source/persistency/global/include/G4PersistentSchema.hh b/source/persistency/global/include/G4PersistentSchema.hh
index 57062e5ba4..3b7ec7a992 100644
--- a/source/persistency/global/include/G4PersistentSchema.hh
+++ b/source/persistency/global/include/G4PersistentSchema.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentSchema.hh,v 1.5 1999/12/05 22:32:26 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentSchema.hh,v 1.5.8.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Persistent-capable schema definitions required for ooddlx processor
 //
diff --git a/source/persistency/global/include/G4PersistentTypes.hh b/source/persistency/global/include/G4PersistentTypes.hh
index 35afe101f4..69bcaa1341 100644
--- a/source/persistency/global/include/G4PersistentTypes.hh
+++ b/source/persistency/global/include/G4PersistentTypes.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentTypes.hh,v 1.2 1999/12/15 14:51:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentTypes.hh,v 1.2.4.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Persistent-capable typedefs for Geant4/Persistency category
diff --git a/source/persistency/global/include/G4Pglobals.hh b/source/persistency/global/include/G4Pglobals.hh
index 1c12b872de..1da77d0c1d 100644
--- a/source/persistency/global/include/G4Pglobals.hh
+++ b/source/persistency/global/include/G4Pglobals.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Pglobals.hh,v 1.2 2001/03/08 15:38:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Pglobals.hh,v 1.2.2.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Wrapper header file to protect globals.hh from ooddlx
diff --git a/source/persistency/global/include/G4VMaterialMap.hh b/source/persistency/global/include/G4VMaterialMap.hh
index 4189e9fa5c..0b23f5d2a9 100644
--- a/source/persistency/global/include/G4VMaterialMap.hh
+++ b/source/persistency/global/include/G4VMaterialMap.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMaterialMap.hh,v 1.1 2000/06/09 12:53:25 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMaterialMap.hh,v 1.1.4.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VMaterialMap_hh
diff --git a/source/persistency/global/include/G4VPersistentSubDbMan.hh b/source/persistency/global/include/G4VPersistentSubDbMan.hh
index 5303712b4b..9f09f0d556 100644
--- a/source/persistency/global/include/G4VPersistentSubDbMan.hh
+++ b/source/persistency/global/include/G4VPersistentSubDbMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistentSubDbMan.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistentSubDbMan.hh,v 1.3.8.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VPersistentSubDbMan 
 //
diff --git a/source/persistency/global/include/G4VPersistentSubMan.hh b/source/persistency/global/include/G4VPersistentSubMan.hh
index 17cb2fa6a9..a090eeb43f 100644
--- a/source/persistency/global/include/G4VPersistentSubMan.hh
+++ b/source/persistency/global/include/G4VPersistentSubMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistentSubMan.hh,v 1.2 1999/11/25 11:33:07 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistentSubMan.hh,v 1.3.2.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VPersistentSubMan 
 //
@@ -16,7 +32,7 @@
 // =================
 //  virtual void SetVerboseLevel(G4int verboseLevel)
 //    Set verbose level
-//  inline G4Pint GetVerboseLevel()
+//  inline G4int GetVerboseLevel()
 //    Get verbose level
 //
 // Member data:
@@ -31,7 +47,6 @@
 #define G4VPersistentSubMan_hh 1
 
 #include "globals.hh"
-#include "G4PersistentTypes.hh"
 
 class G4VPersistentSubMan 
 {
@@ -48,7 +63,7 @@ class G4VPersistentSubMan
       { f_verboseLevel = verboseLevel; }
 
   public:
-      inline G4Pint GetVerboseLevel()
+      inline G4int GetVerboseLevel()
       { return f_verboseLevel; };
 
   protected:
diff --git a/source/persistency/global/src/G4VMaterialMap.cc b/source/persistency/global/src/G4VMaterialMap.cc
index b83d2727dc..2016f423b0 100644
--- a/source/persistency/global/src/G4VMaterialMap.cc
+++ b/source/persistency/global/src/G4VMaterialMap.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMaterialMap.cc,v 1.1 2000/06/09 12:53:51 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMaterialMap.cc,v 1.2.2.1 2001/06/28 19:11:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VMaterialMap.hh"
@@ -25,7 +41,7 @@ G4VMaterialMap::G4VMaterialMap()
 
 G4VMaterialMap::~G4VMaterialMap()
 {
-  fMaterialMap = NULL;
+  fMaterialMap = 0;
 }
 
 
diff --git a/source/persistency/global/src/G4VPersistentSubDbMan.cc b/source/persistency/global/src/G4VPersistentSubDbMan.cc
index 7f18498f74..946239dccd 100644
--- a/source/persistency/global/src/G4VPersistentSubDbMan.cc
+++ b/source/persistency/global/src/G4VPersistentSubDbMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistentSubDbMan.cc,v 1.2 1999/11/26 20:37:00 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistentSubDbMan.cc,v 1.3.2.1 2001/06/28 19:11:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VPersistentSubDbMan 
 //
@@ -16,7 +32,7 @@
 #include "G4VPersistentSubDbMan.hh"
 
 G4VPersistentSubDbMan::G4VPersistentSubDbMan()
- : f_DB(NULL), f_container(NULL), f_currentContainer(NULL)
+ : f_DB(0), f_container(0), f_currentContainer(0)
 {;}
 
 G4VPersistentSubDbMan::~G4VPersistentSubDbMan()
diff --git a/source/persistency/global/src/G4VPersistentSubMan.cc b/source/persistency/global/src/G4VPersistentSubMan.cc
index 72f371c927..36b5cb7e24 100644
--- a/source/persistency/global/src/G4VPersistentSubMan.cc
+++ b/source/persistency/global/src/G4VPersistentSubMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistentSubMan.cc,v 1.2 1999/11/25 11:33:08 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistentSubMan.cc,v 1.2.8.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4VPersistentSubMan 
 //
diff --git a/source/persistency/management/GNUmakefile b/source/persistency/management/GNUmakefile
index 34e8bf2431..232fa5d7b1 100644
--- a/source/persistency/management/GNUmakefile
+++ b/source/persistency/management/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.17 2000/06/09 12:55:01 morita Exp $
+# $Id: GNUmakefile,v 1.18 2001/03/15 22:58:55 morita Exp $
 
 name := G4pmanagement
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../..
+  G4INSTALL = $(PWD)/../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4TMP)/$(G4SYSTEM)/G4pdigits \
              -I$(G4TMP)/$(G4SYSTEM)/G4phits \
diff --git a/source/persistency/management/include/G4PersistencyManager.hh b/source/persistency/management/include/G4PersistencyManager.hh
index cfb0c7a9b2..d3aac03b98 100644
--- a/source/persistency/management/include/G4PersistencyManager.hh
+++ b/source/persistency/management/include/G4PersistencyManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistencyManager.hh,v 1.15 1999/12/15 14:51:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistencyManager.hh,v 1.15.4.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // History:
 // 98.01.08 Y.Morita  Initial version
diff --git a/source/persistency/management/include/G4PersistencyMessenger.hh b/source/persistency/management/include/G4PersistencyMessenger.hh
index 67ac893b3b..3b80bee95c 100644
--- a/source/persistency/management/include/G4PersistencyMessenger.hh
+++ b/source/persistency/management/include/G4PersistencyMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistencyMessenger.hh,v 1.4 1999/11/26 11:19:39 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistencyMessenger.hh,v 1.4.8.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/persistency/management/include/G4TransactionManager.hh b/source/persistency/management/include/G4TransactionManager.hh
index 85aea87426..e2518b4988 100644
--- a/source/persistency/management/include/G4TransactionManager.hh
+++ b/source/persistency/management/include/G4TransactionManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransactionManager.hh,v 1.7 2000/12/05 14:40:03 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransactionManager.hh,v 1.7.4.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/persistency/management/src/G4PersistencyManager.cc b/source/persistency/management/src/G4PersistencyManager.cc
index d1b7e478df..f4d9f4f166 100644
--- a/source/persistency/management/src/G4PersistencyManager.cc
+++ b/source/persistency/management/src/G4PersistencyManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistencyManager.cc,v 1.16 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistencyManager.cc,v 1.17.2.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistencyManager 
 //
@@ -30,7 +46,7 @@
 #include "G4TransactionManager.hh"
 #include "HepODBMS/clustering/HepDbApplication.h"
 
-G4PersistencyManager* G4PersistencyManager::f_PersistencyManager = NULL;
+G4PersistencyManager* G4PersistencyManager::f_PersistencyManager = 0;
 
 G4PersistencyManager* G4PersistencyManager::GetPersistencyManager()
 {
diff --git a/source/persistency/management/src/G4PersistencyMessenger.cc b/source/persistency/management/src/G4PersistencyMessenger.cc
index 4d507e0468..230e863017 100644
--- a/source/persistency/management/src/G4PersistencyMessenger.cc
+++ b/source/persistency/management/src/G4PersistencyMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistencyMessenger.cc,v 1.7 1999/11/26 16:50:21 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistencyMessenger.cc,v 1.7.8.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PersistencyMessenger.hh"
diff --git a/source/persistency/management/src/G4TransactionManager.cc b/source/persistency/management/src/G4TransactionManager.cc
index 84857db28a..2a0bee9c6d 100644
--- a/source/persistency/management/src/G4TransactionManager.cc
+++ b/source/persistency/management/src/G4TransactionManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransactionManager.cc,v 1.6 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransactionManager.cc,v 1.7.2.1 2001/06/28 19:11:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4TransactionManager 
 //
@@ -136,7 +152,7 @@ G4bool G4TransactionManager::DoStart(ETypeOfDB dbtype,
   }
 
   HepDatabaseRef aDBref = f_dbApp->db( DBName(dbtype) );
-  if( aDBref == NULL )
+  if( aDBref == 0 )
   {
     G4cerr << "G4TransactionManager: Could not create or find /"
            << DBName(dbtype) << "/ database." << G4endl;
@@ -145,7 +161,7 @@ G4bool G4TransactionManager::DoStart(ETypeOfDB dbtype,
   SetDB( dbtype, aDBref );
 
   HepContainerRef aContRef = f_dbApp->container(ContainerName(dbtype));
-  if( aContRef == NULL )
+  if( aContRef == 0 )
   {
     G4cerr << "G4TransactionManager: Could not create or find /"
            << ContainerName(dbtype) << "/ container." << G4endl;
diff --git a/source/persistency/run/GNUmakefile b/source/persistency/run/GNUmakefile
index 83d46eb20e..cd01f7f784 100644
--- a/source/persistency/run/GNUmakefile
+++ b/source/persistency/run/GNUmakefile
@@ -1,19 +1,20 @@
-# $Id: GNUmakefile,v 1.7 1999/11/22 12:11:23 morita Exp $
+# $Id: GNUmakefile,v 1.8 2001/03/15 22:58:55 morita Exp $
 
 name := G4prun
 G4ODBMS := true
 G4ODBMS_INSTALLATION := true
+PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
 
 ifndef G4INSTALL
-  G4INSTALL = ../../..
+  G4INSTALL = $(PWD)/../../..
 endif
 
 include $(G4INSTALL)/config/architecture.gmk
 
-G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
+G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
 
 CPPFLAGS  += \
-             -Iinclude \
+             -I$(PWD)/include \
              -I$(G4SCHEMA_HEADER_DIR) \
              -I$(G4INSTALL)/source/persistency/global/include \
              -I$(G4INSTALL)/source/persistency/management/include \
diff --git a/source/persistency/run/include/G4PRun.ddl b/source/persistency/run/include/G4PRun.ddl
index 37865e70bd..61f701e732 100644
--- a/source/persistency/run/include/G4PRun.ddl
+++ b/source/persistency/run/include/G4PRun.ddl
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PRun.ddl,v 1.8 2000/12/15 08:02:21 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PRun.ddl,v 1.8.4.1 2001/06/28 19:11:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/run/include/G4PersistentRunMan.hh b/source/persistency/run/include/G4PersistentRunMan.hh
index e9794b5e52..ee38a17a9d 100644
--- a/source/persistency/run/include/G4PersistentRunMan.hh
+++ b/source/persistency/run/include/G4PersistentRunMan.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentRunMan.hh,v 1.9 2000/12/15 07:55:32 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentRunMan.hh,v 1.9.4.1 2001/06/28 19:11:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description:
diff --git a/source/persistency/run/src/G4PRun.cc b/source/persistency/run/src/G4PRun.cc
index 647f7a3bc2..1aea5dd472 100644
--- a/source/persistency/run/src/G4PRun.cc
+++ b/source/persistency/run/src/G4PRun.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PRun.cc,v 1.5 1999/12/15 14:51:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PRun.cc,v 1.6.2.1 2001/06/28 19:11:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Run.hh"
@@ -14,7 +30,7 @@
 #include "G4Event.hh"
 
 G4PRun::G4PRun()
-// :runID(0),numberOfEvent(0),HCtable(NULL),DCtable(NULL)
+// :runID(0),numberOfEvent(0),HCtable(0),DCtable(0)
 :runID(0),numberOfEvent(0)
 {;}
 
diff --git a/source/persistency/run/src/G4PersistentRunMan.cc b/source/persistency/run/src/G4PersistentRunMan.cc
index 1d81a93bad..1e2e92ca01 100644
--- a/source/persistency/run/src/G4PersistentRunMan.cc
+++ b/source/persistency/run/src/G4PersistentRunMan.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.  
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PersistentRunMan.cc,v 1.8 1999/11/28 21:54:22 morita Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PersistentRunMan.cc,v 1.9.2.1 2001/06/28 19:11:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // class G4PersistentRunMan 
 //
@@ -38,7 +54,7 @@ G4bool G4PersistentRunMan::Store( HepDbApplication* dbApp,
   // Create persistent run
   f_currentPRun = new(f_container) G4PRun(aRun);
 
-  if( f_currentPRun == NULL )
+  if( f_currentPRun == 0 )
     return false;
 
   f_currentRunID = aRun->GetRunID();
@@ -50,7 +66,7 @@ G4bool G4PersistentRunMan::Retrieve( HepDbApplication* dbApp,
                                      G4Run*& aRun)
 {
   G4bool theStatus = false;
-  aRun = NULL;
+  aRun = 0;
 
   ooItr(G4PRun) pRun_iterator;
 
@@ -66,7 +82,7 @@ G4bool G4PersistentRunMan::Retrieve( HepDbApplication* dbApp,
   if( pRun_iterator.next() )
   {
     G4Run* run = pRun_iterator->MakeTransientObject();
-    if( run != NULL )
+    if( run != 0 )
     {
       aRun = run;
       theStatus = true;
diff --git a/source/processes/decay/include/G4Decay.hh b/source/processes/decay/include/G4Decay.hh
index 4d104631aa..c8d0b7dbda 100644
--- a/source/processes/decay/include/G4Decay.hh
+++ b/source/processes/decay/include/G4Decay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Decay.hh,v 1.6 2001/02/22 13:29:26 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Decay.hh,v 1.6.2.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      7 July 1996 H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/processes/decay/include/G4VExtDecayer.hh b/source/processes/decay/include/G4VExtDecayer.hh
index b07bb45571..7eda419fec 100644
--- a/source/processes/decay/include/G4VExtDecayer.hh
+++ b/source/processes/decay/include/G4VExtDecayer.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VExtDecayer.hh,v 1.2 2001/02/28 06:18:36 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VExtDecayer.hh,v 1.2.2.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //
 // ------------------------------------------------------------
 //  New  scheme                      23 Feb. 2001  H.Kurahige
diff --git a/source/processes/decay/src/G4Decay.cc b/source/processes/decay/src/G4Decay.cc
index 0bce7ca994..d0d0b21fe6 100644
--- a/source/processes/decay/src/G4Decay.cc
+++ b/source/processes/decay/src/G4Decay.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Decay.cc,v 1.8 2001/02/22 13:29:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Decay.cc,v 1.8.2.2 2001/06/28 20:19:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      7 July 1996 H.Kurashige
diff --git a/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
index 2e2ce4a6ba..d2d4fb6f58 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuBremsstrahlung.hh,v 1.1 2001/03/05 10:55:19 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuBremsstrahlung.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuBremsstrahlung physics process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc
index 043ffd81ec..ef4ec1f749 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc
+++ b/source/processes/electromagnetic/integral/include/G4IMuBremsstrahlung.icc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuBremsstrahlung.icc,v 1.1 2001/03/05 10:55:19 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuBremsstrahlung.icc,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuBremsstrahlung physics process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh b/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
index 3b4ba7606a..de6d49c1d3 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuIonisation.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuIonisation.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IMuIonisation physics process ------------
diff --git a/source/processes/electromagnetic/integral/include/G4IMuIonisation.icc b/source/processes/electromagnetic/integral/include/G4IMuIonisation.icc
index a8a60325ce..333565367c 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuIonisation.icc
+++ b/source/processes/electromagnetic/integral/include/G4IMuIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuIonisation.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuIonisation.icc,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IMuIonisation physics process -------------
diff --git a/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
index 261c58c097..d53dd21edb 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuPairProduction.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuPairProduction.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuPairProduction physics process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc
index f42cf1680d..7447196f78 100644
--- a/source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc
+++ b/source/processes/electromagnetic/integral/include/G4IMuPairProduction.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuPairProduction.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuPairProduction.icc,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuPairProduction physics process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh
index e292de720a..6447df5f74 100644
--- a/source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh
+++ b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMultipleScattering.hh,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMultipleScattering.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 // --------------------------------------------------------------
 //    GEANT 4 class header file
 //  
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //    --------- G4IMultipleScattering physics process --------
diff --git a/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
index 12ab4c0a28..bc82e6fca3 100644
--- a/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
+++ b/source/processes/electromagnetic/integral/include/G4IMultipleScattering.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMultipleScattering.icc,v 1.1 2001/03/05 10:55:20 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMultipleScattering.icc,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // -------------------------------------------------------------
 //    GEANT 4 class inlined methods file
 //
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //    ------- G4IMultipleScattering physics process ------
diff --git a/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
index 21c3567278..1b6c8686fd 100644
--- a/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
+++ b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeBremsstrahlung.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeBremsstrahlung.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeBremsstrahlung physics process ------
diff --git a/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc
index 0978afc144..bc009e349b 100644
--- a/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc
+++ b/source/processes/electromagnetic/integral/include/G4IeBremsstrahlung.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeBremsstrahlung.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeBremsstrahlung.icc,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeBremsstrahlung physics process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IeIonisation.hh b/source/processes/electromagnetic/integral/include/G4IeIonisation.hh
index a9a79e05d0..35ea30ced5 100644
--- a/source/processes/electromagnetic/integral/include/G4IeIonisation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IeIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeIonisation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeIonisation.hh,v 1.1.2.2 2001/06/28 20:19:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4IeIonisation physics process -----------
diff --git a/source/processes/electromagnetic/integral/include/G4IeIonisation.icc b/source/processes/electromagnetic/integral/include/G4IeIonisation.icc
index 8c9781eb5e..c8bb815b7f 100644
--- a/source/processes/electromagnetic/integral/include/G4IeIonisation.icc
+++ b/source/processes/electromagnetic/integral/include/G4IeIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeIonisation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeIonisation.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4IeIonisation physics process ------------
 //                by Laszlo Urban, 23 June 1998
 // ************************************************************
diff --git a/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
index 3ea2321f0e..29b73f8bdd 100644
--- a/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeplusAnnihilation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeplusAnnihilation.hh,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeplusAnnihilation process ------
diff --git a/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc
index 67d7133ec7..5a7f6dce9b 100644
--- a/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc
+++ b/source/processes/electromagnetic/integral/include/G4IeplusAnnihilation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeplusAnnihilation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeplusAnnihilation.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeplusAnnihilation process ---------
diff --git a/source/processes/electromagnetic/integral/include/G4IhIonisation.hh b/source/processes/electromagnetic/integral/include/G4IhIonisation.hh
index 1a51cce5bd..e4890dbc4f 100644
--- a/source/processes/electromagnetic/integral/include/G4IhIonisation.hh
+++ b/source/processes/electromagnetic/integral/include/G4IhIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IhIonisation.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IhIonisation.hh,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4IhIonisation physics process -----------
diff --git a/source/processes/electromagnetic/integral/include/G4IhIonisation.icc b/source/processes/electromagnetic/integral/include/G4IhIonisation.icc
index 2a4ccf3700..46a93e51ef 100644
--- a/source/processes/electromagnetic/integral/include/G4IhIonisation.icc
+++ b/source/processes/electromagnetic/integral/include/G4IhIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IhIonisation.icc,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IhIonisation.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4IhIonisation physics process ------------
 //                  by Laszlo Urban, 30 May 1997
 // ***************************************************************
diff --git a/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
index 3cc8741e4c..f04a416e12 100644
--- a/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIMuEnergyLoss.hh,v 1.1 2001/03/05 10:55:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIMuEnergyLoss.hh,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // -------------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIMuEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
index 48b2f1bdaf..9d8bf196a2 100644
--- a/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIMuEnergyLoss.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIMuEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIMuEnergyLoss.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VIMuEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
index 1a9ea387d0..8dcfd158c9 100644
--- a/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIeEnergyLoss.hh,v 1.1 2001/03/05 10:55:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIeEnergyLoss.hh,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIeEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
index 341a701db8..56ffe78141 100644
--- a/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIeEnergyLoss.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIeEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIeEnergyLoss.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VIeEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
index aaa0d50f7a..45c730fedf 100644
--- a/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
+++ b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIhEnergyLoss.hh,v 1.1 2001/03/05 10:55:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIhEnergyLoss.hh,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIhEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
index 43496edffa..2a71083ead 100644
--- a/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
+++ b/source/processes/electromagnetic/integral/include/G4VIhEnergyLoss.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIhEnergyLoss.icc,v 1.1 2001/03/05 10:55:22 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIhEnergyLoss.icc,v 1.1.2.2 2001/06/28 20:19:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VIhEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc b/source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc
index 4c7f069c82..e358dec8ff 100644
--- a/source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc
+++ b/source/processes/electromagnetic/integral/src/G4IMuBremsstrahlung.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuBremsstrahlung.cc,v 1.1 2001/03/05 10:55:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuBremsstrahlung.cc,v 1.1.2.2 2001/06/28 20:19:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //    
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuBremsstrahlung physics process ---------
diff --git a/source/processes/electromagnetic/integral/src/G4IMuIonisation.cc b/source/processes/electromagnetic/integral/src/G4IMuIonisation.cc
index ac6e9de2c8..f25dddadd6 100644
--- a/source/processes/electromagnetic/integral/src/G4IMuIonisation.cc
+++ b/source/processes/electromagnetic/integral/src/G4IMuIonisation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuIonisation.cc,v 1.1 2001/03/05 10:55:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuIonisation.cc,v 1.1.2.2 2001/06/28 20:19:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IMuIonisation physics process -------------
diff --git a/source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc b/source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc
index db9cba66a8..3dba2d5f50 100644
--- a/source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc
+++ b/source/processes/electromagnetic/integral/src/G4IMuPairProduction.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMuPairProduction.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMuPairProduction.cc,v 1.1.2.2 2001/06/28 20:19:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4IMuPairProduction physics process ---------
diff --git a/source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc b/source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc
index 8a048e7ec6..ab420d86ce 100644
--- a/source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc
+++ b/source/processes/electromagnetic/integral/src/G4IMultipleScattering.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IMultipleScattering.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IMultipleScattering.cc,v 1.1.2.2 2001/06/28 20:19:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //    GEANT 4 class implementation file
 //
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //   -------- G4IMultipleScattering physics process ------------
diff --git a/source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc b/source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc
index 3448a59e19..4b4c2a69dd 100644
--- a/source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc
+++ b/source/processes/electromagnetic/integral/src/G4IeBremsstrahlung.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeBremsstrahlung.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeBremsstrahlung.cc,v 1.1.2.2 2001/06/28 20:19:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeBremsstrahlung physics process --------
diff --git a/source/processes/electromagnetic/integral/src/G4IeIonisation.cc b/source/processes/electromagnetic/integral/src/G4IeIonisation.cc
index 024e0292d1..f47155d299 100644
--- a/source/processes/electromagnetic/integral/src/G4IeIonisation.cc
+++ b/source/processes/electromagnetic/integral/src/G4IeIonisation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeIonisation.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeIonisation.cc,v 1.1.2.2 2001/06/28 20:19:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4IeIonisation physics process -----------
diff --git a/source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc b/source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc
index 4473ada6ad..91950aa19b 100644
--- a/source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc
+++ b/source/processes/electromagnetic/integral/src/G4IeplusAnnihilation.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IeplusAnnihilation.cc,v 1.1 2001/03/05 10:55:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IeplusAnnihilation.cc,v 1.1.2.2 2001/06/28 20:19:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4IeplusAnnihilation process --------
diff --git a/source/processes/electromagnetic/integral/src/G4IhIonisation.cc b/source/processes/electromagnetic/integral/src/G4IhIonisation.cc
index 99dda36482..13c7922e66 100644
--- a/source/processes/electromagnetic/integral/src/G4IhIonisation.cc
+++ b/source/processes/electromagnetic/integral/src/G4IhIonisation.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IhIonisation.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IhIonisation.cc,v 1.1.2.2 2001/06/28 20:19:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4IhIonisation physics process -----------
diff --git a/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
index dc94d2d2fc..7f0b406c0e 100644
--- a/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIMuEnergyLoss.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIMuEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIMuEnergyLoss.cc,v 1.1.2.2 2001/06/28 20:19:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIMuEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
index 891d84531d..eb441c3eed 100644
--- a/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIeEnergyLoss.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIeEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIeEnergyLoss.cc,v 1.1.2.2 2001/06/28 20:19:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //  
 // $Id: 
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIeEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc b/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
index 6b159d9bff..9c72198e13 100644
--- a/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
+++ b/source/processes/electromagnetic/integral/src/G4VIhEnergyLoss.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIhEnergyLoss.cc,v 1.1 2001/03/05 10:55:25 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIhEnergyLoss.cc,v 1.1.2.2 2001/06/28 20:19:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VIhEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/lowenergy/History b/source/processes/electromagnetic/lowenergy/History
index f5f53c8f09..27d713d7e3 100644
--- a/source/processes/electromagnetic/lowenergy/History
+++ b/source/processes/electromagnetic/lowenergy/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.58 2001/02/05 17:45:13 gcosmo Exp $
+$Id: History,v 1.80 2001/06/18 12:58:43 pia Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,109 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+18.06.2001 - MGP, tag emlowen-V03-01-19
+             Same as emlowen-V03-01-18, with corrections by S. Chauvie
+             to recover from modifications listed below
+	     Quantum oscillator model is applied to all materials, as it
+             has been since Geant4 3.0 release
+             Contains also updates to G4StoppingPowerTest
+             
+18.06.2001 - MGP, tag emlowen-V03-01-18
+             Same as emlowen-V03-01-17, with a bug fix to 
+             G4LowEnergyPolarizedCompton by F. Longo and G. Depaola
+
+07.06.2001 - Add printout to G4hLowEnergyIonisation + clean up (V.I.)
+             Oscillator model is applied only for 6 materials (V.I.)
+
+05.06.2001 - MGP, tag emlowen-V03-01-17
+             Fix in G4QAOLowEnergyLoss by S. Chauvie of bugs introduced
+             with the changes below    
+             Also fixes in unit tests related to hadron ionisation         
+
+01.06.2001 - V.Ivanchenko change G4QAOLowEnergyLoss: materials
+             search by Z not name, validity range down to 5 keV,
+             fix sign of the Barkas term
+
+28.05.2001 - MGP, tag emlowen-V03-01-16
+             Corrected typo involuntarily introduced into a public m.f.
+ 
+25.05.2001 - MGP, tag emlowen-V03-01-15
+             Added protections in G4LowEnergyPolarizedCompton (MGP)
+             Improved comments in hadron/ion classes (V.I.)
+             Improved code style in e/photon classes (MGP)
+
+24.05.2001 - MGP, tag emlowen-V03-01-14
+             Modified G4LowEnergyPolarizedCompton to inherit from
+             G4VDiscreteProcess
+    
+23.05.2001 - MGP, tag emlowen-V03-01-13
+             Modifications in G4LowEnergyIonisation and G4eLowEnergyLoss 
+             by V.Ivanchenko:
+             calculation of range directly from RangeTable;
+             calculation of MeanFreePath from LambdaTable;
+             improvement in the kinematics of delta-ray production
+
+23.05.2001 - MGP, tag emlowen-V03-01-12
+             Minor fix in G4hLowEnergyIonisation by V.Ivanchenko
+
+23.05.2001 - MGP, tag emlowen-V03-01-11
+             Cleaned up test macro names; minor update to G4MeanFreePathTest.cc
+             minor changes in hTest histograms
+
+23.05.2001 - V.Ivanchenko
+             G4LowEnergyIonisation and G4eLowEnergyLoss changed:
+             direct method of range table calculation;
+             MeanFreePath is calculated from lambda table;
+             kinematics of delta-ray production improved;
+             minor fix in G4hLowEnergyIonisation.
+
+22.05.2001 - MGP, tag emlowen-V03-01-10
+             Bug fix in G4QAOLowEnergyLoss.cc
+
+22.05.2001 - MGP, tag emlowen-V03-01-09
+             Same as emlowen-V03-01-08, with further modifications to hTest
+
+22.05.2001 - MGP, tag emlowen-V03-01-08
+  	     Same as emlowen-V03-01-07, with in addition:
+             - new unit tests (G4hTestLossTableProduction, G4MeanFreePathTest)
+             - modifications to hTest
+             - test macros renamed to be more easily identifiable
+
+11.05.2001 - MGP, tag emlowen-V03-01-07
+             Removed more compilation warnings in ANSI strict mode
+
+11.05.2001 - MGP, tag emlowen-V03-01-06
+             Same as emlowen-V03-01-04, with minor modification on hTest 
+             by V. Ivanchenko
+
+11.05.2001 - MGP, tag emlowen-V03-01-05
+             Same as emlowen-V03-01-04, with a new unit test by V. Ivanchenko
+
+10.05.2001 - V.Ivanchenko
+             Removed compilation warnings in ANSI strict mode
+
+08.05.2001 - MGP, tag emlowen-V03-01-04
+             Removed compilation warnings in ANSI strict mode
+
+07.05.2001 - MGP, tag emlowen-V03-01-03
+             Removal of RW remnants, moved to STL containers
+
+07.05.2001 - MGP, tag emlowen-V03-01-02
+             Same as emlowen-V03-01-01, with some improvements in tests
+
+02.05.2001 - MGP, tag emlowen-V03-01-01
+             Same as emlowen-V03-01-00, with a first implementation of 
+             a full suite of unit tests for electrons and photons
+
+02.05.2001 - MGP, tag emlowen-V03-01-00
+             Same as emlowen-V03-00-00, with minor new functionalities in 
+             test/G4BremsstrahlungTest and G4eIonisationTest, and a new
+             test/G4PhotoelectricTest unit test
+
+24.04.2001 - V.Ivanchenko remove all references to RogueWave vectors
+
+24.04.2001 - V.Ivanchenko reorganize and update hTest
+ 
 05.02.2001 - G.Cosmo, tag emlowen-V03-00-00
              Migration to STL for G4DataVector and G4OrderedTable:
              o Removed obsolete class G4Data. G4DataVector is now used instead.
diff --git a/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh b/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
index 858e1851e2..a086236e60 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4FirstLevel.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4FirstLevel.hh
@@ -18,8 +32,10 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave
 // 
+// -------------------------------------------------------------------
+
 // Class description:
 // Utility for Low Energy e.m. e/photon processes
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
@@ -30,10 +46,10 @@
 #define G4FIRSTLEVEL_HH
 
 #include "G4DataVector.hh"
-#include "g4rw/tpordvec.h"
 
-class G4FirstLevel : public G4RWTPtrOrderedVector< G4DataVector >{
+class G4FirstLevel : public G4std::vector< G4DataVector* >
 
+{
 
 public:
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4IonChuFluctuationModel.hh b/source/processes/electromagnetic/lowenergy/include/G4IonChuFluctuationModel.hh
index 3f0b3c30a8..fedbde30cb 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4IonChuFluctuationModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4IonChuFluctuationModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     IonChuFluctuationModel
 //
@@ -28,7 +42,7 @@
 // eds. J.W. Mayer and E. Rimini (Academic Press, New York, 1977).
 // Q.Yang et al., NIM B61(1991)149-155.
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
-
+// and Physics Reference Manual
 
 // -------------------------------------------------------------------
 
@@ -41,11 +55,11 @@
 class G4IonChuFluctuationModel : public G4VLowEnergyModel
 {
 
-public:
+public: // With description
 
-  G4IonChuFluctuationModel(const G4String& name) ;
+  G4IonChuFluctuationModel(const G4String& name);
 
-  ~G4IonChuFluctuationModel() ;
+  ~G4IonChuFluctuationModel();
 
   G4double TheValue(const G4DynamicParticle* particle,
 	       	          const G4Material* material);
diff --git a/source/processes/electromagnetic/lowenergy/include/G4IonYangFluctuationModel.hh b/source/processes/electromagnetic/lowenergy/include/G4IonYangFluctuationModel.hh
index 37d4bf1297..3517d019dc 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4IonYangFluctuationModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4IonYangFluctuationModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     IonYangFluctuationModel
 //
@@ -26,6 +40,7 @@
 // The aproximation of additional ion energy loss fluctuations 
 // Q.Yang et al., NIM B61(1991)149-155.
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
+// and Physics Reference Manual
 
 // -------------------------------------------------------------------
 //
@@ -38,11 +53,11 @@
 class G4IonYangFluctuationModel : public G4VLowEnergyModel
 {
 
-public:
+public: 
 
-  G4IonYangFluctuationModel(const G4String& name) ;
+  G4IonYangFluctuationModel(const G4String& name);
 
-  ~G4IonYangFluctuationModel() ;
+  ~G4IonYangFluctuationModel();
 
   G4double TheValue(const G4DynamicParticle* particle,
 	       	          const G4Material* material);
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
index 98c94e8670..95be7128e6 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyBremsstrahlung.hh,v 1.13 2001/02/05 17:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyBremsstrahlung.hh,v 1.16.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyBremsstrahlung physics process ------
 //                     by A.Forti  1999/03/27 19:18:13
 //
@@ -73,7 +87,7 @@ private:
   void BuildZVec();
   void BuildLambdaTable(const G4ParticleDefinition& aParticleType);
 
-  void ComputePartialSumSigma(const G4double KineticEnergy, 
+  void ComputepartialSumSigma(const G4double KineticEnergy, 
 			      const G4Material* aMaterial,
 			      const G4double threshold);
   
@@ -105,14 +119,14 @@ private:
 
   G4LowEnergyUtilities util;
   // partial sum of total crosssection
-  G4OrderedTable PartialSumSigma;
+  G4OrderedTable partialSumSigma;
   
-  G4double LowestKineticEnergy;      
-  G4double HighestKineticEnergy;     
+  G4double lowestKineticEnergy;      
+  G4double highestKineticEnergy;     
   
   G4double lowEnergyCut;    // lower limit of the energy sampling formula
-  G4int    TotBin;                   // number of bins in the tables 
-  G4double CutForLowEnergySecondaryPhotons;
+  G4int    totBin;                   // number of bins in the tables 
+  G4double cutForLowEnergySecondaryPhotons;
 
 };
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
index 98bde0b941..b5b816f161 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyBremsstrahlung.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyBremsstrahlung.icc,v 1.14 2001/02/05 17:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyBremsstrahlung.icc,v 1.18.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyBremsstrahlung physics process ---------
 //                     by A.Forti 1999/03/27
 //
@@ -23,7 +37,7 @@
 // ***************************************************************
 #include "G4Gamma.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 inline G4bool G4LowEnergyBremsstrahlung::IsApplicable(
                             const G4ParticleDefinition& particle)
@@ -50,16 +64,16 @@ inline G4double G4LowEnergyBremsstrahlung::GetMeanFreePath(const G4Track& track,
    G4double* CutInKineticEnergy = G4Gamma::Gamma()->GetCutsInEnergy() ;
    G4double Threshold = CutInKineticEnergy[aMaterial->GetIndex()] ;
    G4double MeanFreePath;
-   G4bool isOutRange ;
+//   G4bool isOutRange ;
 
-   if (KineticEnergy <  LowestKineticEnergy)
+   if (KineticEnergy <  lowestKineticEnergy)
 
      ////MeanFreePath = DBL_MIN;
      MeanFreePath = DBL_MAX;
 
    else {
 
-     if (KineticEnergy > HighestKineticEnergy) KineticEnergy = 0.99*HighestKineticEnergy ;
+     if (KineticEnergy > highestKineticEnergy) KineticEnergy = 0.99*highestKineticEnergy ;
 
      ///MeanFreePath = util.DataLogInterpolation(KineticEnergy, aMaterial->GetIndex(), theMeanFreePathTable);
     /// MeanFreePath = (*theMeanFreePathTable)(aMaterial->GetIndex())->
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
index be22a6354f..f0cfd144ef 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyCompton.hh,v 1.8 2001/02/05 17:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyCompton.hh,v 1.11.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1995
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyCompton physics process ------
 //                   by A.Forti 1999/03/02
 //
@@ -74,23 +88,16 @@ private:
   G4PhysicsTable* theMeanFreePathTable;
   G4DataVector* ZNumVec;
 
+  G4double lowestEnergyLimit; // low  energy limit of the crosssection data 
+  G4double highestEnergyLimit; // high energy limit of the crosssection data
+  G4int numbBinTable; // number of bins in the data  tables
+
   G4LowEnergyUtilities util;
 
-  G4double LowestEnergyLimit; // low  energy limit of the crosssection data 
-  G4double HighestEnergyLimit; // high energy limit of the crosssection data
-  G4int NumbBinTable; // number of bins in the data  tables
-
-  G4double MeanFreePath; // actual Mean Free Path (current medium)
+  G4double meanFreePath; // actual Mean Free Path (current medium)
 };
 
 #include "G4LowEnergyCompton.icc"
 
 #endif
 
-
-
-
-
-
-
-
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
index a34d14617d..90f0d265ec 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyCompton.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyCompton.icc,v 1.11 2000/06/22 02:25:25 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyCompton.icc,v 1.13.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyCompton physics process ---------
 //                   by A.Forti 1999/03/02
 // ***************************************************************
@@ -32,26 +46,26 @@ G4LowEnergyCompton::GetMeanFreePath(const G4Track& aTrack, G4double, G4ForceCond
   G4double GammaEnergy = aDynamicGamma->GetKineticEnergy();
   G4Material* aMaterial = aTrack.GetMaterial();
 
-  G4bool isOutRange ;
+  //  G4bool isOutRange ;
   
 
-  if (GammaEnergy > HighestEnergyLimit){
-     MeanFreePath = DBL_MAX;
+  if (GammaEnergy > highestEnergyLimit){
+     meanFreePath = DBL_MAX;
    }	
-   else if(GammaEnergy < LowestEnergyLimit){
+   else if(GammaEnergy < lowestEnergyLimit){
 
-	MeanFreePath = DBL_MIN;
+	meanFreePath = DBL_MIN;
    }
 
   else {
 
-    MeanFreePath = util.DataLogInterpolation(GammaEnergy, 
+    meanFreePath = util.DataLogInterpolation(GammaEnergy, 
 	aMaterial->GetIndex(), 
 	theMeanFreePathTable);	
 
   }                                     
   
-  return MeanFreePath;
+  return meanFreePath;
 }
 
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
index c487ea2975..3e611acdb6 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyGammaConversion.hh,v 1.7 2001/02/05 17:45:15 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyGammaConversion.hh,v 1.9.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyGammaConversion physics process ------
 //                   by A.Forti 1999/03/02
 //
@@ -76,13 +90,14 @@ private:
   G4SecondLevel* theCrossSectionTable;    
   G4PhysicsTable* theMeanFreePathTable;
 
-  G4LowEnergyUtilities util;
-
-  G4double LowestEnergyLimit; 
-  G4double HighestEnergyLimit;
-  G4int NumbBinTable; 
   G4DataVector* ZNumVec;
+
+  G4double lowestEnergyLimit; 
+  G4double highestEnergyLimit;
+  G4int NumbBinTable; 
+
   G4double MeanFreePath; // actual Mean Free Path (current medium)
+  G4LowEnergyUtilities util;
 };
 
 #include "G4LowEnergyGammaConversion.icc"
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
index abd042d72b..e6bd9a80b5 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyGammaConversion.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyGammaConversion.icc,v 1.9 2000/06/22 02:25:25 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyGammaConversion.icc,v 1.11.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyGammaConversion physics process ---------
 //                   by A.Forti 1999/03/02
 // ***************************************************************
@@ -31,14 +45,14 @@ G4LowEnergyGammaConversion::GetMeanFreePath(const G4Track& aTrack, G4double, G4F
   G4double GammaEnergy = aDynamicGamma->GetKineticEnergy();
   G4Material* aMaterial = aTrack.GetMaterial();
 
-  G4bool isOutRange ;
+  //  G4bool isOutRange ;
   
-  if (GammaEnergy < LowestEnergyLimit){
+  if (GammaEnergy < lowestEnergyLimit){
     MeanFreePath = DBL_MAX;
 
   }
   else {
-    if(GammaEnergy > HighestEnergyLimit) GammaEnergy = 0.99*HighestEnergyLimit;   
+    if(GammaEnergy > highestEnergyLimit) GammaEnergy = 0.99*highestEnergyLimit;   
     MeanFreePath = util.DataLogInterpolation(GammaEnergy, aMaterial->GetIndex(), theMeanFreePathTable);	
 
   }                                     
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
index b0c7ee91a7..e090d5e380 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyIonisation.hh,v 1.17 2001/02/05 17:45:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyIonisation.hh,v 1.20.2.2 2001/06/28 20:19:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      --- G4LowEnergyIonisation physics process for electrons
 //                by Alessandra Forti July 1999
 // ************************************************************
@@ -83,6 +97,7 @@ public:
                                      const G4int subshellindex,
                                      const G4double KineticEnergy,
                                      const G4double Tcut) ;
+  void SetLowEnergyLimit(G4double val) {if(val > 0.0) lEnergyLimit = val;};
   
   private:
   
@@ -91,6 +106,9 @@ public:
   G4double ComputeCrossSectionWithCut(const G4double AtomIndex,
 				      const G4double IncEnergy,
 		   	 	      const G4double CutEnergy);
+  G4double ComputeMicroscopicCrossSection(const G4double AtomIndex,
+				      const G4double IncEnergy,
+		   	 	      const G4double CutEnergy);
   
   void BuildLossTable(const G4ParticleDefinition& aParticleType);
   void BuildShellCrossSectionTable();
@@ -129,19 +147,23 @@ private:
   allAtomTable* theFluorTransitionTable;
   allAtomTable* theSamplingCoeffTable;
   G4SecondLevel* theBindingEnergyTable;  
-  G4DataVector thePrimShVec;
   G4DataVector* ZNumVec;
   G4DataVector* ZNumVecFluor;
 
-  G4LowEnergyUtilities util;
+  G4PhysicsTable* theMeanFreePathTable;
 
-  G4double LowestKineticEnergy;
-  G4double HighestKineticEnergy;
-  G4int TotBin;
   G4double CutForLowEnergySecondaryPhotons;
   G4double CutForLowEnergySecondaryElectrons;
   G4double MeanFreePath;
-  G4PhysicsTable* theMeanFreePathTable;
+
+  G4double lowestKineticEnergy;
+  G4double highestKineticEnergy;
+  G4int TotBin;
+
+  G4LowEnergyUtilities util;
+
+  G4DataVector thePrimShVec;
+  G4double lEnergyLimit;
 };
  
 #include "G4LowEnergyIonisation.icc"
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
index ebd0673018..8203cc03cf 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyIonisation.icc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyIonisation.icc,v 1.11 2000/04/07 13:43:13 lefebure Exp $
+//
+// $Id: G4LowEnergyIonisation.icc,v 1.16.2.2 2001/06/28 20:19:24 gunter Exp $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyIonisation physics process ------------
 //
 //                  by Alessandra Forti , July 1999
@@ -20,20 +34,27 @@
 //
 //   07.04.2000 Veronique Lefebure + Laszlo Urban
 // - First implemention of continuous energy loss
-// 14/07/99: corrections by L. Urban
+// 14/07/99 corrections by L. Urban
+// 16/05/01 V.Ivanchenko: cross section is taken from the table.
+// 17/05/01 V.Ivanchenko: warning print out.
+// 22/05/01 V.Ivanchenko: switch on using tables of cross sections.
 // ---------------------------------------------------------------
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 inline G4bool G4LowEnergyIonisation::IsApplicable(
                             const G4ParticleDefinition& particle)
 {
+   if(&particle == G4Positron::Positron()) {
+     G4cout << "WARNING: G4LowEnergyIonisation is not applicable"
+            << " for positron yet!" << G4endl;
+   } 
    return(  (&particle == G4Electron::Electron())
         /////////////////||(&particle == G4Positron::Positron()) 
 	  );
 }
          
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 inline G4double G4LowEnergyIonisation::GetMeanFreePath(
                                                const G4Track& track,
@@ -43,31 +64,16 @@ inline G4double G4LowEnergyIonisation::GetMeanFreePath(
    const G4DynamicParticle* aParticle = track.GetDynamicParticle();
    G4double KineticEnergy = aParticle->GetKineticEnergy();
    const G4Material* aMaterial  = track.GetMaterial();
-   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
-   const G4double* theAtomicNumDensityVector = aMaterial->GetAtomicNumDensityVector();
-   const G4int NumberOfElements = aMaterial->GetNumberOfElements() ;
-   G4double* DeltaCutInKineticEnergy = G4Electron::Electron()->GetCutsInEnergy() ;
-   G4double DeltaThreshold = DeltaCutInKineticEnergy[aMaterial->GetIndex()] ;
  
-   G4bool isOutRange ;
-   G4double SIGMA = 0.;
+   G4bool isOutRange = false;
 
-   if( KineticEnergy < LowestKineticEnergy )
-     MeanFreePath = DBL_MAX;
+   if( KineticEnergy < lowestKineticEnergy ) MeanFreePath = DBL_MAX;
    else {
-     if (KineticEnergy > HighestKineticEnergy) KineticEnergy = HighestKineticEnergy;
-     ///don't use table for now 
-     ///MeanFreePath = ((*theMeanFreePathTable)(aMaterial->GetIndex()))->
-     ///               GetValue( KineticEnergy, isOutRange);
-        SIGMA = 0.;
-	G4int iel;           
-        for (iel=0; iel<NumberOfElements; iel++ ){
-             SIGMA += theAtomicNumDensityVector[iel]*
-                      ComputeCrossSectionWithCut( (*theElementVector)(iel)->GetZ(),
-			                           KineticEnergy,
-                                                   DeltaThreshold);
-        }
-        MeanFreePath = SIGMA > DBL_MIN ? 1./SIGMA : DBL_MAX;     
+     if(KineticEnergy > highestKineticEnergy) 
+        KineticEnergy = highestKineticEnergy;
+
+     MeanFreePath = ((*theMeanFreePathTable)(aMaterial->GetIndex()))->
+                    GetValue( KineticEnergy, isOutRange);
    }
   return MeanFreePath ;
 }
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
index 002664a789..0fe7f69fda 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyPhotoElectric.hh,v 1.15 2001/02/05 17:45:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyPhotoElectric.hh,v 1.18.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyPhotoElectric physics process ------
 //                   by A.Forti  1999/03/02
 //
@@ -34,13 +48,13 @@
 #include "G4LowEnergyUtilities.hh"
 #include "G4Gamma.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 typedef G4FirstLevel oneShellTable;
 typedef G4SecondLevel oneAtomTable;
 typedef G4ThirdLevel allAtomTable;
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 class G4LowEnergyPhotoElectric : public G4VDiscreteProcess
 
@@ -99,26 +113,29 @@ private:
      
 private:
 
+  G4double lowestEnergyLimit;      
+  G4double highestEnergyLimit;     
+
+  G4int NumbBinTable;              
+
+  G4double CutForLowEnergySecondaryPhotons;
+
   G4SecondLevel* theCrossSectionTable;    
   G4PhysicsTable* theMeanFreePathTable;
 
   allAtomTable* allAtomShellCrossSec;
   allAtomTable* theFluorTransitionTable;
   G4SecondLevel* theBindingEnergyTable;   
-  G4DataVector thePrimShVec;
   G4DataVector* ZNumVec;
   G4DataVector* ZNumVecFluor;
 
+  G4DataVector thePrimShVec;
   G4LowEnergyUtilities util;
 
-  G4double LowestEnergyLimit;      
-  G4double HighestEnergyLimit;     
-  G4int NumbBinTable;              
-  G4double CutForLowEnergySecondaryPhotons;
   G4double MeanFreePath;           
 };
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 #include "G4LowEnergyPhotoElectric.icc"
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
index ce30ce36ed..3798b334c7 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPhotoElectric.icc
@@ -1,31 +1,48 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyPhotoElectric.icc,v 1.14 2000/06/22 02:25:26 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyPhotoElectric.icc,v 1.18.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyPhotoElectric physics process ---------
 //                   by A.Forti 1999/03/02
+//
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
+//
 // ***************************************************************
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 inline G4bool G4LowEnergyPhotoElectric::IsApplicable(const G4ParticleDefinition& particle)
 {
    return ( &particle == G4Gamma::Gamma() ); 
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 inline G4double 
 G4LowEnergyPhotoElectric::GetMeanFreePath(const G4Track& aTrack, G4double,
@@ -36,11 +53,11 @@ G4LowEnergyPhotoElectric::GetMeanFreePath(const G4Track& aTrack, G4double,
   G4double GammaEnergy = aDynamicGamma->GetKineticEnergy();
   G4Material* aMaterial = aTrack.GetMaterial();
 
-  G4bool isOutRange ;
-  if (GammaEnergy > HighestEnergyLimit){
+  // G4bool isOutRange ;
+  if (GammaEnergy > highestEnergyLimit){
      MeanFreePath = DBL_MAX;
    }	
-   else if(GammaEnergy < LowestEnergyLimit){
+   else if(GammaEnergy < lowestEnergyLimit){
 
 	MeanFreePath = DBL_MIN;
    }
@@ -54,20 +71,18 @@ G4LowEnergyPhotoElectric::GetMeanFreePath(const G4Track& aTrack, G4double,
   return MeanFreePath;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
-inline G4double 
-G4LowEnergyPhotoElectric::GetCrossSection(G4DynamicParticle* aDynamicGamma,
-			                  G4Element* anElement)
+inline G4double G4LowEnergyPhotoElectric::GetCrossSection(G4DynamicParticle* aDynamicGamma,
+			                                  G4Element* anElement)
  
 // gives the microscopic total cross section in GEANT4 internal units
 
 {
    G4double crossSection;
    G4double GammaEnergy = aDynamicGamma->GetKineticEnergy();
-   G4bool isOutRange ;
 
-   if (GammaEnergy < LowestEnergyLimit || GammaEnergy > HighestEnergyLimit)
+   if (GammaEnergy < lowestEnergyLimit || GammaEnergy > highestEnergyLimit)
       crossSection = 0.;
    else{
 
@@ -82,7 +97,7 @@ G4LowEnergyPhotoElectric::GetCrossSection(G4DynamicParticle* aDynamicGamma,
    return crossSection;
 } 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh
new file mode 100644
index 0000000000..6c37c6b32e
--- /dev/null
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyPolarizedCompton.hh
@@ -0,0 +1,125 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4LowEnergyPolarizedCompton.hh,v 1.4.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// ------------------------------------------------------------
+//      GEANT 4 class header file
+//      CERN Geneva Switzerland
+//
+
+// --------- G4LowEnergyPolarizedCompton class -----
+//
+//           by G.Depaola & F.Longo (21 may 2001)
+// 24 May 2001 - MGP      Modified to inherit from G4VDiscreteProcess
+// 25 May 2001 - MGP      Added protections to avoid crashes
+//
+// Class description:
+// Low Energy electromagnetic process, Polarised Compton scattering
+// Further documentation available from http://www.ge.infn.it/geant4/lowE
+
+// ------------------------------------------------------------
+
+#ifndef G4LowEnergyPolarizedCompton_h
+#define G4LowEnergyPolarizedCompton_h 1
+
+#include "globals.hh"
+#include "G4VDiscreteProcess.hh"
+#include "G4LowEnergyUtilities.hh"
+//#include "G4VParticleChange.hh"
+
+class G4SecondLevel;
+class G4PhysicsTable;
+class G4DataVector;
+class G4ParticleDefinition;
+class G4VParticleChange;
+
+
+class G4LowEnergyPolarizedCompton : public  G4VDiscreteProcess
+{  
+public:  
+  
+  G4LowEnergyPolarizedCompton(const G4String& processName = "polarLowEnCompt");
+  
+  ~G4LowEnergyPolarizedCompton();
+
+  G4bool IsApplicable(const G4ParticleDefinition&);
+  
+  void BuildPhysicsTable(const G4ParticleDefinition& GammaType);
+ 
+  G4double GetMeanFreePath(const G4Track& aTrack, 
+			   G4double previousStepSize, 
+			   G4ForceCondition* condition);
+
+  G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep);
+
+protected:
+
+  void BuildScatteringFunctionTable();
+  void BuildCrossSectionTable();
+  void BuildMeanFreePathTable();
+  void BuildZVec();
+
+private:
+  
+  G4Element* SelectRandomAtom(const G4DynamicParticle*, G4Material*);
+  
+  G4SecondLevel* theCrossSectionTable;
+  G4SecondLevel* theScatteringFunctionTable;
+  G4PhysicsTable* theMeanFreePathTable;
+  G4DataVector* ZNumVec;
+
+  G4double lowestEnergyLimit; // low  energy limit of the crosssection data 
+  G4double highestEnergyLimit; // high energy limit of the crosssection data
+  G4int numbBinTable; // number of bins in the data  tables
+
+  G4LowEnergyUtilities util;
+
+  G4double meanFreePath; // actual Mean Free Path (current medium)
+
+  G4ThreeVector SetNewPolarization(G4double epsilon, G4double sinSqrTheta, 
+				   G4double phi, G4double cosTheta);
+  
+  G4double SetPhi(G4double, G4double);
+  
+  void SystemOfRefChange(G4ThreeVector& direction0, G4ThreeVector& direction1, 
+			 G4ThreeVector& polarization0, G4ThreeVector& polarization1);
+
+  // hide assignment operator as private 
+  G4LowEnergyPolarizedCompton& operator=(const G4LowEnergyPolarizedCompton &right);
+  G4LowEnergyPolarizedCompton(const G4LowEnergyPolarizedCompton& );
+
+
+};
+
+#endif
+ 
+
+
+
+
+
+
+
+
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
index 1b6d292c82..d97f152861 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyRayleigh.hh,v 1.8 2001/02/05 17:45:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyRayleigh.hh,v 1.10.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1995
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyRayleigh physics process ------
 //                   by A.Forti 1999/03/02
 //
@@ -74,12 +88,12 @@ private:
   G4PhysicsTable* theMeanFreePathTable;  
   G4DataVector* ZNumVec;
 
-  G4LowEnergyUtilities util;
-
-  G4double LowestEnergyLimit; // low  energy limit of the crosssection formula
-  G4double HighestEnergyLimit; // high energy limit of the crosssection formula
+  G4double lowestEnergyLimit; // low  energy limit of the crosssection formula
+  G4double highestEnergyLimit; // high energy limit of the crosssection formula
   G4int NumbBinTable; // number of bins in the crossection table
 
+  G4LowEnergyUtilities util;
+
   G4double MeanFreePath; // actual Mean Free Path (current medium)
 };
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
index 2758acc649..ae17a296b5 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyRayleigh.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyRayleigh.icc,v 1.10 2000/06/22 02:25:26 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyRayleigh.icc,v 1.12.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyRayleigh physics process ---------
 //                   by A.Forti 1999/03/02
 // ***************************************************************
@@ -29,12 +43,12 @@ inline G4double G4LowEnergyRayleigh::GetMeanFreePath(const G4Track& aTrack, G4do
    G4double GammaEnergy = aDynamicGamma->GetKineticEnergy();
    G4Material* aMaterial = aTrack.GetMaterial();
 
-   G4bool isOutRange ;
+   // G4bool isOutRange ;
 
-   if (GammaEnergy > HighestEnergyLimit){
+   if (GammaEnergy > highestEnergyLimit){
      MeanFreePath = DBL_MAX;
    }	
-   else if(GammaEnergy < LowestEnergyLimit){
+   else if(GammaEnergy < lowestEnergyLimit){
 
 	MeanFreePath = DBL_MIN;
    }
diff --git a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
index ec2dd52149..7b17215be8 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4LowEnergyUtilities.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyUtilities.hh,v 1.7 2001/02/05 17:45:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyUtilities.hh,v 1.8.2.2 2001/06/28 20:19:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4LowEnergyPhotoElectric physics process ------
 //                   by A.Forti 1999/06/28
 //
@@ -95,8 +109,9 @@ inline G4double G4LowEnergyUtilities::DataLogInterpolation(const G4double Argume
                                                                const G4DataVector& valVec){
 
   G4int theLoc = FindBinLocation(Argument, argVec); 
+  G4int size = argVec.size()-1;
 
-  if(theLoc == argVec.size()-1){
+  if(theLoc == size){
     return valVec[theLoc];
   }
 
@@ -166,8 +181,9 @@ inline G4double G4LowEnergyUtilities::DataSemiLogInterpolation(const G4double Ar
                                                                 const G4DataVector& valVec){
 
   G4int theLoc = FindBinLocation(Argument, argVec); 
+  G4int size = argVec.size()-1;
 
-  if(theLoc == argVec.size()-1){
+  if (theLoc == size){
     return valVec[theLoc];
   }
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4QAOLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4QAOLowEnergyLoss.hh
index 6d214e7e05..23711e5093 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4QAOLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4QAOLowEnergyLoss.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: New Implementation
 //    
 //      ---------- G4QAOLowEnergyLoss physics process -------
@@ -18,6 +32,7 @@
 // Modified:
 // 16/09/2000 S. Chauvie  Oscillator for all materials
 // 23/05/2000 MGP  Made compliant to design
+// 01/06/2001 V.Ivanchenko replace names by Z
 //  
 // Class description:
 // Quantal Harmonic Oscillator Model for energy loss of low energy antiprotons 
@@ -96,8 +111,8 @@ private:
   G4double GetL2(G4double normEnergy) const;
   // terms in Z^4
   
-  //  material at now avaliable for the model
-  static const G4String materialAvailable[6];
+  // Z of element at now avaliable for the model
+  static const G4int materialAvailable[6];
   
   // number, energy and oscillator strenghts
   // for an harmonic oscillator model of material
diff --git a/source/processes/electromagnetic/lowenergy/include/G4SecondLevel.hh b/source/processes/electromagnetic/lowenergy/include/G4SecondLevel.hh
index 280717afa9..57df6ff5e2 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4SecondLevel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4SecondLevel.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4SecondLevel.hh
@@ -18,9 +32,10 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave
 //      
-//
+// -------------------------------------------------------------------
+
 // Class description:
 // Utility for Low Energy electromagnetic e/photon processes
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
@@ -31,10 +46,12 @@
 #define G4SECONDLEVEL_HH
 
 #include "G4FirstLevel.hh"
-#include "g4rw/tpordvec.h"
+//#include "g4rw/tpordvec.h"
 
-class G4SecondLevel : public G4RWTPtrOrderedVector< G4FirstLevel >{
+//class G4SecondLevel : public G4RWTPtrOrderedVector< G4FirstLevel >{
+class G4SecondLevel : public G4std::vector< G4FirstLevel* >
 
+{
 
 public:
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4ThirdLevel.hh b/source/processes/electromagnetic/lowenergy/include/G4ThirdLevel.hh
index 7cd3288947..a202960634 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4ThirdLevel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4ThirdLevel.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ThirdLevel.hh
@@ -18,8 +32,10 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave
 //      
+// -------------------------------------------------------------------
+
 // Class description:
 // Utility for Low Energy electromagnetic e/photon processes
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
@@ -30,10 +46,11 @@
 #define G4THIRDLEVEL_HH
 
 #include "G4SecondLevel.hh"
-#include "g4rw/tpordvec.h"
-
-class G4ThirdLevel : public G4RWTPtrOrderedVector< G4SecondLevel >{
+//#include "g4rw/tpordvec.h"
 
+//class G4ThirdLevel : public G4RWTPtrOrderedVector< G4SecondLevel >{
+class G4ThirdLevel : public G4std::vector< G4SecondLevel* >
+{
 
 public:
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyModel.hh b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyModel.hh
index 59c042a6cc..0e38171c3c 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VLowEnergyModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VLowEnergyModel
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
index 7c1c658c46..2c0019e5cc 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VeLowEnergyLoss.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VeLowEnergyLoss.hh,v 1.3 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VeLowEnergyLoss.hh,v 1.4.2.2 2001/06/28 20:19:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 3.4.2000 Veronique Lefebure:
 //          Move utils/include/G4VEnergyLoss.hh to 
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // Class Description 
 //
@@ -180,6 +194,9 @@ class G4VeLowEnergyLoss : public G4VContinuousDiscreteProcess
                         G4double Tmin,G4double Tmax,G4int nbin,
                         G4int materialIndex,G4PhysicsLogVector* rangeVector);
 
+    static void BuildRangeVectorNew(const G4PhysicsTable*,G4int,
+                                          G4int,G4PhysicsLogVector*);
+
     static G4double RangeIntLin(G4PhysicsVector* physicsVector
                                                         ,G4int nbin);
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VhElectronicStoppingPower.hh b/source/processes/electromagnetic/lowenergy/include/G4VhElectronicStoppingPower.hh
index bc881f7d3e..3186453ec3 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VhElectronicStoppingPower.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VhElectronicStoppingPower.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VhElectronicStoppingPower
 //
@@ -24,6 +38,8 @@
 // Class Description: 
 //
 // Low energy hadrons/ions electronic stopping power parametrisation
+// Virtual class to provide the interface between G4hLowEnergyIonisation
+// and a model of energy loss of low energy proton or alpha particle.
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
 
 // -------------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VhEnergyLossModel.hh b/source/processes/electromagnetic/lowenergy/include/G4VhEnergyLossModel.hh
index 830d2bdf8b..bf0ed36c96 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VhEnergyLossModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VhEnergyLossModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VhEnergyLossModel
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4VhNuclearStoppingPower.hh b/source/processes/electromagnetic/lowenergy/include/G4VhNuclearStoppingPower.hh
index 25a4a6ab15..4fbbad9f88 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4VhNuclearStoppingPower.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4VhNuclearStoppingPower.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VhNuclearStoppingPower
 //
@@ -24,6 +38,8 @@
 // Class Description: 
 //
 // Hadrons/ions nuclear stopping power parameterisation
+// Virtual class to provide an interface before nucleare stopping
+// power model and G4hLowEnergyIonisation.
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
 
 // -------------------------------------------------------------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
index 1e5856cbfe..fe46e8b12f 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eLowEnergyLoss.hh,v 1.1 2000/04/04 13:47:35 lefebure Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eLowEnergyLoss.hh,v 1.1.4.2 2001/06/28 20:19:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4eLowEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
index fcb2ef4652..5e5a310f4e 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4eLowEnergyLoss.icc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eLowEnergyLoss.icc,v 1.1 2000/04/04 13:47:36 lefebure Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eLowEnergyLoss.icc,v 1.2.2.2 2001/06/28 20:19:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4eLowEnergyLoss physics process ------------
@@ -64,7 +78,7 @@ inline G4double G4eLowEnergyLoss::GetConstraints(
   return StepLimit;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 inline G4double G4eLowEnergyLoss::GetContinuousStepLimit(
                                                const G4Track& track,
@@ -81,7 +95,7 @@ inline G4double G4eLowEnergyLoss::GetContinuousStepLimit(
   return Step ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 inline G4bool G4eLowEnergyLoss::IsApplicable(const G4ParticleDefinition&
                                                      particle)
 {
@@ -89,5 +103,5 @@ inline G4bool G4eLowEnergyLoss::IsApplicable(const G4ParticleDefinition&
            ||(&particle == G4Positron::Positron()) );
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hBetheBlochModel.hh b/source/processes/electromagnetic/lowenergy/include/G4hBetheBlochModel.hh
index 18f5445100..7d50cb3174 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hBetheBlochModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hBetheBlochModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hBetheBlochModel
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hICRU49He.hh b/source/processes/electromagnetic/lowenergy/include/G4hICRU49He.hh
index e40d5755dd..9fc494f590 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hICRU49He.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hICRU49He.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49He
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hICRU49Nuclear.hh b/source/processes/electromagnetic/lowenergy/include/G4hICRU49Nuclear.hh
index b0951eb0e1..b9d6ce98b0 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hICRU49Nuclear.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hICRU49Nuclear.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49Nuclear
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hICRU49p.hh b/source/processes/electromagnetic/lowenergy/include/G4hICRU49p.hh
index 74bb77d368..bb96c4e9b6 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hICRU49p.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hICRU49p.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49p
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hIonEffChargeSquare.hh b/source/processes/electromagnetic/lowenergy/include/G4hIonEffChargeSquare.hh
index fa78219593..47184e6ea9 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hIonEffChargeSquare.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hIonEffChargeSquare.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hIonEffChargeSquare
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
index 6453a97354..9628828ba9 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hLowEnergyIonisation physics process -----
@@ -43,6 +57,7 @@
 // Nuclear stopping powers:    "ICRU_49" (default), "Ziegler1977",
 //                             "Ziegler1985"
 // Further documentation available from http://www.ge.infn.it/geant4/lowE
+// and in the Physics Reference Manual
 
 // ------------------------------------------------------------
 
@@ -79,7 +94,7 @@ public: // With description
   // True for all charged hadrons/ions
     
   void BuildPhysicsTable(const G4ParticleDefinition& aParticleType) ;
-  // Build physics table during inicialisation
+  // Build physics table during initialisation
 
   G4double GetMeanFreePath(const G4Track& track,
 			         G4double previousStepSize,
@@ -92,25 +107,26 @@ public: // With description
   void SetHighEnergyForProtonParametrisation(G4double energy) 
                              {protonHighEnergy = energy;} ;
   // Definition of the boundary proton energy. For higher energies
-  // Bethe-Bloch formula is used, for lower energies parametrisation
-  // of the energy losses is performed. 
+  // Bethe-Bloch formula is used, for lower energies a parametrisation
+  // of the energy losses is performed. Default is 2 MeV.
 
   void SetLowEnergyForProtonParametrisation(G4double energy) 
                              {protonLowEnergy = energy;} ;
-  // Definition of the boundary proton energy. For lower energies
-  // Free Electron Gas model is used for the energy losses
+  // Set of the boundary proton energy. For lower energies
+  // the Free Electron Gas model is used for the energy losses.
+  // Default is 1 keV.
 
   void SetHighEnergyForAntiProtonParametrisation(G4double energy) 
                              {antiProtonHighEnergy = energy;} ;
-  // Definition of the boundary antiproton energy. For higher energies
+  // Set of the boundary antiproton energy. For higher energies
   // Bethe-Bloch formula is used, for lower energies parametrisation
   // of the energy losses is performed. Default is 2 MeV.
 
   void SetLowEnergyForAntiProtonParametrisation(G4double energy) 
                               {antiProtonLowEnergy = energy;} ;
-  // Definition of the boundary antiproton energy. For lower energies
-  // Free Electron Gas model is used for the energy losses. Default
-  // is 1 keV.
+  // Set of the boundary antiproton energy. For lower energies
+  // the Free Electron Gas model is used for the energy losses. 
+  // Default is 1 keV.
 
   G4double GetContinuousStepLimit(const G4Track& track,
                                         G4double previousStepSize,
@@ -135,10 +151,10 @@ public: // With description
   // This method switch off calculation of the nuclear stopping power.
   
   void SetBarkasOn() {theBarkas = true;};
-  // This method switch on calculation of the Barkas and Bloch effects 
+  // This method switch on calculation of the Barkas and Bloch effects. 
   
   void SetBarkasOff() {theBarkas = false;};
-  // This method switch off calculation of the Barkas and Bloch effects
+  // This method switch off calculation of the Barkas and Bloch effects.
                                        
   G4VParticleChange* AlongStepDoIt(const G4Track& trackData , 
                                    const G4Step& stepData ) ;
@@ -146,7 +162,7 @@ public: // With description
 
   G4VParticleChange* PostStepDoIt(const G4Track& track,
 				  const G4Step& Step  ) ;                 
-  // Simulation of delta rays production
+  // Simulation of delta rays production.
     
   G4double ComputeDEDX(const G4ParticleDefinition* aParticle,
                        const G4Material* material,
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.icc b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.icc
index 5e52698a5e..17759c6111 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyIonisation.icc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4hLowEnergyIonisation physics process ------
 //                by Vladimir Ivanchenko, 27 July 1999 
 //                was made on the base of G4hIonisation class
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
index 609c6909a8..ad9676f354 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hLowEnergyLoss.hh,v 1.9 2000/11/03 10:29:51 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hLowEnergyLoss.hh,v 1.10.2.2 2001/06/28 20:19:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hEnergyLoss physics process -----------
@@ -30,13 +44,9 @@
 // The energy loss for other charged hadrons is calculated from the p/pbar
 // tables with scaled kinetic energy.
 //
-// **************************************************************************** 
-// It is assumed that the cut in range is the same for all the charged hadrons! 
-// ****************************************************************************
-//
-// 7/10/98 some bugs fixed + some cleanup , L.Urban 
-// 22/10/98 cleanup , L.Urban
-// 02/02/99 several bugs fixed, L.Urban
+// 7/10/98  L.Urban some bugs fixed + some cleanup 
+// 22/10/98 L.Urban cleanup
+// 02/02/99 L.Urban several bugs fixed
 // 31/03/00 V.Ivanchenko rename to lowenergy as G4hLowEnergyLoss.hh 
 // 09/08/00 V.Ivanchenko remove GetContinuousStepLimit and IsApplicable
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
index 356f298df7..913b904a20 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
+++ b/source/processes/electromagnetic/lowenergy/include/G4hLowEnergyLoss.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hLowEnergyLoss.icc,v 1.1 2000/03/31 15:15:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hLowEnergyLoss.icc,v 1.1.4.2 2001/06/28 20:19:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4hEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hNuclearStoppingModel.hh b/source/processes/electromagnetic/lowenergy/include/G4hNuclearStoppingModel.hh
index 6a01a424fb..ae0d541520 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hNuclearStoppingModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hNuclearStoppingModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hNuclearStoppingModel
 //
@@ -24,7 +38,7 @@
 // Class Description: 
 //
 // Low energy hadrons/ions ionisation parameterisation
-// Further documentation available from http://www.ge.infn.it/geant4/lowE//
+// Further documentation available from http://www.ge.infn.it/geant4/lowE/
 
 // -------------------------------------------------------------------
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hParametrisedLossModel.hh b/source/processes/electromagnetic/lowenergy/include/G4hParametrisedLossModel.hh
index 6ffedbf1a1..af885f0947 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hParametrisedLossModel.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hParametrisedLossModel.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hParametrisedLossModel
 //
@@ -24,7 +38,7 @@
 // Class Description: 
 //
 // Low energy hadrons/ions ionisation parameterisation
-// Further documentation available from http://www.ge.infn.it/geant4/lowE//
+// Further documentation available from http://www.ge.infn.it/geant4/lowE/
 
 // -------------------------------------------------------------------
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977He.hh b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977He.hh
index c54a5ad6f3..0e5cf90e2e 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977He.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977He.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977He
 //
@@ -26,7 +40,7 @@
 // Electronic stopping power parameterised according to
 // J.F.Ziegler, Helium Stopping Powers and
 // Ranges in All Elemental Matter, Vol.4, Pergamon Press, 1977
-// Further documentation available from http://www.ge.infn.it/geant4/lowE//
+// Further documentation available from http://www.ge.infn.it/geant4/lowE/
 
 // -------------------------------------------------------------------
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977Nuclear.hh b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977Nuclear.hh
index 5a478344d5..333799779c 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977Nuclear.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977Nuclear.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977Nuclear
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977p.hh b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977p.hh
index dd823b8947..6edfea941c 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977p.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1977p.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977p
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985Nuclear.hh b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985Nuclear.hh
index edd9f40751..a8d8a10bfa 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985Nuclear.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985Nuclear.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1985Nuclear
 //
diff --git a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985p.hh b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985p.hh
index 2b1a6dd864..138afb0635 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985p.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4hZiegler1985p.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1985p
 //
@@ -57,6 +71,7 @@ protected:
 
 private:
   const G4double protonMassAMU;
+  static G4double a[92][8];
 
 };
 
diff --git a/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh b/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
index 7b6827215b..03e1cead18 100644
--- a/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
+++ b/source/processes/electromagnetic/lowenergy/include/G4ionLowEnergyIonisation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4ionLowEnergyIonisation physics process -----
diff --git a/source/processes/electromagnetic/lowenergy/src/G4FirstLevel.cc b/source/processes/electromagnetic/lowenergy/src/G4FirstLevel.cc
index bb356513bb..9463199454 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4FirstLevel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4FirstLevel.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4FirstLevel.hh
@@ -18,7 +32,7 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave 
 //      
 // -------------------------------------------------------------------
 
@@ -27,18 +41,21 @@
 
 G4FirstLevel::~G4FirstLevel(){
 
-  this->clearAndDestroy();
+  //this->clearAndDestroy();
+  this->clear();
 }
 
 G4bool G4FirstLevel::operator == (const G4FirstLevel& input) const{
 
-  return( this->entries() == input.entries());
+  //  return( this->entries() == input.entries());
+  return( this->size() == input.size());
 
 }
 
 G4bool G4FirstLevel::operator < (const G4FirstLevel& input) const{
 
-  return(this->entries() < input.entries());
+  //  return(this->entries() < input.entries());
+  return(this->size() < input.size());
 
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4IonChuFluctuationModel.cc b/source/processes/electromagnetic/lowenergy/src/G4IonChuFluctuationModel.cc
index 29d4d60d07..31308c40d4 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4IonChuFluctuationModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4IonChuFluctuationModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4IonChuFluctuationModel
 //
@@ -22,6 +36,7 @@
 // 18/08/2000  V.Ivanchenko First implementation
 // 04/09/2000  V.Ivanchenko Rename fluctuations            
 // 03/10/2000  V.Ivanchenko CodeWizard clean up
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // -------------------------------------------------------------------
 //
@@ -151,111 +166,111 @@ G4double G4IonChuFluctuationModel::ChuFluctuationModel(
                   (material->GetTotNbOfAtomsPerVolume()) ;
 
   static G4double a[96][4] = {
- -0.3291, -0.8312,  0.2460, -1.0220,
- -0.5615, -0.5898,  0.5205, -0.7258,
- -0.5280, -0.4981,  0.5519, -0.5865,
- -0.5125, -0.4625,  0.5660, -0.5190,
- -0.5127, -0.8595,  0.5626, -0.8721,
- -0.5174, -1.1930,  0.5565, -1.1980,
- -0.5179, -1.1850,  0.5560, -1.2070,
- -0.5209, -0.9355,  0.5590, -1.0250,
- -0.5255, -0.7766,  0.5720, -0.9412,
+ {-0.3291, -0.8312,  0.2460, -1.0220},
+ {-0.5615, -0.5898,  0.5205, -0.7258},
+ {-0.5280, -0.4981,  0.5519, -0.5865},
+ {-0.5125, -0.4625,  0.5660, -0.5190},
+ {-0.5127, -0.8595,  0.5626, -0.8721},
+ {-0.5174, -1.1930,  0.5565, -1.1980},
+ {-0.5179, -1.1850,  0.5560, -1.2070},
+ {-0.5209, -0.9355,  0.5590, -1.0250},
+ {-0.5255, -0.7766,  0.5720, -0.9412},
 
- -0.5776, -0.6665,  0.6598, -0.8484,
- -0.6013, -0.6045,  0.7321, -0.7671,
- -0.5781, -0.5518,  0.7605, -0.6919,
- -0.5587, -0.4981,  0.7835, -0.6195,
- -0.5466, -0.4656,  0.7978, -0.5771,
- -0.5406, -0.4690,  0.8031, -0.5718,
- -0.5391, -0.5061,  0.8024, -0.5974,
- -0.5380, -0.6483,  0.7962, -0.6970,
- -0.5355, -0.7722,  0.7962, -0.7839,
- -0.5329, -0.7720,  0.7988, -0.7846,
+ {-0.5776, -0.6665,  0.6598, -0.8484},
+ {-0.6013, -0.6045,  0.7321, -0.7671},
+ {-0.5781, -0.5518,  0.7605, -0.6919},
+ {-0.5587, -0.4981,  0.7835, -0.6195},
+ {-0.5466, -0.4656,  0.7978, -0.5771},
+ {-0.5406, -0.4690,  0.8031, -0.5718},
+ {-0.5391, -0.5061,  0.8024, -0.5974},
+ {-0.5380, -0.6483,  0.7962, -0.6970},
+ {-0.5355, -0.7722,  0.7962, -0.7839},
+ {-0.5329, -0.7720,  0.7988, -0.7846},
 
- -0.5335, -0.7671,  0.7984, -0.7933,
- -0.5324, -0.7612,  0.7998, -0.8031,
- -0.5305, -0.7300,  0.8031, -0.7990,
- -0.5307, -0.7178,  0.8049, -0.8216,
- -0.5248, -0.6621,  0.8165, -0.7919,
- -0.5180, -0.6502,  0.8266, -0.7986,
- -0.5084, -0.6408,  0.8396, -0.8048,
- -0.4967, -0.6331,  0.8549, -0.8093,
- -0.4861, -0.6508,  0.8712, -0.8432,
- -0.4700, -0.6186,  0.8961, -0.8132,
+ {-0.5335, -0.7671,  0.7984, -0.7933},
+ {-0.5324, -0.7612,  0.7998, -0.8031},
+ {-0.5305, -0.7300,  0.8031, -0.7990},
+ {-0.5307, -0.7178,  0.8049, -0.8216},
+ {-0.5248, -0.6621,  0.8165, -0.7919},
+ {-0.5180, -0.6502,  0.8266, -0.7986},
+ {-0.5084, -0.6408,  0.8396, -0.8048},
+ {-0.4967, -0.6331,  0.8549, -0.8093},
+ {-0.4861, -0.6508,  0.8712, -0.8432},
+ {-0.4700, -0.6186,  0.8961, -0.8132},
 
- -0.4545, -0.5720,  0.9227, -0.7710,
- -0.4404, -0.5226,  0.9481, -0.7254,
- -0.4288, -0.4778,  0.9701, -0.6850,
- -0.4199, -0.4425,  0.9874, -0.6539,
- -0.4131, -0.4188,  0.9998, -0.6332,
- -0.4089, -0.4057,  1.0070, -0.6218,
- -0.4039, -0.3913,  1.0150, -0.6107,
- -0.3987, -0.3698,  1.0240, -0.5938,
- -0.3977, -0.3608,  1.0260, -0.5852,
- -0.3972, -0.3600,  1.0260, -0.5842,
+ {-0.4545, -0.5720,  0.9227, -0.7710},
+ {-0.4404, -0.5226,  0.9481, -0.7254},
+ {-0.4288, -0.4778,  0.9701, -0.6850},
+ {-0.4199, -0.4425,  0.9874, -0.6539},
+ {-0.4131, -0.4188,  0.9998, -0.6332},
+ {-0.4089, -0.4057,  1.0070, -0.6218},
+ {-0.4039, -0.3913,  1.0150, -0.6107},
+ {-0.3987, -0.3698,  1.0240, -0.5938},
+ {-0.3977, -0.3608,  1.0260, -0.5852},
+ {-0.3972, -0.3600,  1.0260, -0.5842},
 
- -0.3985, -0.3803,  1.0200, -0.6013,
- -0.3985, -0.3979,  1.0150, -0.6168,
- -0.3968, -0.3990,  1.0160, -0.6195,
- -0.3971, -0.4432,  1.0050, -0.6591,
- -0.3944, -0.4665,  1.0010, -0.6825,
- -0.3924, -0.5109,  0.9921, -0.7235,
- -0.3882, -0.5158,  0.9947, -0.7343,
- -0.3838, -0.5125,  0.9999, -0.7370,
- -0.3786, -0.4976,  1.0090, -0.7310,
- -0.3741, -0.4738,  1.0200, -0.7155,
+ {-0.3985, -0.3803,  1.0200, -0.6013},
+ {-0.3985, -0.3979,  1.0150, -0.6168},
+ {-0.3968, -0.3990,  1.0160, -0.6195},
+ {-0.3971, -0.4432,  1.0050, -0.6591},
+ {-0.3944, -0.4665,  1.0010, -0.6825},
+ {-0.3924, -0.5109,  0.9921, -0.7235},
+ {-0.3882, -0.5158,  0.9947, -0.7343},
+ {-0.3838, -0.5125,  0.9999, -0.7370},
+ {-0.3786, -0.4976,  1.0090, -0.7310},
+ {-0.3741, -0.4738,  1.0200, -0.7155},
 
- -0.3969, -0.4496,  1.0320, -0.6982,
- -0.3663, -0.4297,  1.0430, -0.6828,
- -0.3630, -0.4120,  1.0530, -0.6689,
- -0.3597, -0.3964,  1.0620, -0.6564,
- -0.3555, -0.3809,  1.0720, -0.6454,
- -0.3525, -0.3607,  1.0820, -0.6289,
- -0.3505, -0.3465,  1.0900, -0.6171,
- -0.3397, -0.3570,  1.1020, -0.6384,
- -0.3314, -0.3552,  1.1130, -0.6441,
- -0.3235, -0.3531,  1.1230, -0.6498,
+ {-0.3969, -0.4496,  1.0320, -0.6982},
+ {-0.3663, -0.4297,  1.0430, -0.6828},
+ {-0.3630, -0.4120,  1.0530, -0.6689},
+ {-0.3597, -0.3964,  1.0620, -0.6564},
+ {-0.3555, -0.3809,  1.0720, -0.6454},
+ {-0.3525, -0.3607,  1.0820, -0.6289},
+ {-0.3505, -0.3465,  1.0900, -0.6171},
+ {-0.3397, -0.3570,  1.1020, -0.6384},
+ {-0.3314, -0.3552,  1.1130, -0.6441},
+ {-0.3235, -0.3531,  1.1230, -0.6498},
 
- -0.3150, -0.3483,  1.1360, -0.6539,
- -0.3060, -0.3441,  1.1490, -0.6593,
- -0.2968, -0.3396,  1.1630, -0.6649,
- -0.2935, -0.3225,  1.1760, -0.6527,
- -0.2797, -0.3262,  1.1940, -0.6722,
- -0.2704, -0.3202,  1.2100, -0.6770,
- -0.2815, -0.3227,  1.2480, -0.6775,
- -0.2880, -0.3245,  1.2810, -0.6801,
- -0.3034, -0.3263,  1.3270, -0.6778,
- -0.2936, -0.3215,  1.3430, -0.6835,
+ {-0.3150, -0.3483,  1.1360, -0.6539},
+ {-0.3060, -0.3441,  1.1490, -0.6593},
+ {-0.2968, -0.3396,  1.1630, -0.6649},
+ {-0.2935, -0.3225,  1.1760, -0.6527},
+ {-0.2797, -0.3262,  1.1940, -0.6722},
+ {-0.2704, -0.3202,  1.2100, -0.6770},
+ {-0.2815, -0.3227,  1.2480, -0.6775},
+ {-0.2880, -0.3245,  1.2810, -0.6801},
+ {-0.3034, -0.3263,  1.3270, -0.6778},
+ {-0.2936, -0.3215,  1.3430, -0.6835},
 
- -0.3282, -0.3200,  1.3980, -0.6650,
- -0.3260, -0.3070,  1.4090, -0.6552,
- -0.3511, -0.3074,  1.4470, -0.6442,
- -0.3501, -0.3064,  1.4500, -0.6442,
- -0.3490, -0.3027,  1.4550, -0.6418,
- -0.3487, -0.3048,  1.4570, -0.6447,
- -0.3478, -0.3074,  1.4600, -0.6483,
- -0.3501, -0.3283,  1.4540, -0.6669,
- -0.3494, -0.3373,  1.4550, -0.6765,
- -0.3485, -0.3373,  1.4570, -0.6774,
+ {-0.3282, -0.3200,  1.3980, -0.6650},
+ {-0.3260, -0.3070,  1.4090, -0.6552},
+ {-0.3511, -0.3074,  1.4470, -0.6442},
+ {-0.3501, -0.3064,  1.4500, -0.6442},
+ {-0.3490, -0.3027,  1.4550, -0.6418},
+ {-0.3487, -0.3048,  1.4570, -0.6447},
+ {-0.3478, -0.3074,  1.4600, -0.6483},
+ {-0.3501, -0.3283,  1.4540, -0.6669},
+ {-0.3494, -0.3373,  1.4550, -0.6765},
+ {-0.3485, -0.3373,  1.4570, -0.6774},
 
- -0.3462, -0.3300,  1.4630, -0.6728,
- -0.3462, -0.3225,  1.4690, -0.6662,
- -0.3453, -0.3094,  1.4790, -0.6553,
- -0.3844, -0.3134,  1.5240, -0.6412,
- -0.3848, -0.3018,  1.5310, -0.6303,
- -0.3862, -0.2955,  1.5360, -0.6237,
- -0.4262, -0.2991,  1.5860, -0.6115,
- -0.4278, -0.2910,  1.5900, -0.6029,
- -0.4303, -0.2817,  1.5940, -0.5927,
- -0.4315, -0.2719,  1.6010, -0.5829,
+ {-0.3462, -0.3300,  1.4630, -0.6728},
+ {-0.3462, -0.3225,  1.4690, -0.6662},
+ {-0.3453, -0.3094,  1.4790, -0.6553},
+ {-0.3844, -0.3134,  1.5240, -0.6412},
+ {-0.3848, -0.3018,  1.5310, -0.6303},
+ {-0.3862, -0.2955,  1.5360, -0.6237},
+ {-0.4262, -0.2991,  1.5860, -0.6115},
+ {-0.4278, -0.2910,  1.5900, -0.6029},
+ {-0.4303, -0.2817,  1.5940, -0.5927},
+ {-0.4315, -0.2719,  1.6010, -0.5829},
 
- -0.4359, -0.2914,  1.6050, -0.6010,
- -0.4365, -0.2982,  1.6080, -0.6080,
- -0.4253, -0.3037,  1.6120, -0.6150,
- -0.4335, -0.3245,  1.6160, -0.6377,
- -0.4307, -0.3292,  1.6210, -0.6447,
- -0.4284, -0.3204,  1.6290, -0.6380,
- -0.4227, -0.3217,  1.6360, -0.6438,
+ {-0.4359, -0.2914,  1.6050, -0.6010},
+ {-0.4365, -0.2982,  1.6080, -0.6080},
+ {-0.4253, -0.3037,  1.6120, -0.6150},
+ {-0.4335, -0.3245,  1.6160, -0.6377},
+ {-0.4307, -0.3292,  1.6210, -0.6447},
+ {-0.4284, -0.3204,  1.6290, -0.6380},
+ {-0.4227, -0.3217,  1.6360, -0.6438}
   } ;
 
   G4int iz = (G4int)zeff - 2 ;
diff --git a/source/processes/electromagnetic/lowenergy/src/G4IonYangFluctuationModel.cc b/source/processes/electromagnetic/lowenergy/src/G4IonYangFluctuationModel.cc
index 2c276779c0..8b8f27056f 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4IonYangFluctuationModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4IonYangFluctuationModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4IonYangFluctuationModel
 //
@@ -22,6 +36,7 @@
 // 18/08/2000  V.Ivanchenko First implementation
 // 04/09/2000  V.Ivanchenko Rename fluctuations            
 // 03/10/2000  V.Ivanchenko CodeWizard clean up
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // -------------------------------------------------------------------
 // Class Description: 
@@ -156,11 +171,11 @@ G4double G4IonYangFluctuationModel::YangFluctuationModel(
   //                                    3 for ions in molecular gases
   //                                    4 for ions in solids
   static G4double b[5][4] = {
-  0.1014,  0.3700,  0.9642,  3.987,
-  0.1955,  0.6941,  2.522,   1.040,
-  0.05058, 0.08975, 0.1419, 10.80,
-  0.05009, 0.08660, 0.2751,  3.787,
-  0.01273, 0.03458, 0.3951,  3.812
+  {0.1014,  0.3700,  0.9642,  3.987},
+  {0.1955,  0.6941,  2.522,   1.040},
+  {0.05058, 0.08975, 0.1419, 10.80},
+  {0.05009, 0.08660, 0.2751,  3.787},
+  {0.01273, 0.03458, 0.3951,  3.812}
   } ;
 
   // protons (hadrons) 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
index c5646a6251..4ad08d06c8 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyBremsstrahlung.cc,v 1.28 2001/02/05 17:45:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyBremsstrahlung.cc,v 1.34.2.2 2001/06/28 20:19:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyBremsstrahlung: low energy modifications --------
 //                   by Alessandra Forti, March 1999
 //
@@ -24,14 +38,15 @@
 // - First implementation of continuous energy loss.
 // 17.02.2000 Veronique Lefebure
 //  - correct bug : the gamma energy was not deposited when the gamma was 
-//    not produced when its energy was < CutForLowEnergySecondaryPhotons
+//    not produced when its energy was < cutForLowEnergySecondaryPhotons
 //
 // Added Livermore data table construction methods A. Forti
 // Modified BuildMeanFreePath to read new data tables A. Forti
 // Modified PostStepDoIt to insert sampling with with EEDL data A. Forti
 // Added SelectRandomAtom A. Forti
 // Added map of the elements A. Forti
-// 20/09/00 update printout V.Ivanchenko
+// 20.09.00 update printout V.Ivanchenko
+// 24.04.01 V.Ivanchenko remove RogueWave 
 // --------------------------------------------------------------
 
 #include "G4LowEnergyBremsstrahlung.hh"
@@ -40,7 +55,7 @@
 #include "G4Electron.hh"
 #include "G4Gamma.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
  
 // constructor
  
@@ -52,14 +67,14 @@ G4LowEnergyBremsstrahlung::G4LowEnergyBremsstrahlung(const G4String& processName
     BTable(0),
     ZNumVec(0),
     lowEnergyCut(0.1*eV),
-    CutForLowEnergySecondaryPhotons(0.)
+    cutForLowEnergySecondaryPhotons(0.)
 { 
-    LowestKineticEnergy  = GetLowerBoundEloss();
-    HighestKineticEnergy = GetUpperBoundEloss();
-    TotBin = GetNbinEloss();
+    lowestKineticEnergy  = GetLowerBoundEloss();
+    highestKineticEnergy = GetUpperBoundEloss();
+    totBin = GetNbinEloss();
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
  
 // destructor
  
@@ -89,25 +104,24 @@ G4LowEnergyBremsstrahlung::~G4LowEnergyBremsstrahlung()
         delete BTable;
      }
 
-   if (&PartialSumSigma) {
+   if (&partialSumSigma) {
 
-      PartialSumSigma.clearAndDestroy();
+      partialSumSigma.clearAndDestroy();
    }
 }
 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 // SET CUT FOR LOW ENERGY SECONDARY PHOTONS A. FORTI
 void G4LowEnergyBremsstrahlung::SetCutForLowEnSecPhotons(G4double cut){
 
-  CutForLowEnergySecondaryPhotons = cut;
+  cutForLowEnergySecondaryPhotons = cut;
 }
 
   // METHOD BELOW  FROM STANDARD E_M PROCESSES CODE
 void G4LowEnergyBremsstrahlung::BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
 {
 
- 
   BuildZVec();
 
   // energy sampling formula coefficient
@@ -116,6 +130,8 @@ void G4LowEnergyBremsstrahlung::BuildPhysicsTable(const G4ParticleDefinition& aP
   BuildCrossSectionTable() ;
   
   BuildLossTable(aParticleType) ;
+
+
   if (&aParticleType==G4Electron::Electron()){
 
     RecorderOfElectronProcess[CounterOfElectronProcess] = (*this).theLossTable ;
@@ -132,12 +148,9 @@ void G4LowEnergyBremsstrahlung::BuildPhysicsTable(const G4ParticleDefinition& aP
  
   BuildDEDXTable(aParticleType) ;
  
- 
- 
-
 
 }
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
   // CONSTRUCT THE CROSS SECTION TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC. 
 void G4LowEnergyBremsstrahlung::BuildCrossSectionTable(){
@@ -150,13 +163,14 @@ void G4LowEnergyBremsstrahlung::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
     G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(AtomInd, dataNum, "brem/br-cs-");
     
-    theCrossSectionTable->insert(oneAtomCS);
+    //    theCrossSectionTable->insert(oneAtomCS);
+    theCrossSectionTable->push_back(oneAtomCS);
     
   }//end for on atoms
 }
@@ -240,9 +254,9 @@ void G4LowEnergyBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aPart
   for (G4int J=0; J<numOfMaterials; J++){
     
       // create physics vector and fill it
-      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(LowestKineticEnergy,
-							   HighestKineticEnergy,
-							   TotBin);
+      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(lowestKineticEnergy,
+							   highestKineticEnergy,
+							   totBin);
       // get material parameters needed for the energy loss calculation
       const G4Material* material= (*theMaterialTable)[J];
 
@@ -255,7 +269,7 @@ void G4LowEnergyBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aPart
       const G4double* theAtomicNumDensityVector = material->GetAtomicNumDensityVector();
       
       // now comes the loop for the kinetic energy values
-      for (G4int i = 0 ; i < TotBin ; i++){
+      for (G4int i = 0 ; i < totBin ; i++){
 
            const G4double LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
            G4double ionloss = 0.;          
@@ -272,7 +286,7 @@ void G4LowEnergyBremsstrahlung::BuildLossTable(const G4ParticleDefinition& aPart
 }
 
       
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
+//     
 
 //
 // METHOD BELOW  FROM STANDARD E_M PROCESSES CODE MODIFIED TO USE 
@@ -284,7 +298,7 @@ void G4LowEnergyBremsstrahlung::BuildMeanFreePathTable()
 // tables are Build for MATERIALS. see GENERAL part of processes in GEANT4
   // manual
 {
-   G4double FixedEnergy = (LowestKineticEnergy + HighestKineticEnergy)/2.;
+   G4double FixedEnergy = (lowestKineticEnergy + highestKineticEnergy)/2.;
 
    //create table
    if (theMeanFreePathTable) {
@@ -297,8 +311,8 @@ void G4LowEnergyBremsstrahlung::BuildMeanFreePathTable()
    G4Material* material;
    G4double* CutInKineticEnergy = G4Gamma::Gamma()->GetCutsInEnergy() ;
 
-   PartialSumSigma.clearAndDestroy();
-   PartialSumSigma.resize(NumbOfMaterials);
+   partialSumSigma.clearAndDestroy();
+   partialSumSigma.resize(NumbOfMaterials);
 
    G4double LowEdgeEnergy , Value;
    theMeanFreePathTable = new G4PhysicsTable(NumbOfMaterials);
@@ -307,21 +321,21 @@ void G4LowEnergyBremsstrahlung::BuildMeanFreePathTable()
    for ( G4int J=0 ; J < NumbOfMaterials; J++ ){ 
      
      //create physics vector then fill it ....
-     ptrVector = new G4PhysicsLogVector(LowestKineticEnergy, HighestKineticEnergy,
-					TotBin ) ;
+     ptrVector = new G4PhysicsLogVector(lowestKineticEnergy, highestKineticEnergy,
+					totBin ) ;
      
      material= (*theMaterialTable)(J);
      const G4ElementVector* theElementVector = material->GetElementVector();
      const G4double* theAtomNumDensityVector = material->GetAtomicNumDensityVector();   
      const G4double Threshold = CutInKineticEnergy[J] ;
         
-     for ( G4int i = 0 ; i < TotBin ; i++ ){
+     for ( G4int i = 0 ; i < totBin ; i++ ){
        
        LowEdgeEnergy = ptrVector->GetLowEdgeEnergy( i ) ;
        const G4double BigPath= DBL_MAX;
        G4double SIGMA = 0 ;
        
-       for ( G4int k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+       for (  size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
 	 
 	 G4int AtomIndex = (G4int) (*theElementVector)(k)->GetZ();
          G4double interCrsSec = GetCrossSectionWithCut(AtomIndex, LowEdgeEnergy,Threshold);
@@ -335,18 +349,18 @@ void G4LowEnergyBremsstrahlung::BuildMeanFreePathTable()
      
      theMeanFreePathTable->insert( ptrVector );
      
-     // Compute the PartialSumSigma table at a given fixed energy
-     ComputePartialSumSigma(FixedEnergy, material,Threshold) ;       
+     // Compute the partialSumSigma table at a given fixed energy
+     ComputepartialSumSigma(FixedEnergy, material,Threshold) ;       
    }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 //
 // METHOD BELOW  FROM STANDARD E_M PROCESSES CODE MODIFIED TO USE 
 // LIVERMORE DATA (using log-log interpolation as reported in stepanek paper)
 //
-void G4LowEnergyBremsstrahlung::ComputePartialSumSigma(const G4double KineticEnergy,
+void G4LowEnergyBremsstrahlung::ComputepartialSumSigma(const G4double KineticEnergy,
 						       const G4Material* aMaterial,
 						       const G4double Threshold)
 
@@ -359,7 +373,7 @@ void G4LowEnergyBremsstrahlung::ComputePartialSumSigma(const G4double KineticEne
    const G4ElementVector* theElementVector = aMaterial->GetElementVector(); 
    const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
 
-   PartialSumSigma[Imate] = new G4DataVector();
+   partialSumSigma[Imate] = new G4DataVector();
 
    G4double SIGMA = 0. ;
 
@@ -371,11 +385,11 @@ void G4LowEnergyBremsstrahlung::ComputePartialSumSigma(const G4double KineticEne
      
      SIGMA += theAtomNumDensityVector[Ielem]*interCrsSec;
 	 
-     PartialSumSigma[Imate]->push_back(SIGMA);
+     partialSumSigma[Imate]->push_back(SIGMA);
    }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VParticleChange* G4LowEnergyBremsstrahlung::PostStepDoIt(const G4Track& trackData,
 							   const G4Step& stepData){
@@ -401,7 +415,7 @@ G4VParticleChange* G4LowEnergyBremsstrahlung::PostStepDoIt(const G4Track& trackD
   //	 << ElectKinEn/keV << " keV " << G4endl;
   // MGP end
 
-  if(ElectKinEn <= LowestKineticEnergy){
+  if(ElectKinEn <= lowestKineticEnergy){
     
     aParticleChange.SetStatusChange(fStopAndKill);
     aParticleChange.SetEnergyChange(0.);
@@ -429,7 +443,7 @@ G4VParticleChange* G4LowEnergyBremsstrahlung::PostStepDoIt(const G4Track& trackD
   
   // limits of the energy sampling
   G4double TotalEnergy = ElectKinEn + electron_mass_c2;
-  G4double TotalEnergysquare = TotalEnergy*TotalEnergy ;
+  //  G4double TotalEnergysquare = TotalEnergy*TotalEnergy ;
   
   //
   // The emitted gamma energy is from EEDL data fitted with A/E+B function.
@@ -455,7 +469,7 @@ G4VParticleChange* G4LowEnergyBremsstrahlung::PostStepDoIt(const G4Track& trackD
   G4double IntegrProb = p1+p2;  
   G4double R1 = G4UniformRand()*IntegrProb;
   
-  G4double GammaEnergy;
+  G4double GammaEnergy = 0.;
 
   if(R1 <= p1){ 
     
@@ -612,7 +626,7 @@ G4double G4LowEnergyBremsstrahlung::GetEnergyLossWithCut(const G4double AtomicNu
    loss+=SmallLoss;
   return loss ;
 }
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 G4double G4LowEnergyBremsstrahlung::GetCrossSection(const G4double AtomicNumber,
                                                     const G4double KineticEnergy){
 						    
@@ -647,7 +661,7 @@ G4double G4LowEnergyBremsstrahlung::GetCrossSectionWithCut(const G4double Atomic
     return CrossSection*fraction;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 // METHOD BELOW  FROM STANDARD E_M PROCESSES CODE MODIFIED TO USE 
 // LIVERMORE DATA (using log-log interpolation as reported in stepanek paper)
 G4Element* G4LowEnergyBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) const
@@ -658,13 +672,13 @@ G4Element* G4LowEnergyBremsstrahlung::SelectRandomAtom(G4Material* aMaterial) co
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
 
-  G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
+  G4double rval = G4UniformRand()*((*partialSumSigma[Index])[NumberOfElements-1]);
   for ( G4int i=0; i < NumberOfElements; i++ )
-    if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)(i));
+    if (rval <= (*partialSumSigma[Index])[i]) return ((*theElementVector)(i));
   return (*theElementVector)(0);
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4LowEnergyBremsstrahlung::PrintInfoDefinition()
 {
@@ -680,7 +694,7 @@ void G4LowEnergyBremsstrahlung::PrintInfoDefinition()
 
 }         
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
index fc853f5eb7..9d1a20b3bc 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyCompton.cc,v 1.21 2001/02/05 17:45:18 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyCompton.cc,v 1.25.2.2 2001/06/28 20:19:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyCompton low energy modifications --------
 //                   by Alessandra Forti, October 1998
 // **************************************************************
@@ -23,6 +37,7 @@
 // Modified PostStepDoIt to insert sampling with EPDL97 data A. Forti
 // Added SelectRandomAtom A. Forti
 // Added map of the elements A. Forti
+// 24.04.01 V.Ivanchenko remove RogueWave 
 // --------------------------------------------------------------
 
 // This Class Header
@@ -37,17 +52,17 @@
 G4LowEnergyCompton::G4LowEnergyCompton(const G4String& processName)
   : G4VDiscreteProcess(processName),
     theCrossSectionTable(0),
-    theMeanFreePathTable(0),
     theScatteringFunctionTable(0),
+    theMeanFreePathTable(0),
     ZNumVec(0),
-    LowestEnergyLimit (250*eV),              // initialization
-    HighestEnergyLimit(100*GeV),
-    NumbBinTable(200)
+    lowestEnergyLimit (250*eV),              // initialization
+    highestEnergyLimit(100*GeV),
+    numbBinTable(200)
 {
    if (verboseLevel>0) {
      G4cout << GetProcessName() << " is created "<< G4endl;
-     G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
+     G4cout << "lowestEnergy: " << lowestEnergyLimit/keV << "keV ";
+     G4cout << "highestEnergy: " << highestEnergyLimit/TeV << "TeV " << G4endl;
    }
 }
  
@@ -104,13 +119,14 @@ void G4LowEnergyCompton::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
     G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(AtomInd, dataNum, "comp/ce-cs-");
     
-    theCrossSectionTable->insert(oneAtomCS);
+    //    theCrossSectionTable->insert(oneAtomCS);
+    theCrossSectionTable->push_back(oneAtomCS);
     
   }//end for on atoms
 }
@@ -125,13 +141,14 @@ void G4LowEnergyCompton::BuildScatteringFunctionTable(){
   theScatteringFunctionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
     G4FirstLevel* oneAtomSF = util.BuildFirstLevelTables(AtomInd, dataNum, "comp/ce-sf-");
      
-     theScatteringFunctionTable->insert(oneAtomSF);
+    //     theScatteringFunctionTable->insert(oneAtomSF);
+     theScatteringFunctionTable->push_back(oneAtomSF);
    
   }//end for on atoms
 }
@@ -189,7 +206,7 @@ G4VParticleChange* G4LowEnergyCompton::PostStepDoIt(const G4Track& aTrack, const
   // Dynamic particle quantities  
   const G4DynamicParticle* aDynamicGamma = aTrack.GetDynamicParticle();
   G4double GammaEnergy0 = aDynamicGamma->GetKineticEnergy();
-  if(GammaEnergy0 <= LowestEnergyLimit){
+  if(GammaEnergy0 <= lowestEnergyLimit){
     
     aParticleChange.SetStatusChange(fStopAndKill);
     aParticleChange.SetEnergyChange(0.);
@@ -205,7 +222,7 @@ G4VParticleChange* G4LowEnergyCompton::PostStepDoIt(const G4Track& aTrack, const
 
   // Select randomly one element 
   G4Material* aMaterial = aTrack.GetMaterial();
-  const G4int numOfElem = aMaterial->GetNumberOfElements();
+  //  const G4int numOfElem = aMaterial->GetNumberOfElements();
   
   G4Element* theElement = SelectRandomAtom(aDynamicGamma, aMaterial);
   G4int elementZ = (G4int) theElement->GetZ();
@@ -300,6 +317,8 @@ G4VParticleChange* G4LowEnergyCompton::PostStepDoIt(const G4Track& aTrack, const
 
   return G4VDiscreteProcess::PostStepDoIt( aTrack, aStep);
 }
+
+
 // used log-log interpolation instead of linear interpolation to build the MFP 
 // as reported in the stepanek paper 
 void G4LowEnergyCompton::BuildMeanFreePathTable(){
@@ -320,20 +339,20 @@ void G4LowEnergyCompton::BuildMeanFreePathTable(){
   for ( G4int J = 0 ; J < NumbOfMaterials; J++ ) { // For each material 
   
     //create physics vector then fill it ....
-    ptrVector = new  G4PhysicsLogVector(LowestEnergyLimit, HighestEnergyLimit, NumbBinTable);
+    ptrVector = new  G4PhysicsLogVector(lowestEnergyLimit, highestEnergyLimit, numbBinTable);
     
     material = (*theMaterialTable)(J);
     const G4ElementVector* theElementVector = material->GetElementVector();
     const G4double* theAtomNumDensityVector = material->GetAtomicNumDensityVector();   
     
-    for ( G4int i = 0 ; i < NumbBinTable ; i++ ){ 
+    for ( G4int i = 0 ; i < numbBinTable ; i++ ){ 
       //For each energy
       
       LowEdgeEnergy = ptrVector->GetLowEdgeEnergy(i);
       
       const G4double BigPath= DBL_MAX;
       G4double SIGMA = 0 ;
-      for ( G4int k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+      for ( size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
 
 	G4int AtomIndex = (G4int) (*theElementVector)(k)->GetZ();
 	const G4FirstLevel* oneAtomCS
@@ -371,15 +390,15 @@ G4Element* G4LowEnergyCompton::SelectRandomAtom(const G4DynamicParticle* aDynami
   G4double PartialSumSigma = 0.;
 
   G4double rval = 0;
-  rval = G4UniformRand()/MeanFreePath;
+  rval = G4UniformRand()/meanFreePath;
 
   for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
 
     G4double crossSection;
-    if (GammaEnergy <  LowestEnergyLimit)
+    if (GammaEnergy <  lowestEnergyLimit)
       crossSection = 0. ;
     else {
-      if (GammaEnergy > HighestEnergyLimit) GammaEnergy = 0.99*HighestEnergyLimit ;
+      if (GammaEnergy > highestEnergyLimit) GammaEnergy = 0.99*highestEnergyLimit ;
       
       G4int AtomIndex = (G4int) (*theElementVector)(i)->GetZ();
       const G4FirstLevel* oneAtomCS
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
index 0262092e5a..3a3e0e067e 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc
@@ -1,28 +1,42 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyGammaConversion.cc,v 1.16 2001/02/05 17:45:19 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyGammaConversion.cc,v 1.19.2.2 2001/06/28 20:19:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      ------------ G4LowEnergyGammaConversion physics process --------
 //                   by A.Forti 1999/03/02
 //
 // 14.03.2000 Veronique Lefebure;
-// Change initialisation of LowestEnergyLimit from 1.22 to 1.022.
+// Change initialisation of lowestEnergyLimit from 1.22 to 1.022.
 // Note that the hard coded value 1.022 should be used instead of
 // 2*electron_mass_c2 in order to agree with the value of the data bank EPDL97
-//
+// 24.04.01 V.Ivanchenko remove RogueWave 
 // **************************************************************
 
 // This Class Header
@@ -43,14 +57,14 @@ G4LowEnergyGammaConversion::G4LowEnergyGammaConversion(const G4String& processNa
     theMeanFreePathTable(0),
     ZNumVec(0),
     //Use lowest limit of EPDL97 which is larger than 2*electron_mass_c2 = 1.02199812 MeV
-    LowestEnergyLimit (1.022000*MeV),
-    HighestEnergyLimit(100*GeV),
+    lowestEnergyLimit (1.022000*MeV),
+    highestEnergyLimit(100*GeV),
     NumbBinTable(200)
 {
    if (verboseLevel>0) {
      G4cout << GetProcessName() << " is created "<< G4endl;
-     G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/GeV << "GeV " << G4endl;
+     G4cout << "lowestEnergy: " << lowestEnergyLimit/keV << "keV ";
+     G4cout << "highestEnergy: " << highestEnergyLimit/GeV << "GeV " << G4endl;
    }
 }
  
@@ -97,13 +111,14 @@ void G4LowEnergyGammaConversion::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
     G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(AtomInd, dataNum, "pair/pp-cs-");
      
-     theCrossSectionTable->insert(oneAtomCS);
+    //     theCrossSectionTable->insert(oneAtomCS);
+     theCrossSectionTable->push_back(oneAtomCS);
    
   }//end for on atoms
 }
@@ -255,12 +270,19 @@ G4VParticleChange* G4LowEnergyGammaConversion::PostStepDoIt(const G4Track& aTrac
 // distribution with respect to the Z axis along the parent photon.
 
   G4double LocalEnerDeposit = 0. ;
-  aParticleChange.SetNumberOfSecondaries(2) ; 
   
+  aParticleChange.SetNumberOfSecondaries(2) ; 
   G4double ElectKineEnergy = G4std::max(0.,ElectTotEnergy - electron_mass_c2) ;
 
-  if (G4EnergyLossTables::GetRange(G4Electron::Electron(), ElectKineEnergy, aMaterial)
-      >= G4std::min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
+  //  if (G4EnergyLossTables::GetRange(G4Electron::Electron(), ElectKineEnergy, aMaterial)
+  //      >= G4std::min(G4Electron::GetCuts(), aStep.GetPostStepPoint()->GetSafety()) ){
+  if((G4EnergyLossTables::GetRange(G4Electron::Electron(),
+        ElectKineEnergy,aMaterial)>aStep.GetPostStepPoint()->GetSafety())
+         ||
+        (ElectKineEnergy >
+        (G4Electron::Electron()->GetCutsInEnergy())[aMaterial->GetIndex()]))
+
+      {
 
     G4ThreeVector ElectDirection ( dirx, diry, dirz );
     ElectDirection.rotateUz(GammaDirection);   
@@ -330,7 +352,7 @@ void G4LowEnergyGammaConversion::BuildMeanFreePathTable(){
   for ( G4int J = 0 ; J < NumbOfMaterials; J++ ) { // For each material 
   
     //create physics vector then fill it ....
-    ptrVector = new  G4PhysicsLogVector(LowestEnergyLimit, HighestEnergyLimit, NumbBinTable);
+    ptrVector = new  G4PhysicsLogVector(lowestEnergyLimit, highestEnergyLimit, NumbBinTable);
     
     material = (*theMaterialTable)(J);
     const G4ElementVector* theElementVector = material->GetElementVector();
@@ -344,7 +366,7 @@ void G4LowEnergyGammaConversion::BuildMeanFreePathTable(){
       const G4double BigPath= DBL_MAX;
       G4double SIGMA = 0 ;
       
-      for ( G4int k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+      for ( size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
 	// For each element            
 	G4int AtomIndex = (G4int) (*theElementVector)(k)->GetZ();
 	const G4FirstLevel* oneAtomCS
@@ -383,10 +405,10 @@ G4Element* G4LowEnergyGammaConversion::SelectRandomAtom(const G4DynamicParticle*
   for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
 
     G4double crossSection;
-    if (GammaEnergy <  LowestEnergyLimit)
+    if (GammaEnergy <  lowestEnergyLimit)
       crossSection = 0. ;
     else {
-      if (GammaEnergy > HighestEnergyLimit) GammaEnergy = 0.99*HighestEnergyLimit ;
+      if (GammaEnergy > highestEnergyLimit) GammaEnergy = 0.99*highestEnergyLimit ;
 
       G4int AtomIndex = (G4int) (*theElementVector)(i)->GetZ();
       const G4FirstLevel* oneAtomCS
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
index 6e89f89b5c..ec1fad97af 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyIonisation.cc,v 1.41 2001/02/05 17:45:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyIonisation.cc,v 1.48.2.2 2001/06/28 20:19:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      --- G4LowEnergyIonisation physics process for electrons
 //                by Alessandra Forti May 1999  
 // **************************************************************
@@ -47,7 +61,10 @@
 // Modified PostStepDoIt to insert sampling with EEDL data A. Forti
 // Added SelectRandomAtom A. Forti
 // Added map of the elements A. Forti
-// 20/09/00 update fluctuations V.Ivanchenko
+// 20.09.00 V.Ivanchenko update fluctuations 
+// 24.04.01 V.Ivanchenko remove RogueWave 
+// 22.05.01 V.Ivanchenko update calculation of delta-ray kinematic + 
+//                       clean up the code 
 //                                                                 
 // --------------------------------------------------------------
  
@@ -57,30 +74,34 @@
 // Collaborating Class Headers
 #include "G4EnergyLossTables.hh"
 #include "G4Gamma.hh"
+#include "G4ProcessManager.hh"
 #include "G4UnitsTable.hh"
 #include "g4std/fstream"
 
-typedef G4RWTPtrOrderedVector<G4DynamicParticle> G4ParticleVector;
+typedef G4std::vector<G4DynamicParticle*> G4ParticleVector;
+
+//    
+//    
 
-// constructor and destructor
 G4LowEnergyIonisation::G4LowEnergyIonisation(const G4String& processName)
    : G4eLowEnergyLoss(processName),
      allAtomShellCrossSec(0),
-     theBindingEnergyTable(0),
      theFluorTransitionTable(0),
      theSamplingCoeffTable(0),
-     CutForLowEnergySecondaryPhotons(0.),
-     CutForLowEnergySecondaryElectrons(0.),
+     theBindingEnergyTable(0),
      ZNumVec(0),
      ZNumVecFluor(0),
-     theMeanFreePathTable(0)
+     theMeanFreePathTable(0),
+     CutForLowEnergySecondaryPhotons(0.),
+     CutForLowEnergySecondaryElectrons(0.),
+     MeanFreePath(0.)
 { 
-    LowestKineticEnergy  = GetLowerBoundEloss();
-    HighestKineticEnergy = GetUpperBoundEloss();
+    lowestKineticEnergy  = GetLowerBoundEloss();
+    highestKineticEnergy = GetUpperBoundEloss();
     TotBin = GetNbinEloss();
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4LowEnergyIonisation::~G4LowEnergyIonisation() 
 {
@@ -122,21 +143,26 @@ G4LowEnergyIonisation::~G4LowEnergyIonisation()
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-void G4LowEnergyIonisation::SetCutForLowEnSecPhotons(G4double cut){
+//    
 
+void G4LowEnergyIonisation::SetCutForLowEnSecPhotons(G4double cut)
+{
   CutForLowEnergySecondaryPhotons = cut;
 }
 
+//    
+
 void G4LowEnergyIonisation::SetCutForLowEnSecElectrons(G4double cut){
 
   CutForLowEnergySecondaryElectrons = cut;
-  //  LowestKineticEnergy = 2*cut;
 }
 
+//    
+
 void G4LowEnergyIonisation::BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
 //  just call BuildLossTable+BuildLambdaTable
 {
+  
   BuildZVec();
 
   BuildShellCrossSectionTable();
@@ -161,33 +187,35 @@ void G4LowEnergyIonisation::BuildPhysicsTable(const G4ParticleDefinition& aParti
     RecorderOfPositronProcess[CounterOfPositronProcess] = (*this).theLossTable ;
     CounterOfPositronProcess++;
    }
+
  
    BuildLambdaTable(aParticleType) ;
  
    BuildDEDXTable(aParticleType);
-  
+ 
+ 
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4LowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType) 
 {
-    
   // Build tables for the ionization energy loss
   //  the tables are built for *MATERIALS*
-  
-  G4double LowEdgeEnergy, ionloss;
+
+  G4double LowEdgeEnergy; 
+  G4double ionloss = 0.0;
   
   // material properties
   ParticleMass = aParticleType.GetPDGMass();
-  G4double* ParticleCutInKineticEnergy = aParticleType.GetEnergyCuts() ;
   
   //  create table
   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
   G4int numOfMaterials = theMaterialTable->length();
   
-  if (theLossTable) { theLossTable->clearAndDestroy();
-  delete theLossTable;
+  if (theLossTable) { 
+     theLossTable->clearAndDestroy();
+     delete theLossTable;
   }
   
   theLossTable = new G4PhysicsTable(numOfMaterials);
@@ -197,13 +225,13 @@ void G4LowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticle
   for (G4int J=0; J<numOfMaterials; J++){
     
       // create physics vector and fill it
-      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(LowestKineticEnergy,
-							   HighestKineticEnergy,
-							   TotBin);
+      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(lowestKineticEnergy,
+			  highestKineticEnergy,TotBin);
       // get material parameters needed for the energy loss calculation
       const G4Material* material= (*theMaterialTable)[J];
 
-      G4double Tcut = G4Electron::Electron()->GetCutsInEnergy()[material->GetIndex()] ;
+      G4double Tcut = G4Electron::Electron()
+                    ->GetCutsInEnergy()[material->GetIndex()] ;
       G4cout<<"*** LEion using Tcut ="<<Tcut<<G4endl;
       const G4ElementVector* theElementVector = material->GetElementVector();
       const G4int NumberOfElements = material->GetNumberOfElements() ;
@@ -211,41 +239,39 @@ void G4LowEnergyIonisation::BuildLossTable(const G4ParticleDefinition& aParticle
                           GetAtomicNumDensityVector() ;
       
       // now comes the loop for the kinetic energy values
-      for (G4int i = 0 ; i < TotBin ; i++)
-      {
+      for (G4int i = 0 ; i < TotBin ; i++) {
         LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
 
         ionloss = 0. ;
 
         // electron
-        if (&aParticleType==G4Electron::Electron())
-        {
-          // loop for elements in the material
-          for (G4int iel=0; iel<NumberOfElements; iel++ )
-          {
-            G4double Z = (*theElementVector)(iel)->GetZ();
+        if (&aParticleType==G4Electron::Electron()) {
 
-            const oneAtomTable* oneAtomCS
-               = (*allAtomShellCrossSec)[ZNumVec->index(Z)];
+            // loop for elements in the material
+            for (G4int iel=0; iel<NumberOfElements; iel++ ) {
+              G4double Z = (*theElementVector)(iel)->GetZ();
 
-            // contributions from the subshells 
-            for(G4int ish=0; ish<oneAtomCS->entries(); ish++)
-            {
-              ionloss += GetShellEnergyLosswithCut(Z,ish,LowEdgeEnergy,Tcut)*
-                         theAtomicNumDensityVector[iel] ;
+              const oneAtomTable* oneAtomCS
+                    = (*allAtomShellCrossSec)[ZNumVec->index(Z)];
+
+              // contributions from the subshells 
+              for(size_t ish=0; ish<oneAtomCS->size(); ish++) {
+                ionloss += GetShellEnergyLosswithCut(Z,ish,LowEdgeEnergy,Tcut)*
+                           theAtomicNumDensityVector[iel] ;
+              }
             }
-          }
+	   
         }
-
+        if (ionloss <= 0.) ionloss = 0.;
         aVector->PutValue(i,ionloss) ;
       }
 
       theLossTable->insert(aVector);
-    }
+  }
 
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 // CONSTRUCT THE CS TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC USING EEDL DATA
 void G4LowEnergyIonisation::BuildShellCrossSectionTable(){
@@ -258,13 +284,14 @@ void G4LowEnergyIonisation::BuildShellCrossSectionTable(){
    allAtomShellCrossSec = new allAtomTable();
    G4int dataNum = 2;
  
-   for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+   for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
      G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
      oneAtomTable* oneAtomShellCS = util.BuildSecondLevelTables(AtomInd, dataNum, "ioni/ion-ss-cs-");
      
-     allAtomShellCrossSec->insert(oneAtomShellCS);
+     //     allAtomShellCrossSec->insert(oneAtomShellCS);
+     allAtomShellCrossSec->push_back(oneAtomShellCS);
    
    }//end for on atoms
 }
@@ -280,7 +307,7 @@ void G4LowEnergyIonisation::BuildBindingEnergyTable(){
   theBindingEnergyTable = util.BuildSecondLevelTables(0,dataNum,"fluor/binding");
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 // CONSTRUCT THE TABLE FOR THE ELEMENTS MAPPED IN ZNUMVECFLUOR DIFFERENT 
 // FROM ZNUMVEC BECAUSE THERE IS NO FLUORESCENCE FOR THE FIRST 5 ELEMENTS. 
 void G4LowEnergyIonisation::BuildFluorTransitionTable(){
@@ -294,12 +321,13 @@ void G4LowEnergyIonisation::BuildFluorTransitionTable(){
   ZNumVecFluor = new G4DataVector(*ZNumVec);
   G4int dataNum = 3;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     if(AtomInd > 5){
       
       oneAtomTable* oneAtomShellFL = util.BuildSecondLevelTables(AtomInd, dataNum, "fluor/fl-tr-pr-");
-      theFluorTransitionTable->insert(oneAtomShellFL);
+      //      theFluorTransitionTable->insert(oneAtomShellFL);
+      theFluorTransitionTable->push_back(oneAtomShellFL);
     }
     else{
       ZNumVecFluor->remove(AtomInd);
@@ -308,7 +336,7 @@ void G4LowEnergyIonisation::BuildFluorTransitionTable(){
 }
 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 // BUILD THE TABLE OF COEFFICIENT FOR THE ELEMENTS MAPPED IN ZNUMVEC
 void G4LowEnergyIonisation::BuildSamplingCoeffTable(){
 
@@ -321,17 +349,18 @@ void G4LowEnergyIonisation::BuildSamplingCoeffTable(){
   
   G4int dataNum = 17;
 
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
-    oneAtomTable* oneAtomShellSc = util.BuildSecondLevelTables(AtomInd, dataNum, "ioni/io-co-");
+    oneAtomTable* oneAtomShellSc = util.BuildSecondLevelTables(AtomInd, 
+                                   dataNum, "ioni/io-co-");
     
-    theSamplingCoeffTable->insert(oneAtomShellSc);
+    theSamplingCoeffTable->push_back(oneAtomShellSc);
 
   }//end for on atoms
 }
 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 //
 // vector mapping the elements of the material table 
 // 
@@ -357,15 +386,12 @@ void G4LowEnergyIonisation::BuildZVec(){
 
       G4double Zel = (*theElementVector)(iel)->GetZ();
 
-      if(ZNumVec->contains(Zel) == FALSE){
-	ZNumVec->push_back(Zel);
-      } else{
-	continue;
-      }
+      if(!ZNumVec->contains(Zel)) ZNumVec->push_back(Zel);
     }
   }
 }
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+//    
 
 void G4LowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aParticleType)
 {
@@ -385,17 +411,16 @@ void G4LowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aPartic
   theMeanFreePathTable = new G4PhysicsTable(numOfMaterials);
 
   // get electron  cuts in kinetic energy
-  G4double* DeltaCutInKineticEnergy = G4Electron::Electron()->GetCutsInEnergy() ;
+  G4double* DeltaCutInKineticEnergy=G4Electron::Electron()->GetCutsInEnergy();
  
 
   // loop for materials 
 
- for (G4int J=0 ; J < numOfMaterials; J++)
-    { 
+  for (G4int J=0 ; J < numOfMaterials; J++) { 
      //create physics vector then fill it ....
 
      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(
-               LowestKineticEnergy, HighestKineticEnergy, TotBin);
+               lowestKineticEnergy, highestKineticEnergy, TotBin);
 
      // compute the (macroscopic) cross section first
  
@@ -403,7 +428,7 @@ void G4LowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aPartic
      const 
      G4ElementVector* theElementVector = material->GetElementVector();
      const
-     G4double* theAtomicNumDensityVector = material->GetAtomicNumDensityVector();
+     G4double* theAtomicNumDensityVector=material->GetAtomicNumDensityVector();
      const
      G4int NumberOfElements = material->GetNumberOfElements() ;
  
@@ -412,27 +437,27 @@ void G4LowEnergyIonisation::BuildLambdaTable(const G4ParticleDefinition& aPartic
      // (--> it will be the same for all the elements in this material )
      G4double DeltaThreshold = DeltaCutInKineticEnergy[J] ;
 
-     for (G4int i = 0 ; i < TotBin ; i++)
-        {
-          LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
-          SIGMA = 0.;           
-          for (G4int iel=0; iel<NumberOfElements; iel++ )
-             {
-                SIGMA += theAtomicNumDensityVector[iel]*
-                         ComputeCrossSectionWithCut( (*theElementVector)(iel)->GetZ(),
-			                               LowEdgeEnergy,
-                                                       DeltaThreshold);
-             }
+     for (G4int i = 0 ; i < TotBin ; i++) {
 
-          // mean free path = 1./macroscopic cross section
-          Value = SIGMA > DBL_MIN ? 1./SIGMA : DBL_MAX;     
-          aVector->PutValue(i, Value) ;
-        }
+       LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
+       SIGMA = 0.;           
+       for (G4int iel=0; iel<NumberOfElements; iel++ ) {
+
+           SIGMA += theAtomicNumDensityVector[iel]*
+             ComputeCrossSectionWithCut( (*theElementVector)(iel)->GetZ(),
+			                  LowEdgeEnergy, DeltaThreshold);
+       }
+       // mean free path = 1./macroscopic cross section
+       Value = SIGMA > DBL_MIN ? 1./SIGMA : DBL_MAX;     
+       aVector->PutValue(i, Value) ;       
+     }
+     // vector is filled
      theMeanFreePathTable->insert(aVector);
-    }
-
+  }
 }
 
+//    
+
 G4double G4LowEnergyIonisation::ComputeCrossSection(const G4double AtomIndex,
 						    const G4double IncEnergy){
   // calculates the microscopic cross section from subshell cross sections
@@ -441,12 +466,12 @@ G4double G4LowEnergyIonisation::ComputeCrossSection(const G4double AtomIndex,
   // interpolation as reported by stepanek and then summed to get the 
   // total cross section 
  
-  G4double TotalCrossSection(0.);
+  G4double TotalCrossSection = 0.0;
 
   const oneAtomTable* oneAtomCS
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomIndex)];
 
-  for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
+  for(size_t ind = 0; ind < oneAtomCS->size(); ind++){
 
     G4double crossSec = 0;
     G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
@@ -459,50 +484,60 @@ G4double G4LowEnergyIonisation::ComputeCrossSection(const G4double AtomIndex,
 
     else{
 
-      crossSec = util.DataLogInterpolation(IncEnergy, (*EnergyVector), (*CrossSecVector))*barn;
+      crossSec = util.DataLogInterpolation(IncEnergy, 
+                (*EnergyVector), (*CrossSecVector))*barn;
 
     }
 
     TotalCrossSection += crossSec;
   }
 
+
   return TotalCrossSection ;
 }
 
-G4double G4LowEnergyIonisation::ComputeCrossSectionWithCut(const G4double AtomIndex,
-						           const G4double IncEnergy,
-							   const G4double CutEnergy){
-  G4double TotalCrossSection(0.);
+//    
+
+G4double G4LowEnergyIonisation::ComputeCrossSectionWithCut(
+                                            const G4double AtomIndex,
+                                            const G4double IncEnergy,
+				            const G4double CutEnergy)
+{
+  G4double TotalCrossSection = 0.0;
 
   const oneAtomTable* oneAtomCS
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomIndex)];
 
    //loop on shells
-  for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
+  for(size_t ind = 0; ind < oneAtomCS->size(); ind++){
 
-    G4double crossSec = 0;
-    G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    // G4double crossSec = 0;
+    // G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
+    // G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
 
-    TotalCrossSection += GetShellCrossSectionwithCut(AtomIndex,ind,IncEnergy,CutEnergy);
+    TotalCrossSection += GetShellCrossSectionwithCut(AtomIndex,ind,IncEnergy,
+                                                     CutEnergy);
   }
 
   return TotalCrossSection ;
 }
 
+//    
 
-G4double G4LowEnergyIonisation::GetShellCrossSection(const G4double AtomicNumber,
-                                                     const G4int ind,
-					       	     const G4double KineticEnergy)
+G4double G4LowEnergyIonisation::GetShellCrossSection(
+                                               const G4double AtomicNumber,
+                                               const G4int ind,
+					       const G4double KineticEnergy)
 {
   // gives the microscopic cross section for the subshell 
  
   const oneAtomTable* oneAtomCS
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomicNumber)];
 
-  G4double crossSec = 0;
+  G4double crossSec = 0.0;
+  G4int oneSize = oneAtomCS->size();
 
-  if( ind >= oneAtomCS->entries() ) return crossSec ;
+  if( ind >= oneSize ) return crossSec ;
 
   G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
   G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
@@ -510,23 +545,22 @@ G4double G4LowEnergyIonisation::GetShellCrossSection(const G4double AtomicNumber
   if(KineticEnergy < (*EnergyVector)[1]){ // First element is the shell number
 
     crossSec = 0;
+  } else{
+
+    crossSec = util.DataLogInterpolation(KineticEnergy, (*EnergyVector), 
+                                        (*CrossSecVector))*barn;
   }
 
-  else{
-
-    crossSec = util.DataLogInterpolation(KineticEnergy, (*EnergyVector), (*CrossSecVector))*barn;
-
-    }
-
-    return crossSec;
-
+  return crossSec;
 }
 
+//    
+
 G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
-                                                     const G4double AtomicNumber,
-                                                     const G4int index,
-						     const G4double KineticEnergy,
-                                                     const G4double Tcut)
+                                             const G4double AtomicNumber,
+                                             const G4int index,
+					     const G4double KineticEnergy,
+                                             const G4double Tcut)
 {
   // it gives the total cross section for the subshell
   // (integration between Tcut and Tmax)
@@ -537,7 +571,8 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
   //  shortcut ..........................
   if(2.*Tcut >= KineticEnergy) return xsec ;
 
-  G4double CrossSection = GetShellCrossSection(AtomicNumber,index,KineticEnergy) ;
+  G4double CrossSection = GetShellCrossSection(AtomicNumber,index,
+                                               KineticEnergy) ;
 
   //  shortcut ..........................
   if(CrossSection <= 0.) return xsec ;
@@ -556,7 +591,7 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
   // shortcut ................................
   if((Tcut >= maxEn)||((minEn+BindingEn) >= maxEn)) return xsec ;
 
-  const G4int CoeffNumber = oneShellCoeffTable->entries();
+  const G4int CoeffNumber = oneShellCoeffTable->size();
 
   const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
   const G4int LastPar = energyVec->size()-1;
@@ -577,26 +612,27 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
 
     else{
 
-      G4double par = util.DataSemiLogInterpolation(KineticEnergy,(*energyVec),(*oneCoeffVec));
+      G4double par = util.DataSemiLogInterpolation(KineticEnergy,
+                                                  (*energyVec),(*oneCoeffVec));
       Parms.push_back(par);
     }
   }
 
 
   // First cut
-  G4double fstCut = (*(*oneShellCoeffTable)[CoeffNumber-2])[0] == 0. ? DBL_MAX :
+  G4double fstCut = (*(*oneShellCoeffTable)[CoeffNumber-2])[0] == 0.? DBL_MAX :
                     (*(*oneShellCoeffTable)[CoeffNumber-2])[0]*MeV;
 
   // Second cut
-  G4double sndCut = (*(*oneShellCoeffTable)[CoeffNumber-1])[0] == 0. ? DBL_MAX : 
+  G4double sndCut = (*(*oneShellCoeffTable)[CoeffNumber-1])[0] == 0.? DBL_MAX :
                     (*(*oneShellCoeffTable)[CoeffNumber-1])[0]*MeV;
 
   G4double low,high,aa,bb,saa,sbb ;
 
-  // for the normalization ********************************************************
+  // for the normalization ***************************
   G4double norm = 0. ;
 
-  // Area of the first function ALWAYS computed**********************
+  // Area of the first function ALWAYS computed*******
   high = maxEn+BindingEn;
   if(fstCut < maxEn){
     high = fstCut+BindingEn;
@@ -657,7 +693,7 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
     }
 
   }
-  //  end of normalization *****************************************
+  //  end of normalization ***********************************
 
     // start of the integration
 
@@ -727,11 +763,13 @@ G4double G4LowEnergyIonisation::GetShellCrossSectionwithCut(
   return xsec*CrossSection/norm ;
 }
 
+//    
+
 G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
-                                                     const G4double AtomicNumber,
-                                                     const G4int index,
-						     const G4double KineticEnergy,
-                                                     const G4double Tcut)
+                                              const G4double AtomicNumber,
+                                              const G4int index,
+				              const G4double KineticEnergy,
+                                              const G4double Tcut)
 {
   // it computes the energy loss for the shell
   // ( integrartion of  T*dSigma/dT between Tmin and Tcut)
@@ -742,7 +780,8 @@ G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
   //  shortcut ..........................
   if(Tcut <= 0.) return loss ;
 
-  G4double CrossSection = GetShellCrossSection(AtomicNumber,index,KineticEnergy) ;
+  G4double CrossSection = GetShellCrossSection(AtomicNumber,index,
+                                               KineticEnergy) ;
 
   //  shortcut ..........................
   if(CrossSection <= 0.) return loss ;
@@ -758,7 +797,7 @@ G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
   G4double maxEn = 0.5*(KineticEnergy-BindingEn) ;
   G4double Tlim = Tcut+BindingEn ;
 
-  const G4int CoeffNumber = oneShellCoeffTable->entries();
+  const G4int CoeffNumber = oneShellCoeffTable->size();
 
   const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
   const G4int LastPar = energyVec->size()-1;
@@ -779,26 +818,27 @@ G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
 
     else{
 
-      G4double par = util.DataSemiLogInterpolation(KineticEnergy,(*energyVec),(*oneCoeffVec));
+      G4double par = util.DataSemiLogInterpolation(KineticEnergy,
+                                                  (*energyVec),(*oneCoeffVec));
       Parms.push_back(par);
     }
   }
 
 
   // First cut
-  G4double fstCut = (*(*oneShellCoeffTable)[CoeffNumber-2])[0] == 0. ? DBL_MAX :
+  G4double fstCut = (*(*oneShellCoeffTable)[CoeffNumber-2])[0] == 0.? DBL_MAX :
                     (*(*oneShellCoeffTable)[CoeffNumber-2])[0]*MeV;
 
   // Second cut
-  G4double sndCut = (*(*oneShellCoeffTable)[CoeffNumber-1])[0] == 0. ? DBL_MAX : 
+  G4double sndCut = (*(*oneShellCoeffTable)[CoeffNumber-1])[0] == 0.? DBL_MAX :
                     (*(*oneShellCoeffTable)[CoeffNumber-1])[0]*MeV;
 
   G4double low,high,aa,bb,saa,sbb,w ;
 
-  // for the normalization ********************************************************
+  // for the normalization ************************************
   G4double norm = 0. ;
 
-  // Area of the first function ALWAYS computed**********************
+  // Area of the first function ALWAYS computed****************
   high = maxEn+BindingEn;
   if(fstCut < maxEn){
     high = fstCut+BindingEn;
@@ -951,30 +991,30 @@ G4double G4LowEnergyIonisation::GetShellEnergyLosswithCut(
   loss *= CrossSection/norm ;
 
   loss += BindingEn*(CrossSection -
-          GetShellCrossSectionwithCut(AtomicNumber,index,KineticEnergy,Tcut)) ;   
+          GetShellCrossSectionwithCut(AtomicNumber,index,KineticEnergy,Tcut)); 
   return loss ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
+//     
  
-G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData,   
-							const G4Step&  stepData){
+G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt(const G4Track& track,   
+						       const G4Step&  step)
+{
 
-  // Fluorescence (as reported by stepanek):
-  // J. Stepanek " A program to determine the radiation spectra due to a single atomic 
-  // subshell ionisation by a particle or due to deexcitation or decay of radionuclides", 
+  // Fluorescence (as reported by J.Stepanek):
+  // J. Stepanek " A program to determine the radiation spectra due 
+  // to a single atomic subshell ionisation by a particle or due to 
+  // deexcitation or decay of radionuclides", 
   // Comp. Phys. Comm. 1206 pp 1-19 (1997)
   // 
 
-  G4double factor = 0.;
-
-  aParticleChange.Initialize(trackData);
+  aParticleChange.Initialize(track);
   
-  G4Material*               aMaterial = trackData.GetMaterial() ;
-  const G4DynamicParticle*  aParticle = trackData.GetDynamicParticle() ;
+  G4Material*               aMaterial = track.GetMaterial() ;
+  const G4DynamicParticle*  aParticle = track.GetDynamicParticle() ;
 
   //  get kinetic energy cut for the electron
-  G4double* DeltaCutInKineticEnergy = G4Electron::Electron()->GetCutsInEnergy() ;
+  G4double* DeltaCutInKineticEnergy= G4Electron::Electron()->GetCutsInEnergy();
   G4double  DeltaThreshold = DeltaCutInKineticEnergy[aMaterial->GetIndex()];
  
   G4double KineticEnergy = aParticle->GetKineticEnergy();
@@ -982,155 +1022,134 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
   // kill e- if Tkin is too small ......
   if(KineticEnergy <= DeltaThreshold)
   { 
-    ////aParticleChange.SetStatusChange(fStopAndKill);
-    aParticleChange.SetEnergyChange(KineticEnergy);  
-    if(KineticEnergy < 0.) G4cout << " 1. negative deposit:" << KineticEnergy/eV << G4endl; 
-    aParticleChange.SetLocalEnergyDeposit(0.);
-    return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
-
+    if(KineticEnergy < 0.) {
+      G4cout << "G4LowEnergyIonisation: negative kinetic energy (eV) = " 
+             << KineticEnergy/eV << G4endl; 
+      KineticEnergy = 0.0;
+    }
+    aParticleChange.SetEnergyChange(0.0);  
+    aParticleChange.SetLocalEnergyDeposit(KineticEnergy);
+    aParticleChange.SetStatusChange(fStopAndKill);
+    return G4VContinuousDiscreteProcess::PostStepDoIt(track,step);
   }
 
-    // Create lists of pointers to DynamicParticles (photons and electrons) 
-    G4ParticleVector photvec;
-    G4int photInd = 0; 
-    G4ParticleVector elecvec;
-    G4int elecInd = 0; 
+  // Create lists of pointers to DynamicParticles (photons and electrons) 
+  G4ParticleVector photvec;
+  G4ParticleVector elecvec;
 
   // select randomly one element constituing the material.
   G4Element* anElement = SelectRandomAtom(aParticle, aMaterial);
   G4int AtomIndex = (G4int) anElement->GetZ();
 
-  // First Ionised subshell chosen basing on subshell integrated cross section EPDL97
-  // partial sum method
-  // Select the subshell WARNING!!!!: it returns the subshell index in the table.
-  G4int subShellIndex = SelectRandomShell(AtomIndex, KineticEnergy, DeltaThreshold);
-  if(subShellIndex<0) {
-    ///aParticleChange.SetEnergyChange(KineticEnergy);  
-    ///aParticleChange.SetLocalEnergyDeposit(0.);
-    return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData); 
+  // First Ionised subshell chosen basing on subshell integrated 
+  // cross section EPDL97 partial sum method
+  // Select the subshell: it returns the subshell index in the table.
+  G4int subShellIndex = SelectRandomShell(AtomIndex, KineticEnergy, 
+                                          DeltaThreshold);
+
+  // There are no delta-ray production
+  if(subShellIndex < 0) {
+    return G4VContinuousDiscreteProcess::PostStepDoIt(track,step); 
   }
   
-  //mv ionsubShellIndex = 20; // WARNING: REMEMBER TO REMOVE THIS CONSTRAIN
+  // Get the subshell energy
   G4FirstLevel* theBindEnVec = (*theBindingEnergyTable)[AtomIndex-1];
   G4int thePrimaryShell = (G4int) (*(*theBindEnVec)[0])[subShellIndex];
   G4double BindingEn = (*(*theBindEnVec)[1])[subShellIndex];
-  G4double theEnergyDeposit = BindingEn; 
 
-  if(KineticEnergy <= BindingEn+DeltaThreshold)
-  {
-    G4cout << " Tkin=" << KineticEnergy/eV << "  Ebind=" << BindingEn/eV
-           << "   selection of subshell ???????" << G4endl;
-    return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
-  }
+  // Kinematic inside Atomic potential 
+  G4ThreeVector ParticleDirection = aParticle->GetMomentumDirection();
+  G4double totEnergy = KineticEnergy + ParticleMass + 2.0*BindingEn;
+  G4double totMomentum = sqrt(totEnergy*totEnergy - ParticleMass*ParticleMass);
+  G4double deltaKinEnergy = 0.0;
 
-  G4ParticleMomentum ParticleDirection = aParticle->GetMomentumDirection();
-
-  // some kinematics
-
-  G4double MaxKineticEnergyTransfer = 0.5*KineticEnergy;
-
-  // sampling kinetic energy of the delta ray 
-  if (MaxKineticEnergyTransfer <= LowestKineticEnergy/2){
-
-    // pathological case (should not happen, there is no change at all)
-    return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
-  }
-
-  // **** normal case ****
 
   // Energy Sampling
-  G4double DeltaKineticEnergy = EnergySampling(AtomIndex, subShellIndex
-                                             , KineticEnergy, DeltaThreshold);
-  G4double finalKineticEnergy = KineticEnergy - DeltaKineticEnergy - BindingEn;
+  deltaKinEnergy = EnergySampling(AtomIndex, subShellIndex,
+                                    KineticEnergy, DeltaThreshold);
+  deltaKinEnergy+= 2.0*BindingEn;
+
+  // one more test for pathology cases
+  if( deltaKinEnergy < DeltaThreshold + 2.0*BindingEn) {
+    deltaKinEnergy -= 2.0*BindingEn;
+    if(deltaKinEnergy < 0.0) deltaKinEnergy = 0.0;
+    aParticleChange.SetEnergyChange(KineticEnergy - deltaKinEnergy);  
+    aParticleChange.SetLocalEnergyDeposit(deltaKinEnergy);
+    return G4VContinuousDiscreteProcess::PostStepDoIt(track,step);
+  }
+
+  // sampling of scattering angle neglecting atomic motion
+  G4double deltaMomentum = sqrt(deltaKinEnergy * 
+                          (deltaKinEnergy + 2.0*ParticleMass ));
+   
+  G4double costheta = deltaKinEnergy * (totEnergy + ParticleMass)
+                    /(deltaMomentum * totMomentum);
+
+  if      (costheta < -1.) costheta = -1.;
+  else if (costheta > +1.) costheta = +1.;
+  G4double sintheta = sqrt(1. - costheta*costheta);
+  G4double phi  = twopi * G4UniformRand(); 
+  G4double dirx = sintheta * cos(phi);
+  G4double diry = sintheta * sin(phi);
+  G4double dirz = costheta;
+
+  // Rotate to incident electron direction
+  G4ThreeVector deltaDir(dirx,diry,dirz);
+  deltaDir.rotateUz(ParticleDirection);
+  dirx = deltaDir.x();
+  diry = deltaDir.y();
+  dirz = deltaDir.z();
+
+  // Find out new incident electron direction
+  G4double finalPx = totMomentum*ParticleDirection.x() - deltaMomentum*dirx; 
+  G4double finalPy = totMomentum*ParticleDirection.y() - deltaMomentum*diry; 
+  G4double finalPz = totMomentum*ParticleDirection.z() - deltaMomentum*dirz; 
+
+  // Take into account atomic motion
+  costheta = 2.0*G4UniformRand() - 1.0;
+  sintheta = sqrt(1. - costheta*costheta);
+  phi  = twopi * G4UniformRand(); 
+  G4double del = sqrt(BindingEn *(BindingEn + 2.0*ParticleMass))/deltaMomentum;
+  dirx += del* sintheta * cos(phi);
+  diry += del* sintheta * sin(phi);
+  dirz += del* costheta;
+  G4double norm = 1.0/sqrt(dirx*dirx + diry*diry + dirz*dirz);
+  
+  G4double finalKineticEnergy = KineticEnergy - deltaKinEnergy;
+  deltaKinEnergy -= 2.0*BindingEn;
+
+  // create G4DynamicParticle object for delta ray
+  G4DynamicParticle* theDeltaRay = new G4DynamicParticle();
+  theDeltaRay->SetKineticEnergy(deltaKinEnergy);
+  theDeltaRay->SetMomentumDirection(dirx*norm,diry*norm,dirz*norm); 
+  theDeltaRay->SetDefinition(G4Electron::Electron());
+  elecvec.push_back(theDeltaRay);
+     
+  G4double theEnergyDeposit = BindingEn;
 
   if(finalKineticEnergy < 0.){
 
-    G4cout << "Tkin=" << KineticEnergy/eV << "  Tdel=" << DeltaKineticEnergy/eV
+    G4cout << "Tkin=" << KineticEnergy/eV << "  Tdel=" << deltaKinEnergy/eV
 	   << "  BindingEn=" << BindingEn/eV << "  ***********" << G4endl;
   }
-  // deposit energy if delta energy is below cut
-  G4ThreeVector DeltaDirection(0.,0.,0.);
-  if(DeltaKineticEnergy <= DeltaThreshold){
-    G4cout<<"This should not happen DeltaKineticEnergy= "<<DeltaKineticEnergy
-          <<" kinetic E = "<<KineticEnergy
-	  <<" DeltaThreshold = "<<DeltaThreshold
-	  << "  BindingEn= " << BindingEn
-	  <<" shell id = "<<subShellIndex
-	  <<G4endl;
-    theEnergyDeposit += DeltaKineticEnergy;
-    DeltaKineticEnergy = 0.;
-  } 
-  else{  
-  
-  // delta ray kinematics
-  // step 1. costheta from assumption : atomic e- free and at rest 
-
-    G4double costheta = sqrt(DeltaKineticEnergy*(KineticEnergy+2.*electron_mass_c2)/
-                             KineticEnergy*(DeltaKineticEnergy+2.*electron_mass_c2));
-
-    if (costheta < -1.) costheta = -1.;
-    if (costheta > +1.) costheta = +1.;
     
-    G4double phi = twopi * G4UniformRand(); 
-    G4double sintheta = sqrt((1.+costheta)*(1.-costheta));
+  // FLUORESCENCE
+  // load the transition probability table for the element
+  // theTable[i][j][k] 
+  // i = subshell, j = type of information (second shell, transition energy , 
+  // transition probability), k = previous vectors.
     
-   // step 2. correction of the delta momentum direction 
-    G4double dirx,diry,dirz ;
-    static G4double cmom=2. ;
+  // Fluorescence data start from element 6
 
-    G4double peinit=sqrt(2.*cmom*electron_mass_c2*BindingEn) ;
-    G4double pdelta=sqrt(DeltaKineticEnergy*(DeltaKineticEnergy+2.*electron_mass_c2)) ;
-    G4double ct=-1.*2.*G4UniformRand() ;
-    if(ct > 1.) ct=1. ;
-    if(ct <-1.) ct=-1. ;
-    G4double st=sqrt(1.-ct*ct) ;
-    G4double ph = twopi * G4UniformRand();
-    dirx=pdelta*sintheta*cos(phi)+peinit*st*cos(ph) ;
-    diry=pdelta*sintheta*sin(phi)+peinit*st*sin(ph) ;
-    dirz=pdelta*costheta+peinit*ct ;
-    G4double mom=sqrt(dirx*dirx+diry*diry+dirz*dirz) ;
-    if(mom > 0.)
-    {
-     dirx=dirx/mom ;
-     diry=diry/mom ;
-     dirz=dirz/mom ;
-    }
-    else
-    {
-     dirx = sintheta * cos(phi), diry = sintheta * sin(phi), dirz = costheta;
-    }
-
-    DeltaDirection = G4ThreeVector(dirx,diry,dirz);
-    DeltaDirection.rotateUz(ParticleDirection);
-        
-    // create G4DynamicParticle object for delta ray
-    G4DynamicParticle* theDeltaRay = new G4DynamicParticle;
-    theDeltaRay->SetKineticEnergy( DeltaKineticEnergy );
-    theDeltaRay->SetMomentumDirection(DeltaDirection.x(),
-				      DeltaDirection.y(),
-				      DeltaDirection.z()); 
-    
-    theDeltaRay->SetDefinition(G4Electron::Electron());
-    elecvec.insert(theDeltaRay);
-   }//create delta-ray.
-    
-    // FLUORESCENCE
-    // load the transition probability table for the element
-    // theTable[i][j][k] 
-    // i = subshell, j = type of information (second shell, transition energy , 
-    // transition probability), k = previous vectors.
-    
-    // Fluorescence data start from element 6
-
-     if(thePrimShVec.size() != 0){thePrimShVec.clear();}
-     thePrimShVec.push_back(thePrimaryShell);
-     if(AtomIndex > 5){
+  if(thePrimShVec.size() != 0) thePrimShVec.clear();
+  thePrimShVec.push_back(thePrimaryShell);
+  if(AtomIndex > 5){
       
       G4bool ThereAreShells = TRUE;
       G4int AtomInd = ZNumVecFluor->index(AtomIndex);
       oneAtomTable* oneAtomFluorTrans = (*theFluorTransitionTable)[AtomInd];
       
-      while(ThereAreShells == TRUE){
+      while(ThereAreShells) {
 	
 	// Select the second transition from another subshell
 	// fluorPar[0] = SubShell 
@@ -1141,7 +1160,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 	
 	G4double fluorPar[3] = {0};
 	
-	// SelectRandomTransition argument is oneAtomTable loop on shells is inside
+  // SelectRandomTransition argument is oneAtomTable loop on shells is inside
 	ThereAreShells = SelectRandomTransition(thePrimaryShell, 
 						fluorPar, 
 						oneAtomFluorTrans);
@@ -1160,9 +1179,8 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 	diry = newsinTh*cos(newPhi);
 	dirx = newsinTh*sin(newPhi);
 	G4ThreeVector newPartDirection(dirx, diry, dirz);
-	///newPartDirection.rotateUz(ParticleDirection);
 	
-	if(ThereAreShells != FALSE){
+	if(ThereAreShells) {
 	  
 	  thePrimaryShell = (G4int) fluorPar[0];
 	  
@@ -1173,10 +1191,9 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 					     newPartDirection, 
 					     fluorPar[2]);
 	    
-	    photvec.insert(newPart);
+	    photvec.push_back(newPart);
 	  }
-	}
-	else{
+	} else {
 	  
 	  /////Energy deposition vl
 	  ////=================NEW================vl
@@ -1199,7 +1216,7 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
 					    newPartDirection, 
 					    lastTransEnergy);
 	    
-	    photvec.insert(newPart);
+	    photvec.push_back(newPart);
 	  }
 	    
 	  thePrimShVec.insert(thePrimaryShell);
@@ -1208,85 +1225,81 @@ G4VParticleChange* G4LowEnergyIonisation::PostStepDoIt( const G4Track& trackData
       }
     } //END OF THE CHECK ON ATOMIC NUMBER
 
-    G4int numOfElec = elecvec.entries(), numOfPhot = photvec.entries();
-    G4int numOfDau = numOfElec + numOfPhot;
-    aParticleChange.SetNumberOfSecondaries(numOfDau);
-    G4int l = 0;
-    for(l = 0; l<numOfElec; l++ ){
+  G4int numOfElec = elecvec.size();
+  G4int numOfPhot = photvec.size();
+  G4int numOfDau = numOfElec + numOfPhot;
+  aParticleChange.SetNumberOfSecondaries(numOfDau);
+  G4int l = 0;
 
-      aParticleChange.AddSecondary(elecvec[l]);
-    }
+  for(l = 0; l<numOfElec; l++ ){
+    aParticleChange.AddSecondary(elecvec[l],true);
+  }
     
-    for(l = 0; l < numOfPhot; l++) {
-      
-      aParticleChange.AddSecondary(photvec[l]); 
-    }
+  for(l = 0; l < numOfPhot; l++) {    
+    aParticleChange.AddSecondary(photvec[l],true); 
+  }
 
-    photvec.clear();
-    elecvec.clear();
+  photvec.clear();
+  elecvec.clear();
     
-    // fill aParticleChange 
-    // changed energy and momentum of the actual particle
-    
-    if(finalKineticEnergy > factor*DeltaThreshold){
-       G4double TotalEnergy = KineticEnergy + ParticleMass;
-       G4double Psquare = KineticEnergy*(TotalEnergy+ParticleMass);
-       G4double TotalMomentum = sqrt(Psquare);
-       G4double DeltaTotalMomentum = sqrt(DeltaKineticEnergy * (DeltaKineticEnergy +
-                                                             2. * electron_mass_c2 ));
-       G4double finalPx = TotalMomentum*ParticleDirection.x()
-                        - DeltaTotalMomentum*DeltaDirection.x(); 
-       G4double finalPy = TotalMomentum*ParticleDirection.y()
-                        - DeltaTotalMomentum*DeltaDirection.y(); 
-       G4double finalPz = TotalMomentum*ParticleDirection.z()
-                        - DeltaTotalMomentum*DeltaDirection.z(); 
-      G4double finalMomentum =
-                sqrt(finalPx*finalPx+finalPy*finalPy+finalPz*finalPz) ;
-      finalPx /= finalMomentum ;
-      finalPy /= finalMomentum ;
-      finalPz /= finalMomentum ;
+  // fill ParticleChange 
+  // changed energy and momentum of the actual particle
 
-       aParticleChange.SetMomentumChange(finalPx,finalPy,finalPz);
-       aParticleChange.SetEnergyChange(finalKineticEnergy);
-       if(theEnergyDeposit < 0.) G4cout << " 4. negative deposit:" << theEnergyDeposit/eV << G4endl; 
-       aParticleChange.SetLocalEnergyDeposit(theEnergyDeposit);
+  if(finalKineticEnergy > DeltaThreshold){
+    G4double fac = 1.0/sqrt(finalPx*finalPx+finalPy*finalPy+finalPz*finalPz);
+    finalPx *= fac;
+    finalPy *= fac;
+    finalPz *= fac;
+
+    aParticleChange.SetMomentumChange(finalPx,finalPy,finalPz);
+    aParticleChange.SetEnergyChange(finalKineticEnergy);
+    if(theEnergyDeposit < 0.) {
+      G4cout << "G4LowEnergyIonisation: Negative energy deposit: " 
+             << theEnergyDeposit/eV << " eV" << G4endl;
+      theEnergyDeposit = 0.0;
     }
-    else{
-       theEnergyDeposit += finalKineticEnergy ;
-       if(theEnergyDeposit < 0.){
-          G4cout << " 5. negative deposit:" << theEnergyDeposit/eV << G4endl; 
-          G4cout << " finalKineticEnergy=" << finalKineticEnergy/eV << G4endl;
-       }
-       aParticleChange.SetLocalEnergyDeposit(theEnergyDeposit);
-       aParticleChange.SetEnergyChange(0.);
-       aParticleChange.SetStatusChange(fStopAndKill);
+    aParticleChange.SetLocalEnergyDeposit(theEnergyDeposit);
+   
+  } else {
+    theEnergyDeposit += finalKineticEnergy ;
+    if(theEnergyDeposit < 0.){
+      G4cout << "G4LowEnergyIonisation: Negative energy deposit: " 
+             << theEnergyDeposit/eV << " eV" << G4endl; 
+      G4cout << "                       finalKineticEnergy= " 
+             << finalKineticEnergy/eV << " eV" << G4endl;
+      theEnergyDeposit = 0.0;
     }
+    aParticleChange.SetLocalEnergyDeposit(theEnergyDeposit);
+    aParticleChange.SetEnergyChange(0.);
+    aParticleChange.SetStatusChange(fStopAndKill);
+  }
     
-  return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
+  return G4VContinuousDiscreteProcess::PostStepDoIt(track,step);
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 //
 // selection of the first ionized subshell: partial sum method
 // 
 G4int G4LowEnergyIonisation::SelectRandomShell(const G4int AtomIndex
                                              , const G4double IncEnergy
-					     , const G4double CutEnergy){
-  
+					     , const G4double CutEnergy)
+{  
   G4double partialSum = 0;
-  G4double totalSum = ComputeCrossSectionWithCut(AtomIndex,IncEnergy,CutEnergy);
+  G4double totalSum = ComputeCrossSectionWithCut(AtomIndex,IncEnergy,
+                                                 CutEnergy);
   if(totalSum<=0.) return -1;
   
   G4double rval = totalSum*G4UniformRand();
   const oneAtomTable* oneAtomCS 
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomIndex)];
 
-  for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
+  for(size_t ind = 0; ind < oneAtomCS->size(); ind++) {
 
     G4double crossSec;
     G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
-    G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
+    // G4DataVector* CrossSecVector = (*(*oneAtomCS)[ind])[1];
     if(IncEnergy < (*EnergyVector)[0]){ //First element is the shell number
 
       crossSec = 0;
@@ -1294,7 +1307,8 @@ G4int G4LowEnergyIonisation::SelectRandomShell(const G4int AtomIndex
 
     else{
 
-      crossSec = GetShellCrossSectionwithCut(AtomIndex, ind, IncEnergy, CutEnergy);
+      crossSec = GetShellCrossSectionwithCut(AtomIndex,ind,IncEnergy,
+                                             CutEnergy);
     }
     
     partialSum += crossSec;
@@ -1306,41 +1320,47 @@ G4int G4LowEnergyIonisation::SelectRandomShell(const G4int AtomIndex
   return 0;
 }
 
+//    
+
 //
 // Element selction in the material already in the standard processes
 // 
-G4Element*
-G4LowEnergyIonisation::SelectRandomAtom(const G4DynamicParticle* aDynamicParticle, 
-					G4Material* aMaterial){
-
+G4Element* G4LowEnergyIonisation::SelectRandomAtom(
+                          const G4DynamicParticle* aDynamicParticle, 
+				G4Material* aMaterial)
+{
   // select randomly 1 element within the material
   G4double KineticEnergy = aDynamicParticle->GetKineticEnergy();
   const G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
   if (NumberOfElements == 1) return (*theElementVector)(0);
 
-  const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
+  const G4double* theAtomNumDensityVector = 
+                  aMaterial->GetAtomicNumDensityVector();
 
   G4double PartialSumSigma = 0. ;
 
   G4double rval = G4UniformRand()/MeanFreePath;
  
   // get electron  cuts in kinetic energy
-  G4double* DeltaCutInKineticEnergy = G4Electron::Electron()->GetCutsInEnergy() ;
-  for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
+  G4double* DeltaCutInKineticEnergy = G4Electron::Electron()
+                                    ->GetCutsInEnergy();
+  for ( G4int i=0 ; i < NumberOfElements ; i++ ) { 
 
     G4double DeltaThreshold = DeltaCutInKineticEnergy[i] ;
     G4double crossSection;
-    if (KineticEnergy <  LowestKineticEnergy)
+    if (KineticEnergy <  lowestKineticEnergy)
 
       crossSection = 0. ;
 
     else {
 
-      if (KineticEnergy > HighestKineticEnergy) KineticEnergy = 0.99*HighestKineticEnergy;
+      if (KineticEnergy > highestKineticEnergy) 
+                          KineticEnergy = 0.99*highestKineticEnergy;
 
       G4int AtomIndex = (G4int) (*theElementVector)(i)->GetZ();
-      crossSection = ComputeCrossSectionWithCut(AtomIndex, KineticEnergy,DeltaThreshold);
+      crossSection = ComputeCrossSectionWithCut(AtomIndex, KineticEnergy,
+                                                DeltaThreshold);
     }
 
     PartialSumSigma += theAtomNumDensityVector[i] * crossSection;
@@ -1351,14 +1371,17 @@ G4LowEnergyIonisation::SelectRandomAtom(const G4DynamicParticle* aDynamicParticl
   return (*theElementVector)(0);
 }
 
+//    
+
 //
-// Select a random transition with the transition probabilities and the partial sum 
-// method using EADL data (A. Forti)
+// Select a random transition with the transition probabilities and 
+// the partial sum method using EADL data (A. Forti)
 //
 
 G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell, 
-						     G4double* TransParam,
-						     const oneAtomTable* TransitionTable){
+					G4double* TransParam,
+				  const oneAtomTable* TransitionTable)
+{
   
   G4int SubShellCol = 0, ProbCol = 1, EnergyCol = 2;
   // transitionTable contains all the transition probabilities of one atom:
@@ -1367,8 +1390,8 @@ G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell,
   // when the last subshell is reached CollIsFull becomes FALSE.
   G4bool ColIsFull = FALSE;
   G4int ShellNum = 0;
-  G4double TotalSum = 0; 
-  G4int maxNumOfShells = TransitionTable->entries()-1;
+  //  G4double TotalSum = 0; 
+  G4int maxNumOfShells = TransitionTable->size()-1;
 
   if(thePrimShell <= 0) {
      G4cerr<<"*** Unvalid Primary shell: "<<thePrimShell<<G4endl;
@@ -1385,9 +1408,10 @@ G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell,
       ShellNum++;
     }
 
-    // TransProb is the index of the loop and of the table of transition. it starts from 1 
-    // because the first element of the data table is the primary shell id number and not a 
-    // transition probability: it must not be added to TotalSum. 
+    // TransProb is the index of the loop and of the table of transition. 
+    // It starts from 1 because the first element of the data table is 
+    // the primary shell id number and not a transition probability: 
+    // it must not be added to TotalSum. 
   
     G4int TransProb = 1;
     // Include non-radiative transitions (vl):
@@ -1400,7 +1424,8 @@ G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell,
     G4double PartSum = 0;
     
     TransProb = 1; 
-    while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->size()){
+    G4int trSize = (*(*TransitionTable)[ShellNum])[ProbCol]->size();
+    while(TransProb < trSize){
       
       PartSum += (*(*(*TransitionTable)[ShellNum])[ProbCol])[TransProb];
       
@@ -1425,34 +1450,41 @@ G4bool G4LowEnergyIonisation::SelectRandomTransition(G4int thePrimShell,
   return ColIsFull;
 }
 
+//    
+
 G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber, 
 					       const G4int ShellIndex, 
 					       const G4double KinEn
-					     , const G4double deltaRayMinE){
-
+					     , const G4double deltaRayMinE)
+{
   // Sampling Method: acceptation - rejection method from
-  // EGS4 W.R. Nelson et al. The EGS4 Code System. SLAC-Report-265 , December 1985 
+  // EGS4 W.R. Nelson et al. The EGS4 Code System. SLAC-Report-265 , 
+  // December 1985 
   // Fit functions:
   //
-  // first function: sum_i A_i/(en+bind)^i  i=2,7 used in all the cases/subshells (see below)
+  // first function: sum_i A_i/(en+bind)^i  i=2,7 used in all 
+  // the cases/subshells (see below)
   //
   // second function: B_1*(en)**B_2 used in 9 cases/subshells (no references)
   //
-  // third function: sum_i C_i/(en+bind)^i i=2,5 used in 462 cases/subshells (see below)
+  // third function: sum_i C_i/(en+bind)^i i=2,5 used in 462 cases/subshells 
+  // (see below)
   //
-  // Y.-K.Kim M.E.Rudd http://physics.nist.gov/PhysRefData/Ionization/intro.html
-  // First and Third functions are a modified version: degree of monomial in the 
-  // truncated sum is from 2 to 7 instead that from 2 to 6. 
+  //Y.K.Kim M.E.Rudd http://physics.nist.gov/PhysRefData/Ionization/intro.html
+  // First and Third functions are a modified version: degree of monomial 
+  // in the truncated sum is from 2 to 7 instead that from 2 to 6. 
   // method A. Forti.
 
   //  1) Load Coefficients (I need Z number and the index of the shell)
-  oneAtomTable* oneAtomCoeffTable = (*theSamplingCoeffTable)[ZNumVec->index(AtomicNumber)];
+  oneAtomTable* oneAtomCoeffTable = 
+               (*theSamplingCoeffTable)[ZNumVec->index(AtomicNumber)];
 
   oneShellTable* oneShellCoeffTable = (*oneAtomCoeffTable)[ShellIndex];
-  const G4double BindingEn = (*(*(*theBindingEnergyTable)[AtomicNumber-1])[1])[ShellIndex];
+  const G4double BindingEn = 
+               (*(*(*theBindingEnergyTable)[AtomicNumber-1])[1])[ShellIndex];
 
   // 2) Interpolate coefficients (I need the incoming electron kinetic energy)
-  const G4int CoeffNumber = oneShellCoeffTable->entries();
+  const G4int CoeffNumber = oneShellCoeffTable->size();
 
   const G4DataVector* energyVec = (*oneShellCoeffTable)[0];
   const G4int LastPar = energyVec->size()-1;
@@ -1473,15 +1505,15 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
 
     else{
 
-      // NO REFERENCES for SEMI-LOG interpolation it is used because coefficients
-      // can be negative. 
+      // NO REFERENCES for SEMI-LOG interpolation it is used 
+      // because coefficients can be negative. 
 
-      G4double par = util.DataSemiLogInterpolation(KinEn,(*energyVec),(*oneCoeffVec));
+      G4double par = util.DataSemiLogInterpolation(KinEn,(*energyVec),
+                                                  (*oneCoeffVec));
       Parms.push_back(par);
     }
   }
 
-
   const G4double minEn = deltaRayMinE;
   
   // cuts in energy are always the same
@@ -1516,12 +1548,13 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
   // Sampling energy limits and areas variable declaration
   G4double maxEn = (KinEn-BindingEn)/2;
   if(minEn>=maxEn) {
-     G4cout<<"G4LowEnergyIonisation::EnergySampling not enought energy left !"<<G4endl;
-     G4cout<<" minEn - kinEn - B"
-           <<minEn<<" "
-	   <<KinEn<<" "
-	   <<BindingEn
-	   <<G4endl;
+     G4cout << "G4LowEnergyIonisation::EnergySampling not enought energy left!"
+            << G4endl;
+     G4cout << " minEn - kinEn - B"
+            << minEn << " "
+	    << KinEn << " "
+	    << BindingEn
+	    << G4endl;
      return 0.;
   }
   G4double area1 = 0.,  area2 = 0., area3 = 0.;
@@ -1532,9 +1565,9 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
   // compute here the weights of the two regions (areas)
   // temporary solution, but needed for consistent sampling
   
-  // NOTATION the number order of the functions follows the energy increasing order
-  // even if what is called second function should be the third following the number 
-  // of cases in which it appears (only 9)
+  // NOTATION the number order of the functions follows the energy 
+  // increasing order even if what is called second function should 
+  // be the third following the number of cases in which it appears (only 9)
 
   //
   // First Function: sum_2(A_i/(energy+Binding)^i)  i = 2,3,4,5,6,7
@@ -1593,8 +1626,12 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
     //
     G4double low = sndCut;
     if(minEn>low) low = minEn;
-    G4double aa = 1./(low+BindingEn); // equivalent to 1./low in the first function 
-    G4double bb = 1./(maxEn+BindingEn);  // equivalent to 1./high in the first function
+
+    G4double aa = 1./(low+BindingEn); 
+    // equivalent to 1./low in the first function 
+
+    G4double bb = 1./(maxEn+BindingEn);  
+    // equivalent to 1./high in the first function
     
     G4double saa = aa, sbb = bb;
     
@@ -1622,8 +1659,12 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
     G4double low = fstCut;
     if(minEn>fstCut)low = minEn;
        
-    G4double aa = 1./(low+BindingEn); // equivalent to 1./low in the first function 
-    G4double bb = 1./(maxEn+BindingEn);  // equivalent to 1./high in the first function
+    G4double aa = 1./(low+BindingEn); 
+    // equivalent to 1./low in the first function 
+
+    G4double bb = 1./(maxEn+BindingEn);  
+    // equivalent to 1./high in the first function
+
     G4double saa = aa, sbb = bb;
     G4int kk;
     for( kk = 1; kk < 5; kk++){
@@ -1646,13 +1687,13 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
     whatCut = low;
   }
    
-  // **********************************************************************************
+  // **************************************************************
   // SAMPLING 
-  // **********************************************************************************
+  // **************************************************************
   
   G4double areaTot = area1+area2+area3;
   G4double areaDue = area1+area2;
-  G4int which;
+  G4int which = 0;
   // 4) Generate a random number .to select the region of work
   G4double rand1 = areaTot*G4UniformRand();
   
@@ -1743,16 +1784,22 @@ G4double G4LowEnergyIonisation::EnergySampling(const G4int AtomicNumber,
       
       G4double arg = sample + BindingEn;
       
-      rejection = Parms[7]/arg+Parms[8]/pow(arg,2)+Parms[9]/pow(arg,3)+Parms[10]/pow(arg,4);
+      rejection = Parms[7]/arg+Parms[8]/pow(arg,2)+Parms[9]/pow(arg,3)
+                + Parms[10]/pow(arg,4);
       
       rejection /= Parms[11];
       
     }while(rejection < G4UniformRand()); 
   }
-  if(sample<minEn) G4cout<<" Error in energy sampling: sampleE<minEn: "<<sample<<" < "<<minEn<<"  "<<which<<G4endl;
+  if(sample<minEn) {
+    G4cout << " Error in energy sampling: sampleE<minEn: "
+           <<sample<<" < "<<minEn<<"  "<<which<<G4endl;
+  }
   return sample;
 }
 
+//    
+
 void G4LowEnergyIonisation::PrintInfoDefinition()
 {
   G4String comments = "Low energy ionisation code ";
@@ -1760,10 +1807,10 @@ void G4LowEnergyIonisation::PrintInfoDefinition()
            comments += "\n At present it can be used for electrons ";
            comments += " in the energy range [250eV,100GeV]";
            comments += 
-  "\n the process must work with G4LowEnergyBremsstrahlung";
-  G4cout << G4endl << GetProcessName() << ":  " << comments << G4endl;
-
+                "\n the process must work with G4LowEnergyBremsstrahlung";
+  G4cout << GetProcessName() << ":  " << comments << G4endl;
 }
 
+//    
 
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
index 11487bd8ce..84e4d64285 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyPhotoElectric.cc,v 1.27 2001/02/05 17:45:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyPhotoElectric.cc,v 1.31.2.2 2001/06/28 20:19:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyPhotoelctric: low energy modifications --------
 //                   by Alessandra Forti, October 1998
 // **************************************************************
@@ -34,6 +48,7 @@
 // Added SelectRandomAtom A. Forti
 // Added map of the elements A. Forti
 // 07-09-99, if no e- emitted: edep=photon energy, mma
+// 24.04.01 V.Ivanchenko remove RogueWave 
 //                                  
 // --------------------------------------------------------------
 
@@ -44,34 +59,35 @@
 #include "G4EnergyLossTables.hh"
 #include "G4Electron.hh"
 
-typedef G4RWTPtrOrderedVector<G4DynamicParticle> G4ParticleVector;
+typedef G4std::vector<G4DynamicParticle*> G4ParticleVector;
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // constructor
  
 G4LowEnergyPhotoElectric::G4LowEnergyPhotoElectric(const G4String& processName)
   : G4VDiscreteProcess(processName),             // initialization
-    LowestEnergyLimit (250*eV),
-    HighestEnergyLimit(100*GeV),
-    theCrossSectionTable(0),
-    theBindingEnergyTable(0),
-    theMeanFreePathTable(0),
-    theFluorTransitionTable(0),
-    allAtomShellCrossSec(0),
-    CutForLowEnergySecondaryPhotons(0.),
-    ZNumVec(0),
-    ZNumVecFluor(0),
-    NumbBinTable(200)
+  lowestEnergyLimit (250*eV),
+  highestEnergyLimit(100*GeV),
+  NumbBinTable(200),
+  CutForLowEnergySecondaryPhotons(0.),
+  theCrossSectionTable(0),
+  theMeanFreePathTable(0),
+  allAtomShellCrossSec(0),
+  theFluorTransitionTable(0),
+  theBindingEnergyTable(0),
+  ZNumVec(0),
+  ZNumVecFluor(0),
+  MeanFreePath(0.)
 {
    if (verboseLevel>0) {
      G4cout << GetProcessName() << " is created "<< G4endl;
-     G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/MeV << "MeV " << G4endl;
+     G4cout << "lowestEnergy: " << lowestEnergyLimit/keV << "keV ";
+     G4cout << "highestEnergy: " << highestEnergyLimit/MeV << "MeV " << G4endl;
    }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
  
 // destructor
  
@@ -82,12 +98,14 @@ G4LowEnergyPhotoElectric::~G4LowEnergyPhotoElectric()
    }
 
    if (theBindingEnergyTable) {
-      theBindingEnergyTable->clearAndDestroy();
+     //      theBindingEnergyTable->clearAndDestroy();
+      theBindingEnergyTable->clear();
       delete theBindingEnergyTable;
    }
 
    if (theMeanFreePathTable) {
-      theMeanFreePathTable->clearAndDestroy();
+     //      theMeanFreePathTable->clearAndDestroy();
+      theMeanFreePathTable->clear();
       delete theMeanFreePathTable;
    }
 
@@ -113,14 +131,14 @@ G4LowEnergyPhotoElectric::~G4LowEnergyPhotoElectric()
 
 }
  
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
  
 void G4LowEnergyPhotoElectric::SetCutForLowEnSecPhotons(G4double cut){
 
   CutForLowEnergySecondaryPhotons = cut;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 void G4LowEnergyPhotoElectric::BuildPhysicsTable(const G4ParticleDefinition& PhotonType)
 
@@ -141,7 +159,7 @@ void G4LowEnergyPhotoElectric::BuildPhysicsTable(const G4ParticleDefinition& Pho
    
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // CONSTRUCT THE CROSS SECTION TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC USING EPDL DATA
 void G4LowEnergyPhotoElectric::BuildCrossSectionTable(){
@@ -154,18 +172,19 @@ void G4LowEnergyPhotoElectric::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
  
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
     G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(AtomInd, dataNum, "phot/pe-cs-");
      
-     theCrossSectionTable->insert(oneAtomCS);
+    //     theCrossSectionTable->insert(oneAtomCS);
+     theCrossSectionTable->push_back(oneAtomCS);
    
   }//end for on atoms
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // CONSTRUCT THE SUBSHELL CS TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC USING EPDL DATA
 void G4LowEnergyPhotoElectric::BuildShellCrossSectionTable(){
@@ -178,18 +197,19 @@ void G4LowEnergyPhotoElectric::BuildShellCrossSectionTable(){
    allAtomShellCrossSec = new allAtomTable();
    G4int dataNum = 2;
  
-   for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+   for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
 
      G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
 
      oneAtomTable* oneAtomShellCS = util.BuildSecondLevelTables(AtomInd, dataNum, "phot/pe-ss-cs-");
      
-     allAtomShellCrossSec->insert(oneAtomShellCS);
+     //     allAtomShellCrossSec->insert(oneAtomShellCS);
+     allAtomShellCrossSec->push_back(oneAtomShellCS);
    
    }//end for on atoms
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // CONSTRUCT THE BE TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC USING EADL DATA
 void G4LowEnergyPhotoElectric::BuildBindingEnergyTable(){
@@ -203,7 +223,7 @@ void G4LowEnergyPhotoElectric::BuildBindingEnergyTable(){
   theBindingEnergyTable = util.BuildSecondLevelTables(0,dataNum,"fluor/binding");
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // CONSTRUCT THE FTP TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC USING EADL DATA
 void G4LowEnergyPhotoElectric::BuildFluorTransitionTable(){
@@ -217,12 +237,13 @@ void G4LowEnergyPhotoElectric::BuildFluorTransitionTable(){
   ZNumVecFluor = new G4DataVector(*ZNumVec);
   G4int dataNum = 3;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     if(AtomInd > 5){
       
       oneAtomTable* oneAtomShellFL = util.BuildSecondLevelTables(AtomInd, dataNum, "fluor/fl-tr-pr-");
-      theFluorTransitionTable->insert(oneAtomShellFL);
+      //      theFluorTransitionTable->insert(oneAtomShellFL);
+      theFluorTransitionTable->push_back(oneAtomShellFL);
     }
     else{
       ZNumVecFluor->remove(AtomInd);
@@ -230,7 +251,7 @@ void G4LowEnergyPhotoElectric::BuildFluorTransitionTable(){
   }//end for on atoms
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 //
 // vector mapping the elements of the material table 
@@ -265,7 +286,7 @@ void G4LowEnergyPhotoElectric::BuildZVec(){
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 // Compute total cross section from subshell integrated cross section: needed for 
 // selection of the first subshell ionized.
@@ -280,7 +301,7 @@ G4double G4LowEnergyPhotoElectric::ComputeCrossSection(const G4double AtomIndex,
   const oneAtomTable* oneAtomCS
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomIndex)];
 
-  for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
+  for(size_t ind = 0; ind < oneAtomCS->size(); ind++){
 
     G4double crossSec = 0;
     G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
@@ -303,7 +324,7 @@ G4double G4LowEnergyPhotoElectric::ComputeCrossSection(const G4double AtomIndex,
   return TotalCrossSection ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 void G4LowEnergyPhotoElectric::BuildMeanFreePathTable(){
 
@@ -326,9 +347,9 @@ void G4LowEnergyPhotoElectric::BuildMeanFreePathTable(){
     //create physics vector then fill it ....
     // WARNING: Lower limit of total cross sections in the data is the binding energy 
     // of the relative subshell. MeanFreePath table require a common lowest limit.
-    // This LowestEnergyLimit is at the moment fixed at 250 ev.
+    // This lowestEnergyLimit is at the moment fixed at 250 ev.
  
-    ptrVector = new  G4PhysicsLogVector(LowestEnergyLimit, HighestEnergyLimit, NumbBinTable);
+    ptrVector = new  G4PhysicsLogVector(lowestEnergyLimit, highestEnergyLimit, NumbBinTable);
     
     material = (*theMaterialTable)(J);
     const G4ElementVector* theElementVector = material->GetElementVector();
@@ -341,7 +362,7 @@ void G4LowEnergyPhotoElectric::BuildMeanFreePathTable(){
       
       G4double SIGMA = 0;
       
-      for ( G4int k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+      for ( size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
 	// For each element            
 	G4int AtomIndex = (G4int) (*theElementVector)(k)->GetZ();
 	const G4FirstLevel* oneAtomCS
@@ -361,7 +382,7 @@ void G4LowEnergyPhotoElectric::BuildMeanFreePathTable(){
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... 
+//    .. 
 
 G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack, const G4Step&  aStep){
 
@@ -377,7 +398,7 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 
   const G4DynamicParticle* aDynamicPhoton = aTrack.GetDynamicParticle();
   const G4double PhotonEnergy = aDynamicPhoton->GetKineticEnergy();
-  if(PhotonEnergy <= LowestEnergyLimit){
+  if(PhotonEnergy <= lowestEnergyLimit){
     
     aParticleChange.SetStatusChange(fStopAndKill);
     aParticleChange.SetEnergyChange(0.);
@@ -414,9 +435,9 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 
   // Create lists of pointers to DynamicParticles (photons and electrons)
   G4ParticleVector photvec;
-  G4int photInd = 0; 
+  // G4int photInd = 0; 
   G4ParticleVector elecvec;
-  G4int elecInd = 0; 
+  // G4int elecInd = 0; 
 
   // primary outcoming electron
   G4double ElecKineEnergy = (PhotonEnergy - BindingEn);
@@ -430,7 +451,7 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
     
     G4DynamicParticle* aElectron = new G4DynamicParticle (G4Electron::Electron(), 
 							  PhotonDirection, ElecKineEnergy) ;
-    elecvec.append(aElectron);
+    elecvec.push_back(aElectron);
   } // END OF CUTS
   
   else{
@@ -487,7 +508,8 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 	    newPart = new G4DynamicParticle (G4Gamma::Gamma(), 
 					     newPartDirection, 
 					     fluorPar[2]*MeV);
-	    photvec.append(newPart);
+	    //	    photvec.append(newPart);
+	    photvec.push_back(newPart);
 	  }
 	}
 	else{
@@ -509,7 +531,7 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 	    newPart = new G4DynamicParticle (G4Gamma::Gamma(), 
 					     newPartDirection, 
 					     lastTransEnergy) ;
-	    photvec.append(newPart);
+	    photvec.push_back(newPart);
            
 	  }
 	  thePrimShVec.insert(thePrimaryShell);
@@ -519,8 +541,9 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
       }
     } //END OF THE CHECK ON ATOMIC NUMBER
     
-    G4int numOfElec = elecvec.entries(), numOfPhot = photvec.entries();
-    G4int numOfDau = numOfElec + numOfPhot;
+    G4int numOfElec = elecvec.size();
+    G4int numOfPhot = photvec.size();
+    G4int numOfDau  = numOfElec + numOfPhot;
 
     aParticleChange.SetNumberOfSecondaries(numOfDau);
     G4int l = 0;
@@ -556,7 +579,7 @@ G4VParticleChange* G4LowEnergyPhotoElectric::PostStepDoIt(const G4Track& aTrack,
 
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 G4int G4LowEnergyPhotoElectric::SelectRandomShell(const G4int AtomIndex,
                                                   const G4double IncEnergy)
@@ -568,7 +591,7 @@ G4int G4LowEnergyPhotoElectric::SelectRandomShell(const G4int AtomIndex,
   const oneAtomTable* oneAtomCS 
     = (*allAtomShellCrossSec)[ZNumVec->index(AtomIndex)];
 
-  for(G4int ind = 0; ind < oneAtomCS->entries(); ind++){
+  for(size_t ind = 0; ind < oneAtomCS->size(); ind++){
 
     G4double crossSec;
     G4DataVector* EnergyVector = (*(*oneAtomCS)[ind])[0];
@@ -593,7 +616,7 @@ G4int G4LowEnergyPhotoElectric::SelectRandomShell(const G4int AtomIndex,
   return 0;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 G4Element*
 G4LowEnergyPhotoElectric::SelectRandomAtom(const G4DynamicParticle* aDynamicPhoton,
@@ -614,13 +637,13 @@ G4LowEnergyPhotoElectric::SelectRandomAtom(const G4DynamicParticle* aDynamicPhot
   for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
 
     G4double crossSection;
-    if (GammaEnergy <  LowestEnergyLimit)
+    if (GammaEnergy <  lowestEnergyLimit)
 
       crossSection = 0. ;
 
     else {
 
-      if (GammaEnergy > HighestEnergyLimit) GammaEnergy = 0.99*HighestEnergyLimit ;
+      if (GammaEnergy > highestEnergyLimit) GammaEnergy = 0.99*highestEnergyLimit ;
 
       G4int AtomIndex = (G4int) (*theElementVector)(i)->GetZ();
       const G4FirstLevel* oneAtomCS
@@ -636,7 +659,7 @@ G4LowEnergyPhotoElectric::SelectRandomAtom(const G4DynamicParticle* aDynamicPhot
   }
   return (*theElementVector)(0);
 }
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 //
 // Select a random transition with the transition probabilities and the partial sum 
@@ -654,8 +677,8 @@ G4bool G4LowEnergyPhotoElectric::SelectRandomTransition(G4int thePrimShell,
   // when the last subshell is reached CollIsFull becomes FALSE.
   G4bool ColIsFull = FALSE;
   G4int ShellNum = 0;
-  G4double TotalSum = 0; 
-  G4int maxNumOfShells = TransitionTable->entries()-1;
+  //  G4double TotalSum = 0; 
+  G4int maxNumOfShells = TransitionTable->size()-1;
 
   if(thePrimShell <= 0) {
      G4cerr<<"*** Unvalid Primary shell: "<<thePrimShell<<G4endl;
@@ -693,7 +716,8 @@ G4bool G4LowEnergyPhotoElectric::SelectRandomTransition(G4int thePrimShell,
       G4double PartSum = 0;
       
       TransProb = 1; 
-      while(TransProb < (*(*TransitionTable)[ShellNum])[ProbCol]->size()){
+      G4int trSize = (*(*TransitionTable)[ShellNum])[ProbCol]->size();
+      while(TransProb < trSize){
 	
 	PartSum += (*(*(*TransitionTable)[ShellNum])[ProbCol])[TransProb];
 	
@@ -717,7 +741,7 @@ G4bool G4LowEnergyPhotoElectric::SelectRandomTransition(G4int thePrimShell,
   return ColIsFull;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+//    ..
 
 
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc
new file mode 100644
index 0000000000..47699fe257
--- /dev/null
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc
@@ -0,0 +1,813 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4LowEnergyPolarizedCompton.cc,v 1.5.2.2 2001/06/28 20:19:30 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// ------------------------------------------------------------
+//      GEANT 4 class implementation file
+//      CERN Geneva Switzerland
+//
+
+// --------- G4LowEnergyPolarizedCompton class -----
+//
+//           by G.Depaola & F.Longo (21 may 2001)
+// 21 May 2001 - MGP      Modified to inherit from G4VDiscreteProcess
+//                        Applies same algorithm as LowEnergyCompton
+//                        if the incoming photon is not polarised
+//                        Temporary protection to avoid crash in the case 
+//                        of polarisation || incident photon direction
+//
+// ************************************************************
+//
+// Corrections by Rui Curado da Silva (2000)
+// New Implementation by G.Depaola & F.Longo      
+//
+// - sampling of phi
+// - polarization of scattered photon
+//
+// --------------------------------------------------------------
+
+#include "G4LowEnergyPolarizedCompton.hh"
+#include "G4Electron.hh"
+#include "G4EnergyLossTables.hh"
+#include "G4Gamma.hh"
+#include "G4SecondLevel.hh"
+#include "G4PhysicsTable.hh"
+#include "G4DataVector.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4ThreeVector.hh"
+#include "G4VParticleChange.hh"
+
+// constructor
+
+G4LowEnergyPolarizedCompton::G4LowEnergyPolarizedCompton(const G4String& processName)
+  : G4VDiscreteProcess(processName),
+    theCrossSectionTable(0),
+    theScatteringFunctionTable(0),
+    theMeanFreePathTable(0),
+    ZNumVec(0),
+    lowestEnergyLimit (250*eV),              // initialization
+    highestEnergyLimit(100*GeV),
+    numbBinTable(200),
+    meanFreePath(0)
+{
+  if (verboseLevel>0) {
+    G4cout << GetProcessName() << " is created "<< G4endl;
+    G4cout << "LowestEnergy: " << lowestEnergyLimit/keV << "keV ";
+    G4cout << "HighestEnergy: " << highestEnergyLimit/TeV << "TeV " << G4endl;
+  }
+}
+
+// destructor
+ 
+G4LowEnergyPolarizedCompton::~G4LowEnergyPolarizedCompton()
+{
+   if (theCrossSectionTable) {
+      delete theCrossSectionTable;
+   }
+
+   if (theScatteringFunctionTable) {
+      delete theScatteringFunctionTable;
+   }
+
+   if (theMeanFreePathTable) {
+      theMeanFreePathTable->clearAndDestroy();
+      delete theMeanFreePathTable;
+   }
+
+   if(ZNumVec){
+     ZNumVec->clear();
+     delete ZNumVec;
+   }
+}
+ 
+ void G4LowEnergyPolarizedCompton::BuildPhysicsTable(const G4ParticleDefinition& GammaType){
+
+  BuildZVec();
+
+  // Build microscopic cross section table and mean free path table
+  BuildCrossSectionTable();
+
+  // Build mean free path table for the Compton Scattering process
+  BuildMeanFreePathTable();
+
+  // build the scattering function table
+  BuildScatteringFunctionTable();
+
+}
+void G4LowEnergyPolarizedCompton::BuildCrossSectionTable(){
+
+  // BUILD THE CS TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC
+ 
+  if (theCrossSectionTable) {
+    
+    delete theCrossSectionTable; 
+  }
+  
+  theCrossSectionTable = new G4SecondLevel();
+  G4int dataNum = 2;
+  
+  for(size_t tableInd = 0; tableInd < ZNumVec->size(); tableInd++){
+    
+    G4int atomInd = (G4int) (*ZNumVec)[tableInd];
+    
+    G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(atomInd, dataNum, "comp/ce-cs-");
+    
+    //    theCrossSectionTable->insert(oneAtomCS);
+    theCrossSectionTable->push_back(oneAtomCS);
+    
+  }//end for on atoms
+}
+
+void G4LowEnergyPolarizedCompton::BuildScatteringFunctionTable(){
+
+// BUILD THE SF TABLE FOR THE ELEMENTS MAPPED IN ZNUMVEC
+
+  if (theScatteringFunctionTable) {
+    
+    delete theScatteringFunctionTable; 
+  }
+
+  theScatteringFunctionTable = new G4SecondLevel();
+  G4int dataNum = 2;
+ 
+  for(size_t tableInd = 0; tableInd < ZNumVec->size(); tableInd++){
+
+    G4int atomInd = (G4int) (*ZNumVec)[tableInd];
+
+    G4FirstLevel* oneAtomSF = util.BuildFirstLevelTables(atomInd, dataNum, "comp/ce-sf-");
+     
+    //     theScatteringFunctionTable->insert(oneAtomSF);
+     theScatteringFunctionTable->push_back(oneAtomSF);
+   
+  }//end for on atoms
+}
+
+
+void G4LowEnergyPolarizedCompton::BuildZVec(){
+
+// vector mapping the elements in the material table
+
+  const G4MaterialTable* theMaterialTable=G4Material::GetMaterialTable();
+  G4int numOfMaterials = theMaterialTable->length();
+
+  if(ZNumVec){
+    ZNumVec->clear();
+    delete ZNumVec;
+  }
+
+  ZNumVec = new G4DataVector(); 
+  for (G4int J=0 ; J < numOfMaterials; J++){ 
+ 
+    const G4Material* material= (*theMaterialTable)[J];        
+    const G4ElementVector* theElementVector = material->GetElementVector();
+    const G4int numberOfElements = material->GetNumberOfElements() ;
+
+    for (G4int iel=0; iel<numberOfElements; iel++ ){
+
+      G4double Zel = (*theElementVector)(iel)->GetZ();
+
+      if(!(ZNumVec->contains(Zel))){
+	ZNumVec->push_back(Zel);
+      }  else{
+	continue;
+      }
+    }
+  }
+}
+
+
+void G4LowEnergyPolarizedCompton::BuildMeanFreePathTable(){
+
+// used log-log interpolation instead of linear interpolation to build the MFP 
+// as reported in the stepanek paper 
+
+  if (theMeanFreePathTable) {
+    theMeanFreePathTable->clearAndDestroy(); delete theMeanFreePathTable; }
+
+  // material
+  G4double NumbOfMaterials = G4Material::GetNumberOfMaterials();
+  const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
+  G4Material* material;
+
+  // MeanFreePath 
+  G4double lowEdgeEnergy, value;
+  theMeanFreePathTable = new G4PhysicsTable(NumbOfMaterials);
+  G4PhysicsLogVector* ptrVector;
+
+  for ( G4int J = 0 ; J < NumbOfMaterials; J++ ) { // For each material 
+  
+    //create physics vector then fill it ....
+    ptrVector = new  G4PhysicsLogVector(lowestEnergyLimit, highestEnergyLimit, numbBinTable);
+    
+    material = (*theMaterialTable)(J);
+    const G4ElementVector* theElementVector = material->GetElementVector();
+    const G4double* theAtomNumDensityVector = material->GetAtomicNumDensityVector();   
+    
+    for ( G4int i = 0 ; i < numbBinTable ; i++ ){ 
+      //For each energy
+      
+      lowEdgeEnergy = ptrVector->GetLowEdgeEnergy(i);
+      
+      const G4double bigPath = DBL_MAX;
+      G4double sigma = 0. ;
+      for ( size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+
+	G4int atomIndex = (G4int) (*theElementVector)(k)->GetZ();
+	const G4FirstLevel* oneAtomCS
+	  = (*theCrossSectionTable)[ZNumVec->index(atomIndex)];
+	
+	G4double interCrsSec = util.DataLogInterpolation(lowEdgeEnergy, 
+							 (*(*oneAtomCS)[0]), 
+							 (*(*oneAtomCS)[1]))*barn;
+	sigma += theAtomNumDensityVector[k]*interCrsSec;
+      }       
+      
+      value = sigma<=0.0 ? bigPath : 1./sigma ;
+      ptrVector->PutValue( i , value ) ;
+
+    }
+    
+    theMeanFreePathTable->insertAt( J , ptrVector );
+  }
+}
+
+
+G4Element* G4LowEnergyPolarizedCompton::SelectRandomAtom(const G4DynamicParticle* aDynamicGamma,
+                                               G4Material* aMaterial){
+
+// METHOD BELOW  FROM STANDARD E_M PROCESSES CODE MODIFIED TO USE 
+// LIVERMORE DATA (using log-log interpolation as reported in stepanek paper)
+
+
+  // select randomly 1 element within the material 
+  G4double gammaEnergy = aDynamicGamma->GetKineticEnergy();
+  const G4int NumberOfElements = aMaterial->GetNumberOfElements();
+  const G4ElementVector* theElementVector = aMaterial->GetElementVector();
+
+  if (NumberOfElements == 1) return (*theElementVector)(0);
+
+  const G4double* theAtomNumDensityVector = aMaterial->GetAtomicNumDensityVector();
+ 
+  G4double partialSumSigma = 0.;
+
+  G4double rval = 0;
+  rval = G4UniformRand()/meanFreePath;
+
+  for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
+
+    G4double crossSection;
+    if (gammaEnergy <  lowestEnergyLimit)
+      crossSection = 0. ;
+    else {
+      if (gammaEnergy > highestEnergyLimit) gammaEnergy = 0.99*highestEnergyLimit ;
+      
+      G4int atomIndex = (G4int) (*theElementVector)(i)->GetZ();
+      const G4FirstLevel* oneAtomCS
+	= (*theCrossSectionTable)[ZNumVec->index(atomIndex)];
+
+      crossSection =  util.DataLogInterpolation(gammaEnergy, 
+						(*(*oneAtomCS)[0]), 
+						(*(*oneAtomCS)[1]))*barn;
+    }
+
+    partialSumSigma += theAtomNumDensityVector[i] * crossSection;
+    if(rval <= partialSumSigma) return ((*theElementVector)(i));
+  }
+
+  return (*theElementVector)(0);
+}
+
+
+G4VParticleChange* G4LowEnergyPolarizedCompton::PostStepDoIt(const G4Track& aTrack,
+							     const G4Step&  aStep)
+{
+  // The scattered gamma energy is sampled according to Klein - Nishina formula.
+  // The random number techniques of Butcher & Messel are used (Nuc Phys 20(1960),15).
+  // GEANT4 internal units
+  //
+  // Note : Effects due to binding of atomic electrons are negliged.
+
+  aParticleChange.Initialize(aTrack);
+
+  // Dynamic particle quantities  
+  const G4DynamicParticle* aDynamicGamma = aTrack.GetDynamicParticle();
+  G4double gammaEnergy0 = aDynamicGamma->GetKineticEnergy();
+  G4ThreeVector gammaPolarization0 = aDynamicGamma->GetPolarization(); 
+  G4double polarisation = gammaPolarization0.mag();
+
+  // Check magnitude of polarisation vector
+  G4bool isPolarised = false;
+  if (polarisation > 0. && polarisation <= 1.) 
+    {
+      isPolarised = true;
+    }
+
+  // Temporary protection: a polarisation parallel to the 
+  // direction causes problems; in that case apply the regular LowEnergyCompton algorithm
+  G4ThreeVector gammaDirection = aDynamicGamma->GetMomentumDirection();
+  G4double angle = gammaPolarization0.angle(gammaDirection);
+  if (angle == 0.)
+    {
+      isPolarised = false;
+    }
+  // End of temporary protection
+
+  // Within energy limit?
+
+  if(gammaEnergy0 <= lowestEnergyLimit)
+{
+  aParticleChange.SetStatusChange(fStopAndKill);
+  aParticleChange.SetEnergyChange(0.);
+  aParticleChange.SetLocalEnergyDeposit(gammaEnergy0);
+  
+  return G4VDiscreteProcess::PostStepDoIt(aTrack,aStep);
+}
+  
+  // Select randomly one element 
+  G4Material* aMaterial = aTrack.GetMaterial();
+  G4Element* theElement = SelectRandomAtom(aDynamicGamma, aMaterial);
+  G4int elementZ = (G4int) theElement->GetZ();
+
+  G4double E0_m = gammaEnergy0 / electron_mass_c2 ;
+
+  G4ThreeVector gammaDirection0 = aDynamicGamma->GetMomentumDirection();
+
+  G4double epsilon, epsilonSq, onecost, sinThetaSqr, greject ;
+
+  G4double epsilon0 = 1./(1. + 2*E0_m);
+  G4double epsilon0Sq = epsilon0*epsilon0;
+  G4double alpha1   = - log(epsilon0);
+  G4double alpha2 = 0.5*(1.- epsilon0Sq);
+  G4double ScatteringFunction;
+  G4double x;
+  G4double wlGamma = h_Planck*c_light/gammaEnergy0;
+  G4double gammaEnergy1;
+  G4ThreeVector gammaDirection1;
+
+  if (isPolarised)
+    {
+      do {
+	if ( alpha1/(alpha1+alpha2) > G4UniformRand() )
+	  { 
+	    epsilon   = exp(-alpha1*G4UniformRand());  
+	    epsilonSq = epsilon*epsilon; 
+	  }
+	else 
+	  {
+	    epsilonSq = epsilon0Sq + (1.- epsilon0Sq)*G4UniformRand();
+	    epsilon   = sqrt(epsilonSq);
+	  }
+	
+	onecost = (1.- epsilon)/(epsilon*E0_m);
+	sinThetaSqr   = onecost*(2.-onecost);
+
+	// Protection
+	if (sinThetaSqr > 1.)
+	  {
+	    if (verboseLevel>0) G4cout 
+	      << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	      << "sin(theta)**2 = " 
+	      << sinThetaSqr
+	      << "; set to 1" 
+	      << G4endl;
+	    sinThetaSqr = 1.;
+	  }
+	if (sinThetaSqr < 0.)
+	  {
+	    if (verboseLevel>0) G4cout 
+	      << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	      << "sin(theta)**2 = " 
+	      << sinThetaSqr
+	      << "; set to 0" 
+	      << G4endl;
+	    sinThetaSqr = 0.;
+	  }
+        // End protection
+	
+	greject = 1. - epsilon*sinThetaSqr/(1.+ epsilonSq);
+      } while (greject < G4UniformRand());
+      
+      // ****************************************************
+      //		Phi determination
+      // ****************************************************
+      
+      G4double phi = SetPhi(epsilon,sinThetaSqr);
+
+      //
+      // scattered gamma angles. ( Z - axis along the parent gamma)
+      //
+      
+      G4double cosTheta = 1. - onecost;
+
+      // Protection
+      
+      if (cosTheta > 1.)
+	{
+	  if (verboseLevel>0) G4cout 
+	    << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	    << "cosTheta = " 
+	    << cosTheta
+	    << "; set to 1" 
+	    << G4endl;
+	  cosTheta = 1.;
+	}
+      if (cosTheta < -1.)
+	{
+	  if (verboseLevel>0) G4cout 
+	    << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	    << "cosTheta = " 
+	    << cosTheta
+	    << "; set to -1" 
+	    << G4endl;
+	  cosTheta = -1.;
+	}
+      // End protection      
+      
+      
+      G4double sinTheta = sqrt (sinThetaSqr);
+      
+      // Protection
+      if (sinTheta > 1.)
+	{
+	  if (verboseLevel>0) G4cout 
+	    << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	    << "sinTheta = " 
+	    << sinTheta
+	    << "; set to 1" 
+	    << G4endl;
+	  sinTheta = 1.;
+	}
+      if (sinTheta < -1.)
+	{
+	  if (verboseLevel>0) G4cout 
+	    << " -- Warning -- G4LowEnergyPolarizedCompton::PostStepDoIt "
+	    << "sinTheta = " 
+	    << sinTheta
+	    << "; set to -1" 
+	    << G4endl;
+	  sinTheta = -1.;
+	}
+      // End protection
+      
+      
+      G4double dirx = sinTheta*cos(phi);
+      G4double diry = sinTheta*sin(phi);
+      G4double dirz = cosTheta ;
+      
+      //
+      // update G4VParticleChange for the scattered gamma 
+      //
+      
+      gammaEnergy1 = epsilon*gammaEnergy0;
+      
+      // New polarization
+
+
+      G4ThreeVector gammaPolarization1 = SetNewPolarization(epsilon,
+							    sinThetaSqr,
+							    phi,
+							    cosTheta);
+      
+      // Set new direction 
+      //G4ThreeVector tmpDirection1( dirx,diry,dirz );
+      G4ParticleMomentum tmpDirection1( dirx,diry,dirz );
+      
+      gammaDirection1 = tmpDirection1;
+      
+      // Change reference frame.
+
+      SystemOfRefChange(gammaDirection0,gammaDirection1,
+			gammaPolarization0,gammaPolarization1);   
+      
+      if (gammaEnergy1 > 0.)
+	{
+	  aParticleChange.SetEnergyChange( gammaEnergy1 ) ;
+	}
+      else
+	{    
+	  aParticleChange.SetEnergyChange(0.) ;
+	  aParticleChange.SetStatusChange(fStopAndKill);
+	}
+      
+    }
+  else
+    {
+      // Temporary, same algorithm as G4LowEnergyCompton
+
+      do{
+	
+	if ( alpha1/(alpha1+alpha2) > G4UniformRand()){
+	  
+	  epsilon   = exp(-alpha1*G4UniformRand());  // pow(epsilon0,G4UniformRand())
+	  epsilonSq = epsilon*epsilon; 
+	}
+	else{
+	  
+	  epsilonSq = epsilon0Sq + (1.- epsilon0Sq)*G4UniformRand();
+	  epsilon   = sqrt(epsilonSq);
+	}
+	
+	onecost = (1.- epsilon)/(epsilon*E0_m);
+	sinThetaSqr   = onecost*(2.-onecost);
+	
+	x = sqrt(onecost/2)/(wlGamma/cm);
+	
+	const G4FirstLevel* oneAtomSF
+	  = (*theScatteringFunctionTable)[ZNumVec->index(elementZ)];
+	
+	ScatteringFunction = util.DataLogInterpolation(x, (*(*oneAtomSF)[0]), 
+						       (*(*oneAtomSF)[1]));
+	greject = (1. - epsilon*sinThetaSqr/(1.+ epsilonSq))*ScatteringFunction;
+	
+      }  while(greject < G4UniformRand()*elementZ);
+      
+      G4double cosTheta = 1. - onecost ;
+      G4double sinTheta = sqrt (sinThetaSqr);
+      G4double phi     = twopi * G4UniformRand() ;
+      G4double dirx = sinTheta*cos(phi) , diry = sinTheta*sin(phi) , dirz = cosTheta ;
+      
+      //
+      // update G4VParticleChange for the scattered gamma 
+      //
+      
+      G4ThreeVector tmpGammaDirection( dirx,diry,dirz );
+      gammaDirection1 = tmpGammaDirection;
+      gammaDirection1.rotateUz(gammaDirection0);
+      aParticleChange.SetMomentumChange( gammaDirection1 ) ;
+      gammaEnergy1 = epsilon*gammaEnergy0;
+      if (gammaEnergy1 > 0.)
+	{
+	  aParticleChange.SetEnergyChange( gammaEnergy1 ) ;
+	}
+      else
+	{    
+	  aParticleChange.SetEnergyChange(0.) ;
+	  aParticleChange.SetStatusChange(fStopAndKill);
+	}
+      
+    }
+  
+  //
+  // kinematic of the scattered electron
+  //
+  
+  G4double ElecKineEnergy = gammaEnergy0 - gammaEnergy1 ;
+  
+  if((G4EnergyLossTables::GetRange(G4Electron::Electron(),
+				   ElecKineEnergy,aMaterial)>aStep.GetPostStepPoint()->GetSafety())
+     ||
+     (ElecKineEnergy > 
+      (G4Electron::Electron()->GetCutsInEnergy())[aMaterial->GetIndex()]))              
+    {
+      G4double ElecMomentum = sqrt(ElecKineEnergy*(ElecKineEnergy+2.*electron_mass_c2));
+      G4ThreeVector ElecDirection (
+				   (gammaEnergy0*gammaDirection0 - gammaEnergy1*gammaDirection1)*(1./ElecMomentum) );
+      
+      // create G4DynamicParticle object for the electron.  
+      G4DynamicParticle* aElectron= new G4DynamicParticle (G4Electron::Electron(),
+							   ElecDirection, 
+							   ElecKineEnergy) ;
+      
+      aParticleChange.SetNumberOfSecondaries(1) ;
+      aParticleChange.AddSecondary( aElectron ) ;
+      aParticleChange.SetLocalEnergyDeposit (0.) ; 
+    }
+  else
+    {
+      aParticleChange.SetNumberOfSecondaries(0) ;
+      aParticleChange.SetLocalEnergyDeposit (ElecKineEnergy) ;
+    }
+  
+  
+  
+  // --- The end ---
+  
+  //  Reset NbOfInteractionLengthLeft and return aParticleChange
+  
+  return G4VDiscreteProcess::PostStepDoIt( aTrack, aStep);
+  
+}
+
+
+G4double G4LowEnergyPolarizedCompton::SetPhi(G4double energyRate,
+					     G4double sinSqrTh)
+{
+  G4double rand1;
+  G4double rand2;
+  G4double phiProbability;
+  G4double phi;
+  G4double a, b;
+  
+  do
+    {
+      rand1 = G4UniformRand();
+      rand2 = G4UniformRand();
+      phiProbability=0.;
+      phi = twopi*rand1;
+      
+      a = 2*sinSqrTh;
+      b = energyRate + 1/energyRate;
+      
+      phiProbability = 1 - (a/b)*(cos(phi)*cos(phi));
+
+      
+ 
+    }
+  while ( rand2 > phiProbability );
+  return phi;
+}
+
+
+G4ThreeVector G4LowEnergyPolarizedCompton::SetNewPolarization(G4double epsilon, 
+							      G4double sinSqrTh, 
+							      G4double phi,
+							      G4double costheta) 
+{
+  G4double rand1;
+  G4double rand2;
+  G4double cosPhi = cos(phi);
+  G4double sinPhi = sin(phi);
+  G4double sinTheta = sqrt(sinSqrTh);
+  G4double cosSqrPhi = cosPhi*cosPhi;
+  //  G4double cossqrth = 1.-sinSqrTh;
+  //  G4double sinsqrphi = sinPhi*sinPhi;
+  G4double normalisation = sqrt(1. - cosSqrPhi*sinSqrTh);
+  
+
+  // Determination of Theta 
+  
+  G4double thetaProbability;
+  G4double theta;
+  G4double a, b;
+  G4double cosTheta;
+
+  do
+    {
+      rand1 = G4UniformRand();
+      rand2 = G4UniformRand();
+      thetaProbability=0.;
+      theta = twopi*rand1;
+      a = 4;
+      b = (epsilon + 1/epsilon) - 2;
+      thetaProbability = (b + a*cos(theta)*cos(theta))/(a+b);
+      cosTheta = cos(theta);       
+    }
+  while ( rand2 > thetaProbability || abs(cosTheta) > abs(normalisation) );
+  
+  G4double cosBeta = cosTheta/normalisation;
+  G4double sinBeta = sqrt(1-cosBeta*cosBeta);
+
+  G4ThreeVector gammaPolarization1;
+  
+  G4double xParallel = normalisation*cosBeta;
+  G4double yParallel = -(sinSqrTh*cosPhi*sinPhi)*cosBeta/normalisation;
+  G4double zParallel = -(cosTheta*sinTheta*cosPhi)*cosBeta/normalisation;
+  G4double xPerpendicular = 0.;
+  G4double yPerpendicular = (cosTheta)*sinBeta/normalisation;
+  G4double zPerpendicular = -(sinTheta*sinPhi)*sinBeta/normalisation;
+  
+  G4double xTotal = (xParallel + xPerpendicular);
+  G4double yTotal = (yParallel + yPerpendicular);
+  G4double zTotal = (zParallel + zPerpendicular);
+  
+  gammaPolarization1.setX(xTotal);
+  gammaPolarization1.setY(yTotal);
+  gammaPolarization1.setZ(zTotal);
+  
+  return gammaPolarization1;
+
+}
+
+
+void G4LowEnergyPolarizedCompton::SystemOfRefChange
+(G4ThreeVector& direction0,G4ThreeVector& direction1,
+ G4ThreeVector& polarization0,G4ThreeVector& polarization1)
+  
+{
+  // Angles for go back to the original RS
+
+
+  
+  G4double cosTheta0 = direction0.cosTheta();
+  G4double sinTheta0 = sin(direction0.theta());
+  G4double cosPhi0 = cos(direction0.phi());
+  G4double sinPhi0 = sin(direction0.phi());
+  G4double cosPsi, sinPsi;
+  
+  //  if (sinTheta0 >= 1.e-14 ) {
+  if (sinTheta0 != 0. ) 
+    {
+      cosPsi = -polarization0.z()/sinTheta0;
+      //  if (cosPhi0 >=1.e-14 ) {
+      if (cosPhi0 != 0. ) 
+	{
+	  sinPsi = (polarization0.y() - cosTheta0*sinPhi0*cosPsi)/cosPhi0;
+	} 
+      else 
+	{
+	  sinPsi = -polarization0.x()/sinPhi0;
+	}
+    } 
+  else 
+    {
+      cosPsi = polarization0.x()/cosTheta0;
+      sinPsi = polarization0.y();
+    }
+  
+  // Added protection
+  G4double psi = 0;
+  if (sinPsi < 0.) psi = -pi/2.;
+  if (sinPsi > 0.) psi = pi/2.;
+
+  if (cosPsi != 0.)
+    {
+      psi = atan(sinPsi/cosPsi); 
+    }
+  
+  // Rotation along Z axis
+  direction1.rotateZ(psi);
+  // 
+  direction1.rotateUz(direction0);
+
+  aParticleChange.SetMomentumChange( direction1 ) ;  
+
+  // 3 Euler angles rotation for scattered photon polarization
+  
+  polarization1.rotateZ(psi);
+  polarization1.rotateUz(direction0);
+  aParticleChange.SetPolarizationChange( polarization1 );
+
+}
+
+
+G4bool G4LowEnergyPolarizedCompton::IsApplicable(const G4ParticleDefinition& particle)
+{
+  return ( &particle == G4Gamma::Gamma() ); 
+}
+
+
+G4double G4LowEnergyPolarizedCompton::GetMeanFreePath(const G4Track& aTrack, G4double, G4ForceCondition*)
+{
+
+  // returns the gamma mean free path in GEANT4 internal units
+  const G4DynamicParticle* aDynamicGamma = aTrack.GetDynamicParticle();
+  G4double gammaEnergy = aDynamicGamma->GetKineticEnergy();
+  G4Material* aMaterial = aTrack.GetMaterial();
+  
+  //  G4bool isOutRange ;
+  
+  
+  if (gammaEnergy > highestEnergyLimit)
+    {
+      meanFreePath = DBL_MAX;
+    }	
+  else if(gammaEnergy < lowestEnergyLimit)
+    {
+      meanFreePath = DBL_MIN;
+    }
+  else 
+    {
+      meanFreePath = util.DataLogInterpolation(gammaEnergy, 
+					       aMaterial->GetIndex(), 
+					       theMeanFreePathTable);	
+    }                                     
+  
+  return meanFreePath;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
index 42088cb651..cb90c36a20 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyRayleigh.cc,v 1.19 2001/02/05 17:45:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyRayleigh.cc,v 1.22.2.2 2001/06/28 20:19:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4LowEnergyRayleigh physics process --------
 //                   by Alessandra Forti, November 1998
 // **************************************************************
@@ -23,6 +37,7 @@
 // Added PostStepDoIt A. Forti
 // Added SelectRandomAtom A. Forti
 // Added map of the elements  A.Forti
+// 24.04.01 V.Ivanchenko remove RogueWave 
 // --------------------------------------------------------------
 
 // This Class Header
@@ -37,17 +52,18 @@
 G4LowEnergyRayleigh::G4LowEnergyRayleigh(const G4String& processName)
   : G4VDiscreteProcess(processName),
     theCrossSectionTable(0),
-    theMeanFreePathTable(0),
     theFormFactorTable(0),
+    theMeanFreePathTable(0),
     ZNumVec(0),
-    LowestEnergyLimit (250*eV),              // initialization
-    HighestEnergyLimit(100*GeV),
-    NumbBinTable(200)
+    lowestEnergyLimit (250*eV),              // initialization
+    highestEnergyLimit(100*GeV),
+    NumbBinTable(200),
+    MeanFreePath(0)
 {
    if (verboseLevel>0) {
      G4cout << GetProcessName() << " is created "<< G4endl;
-     G4cout << "LowestEnergy: " << LowestEnergyLimit/keV << "keV ";
-     G4cout << "HighestEnergy: " << HighestEnergyLimit/TeV << "TeV " << G4endl;
+     G4cout << "lowestEnergy: " << lowestEnergyLimit/keV << "keV ";
+     G4cout << "highestEnergy: " << highestEnergyLimit/TeV << "TeV " << G4endl;
    }
 }
  
@@ -103,13 +119,14 @@ void G4LowEnergyRayleigh::BuildCrossSectionTable(){
   theCrossSectionTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
     G4FirstLevel* oneAtomCS = util.BuildFirstLevelTables(AtomInd, dataNum, "rayl/re-cs-");
     
-    theCrossSectionTable->insert(oneAtomCS);
+    //    theCrossSectionTable->insert(oneAtomCS);
+    theCrossSectionTable->push_back(oneAtomCS);
     
   }//end for on atoms
 }
@@ -124,13 +141,14 @@ void G4LowEnergyRayleigh::BuildFormFactorTable(){
   theFormFactorTable = new G4SecondLevel();
   G4int dataNum = 2;
   
-  for(G4int TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
+  for(size_t TableInd = 0; TableInd < ZNumVec->size(); TableInd++){
     
     G4int AtomInd = (G4int) (*ZNumVec)[TableInd];
     
     G4FirstLevel* oneAtomFF = util.BuildFirstLevelTables(AtomInd, dataNum, "rayl/re-ff-");
     
-    theFormFactorTable->insert(oneAtomFF);
+    //    theFormFactorTable->insert(oneAtomFF);
+    theFormFactorTable->push_back(oneAtomFF);
     
   }//end for on atoms
 }
@@ -184,7 +202,7 @@ G4VParticleChange* G4LowEnergyRayleigh::PostStepDoIt(const G4Track& aTrack, cons
   const G4DynamicParticle* aDynamicGamma = aTrack.GetDynamicParticle();
   G4double GammaEnergy0 = aDynamicGamma->GetKineticEnergy();
   
-  if(GammaEnergy0 <= LowestEnergyLimit){
+  if(GammaEnergy0 <= lowestEnergyLimit){
     
     aParticleChange.SetStatusChange(fStopAndKill);
     aParticleChange.SetEnergyChange(0.);
@@ -193,19 +211,19 @@ G4VParticleChange* G4LowEnergyRayleigh::PostStepDoIt(const G4Track& aTrack, cons
     return G4VDiscreteProcess::PostStepDoIt(aTrack,aStep);
   }
 
-  G4double E0_m = GammaEnergy0 / electron_mass_c2 ;
+  //  G4double E0_m = GammaEnergy0 / electron_mass_c2 ;
   G4ParticleMomentum GammaDirection0 = aDynamicGamma->GetMomentumDirection();
   
   // Select randomly one element
   G4Material* aMaterial = aTrack.GetMaterial();
-  const G4int numOfElem = aMaterial->GetNumberOfElements();
+  //  const G4int numOfElem = aMaterial->GetNumberOfElements();
   G4Element* theElement = SelectRandomAtom(aDynamicGamma, aMaterial);
   
   // sample the energy of the scattered gamma 
 
   G4double wlGamma = h_Planck*c_light/GammaEnergy0;
   G4int elementZ = (G4int) theElement->GetZ();
-  G4double tableIndex = elementZ - 1;
+  //  G4double tableIndex = elementZ - 1;
 
   G4double Theta, DataFormFactor;
   G4double cosTheta, greject;
@@ -275,7 +293,7 @@ void G4LowEnergyRayleigh::BuildMeanFreePathTable(){
   for ( G4int J = 0 ; J < NumbOfMaterials; J++ ) { // For each material 
   
     //create physics vector then fill it ....
-    ptrVector = new  G4PhysicsLogVector(LowestEnergyLimit, HighestEnergyLimit, NumbBinTable);
+    ptrVector = new  G4PhysicsLogVector(lowestEnergyLimit, highestEnergyLimit, NumbBinTable);
     
     material = (*theMaterialTable)(J);
     const G4ElementVector* theElementVector = material->GetElementVector();
@@ -289,7 +307,7 @@ void G4LowEnergyRayleigh::BuildMeanFreePathTable(){
       const G4double BigPath= DBL_MAX;
       G4double SIGMA = 0 ;
       
-      for ( G4int k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
+      for ( size_t k=0 ; k < material->GetNumberOfElements() ; k++ ){ 
 	// For each element            
 
 	G4double AtomIndex = (*theElementVector)(k)->GetZ();
@@ -332,10 +350,10 @@ G4Element* G4LowEnergyRayleigh::SelectRandomAtom(const G4DynamicParticle* aDynam
   for ( G4int i=0 ; i < NumberOfElements ; i++ ){ 
 
     G4double crossSection;
-    if (GammaEnergy <  LowestEnergyLimit)
+    if (GammaEnergy <  lowestEnergyLimit)
       crossSection = 0. ;
     else {
-      if (GammaEnergy > HighestEnergyLimit) GammaEnergy = 0.99*HighestEnergyLimit ;
+      if (GammaEnergy > highestEnergyLimit) GammaEnergy = 0.99*highestEnergyLimit ;
 
       G4double AtomIndex = (*theElementVector)(i)->GetZ();
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
index 77cec9af55..3c8511f5e2 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4LowEnergyUtilities.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LowEnergyUtilities.cc,v 1.8 2001/02/05 17:45:21 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LowEnergyUtilities.cc,v 1.9.2.1 2001/06/28 19:11:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
@@ -18,7 +34,8 @@
 // 
 // Creation date: 2 March 1999
 //
-// Modifications: 16/11/2000 MG Pia    Replaced HepString with G4String
+// Modifications: 16.11.00 MG Pia    Replaced HepString with G4String
+//                24.04.01 V.Ivanchenko remove RogueWave 
 //      
 // --------------------------------------------------------------
 
@@ -82,7 +99,8 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
   
   for(G4int j = 0; j < ParNum; j++){ 
     
-    oneShellPar->insertAt(j,new G4DataVector());
+    //    oneShellPar->insertAt(j,new G4DataVector());
+    oneShellPar->push_back(new G4DataVector());
   }
   
   G4double a = 0;
@@ -96,12 +114,14 @@ G4SecondLevel* G4LowEnergyUtilities::BuildSecondLevelTables(const G4int TableInd
       
       if(s == 0){
 	
-	oneAtomPar->insert(oneShellPar);
+	//	oneAtomPar->insert(oneShellPar);
+	oneAtomPar->push_back(oneShellPar);
 	oneShellPar = new oneShellTable();
 	
 	for(G4int j = 0; j < ParNum; j++){ 
 	  
-	  oneShellPar->insertAt(j,new G4DataVector());
+	  //	  oneShellPar->insertAt(j,new G4DataVector());
+	  oneShellPar->push_back(new G4DataVector());
 	}
       }
       
@@ -181,7 +201,8 @@ G4FirstLevel* G4LowEnergyUtilities::BuildFirstLevelTables(const G4int TableInd,
   
   for(G4int j = 0; j < ParNum; j++){ 
     
-    oneAtomPar->insertAt(j,new G4DataVector());
+    //    oneAtomPar->insertAt(j,new G4DataVector());
+    oneAtomPar->push_back(new G4DataVector());
   }
   
   G4double a = 0;
diff --git a/source/processes/electromagnetic/lowenergy/src/G4QAOLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4QAOLowEnergyLoss.cc
index 764a024620..4a7b528876 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4QAOLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4QAOLowEnergyLoss.cc
@@ -1,29 +1,49 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: New Implementation
 //    
 //      ---------- G4QAOLowEnergyLoss physics process -------
 //                  by Stephane Chauvie, 5 May 2000 
 // Modified:
 //
-// 16/09/2000 S. Chauvie  Oscillator for all materials
 // 24/05/2000 MGP  Modified to remove compilation warnings on Linux and DEC
 //                 Introduced sizes of L0, L1, L2 arrays
 // 23/05/2000 MGP  Made compliant to design
 // 02/08/2000 V.Ivanchenko Clean up according new design
+// 16/09/2000 S. Chauvie  Oscillator for all materials
 // 03/10/2000 V.Ivanchenko CodeWizard clean up
 // 05/11/2000 V.Ivanchenko "Aluminum" - correct name, end of cycle
 //            over shells, and two bugs from previous edition
+// 10/05/2001 V.Ivanchenko Clean up againist Linux compilation with -Wall
+// 13/05/2001 S. Chauvie corrected bugs
+// 01/06/2001 V.Ivanchenko replace names by Z, change the validity range
+//                         from 50 keV to 5 KeV and change sign of the
+//                         Barkas term
+// 4/06/2001 S. Chauvie  Corrected small bugs
 //
 // ************************************************************
 // It is the Quantal Harmonic Oscillator Model for energy loss
@@ -72,7 +92,8 @@ G4double G4QAOLowEnergyLoss::LowEnergyLimit(
                              const G4ParticleDefinition* aParticle,
                              const G4Material* material) const
 {
-  return 50.0*keV ;
+  //  return 50.0*keV ;
+  return 5.0*keV ;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -88,7 +109,8 @@ G4double G4QAOLowEnergyLoss::HighEnergyLimit(
 G4double G4QAOLowEnergyLoss::LowEnergyLimit(
                              const G4ParticleDefinition* aParticle) const
 {
-  return 50.0*keV ;
+  //  return 50.0*keV ;
+  return 5.0*keV ;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -101,44 +123,33 @@ G4bool G4QAOLowEnergyLoss::IsInCharge(
 
   G4bool hasMaterial = false;
 
-  for (G4int m = 0; m < numberOfMaterials; m++)
-    {
-      G4String matName = material->GetName();
-      if (matName == materialAvailable[m]){ 
-	hasMaterial = true;
-	break;}
-    }
+  if (material->GetNumberOfElements() == 1) hasMaterial = true;
   
   if ((particle->GetDefinition()) == (G4AntiProton::AntiProtonDefinition())
                && hasMaterial) isInCharge = true;
   
   return isInCharge;
-      
+
 }
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 G4bool G4QAOLowEnergyLoss::IsInCharge(
-			    const G4ParticleDefinition* aParticle,
-			    const G4Material* material) const
+				      const G4ParticleDefinition* aParticle,
+				      const G4Material* material) const
 {
-  G4bool isInCharge = false;
-
-  G4bool hasMaterial = false;
-
-  for (G4int m = 0; m < numberOfMaterials; m++)
-    {
-      G4String matName = material->GetName();
-      if (matName == materialAvailable[m] && 
-          material->GetNumberOfElements() == 1){ 
-	hasMaterial = true;
-	break;}
-    }
   
+  G4bool isInCharge = false;
+  
+  G4bool hasMaterial = false;
+  
+  if (material->GetNumberOfElements() == 1) hasMaterial = true;
+  
+
   if (aParticle == (G4AntiProton::AntiProtonDefinition())
                 && hasMaterial) isInCharge = true;
   
   return isInCharge;
-      
+  
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -175,17 +186,34 @@ G4double G4QAOLowEnergyLoss::EnergyLoss(const G4Material* material,
                                               G4double zParticle) const 
 {
   G4int nbOfShell = GetNumberOfShell(material);
-  G4double ionisationEnergy = material->GetIonisation()
-                            ->GetMeanExcitationEnergy();
+  if(nbOfShell < 1) nbOfShell = 1;
+  
+  //G4int iz = (G4int)(material->GetZ());
+  //if(iz < 1) iz = 1;
+  //else if(iz > 100) iz = 100;
+  //G4int nbOfShell = fNumberOfShells[iz];
+  
+  /*
+  if(material->GetName()=="Graphite"){
+  G4cout << " E(MeV)= " << kineticEnergy/MeV << " n= " 
+         << nbOfShell 
+         << " for " << material->GetZ() << G4endl; 
+  }
+  */
   G4double dedx=0;
+
   G4double v = c_light * sqrt( 2.0 * kineticEnergy / proton_mass_c2 );
   G4double coeff = twopi * proton_mass_c2 * 
                   (material-> GetTotNbOfElectPerVolume()) / 
                    electron_mass_c2 ;
+  G4double fBetheVelocity = fine_structure_const * c_light / v;
   coeff *= fine_structure_const * fine_structure_const * hbarc_squared / 
            kineticEnergy ;
 
-  G4double fBetheVelocity = fine_structure_const * c_light / v;
+  //G4double beta = sqrt( 2.0 * kineticEnergy / proton_mass_c2 );
+  //G4double fBetheVelocity = sqrt( 2.0 * 25.0 * keV / proton_mass_c2 )/beta;
+  //G4double coeff= twopi_mc2_rcl2*(material->GetElectronDensity())/(beta*beta);
+
   
   G4double l0Term = 0, l1Term = 0, l2Term = 0;
   
@@ -193,22 +221,43 @@ G4double G4QAOLowEnergyLoss::EnergyLoss(const G4Material* material,
     
     G4double l0 = 0, l1 = 0, l2 = 0;
     G4double NormalizedEnergy = ( 2.0 * electron_mass_c2 * v * v  ) / 
-                                ( c_squared * GetShellEnergy(material,nos) );
+                          ( c_squared * GetShellEnergy(material,nos) );
+    //G4double NormalizedEnergy = ( 2.0 * electron_mass_c2 * beta * beta  ) / 
+    //                              GetShellEnergy(material,nos);
+    G4double shStrength = GetShellStrength(material,nos);
+
     l0 = GetL0(NormalizedEnergy);
-    l0Term += GetShellStrength(material,nos)  * l0; 
+    l0Term += shStrength  * l0; 
     
     l1 = GetL1(NormalizedEnergy);
-    l1Term += GetShellStrength(material,nos) * l1; 
+    l1Term += shStrength * l1; 
     
     l2 = GetL2(NormalizedEnergy);
-    l2Term += GetShellStrength(material,nos) * l2; 
-    
+    l2Term += shStrength * l2; 
+
+    /*
+    if(material->GetName()=="Graphite"){
+    G4cout << nos << ". "
+           << " E(MeV)= " << kineticEnergy/MeV 
+           << " normE= "  << NormalizedEnergy
+           << " sh en= "  << GetShellEnergy(material,nos)
+           << " str= "  << shStrength
+           << " v0/v= " << fBetheVelocity
+           << " l0= " << l0Term
+           << " l1= " << l1Term
+           << " l2= " << l2Term
+           << G4endl;
+	   }
+     */   
   }
        
   dedx = coeff * zParticle * zParticle * (l0Term
        + zParticle * fBetheVelocity * l1Term 
        + zParticle * zParticle * fBetheVelocity * fBetheVelocity * l2Term);
-              
+
+  //  G4cout << " E(MeV)= " << kineticEnergy/MeV 
+  //         << " dedx(Mev/mm)= " << dedx*mm/MeV << G4endl;
+          
   return dedx ; 
                             
 }
@@ -217,24 +266,24 @@ G4double G4QAOLowEnergyLoss::EnergyLoss(const G4Material* material,
 
 G4int G4QAOLowEnergyLoss::GetNumberOfShell(const G4Material* material) const
 {
-  // Set default return value
-  G4int nShell = nbofShellForMaterial[0];
+  // Set return value from table
+  G4int Z = (G4int)(material->GetZ());
+  G4int nShell = 0;
 
+  // Set return value if in material available from Aahrus
   for(G4int i=0; i<numberOfMaterials; i++) {
 
-    if(materialAvailable[i] == material->GetName()) {
-      nShell =  nbofShellForMaterial[i];
-      return nShell;
+    if(materialAvailable[i] == Z){
+    	nShell = nbofShellForMaterial[i];
+	break;
     }
+    else nShell = fNumberOfShells[Z];
   }
-
-  G4cout << "WARNING - G4QAOLowEnergyLoss::GetNumberOfShell - "
-         << "The model is not available for "
-         << material->GetName() << G4endl;
-
-  return nShell;
+  
+   return nShell;
 }
 
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 G4double G4QAOLowEnergyLoss::GetShellEnergy(const G4Material* material,
@@ -243,12 +292,12 @@ G4double G4QAOLowEnergyLoss::GetShellEnergy(const G4Material* material,
     // 
     G4double shellEnergy = alShellEnergy[0];
 
-    if(material->GetName() == "Aluminum") shellEnergy =  alShellEnergy[nbOfTheShell];
-    else if  (material->GetName() == "Silicon"  ) shellEnergy =  siShellEnergy[nbOfTheShell];
-    else if  (material->GetName() == "Copper") shellEnergy =  cuShellEnergy[nbOfTheShell];  
-    else if  (material->GetName() == "Tantalum") shellEnergy =  taShellEnergy[nbOfTheShell];
-    else if  (material->GetName() == "Gold" )  shellEnergy =  auShellEnergy[nbOfTheShell];   
-    else if  (material->GetName() == "Platinum") shellEnergy =  ptShellEnergy[nbOfTheShell];
+    if(material->GetZ() == 13) shellEnergy =  alShellEnergy[nbOfTheShell];
+    else if(material->GetZ() == 14)shellEnergy = siShellEnergy[nbOfTheShell];
+    else if(material->GetZ() == 29)shellEnergy = cuShellEnergy[nbOfTheShell]; 
+    else if(material->GetZ() == 73)shellEnergy =  taShellEnergy[nbOfTheShell];
+    else if(material->GetZ() == 79)shellEnergy =  auShellEnergy[nbOfTheShell];
+    else if(material->GetZ() == 78)shellEnergy =  ptShellEnergy[nbOfTheShell];
     else if  (material->GetNumberOfElements() == 1)
       shellEnergy = GetOscillatorEnergy(material, nbOfTheShell);
     else G4cout << "WARNING - G4QAOLowEnergyLoss::GetShellEnergy - "
@@ -269,19 +318,32 @@ G4double G4QAOLowEnergyLoss::GetOscillatorEnergy(const G4Material* material,
   
   G4int Z = (G4int)(element->GetZ());
     
-  G4double squaredPlasmonEnergy = 28.16 * 28.16 * 1e-6  
-                                * (material->GetDensity()) * (cm3/g)
-			        *  Z / (element->GetN()) ;
+G4double squaredPlasmonEnergy = 28.816 * 28.816  * 1e-6 
+				* material->GetDensity()/g/cm3
+				* (Z/element->GetN()) ;
+//G4double squaredPlasmonEnergy = 28.16 * 28.16 * 1e-6  
+//                                * (material->GetDensity()) * (cm3/g)
+//			        *  Z / (element->GetN()) ;
   
   G4double plasmonTerm = 0.66667 * GetOccupationNumber(Z,nbOfTheShell)  
                        * squaredPlasmonEnergy / (Z*Z) ; 
-
+  
   G4double ionTerm = exp(0.5) * (element->GetAtomicShell(nbOfTheShell)) ;
 
   ionTerm = ionTerm*ionTerm ;
    
   G4double oscShellEnergy = sqrt( ionTerm + plasmonTerm );
  
+/*  if(material->GetName()=="Graphite"){
+    G4cout << "\t" << Z 
+     	   << "\t" << nbOfTheShell
+           << "\t" << squaredPlasmonEnergy
+	   << "\t" << plasmonTerm
+	   << "\t" << ionTerm
+	   << "\t" << GetOccupationNumber(Z,nbOfTheShell)
+	   << "\t" << element->GetAtomicShell(nbOfTheShell)
+	   << "\t" << oscShellEnergy << G4endl;}
+*/
   return  oscShellEnergy;
 }
 
@@ -292,12 +354,12 @@ G4double G4QAOLowEnergyLoss::GetShellStrength(const G4Material* material,
 {
   G4double shellStrength = alShellStrength[0];
   
-  if(material->GetName() == "Aluminum") shellStrength = alShellStrength[nbOfTheShell];
-  else if  (material->GetName() == "Silicon"  ) shellStrength = siShellStrength[nbOfTheShell];
-  else if  (material->GetName() == "Copper") shellStrength = cuShellStrength[nbOfTheShell];  
-  else if  (material->GetName() == "Tantalum") shellStrength = taShellStrength[nbOfTheShell];
-  else if  (material->GetName() == "Gold" )  shellStrength = auShellStrength[nbOfTheShell];   
-  else if  (material->GetName() == "Platinum") shellStrength = ptShellStrength[nbOfTheShell];
+  if(material->GetZ() == 13) shellStrength = alShellStrength[nbOfTheShell];
+  else if(material->GetZ() == 14)shellStrength =siShellStrength[nbOfTheShell];
+  else if(material->GetZ() == 29)shellStrength =cuShellStrength[nbOfTheShell];
+  else if(material->GetZ() == 73)shellStrength =taShellStrength[nbOfTheShell];
+  else if(material->GetZ() == 79)shellStrength =auShellStrength[nbOfTheShell];
+  else if(material->GetZ() == 78)shellStrength =ptShellStrength[nbOfTheShell];
   else if  (material->GetNumberOfElements() == 1){
     G4int Z = (G4int)(material->GetZ());
     shellStrength = GetOccupationNumber(Z,nbOfTheShell) / Z ;}
@@ -317,7 +379,7 @@ G4double G4QAOLowEnergyLoss::GetOccupationNumber(G4int Z, G4int ShellNb) const
   G4int indice = ShellNb ;
   for (G4int z = 1 ; z < Z ; z++) {indice += fNumberOfShells[z];}
 
-  return nbOfElectronPerSubShell[indice];
+  return nbOfElectronPerSubShell[indice+1];
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -381,19 +443,20 @@ G4double G4QAOLowEnergyLoss::GetL2(G4double normEnergy) const
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-const G4String G4QAOLowEnergyLoss::materialAvailable[6] = {
+const G4int G4QAOLowEnergyLoss::materialAvailable[6] = {13,14,29,73,79,78};
+  /*
   "Aluminum",
   "Silicon",
   "Copper",
   "Tantalum",
   "Gold",
   "Platinum"};
-
+  */
 const G4int G4QAOLowEnergyLoss::nbofShellForMaterial[6] = {3,3,4,6,6,6 };
               
-G4double G4QAOLowEnergyLoss::alShellEnergy[3]  ={  2795e-6,  202e-6,  16.9e-6};
+G4double G4QAOLowEnergyLoss::alShellEnergy[3]  ={ 2795e-6, 202e-6,  16.9e-6};
 G4double G4QAOLowEnergyLoss::alShellStrength[3]={ 0.1349, 0.6387, 0.2264};
-G4double G4QAOLowEnergyLoss::siShellEnergy[3]  ={  3179e-6, 249e-6, 20.3e-6 };
+G4double G4QAOLowEnergyLoss::siShellEnergy[3]  ={ 3179e-6, 249e-6, 20.3e-6 };
 G4double G4QAOLowEnergyLoss::siShellStrength[3]={ 0.1222, 0.5972, 0.2806};
 G4double G4QAOLowEnergyLoss::cuShellEnergy[4]  ={ 16931e-6, 1930e-6, 199e-6, 39.6e-6};
 G4double G4QAOLowEnergyLoss::cuShellStrength[4]={ 0.0505, 0.2561, 0.4913, 0.2021};
@@ -408,120 +471,120 @@ G4double G4QAOLowEnergyLoss::ptShellStrength[6]={ 0.0129, 0.0745, 0.2295, 0.4627
 
 const G4double G4QAOLowEnergyLoss::L0[67][2] =
 {
-  0.00,  0.000001,
-  0.10,	0.000001,
-  0.12,	0.00001,
-  0.14,	0.00005,
-  0.16,	0.00014,
-  0.18,	0.00030,
-  0.20,	0.00057,
-  0.25,	0.00189,
-  0.30,	0.00429,
-  0.35,	0.00784,
-  0.40,	0.01248,
-  0.45,	0.01811,
-  0.50,	0.02462,
-  0.60,	0.03980,
-  0.70,	0.05731,
-  0.80,	0.07662,
-  0.90,	0.09733,
-  1.00,	0.11916,
-  1.20,	0.16532,
-  1.40,	0.21376,
-  1.60,	0.26362,
-  1.80,	0.31428,
-  2.00,	0.36532,
-  2.50,	0.49272,
-  3.00,	0.61765,
-  3.50,	0.73863,
-  4.00,	0.85496,
-  4.50,	0.96634,
-  5.00,	1.07272,
-  6.00,	1.27086,
-  7.00,	1.45075,
-  8.00,	1.61412,
-  9.00,	1.76277,
-  10.00,  1.89836,
-  12.00,  2.13625,
-  14.00,  2.33787,
-  16.00,  2.51093,
-  18.00,  2.66134,
-  20.00,  2.79358,
-  25.00,  3.06539,
-  30.00,  3.27902,
-  35.00,  3.45430,
-  40.00,  3.60281,
-  45.00,  3.73167,
-  50.00,  3.84555,
-  60.00,  4.04011,
-  70.00,  4.20264,
-  80.00,  4.34229,
-  90.00,   4.46474,
-  100.00,  4.57378,
-  120.00,  4.76155,
-  140.00,  4.91953,
-  160.00,  5.05590,
-  180.00,  5.17588,
-  200.00,  5.28299,
-  250.00,  5.50925,
-  300.00,  5.69364,
-  350.00,  5.84926,
-  400.00,  5.98388,
-  450.00,  6.10252,
-  500.00,  6.20856,
-  600.00,  6.39189,
-  700.00,  6.54677,
-  800.00,  6.68084,
-  900.00,  6.79905,
-  1000.00,  6.90474
+  {0.00,        0.000001},
+  {0.10,	0.000001},
+  {0.12,	0.00001},
+  {0.14,	0.00005},
+  {0.16,	0.00014},
+  {0.18,	0.00030},
+  {0.20,	0.00057},
+  {0.25,	0.00189},
+  {0.30,	0.00429},
+  {0.35,	0.00784},
+  {0.40,	0.01248},
+  {0.45,	0.01811},
+  {0.50,	0.02462},
+  {0.60,	0.03980},
+  {0.70,	0.05731},
+  {0.80,	0.07662},
+  {0.90,	0.09733},
+  {1.00,	0.11916},
+  {1.20,	0.16532},
+  {1.40,	0.21376},
+  {1.60,	0.26362},
+  {1.80,	0.31428},
+  {2.00,	0.36532},
+  {2.50,	0.49272},
+  {3.00,	0.61765},
+  {3.50,	0.73863},
+  {4.00,	0.85496},
+  {4.50,	0.96634},
+  {5.00,	1.07272},
+  {6.00,	1.27086},
+  {7.00,	1.45075},
+  {8.00,	1.61412},
+  {9.00,	1.76277},
+  {10.00,       1.89836},
+  {12.00,       2.13625},
+  {14.00,       2.33787},
+  {16.00,       2.51093},
+  {18.00,       2.66134},
+  {20.00,       2.79358},
+  {25.00, 3.06539},
+  {30.00, 3.27902},
+  {35.00, 3.45430},
+  {40.00, 3.60281},
+  {45.00, 3.73167},
+  {50.00, 3.84555},
+  {60.00, 4.04011},
+  {70.00, 4.20264},
+  {80.00, 4.34229},
+  {90.00,  4.46474},
+  {100.00, 4.57378},
+  {120.00, 4.76155},
+  {140.00, 4.91953},
+  {160.00, 5.05590},
+  {180.00, 5.17588},
+  {200.00, 5.28299},
+  {250.00, 5.50925},
+  {300.00, 5.69364},
+  {350.00, 5.84926},
+  {400.00, 5.98388},
+  {450.00, 6.10252},
+  {500.00, 6.20856},
+  {600.00, 6.39189},
+  {700.00, 6.54677},
+  {800.00, 6.68084},
+  {900.00, 6.79905},
+  {1000.00, 6.90474}
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 const G4double G4QAOLowEnergyLoss::L1[22][2] =
 {
-  0.00,  -0.000001,
-  0.10,  -0.00001,
-  0.20,  -0.00049,
-  0.30,  -0.00084,
-  0.40,	0.00085,
-  0.50,	0.00519,
-  0.60,	0.01198,
-  0.70,	0.02074,
-  0.80,	0.03133,
-  0.90,	0.04369,
-  1.00,	0.06035,
-  2.00,	0.24023,
-  3.00,	0.44284,
-  4.00,	0.62012,
-  5.00,	0.77031,
-  6.00,	0.90390,
-  7.00,	1.02705,
-  8.00,	1.10867,
-  9.00,	1.17546,
-  10.00,   1.21599,
-  15.00,	1.24349,
-  20.00,	1.16752
+  {0.00,       -0.000001},
+  {0.10,       -0.00001},
+  {0.20,       -0.00049},
+  {0.30,       -0.00084},
+  {0.40,	0.00085},
+  {0.50,	0.00519},
+  {0.60,	0.01198},
+  {0.70,	0.02074},
+  {0.80,	0.03133},
+  {0.90,	0.04369},
+  {1.00,	0.06035},
+  {2.00,	0.24023},
+  {3.00,	0.44284},
+  {4.00,	0.62012},
+  {5.00,	0.77031},
+  {6.00,	0.90390},
+  {7.00,	1.02705},
+  {8.00,	1.10867},
+  {9.00,	1.17546},
+  {10.00,       1.21599},
+  {15.00,	1.24349},
+  {20.00,	1.16752}
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 const G4double G4QAOLowEnergyLoss::L2[14][2] =
 {
-  0.00,	0.000001,
-  0.10,	0.00001,
-  0.20,	0.00000,
-  0.40,  -0.00120,
-  0.60,  -0.00036,
-  0.80,	0.00372,
-  1.00,	0.01298,
-  2.00,	0.08296,
-  4.00,	0.21953,
-  6.00,	0.23903,
-  8.00,	0.20893,
-  10.00,	0.10879,
-  20.00,  -0.88409,	
-  40.00,  -1.13902
+  {0.00,	0.000001},
+  {0.10,	0.00001},
+  {0.20,	0.00000},
+  {0.40,       -0.00120},
+  {0.60,       -0.00036},
+  {0.80,	0.00372},
+  {1.00,	0.01298},
+  {2.00,	0.08296},
+  {4.00,	0.21953},
+  {6.00,	0.23903},
+  {8.00,	0.20893},
+  {10.00,	0.10879},
+  {20.00,      -0.88409},	
+  {40.00,      -1.13902}
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/source/processes/electromagnetic/lowenergy/src/G4SecondLevel.cc b/source/processes/electromagnetic/lowenergy/src/G4SecondLevel.cc
index 471514772c..9f24e1363f 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4SecondLevel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4SecondLevel.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4SecondLevel.hh
@@ -18,7 +32,7 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave 
 //      
 // -------------------------------------------------------------------
 
@@ -27,18 +41,21 @@
 
 G4SecondLevel::~G4SecondLevel(){
 
-  this->clearAndDestroy();
+  //  this->clearAndDestroy();
+  this->clear();
 }
 
 G4bool G4SecondLevel::operator == (const G4SecondLevel& input) const{
 
-  return( this->entries() == input.entries());
+  //  return( this->entries() == input.entries());
+  return( this->size() == input.size());
 
 }
 
 G4bool G4SecondLevel::operator < (const G4SecondLevel& input) const{
 
-  return(this->entries() < input.entries());
+  //  return(this->entries() < input.entries());
+  return(this->size() < input.size());
 
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4ThirdLevel.cc b/source/processes/electromagnetic/lowenergy/src/G4ThirdLevel.cc
index cb87a15e0d..23454e64f0 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4ThirdLevel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4ThirdLevel.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ThirdLevel.hh
@@ -18,7 +32,7 @@
 // 
 //      Creation date: 1 Giugno 1999
 //
-//      Modifications: 
+//      Modifications: 24.04.01 V.Ivanchenko remove RogueWave 
 //      
 // -------------------------------------------------------------------
 
@@ -27,18 +41,21 @@
 
 G4ThirdLevel::~G4ThirdLevel(){
 
-  this->clearAndDestroy();
+  //  this->clearAndDestroy();
+  this->clear();
 }
 
 G4bool G4ThirdLevel::operator == (const G4ThirdLevel& input) const{
 
-  return( this->entries() == input.entries());
+  //  return( this->entries() == input.entries());
+  return( this->size() == input.size());
 
 }
 
 G4bool G4ThirdLevel::operator < (const G4ThirdLevel& input) const{
 
-  return(this->entries() < input.entries());
+  //  return(this->entries() < input.entries());
+  return(this->size() < input.size());
 
 }
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyModel.cc b/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyModel.cc
index 224e118e56..fdacb20c53 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VLowEnergyModel
 //
@@ -30,18 +44,18 @@
 //
 // -------------------------------------------------------------------
 //
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 #include "G4VLowEnergyModel.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VLowEnergyModel::G4VLowEnergyModel(const G4String& name)
 {;}
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VLowEnergyModel::~G4VLowEnergyModel() 
 {;}
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
index b9e0013b9d..8fad4788b8 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VeLowEnergyLoss.cc,v 1.6 2000/11/22 16:06:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VeLowEnergyLoss.cc,v 1.12.2.2 2001/06/28 20:19:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	GEANT4 Collaboration
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
@@ -21,6 +35,8 @@
 // Modifications:
 // 20/09/00 update fluctuations V.Ivanchenko
 // 22/11/00 minor fix in fluctuations V.Ivanchenko
+// 10/05/01  V.Ivanchenko Clean up againist Linux compilation with -Wall
+// 22/05/01  V.Ivanchenko Update range calculation
 //
 // --------------------------------------------------------------
 
@@ -42,7 +58,7 @@ G4double     G4VeLowEnergyLoss::c2lim = 2.*(1.-dRoverRange)*finalRange ;
 G4double     G4VeLowEnergyLoss::c3lim = -(1.-dRoverRange)*finalRange*finalRange;
 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VeLowEnergyLoss::G4VeLowEnergyLoss()
                    :G4VContinuousDiscreteProcess("No Name Loss Process"),
@@ -53,37 +69,37 @@ G4VeLowEnergyLoss::G4VeLowEnergyLoss()
   G4Exception("G4VeLowEnergyLoss:: default constructor is called");
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VeLowEnergyLoss::G4VeLowEnergyLoss(const G4String& aName , G4ProcessType aType)
                   : G4VContinuousDiscreteProcess(aName, aType),
-     lastMaterial(NULL),
+     lastMaterial(0),
      nmaxCont1(4),
      nmaxCont2(16)
 {
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VeLowEnergyLoss::~G4VeLowEnergyLoss()
 {
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4VeLowEnergyLoss::G4VeLowEnergyLoss(G4VeLowEnergyLoss& right)
                   : G4VContinuousDiscreteProcess(right),
-     lastMaterial(NULL),
+     lastMaterial(0),
      nmaxCont1(4),
      nmaxCont2(16)
 {
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeTable(
         G4PhysicsTable* theDEDXTable,G4PhysicsTable* theRangeTable,            
-        G4double LowestKineticEnergy,G4double HighestKineticEnergy,G4int TotBin)
+        G4double lowestKineticEnergy,G4double highestKineticEnergy,G4int TotBin)
 // Build range table from the energy loss table
 {
    const G4MaterialTable* theMaterialTable=
@@ -100,141 +116,54 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeTable(
    for (G4int J=0;  J<numOfMaterials; J++)
    {
      G4PhysicsLogVector* aVector;
-     aVector = new G4PhysicsLogVector(LowestKineticEnergy,
-                              HighestKineticEnergy,TotBin);
-
-     BuildRangeVector(theDEDXTable,LowestKineticEnergy,HighestKineticEnergy,
+     aVector = new G4PhysicsLogVector(lowestKineticEnergy,
+                              highestKineticEnergy,TotBin);
+     BuildRangeVector(theDEDXTable,lowestKineticEnergy,highestKineticEnergy,
                       TotBin,J,aVector);
      theRangeTable->insert(aVector);
    }
    return theRangeTable ;
 }   
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4VeLowEnergyLoss::BuildRangeVector(G4PhysicsTable* theDEDXTable,
-                G4double LowestKineticEnergy,G4double HighestKineticEnergy,G4int TotBin,
-                                 G4int materialIndex,G4PhysicsLogVector* rangeVector)
+                                         G4double lowestKineticEnergy,
+                                         G4double,
+                                         G4int TotBin,
+                                         G4int materialIndex,
+                                         G4PhysicsLogVector* rangeVector)
+
 //  create range vector for a material
 {
-  G4int nbin=100,i;
   G4bool isOut;
-
-  static G4double masslimit = 0.52*MeV ;
-
-  G4double tlim=2.*MeV,t1=0.1*MeV,t2=0.025*MeV ;
-  G4double tlime=10.*keV,factor=2.*electron_mass_c2 ;
-  G4double loss1,loss2,ca,cb,cba ;
-  G4double losslim,clim ;
-  G4double taulim,rangelim,ltaulim,ltaumax,
-           LowEdgeEnergy,tau,Value,tau1,sqtau1 ;
-  G4double oldValue,tauold ;
-
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
+  G4double energy1 = lowestKineticEnergy;
+  G4double dedx    = physicsVector->GetValue(energy1,isOut);
+  G4double range   = 0.5*energy1/dedx;
+  rangeVector->PutValue(0,range);
+  G4int n = 100;
+  G4double del = 1.0/(G4double)n ;
 
-  // low energy part first...
- // heavy particle
- if(ParticleMass > masslimit)
- {
-  loss1 = physicsVector->GetValue(t1,isOut);
-  loss2 = physicsVector->GetValue(t2,isOut);
-  tau1 = t1/ParticleMass ;
-  sqtau1 = sqrt(tau1) ;
-  ca = (4.*loss2-loss1)/sqtau1 ;
-  cb = (2.*loss1-4.*loss2)/tau1 ;
-  cba = cb/ca ;
-  taulim = tlim/ParticleMass ;
-  ltaulim = log(taulim) ;
-  ltaumax = log(HighestKineticEnergy/ParticleMass) ;
+  for (G4int j=1; j<TotBin; j++) {
 
-  i=-1;
-  oldValue = 0. ;
- 
-  do
-  {
-    i += 1 ;
-    LowEdgeEnergy = rangeVector->GetLowEdgeEnergy(i);
-    tau = LowEdgeEnergy/ParticleMass;
-    if ( tau <= tau1 )
-    {
-      Value = 2.*ParticleMass*log(1.+cba*sqrt(tau))/cb ;
+    G4double energy2 = rangeVector->GetLowEdgeEnergy(j);
+    G4double de = (energy2 - energy1) * del ;
+    G4double dedx1 = dedx ;
+
+    for (G4int i=1; i<n; i++) {
+      G4double energy = energy1 + i*de ;
+      G4double dedx2  = physicsVector->GetValue(energy,isOut);
+      range  += 0.5*de*(1.0/dedx1 + 1.0/dedx2);
+      dedx1   = dedx2;
     }
-    else
-    {
-      Value = 2.*ParticleMass*log(1.+cba*sqtau1)/cb ;
-      if(tau<=taulim)
-      {
-        taulow = tau1 ;
-        tauhigh = tau ;
-        Value += RangeIntLin(physicsVector,nbin);
-      }
-      else
-      {
-
-        taulow = tau1 ;
-        tauhigh = taulim ;
-        Value += RangeIntLin(physicsVector,nbin) ;
-        ltaulow = ltaulim ;
-        ltauhigh = log(tau) ;
-        Value += RangeIntLog(physicsVector,nbin);
-      }
-    }
-
-    rangeVector->PutValue(i,Value);
-    oldValue = Value ;
-    tauold = tau ;
-  } while (tau<=taulim) ;
- }
- else
- // electron/positron 
- {
-  losslim = physicsVector->GetValue(tlime,isOut) ;
-  taulim  = tlime/electron_mass_c2;
-  clim    = losslim/sqrt(taulim);
-  ltaulim = log(taulim);
-  ltaumax = log(HighestKineticEnergy/electron_mass_c2);
-
-  i=-1;
-  oldValue = 0.;
-
-  do
-    {
-     i += 1 ;
-     LowEdgeEnergy = rangeVector->GetLowEdgeEnergy(i);
-     tau = LowEdgeEnergy/electron_mass_c2;
-     if (tau <= taulim) Value = factor*sqrt(tau)/clim;
-     else {
-           rangelim = factor*taulim/losslim ;
-           ltaulow  = log(taulim);
-           ltauhigh = log(tau);
-           Value    = rangelim+RangeIntLog(physicsVector,nbin);
-          }
-     rangeVector->PutValue(i,Value);
-     oldValue = Value;
-     tauold   = tau;
-
-    } while (tau<=taulim);
-
- }
-
-  i += 1 ;
-  for (G4int j=i; j<TotBin; j++)
-  {
-    LowEdgeEnergy = rangeVector->GetLowEdgeEnergy(j);
-    tau = LowEdgeEnergy/ParticleMass;
-    ltaulow = log(tauold);
-    ltauhigh = log(tau);
-    Value = oldValue+RangeIntLog(physicsVector,nbin);
-    rangeVector->PutValue(j,Value);
-    oldValue = Value ;
-
-    tauold = tau ;
+    rangeVector->PutValue(j,range);
+    dedx = dedx1 ;
+    energy1 = energy2 ;
   }
-}   
+}    
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4double G4VeLowEnergyLoss::RangeIntLin(G4PhysicsVector* physicsVector,
                                     G4int nbin)
@@ -265,7 +194,7 @@ G4double G4VeLowEnergyLoss::RangeIntLin(G4PhysicsVector* physicsVector,
   return Value;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4double G4VeLowEnergyLoss::RangeIntLog(G4PhysicsVector* physicsVector,
                                     G4int nbin)
@@ -299,12 +228,12 @@ G4double G4VeLowEnergyLoss::RangeIntLog(G4PhysicsVector* physicsVector,
 }
 
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildLabTimeTable(G4PhysicsTable* theDEDXTable,
                                      G4PhysicsTable* theLabTimeTable,
-                                     G4double LowestKineticEnergy,
-                                     G4double HighestKineticEnergy,G4int TotBin)
+                                     G4double lowestKineticEnergy,
+                                     G4double highestKineticEnergy,G4int TotBin)
                             
 {
   const G4MaterialTable* theMaterialTable=
@@ -321,11 +250,11 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildLabTimeTable(G4PhysicsTable* theDEDXTabl
   {
     G4PhysicsLogVector* aVector;
 
-    aVector = new G4PhysicsLogVector(LowestKineticEnergy,
-                            HighestKineticEnergy,TotBin);
+    aVector = new G4PhysicsLogVector(lowestKineticEnergy,
+                            highestKineticEnergy,TotBin);
 
     BuildLabTimeVector(theDEDXTable,
-              LowestKineticEnergy,HighestKineticEnergy,TotBin,J,aVector);
+              lowestKineticEnergy,highestKineticEnergy,TotBin,J,aVector);
     theLabTimeTable->insert(aVector);
 
 
@@ -333,12 +262,12 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildLabTimeTable(G4PhysicsTable* theDEDXTabl
   return theLabTimeTable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildProperTimeTable(G4PhysicsTable* theDEDXTable,
                                      G4PhysicsTable* theProperTimeTable,
-                                     G4double LowestKineticEnergy,
-                                     G4double HighestKineticEnergy,G4int TotBin)
+                                     G4double lowestKineticEnergy,
+                                     G4double highestKineticEnergy,G4int TotBin)
                             
 {
   const G4MaterialTable* theMaterialTable=
@@ -355,11 +284,11 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildProperTimeTable(G4PhysicsTable* theDEDXT
   {
     G4PhysicsLogVector* aVector;
 
-    aVector = new G4PhysicsLogVector(LowestKineticEnergy,
-                            HighestKineticEnergy,TotBin);
+    aVector = new G4PhysicsLogVector(lowestKineticEnergy,
+                            highestKineticEnergy,TotBin);
 
     BuildProperTimeVector(theDEDXTable,
-              LowestKineticEnergy,HighestKineticEnergy,TotBin,J,aVector);
+              lowestKineticEnergy,highestKineticEnergy,TotBin,J,aVector);
     theProperTimeTable->insert(aVector);
 
 
@@ -367,11 +296,11 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildProperTimeTable(G4PhysicsTable* theDEDXT
   return theProperTimeTable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4VeLowEnergyLoss::BuildLabTimeVector(G4PhysicsTable* theDEDXTable,
-                                    G4double LowestKineticEnergy,
-                                    G4double HighestKineticEnergy,G4int TotBin,
+                                    G4double lowestKineticEnergy,
+                                    G4double highestKineticEnergy,G4int TotBin,
                                     G4int materialIndex, G4PhysicsLogVector* timeVector)
 //  create lab time vector for a material
 {
@@ -383,15 +312,14 @@ void G4VeLowEnergyLoss::BuildLabTimeVector(G4PhysicsTable* theDEDXTable,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
   taulim=tlim/ParticleMass ;
   clim=sqrt(ParticleMass*tlim/2.)/(c_light*losslim*ppar) ;
   ltaulim = log(taulim);
-  ltaumax = log(HighestKineticEnergy/ParticleMass) ;
+  ltaumax = log(highestKineticEnergy/ParticleMass) ;
 
   G4int i=-1;
   G4double oldValue = 0. ;
@@ -430,11 +358,11 @@ void G4VeLowEnergyLoss::BuildLabTimeVector(G4PhysicsTable* theDEDXTable,
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4VeLowEnergyLoss::BuildProperTimeVector(G4PhysicsTable* theDEDXTable,
-                                    G4double LowestKineticEnergy,
-                                    G4double HighestKineticEnergy,G4int TotBin,
+                                    G4double lowestKineticEnergy,
+                                    G4double highestKineticEnergy,G4int TotBin,
                                     G4int materialIndex, G4PhysicsLogVector* timeVector)
 //  create proper time vector for a material
 {
@@ -445,15 +373,14 @@ void G4VeLowEnergyLoss::BuildProperTimeVector(G4PhysicsTable* theDEDXTable,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
   taulim=tlim/ParticleMass ;
   clim=sqrt(ParticleMass*tlim/2.)/(c_light*losslim*ppar) ;
   ltaulim = log(taulim);
-  ltaumax = log(HighestKineticEnergy/ParticleMass) ;
+  ltaumax = log(highestKineticEnergy/ParticleMass) ;
 
   G4int i=-1;
   G4double oldValue = 0. ;
@@ -492,7 +419,7 @@ void G4VeLowEnergyLoss::BuildProperTimeVector(G4PhysicsTable* theDEDXTable,
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4double G4VeLowEnergyLoss::LabTimeIntLog(G4PhysicsVector* physicsVector,
                                     G4int nbin)
@@ -525,7 +452,7 @@ G4double G4VeLowEnergyLoss::LabTimeIntLog(G4PhysicsVector* physicsVector,
   return Value;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4double G4VeLowEnergyLoss::ProperTimeIntLog(G4PhysicsVector* physicsVector,
                                     G4int nbin)
@@ -558,15 +485,15 @@ G4double G4VeLowEnergyLoss::ProperTimeIntLog(G4PhysicsVector* physicsVector,
   return Value;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildInverseRangeTable(G4PhysicsTable* theRangeTable,
                                    G4PhysicsTable* theRangeCoeffATable,
                                    G4PhysicsTable* theRangeCoeffBTable,
                                    G4PhysicsTable* theRangeCoeffCTable,
                                    G4PhysicsTable* theInverseRangeTable,
-                                   G4double LowestKineticEnergy,
-                                   G4double HighestKineticEnergy,G4int TotBin)
+                                   G4double lowestKineticEnergy,
+                                   G4double highestKineticEnergy,G4int TotBin)
 // Build inverse table of the range table
 {
   G4double SmallestRange,BiggestRange ;
@@ -584,9 +511,9 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildInverseRangeTable(G4PhysicsTable* theRan
   for (G4int J=0;  J<numOfMaterials; J++)
   {
     SmallestRange = (*theRangeTable)(J)->
-                       GetValue(LowestKineticEnergy,isOut) ;
+                       GetValue(lowestKineticEnergy,isOut) ;
     BiggestRange = (*theRangeTable)(J)->
-                       GetValue(HighestKineticEnergy,isOut) ;
+                       GetValue(highestKineticEnergy,isOut) ;
     G4PhysicsLogVector* aVector;
     aVector = new G4PhysicsLogVector(SmallestRange,
                             BiggestRange,TotBin);
@@ -595,27 +522,27 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildInverseRangeTable(G4PhysicsTable* theRan
                       theRangeCoeffATable,
                       theRangeCoeffBTable,
                       theRangeCoeffCTable,
-         LowestKineticEnergy,HighestKineticEnergy,TotBin,J, aVector);
+         lowestKineticEnergy,highestKineticEnergy,TotBin,J, aVector);
 
     theInverseRangeTable->insert(aVector);
   }
   return theInverseRangeTable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 void G4VeLowEnergyLoss::InvertRangeVector(G4PhysicsTable* theRangeTable,
                               G4PhysicsTable* theRangeCoeffATable,
                               G4PhysicsTable* theRangeCoeffBTable,
                               G4PhysicsTable* theRangeCoeffCTable,
-                              G4double LowestKineticEnergy,
-                              G4double HighestKineticEnergy,G4int TotBin,
+                              G4double lowestKineticEnergy,
+                              G4double highestKineticEnergy,G4int TotBin,
                               G4int  materialIndex,G4PhysicsLogVector* aVector)
 //  invert range vector for a material
 {
   G4double LowEdgeRange,A,B,C,discr,KineticEnergy ;
-  G4double RTable = exp(log(HighestKineticEnergy/LowestKineticEnergy)/TotBin) ;
-  G4double Tbin = LowestKineticEnergy/RTable ;
+  G4double RTable = exp(log(highestKineticEnergy/lowestKineticEnergy)/TotBin) ;
+  G4double Tbin = lowestKineticEnergy/RTable ;
   G4double rangebin = 0.0 ;
   G4int binnumber = -1 ;
   G4bool isOut ;
@@ -636,9 +563,9 @@ void G4VeLowEnergyLoss::InvertRangeVector(G4PhysicsTable* theRangeTable,
     }
 
     if(binnumber == 0)
-      KineticEnergy = LowestKineticEnergy ;
+      KineticEnergy = lowestKineticEnergy ;
     else if(binnumber == TotBin-1)
-      KineticEnergy = HighestKineticEnergy ;
+      KineticEnergy = highestKineticEnergy ;
     else
     {
       A = (*(*theRangeCoeffATable)(materialIndex))(binnumber-1) ;
@@ -658,12 +585,12 @@ void G4VeLowEnergyLoss::InvertRangeVector(G4PhysicsTable* theRangeTable,
   }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffATable(G4PhysicsTable* theRangeTable,
                                       G4PhysicsTable* theRangeCoeffATable,
-                                      G4double LowestKineticEnergy,
-                             G4double HighestKineticEnergy,G4int TotBin)
+                                      G4double lowestKineticEnergy,
+                             G4double highestKineticEnergy,G4int TotBin)
 // Build tables of coefficients for the energy loss calculation
 //  create table for coefficients "A"
 {
@@ -676,7 +603,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffATable(G4PhysicsTable* theRang
     delete theRangeCoeffATable; }
   theRangeCoeffATable = new G4PhysicsTable(numOfMaterials);
 
-  G4double RTable = exp(log(HighestKineticEnergy/LowestKineticEnergy)/TotBin) ;
+  G4double RTable = exp(log(highestKineticEnergy/lowestKineticEnergy)/TotBin) ;
   G4double R2 = RTable*RTable ;
   G4double R1 = RTable+1.;
   G4double w = R1*(RTable-1.)*(RTable-1.);
@@ -690,7 +617,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffATable(G4PhysicsTable* theRang
     G4int binmax=TotBin ;
     G4PhysicsLinearVector* aVector =
                            new G4PhysicsLinearVector(0.,binmax, TotBin);
-    Ti = LowestKineticEnergy ;
+    Ti = lowestKineticEnergy ;
     G4PhysicsVector* rangeVector= (*theRangeTable)[J];
 
     for ( G4int i=0; i<TotBin; i++)
@@ -721,12 +648,12 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffATable(G4PhysicsTable* theRang
   return theRangeCoeffATable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
   
 G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffBTable(G4PhysicsTable* theRangeTable,
                                       G4PhysicsTable* theRangeCoeffBTable,
-                                      G4double LowestKineticEnergy,
-                             G4double HighestKineticEnergy,G4int TotBin)
+                                      G4double lowestKineticEnergy,
+                             G4double highestKineticEnergy,G4int TotBin)
 // Build tables of coefficients for the energy loss calculation
 //  create table for coefficients "B"
 {
@@ -739,7 +666,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffBTable(G4PhysicsTable* theRang
     delete theRangeCoeffBTable; }
   theRangeCoeffBTable = new G4PhysicsTable(numOfMaterials);
 
-  G4double RTable = exp(log(HighestKineticEnergy/LowestKineticEnergy)/TotBin) ;
+  G4double RTable = exp(log(highestKineticEnergy/lowestKineticEnergy)/TotBin) ;
   G4double R2 = RTable*RTable ;
   G4double R1 = RTable+1.;
   G4double w = R1*(RTable-1.)*(RTable-1.);
@@ -753,7 +680,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffBTable(G4PhysicsTable* theRang
     G4int binmax=TotBin ;
     G4PhysicsLinearVector* aVector =
                         new G4PhysicsLinearVector(0.,binmax, TotBin);
-    Ti = LowestKineticEnergy ;
+    Ti = lowestKineticEnergy ;
     G4PhysicsVector* rangeVector= (*theRangeTable)[J];
   
     for ( G4int i=0; i<TotBin; i++)
@@ -783,12 +710,12 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffBTable(G4PhysicsTable* theRang
   return theRangeCoeffBTable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffCTable(G4PhysicsTable* theRangeTable,
                                       G4PhysicsTable* theRangeCoeffCTable,
-                                      G4double LowestKineticEnergy,
-                             G4double HighestKineticEnergy,G4int TotBin)
+                                      G4double lowestKineticEnergy,
+                             G4double highestKineticEnergy,G4int TotBin)
 // Build tables of coefficients for the energy loss calculation
 //  create table for coefficients "C"
 {
@@ -801,7 +728,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffCTable(G4PhysicsTable* theRang
     delete theRangeCoeffCTable; }
   theRangeCoeffCTable = new G4PhysicsTable(numOfMaterials);
 
-  G4double RTable = exp(log(HighestKineticEnergy/LowestKineticEnergy)/TotBin) ;
+  G4double RTable = exp(log(highestKineticEnergy/lowestKineticEnergy)/TotBin) ;
   G4double R2 = RTable*RTable ;
   G4double R1 = RTable+1.;
   G4double w = R1*(RTable-1.)*(RTable-1.);
@@ -815,7 +742,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffCTable(G4PhysicsTable* theRang
     G4int binmax=TotBin ;
     G4PhysicsLinearVector* aVector =
                       new G4PhysicsLinearVector(0.,binmax, TotBin);
-    Ti = LowestKineticEnergy ;
+    Ti = lowestKineticEnergy ;
     G4PhysicsVector* rangeVector= (*theRangeTable)[J];
   
     for ( G4int i=0; i<TotBin; i++)
@@ -845,7 +772,7 @@ G4PhysicsTable* G4VeLowEnergyLoss::BuildRangeCoeffCTable(G4PhysicsTable* theRang
   return theRangeCoeffCTable ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4double G4VeLowEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
                                                G4Material* aMaterial,
@@ -884,7 +811,8 @@ G4double G4VeLowEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
   G4int p1,p2,p3;
   G4int nb;
   G4double Corrfac, na,alfa,rfac,namean,sa,alfa1,ea,sea;
-  G4double dp1,dp3;
+  //  G4double dp1;
+  G4double dp3;
   G4double siga ;
 
   // shortcut for very very small loss 
@@ -1085,5 +1013,5 @@ G4double G4VeLowEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
   return loss ;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
    
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VhElectronicStoppingPower.cc b/source/processes/electromagnetic/lowenergy/src/G4VhElectronicStoppingPower.cc
index 031aa81bcc..eb32f3949d 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4VhElectronicStoppingPower.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4VhElectronicStoppingPower.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VhElectronicStoppingPower
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4VhNuclearStoppingPower.cc b/source/processes/electromagnetic/lowenergy/src/G4VhNuclearStoppingPower.cc
index a2c10c8c60..a14c89b2a9 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4VhNuclearStoppingPower.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4VhNuclearStoppingPower.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4VhNuclearStoppingPower
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
index 45ba153848..869a209170 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eLowEnergyLoss.cc,v 1.7 2000/09/20 16:49:41 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eLowEnergyLoss.cc,v 1.9.2.2 2001/06/28 20:19:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //  
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4eLowEnergyLoss physics process -----------
@@ -41,7 +55,7 @@
 #include "G4EnergyLossMessenger.hh"
 #include "G4Poisson.hh"
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 // Initialisation of static data members
 // -------------------------------------
@@ -90,29 +104,29 @@ G4double         G4eLowEnergyLoss::LOGRTable ;
 
 G4EnergyLossMessenger* G4eLowEnergyLoss::eLossMessenger         = 0;
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
  
 // constructor and destructor
  
 G4eLowEnergyLoss::G4eLowEnergyLoss(const G4String& processName)
    : G4VeLowEnergyLoss (processName),
      theLossTable(0),
-     theDEDXTable(0),
-     Charge(-1.),lastCharge(0.),
      MinKineticEnergy(1.*eV),
+     Charge(-1.),lastCharge(0.),
+     theDEDXTable(0),
      //linLossLimit(0.02)
-     linLossLimit(0.05),
+     CounterOfProcess(0),
      RecorderOfProcess(0),
      fdEdx(0),
      fRangeNow(0),
-     CounterOfProcess(0)
+     linLossLimit(0.05)
 {
  
  //create (only once) EnergyLoss messenger 
  if(!eLossMessenger) eLossMessenger = new G4EnergyLossMessenger();
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 G4eLowEnergyLoss::~G4eLowEnergyLoss() 
 {
@@ -123,7 +137,7 @@ G4eLowEnergyLoss::~G4eLowEnergyLoss()
        }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... 
+//     
 
 void G4eLowEnergyLoss::BuildDEDXTable(
                          const G4ParticleDefinition& aParticleType)
@@ -308,7 +322,7 @@ void G4eLowEnergyLoss::BuildDEDXTable(
     }
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
       
 G4VParticleChange* G4eLowEnergyLoss::AlongStepDoIt( const G4Track& trackData,
                                                  const G4Step&  stepData)
@@ -324,7 +338,7 @@ G4VParticleChange* G4eLowEnergyLoss::AlongStepDoIt( const G4Track& trackData,
   //  G4cout << "MGP -- Along eInit " << E/keV << " keV " << G4endl;
   
   G4Material* aMaterial = trackData.GetMaterial();
-  G4int index = aMaterial->GetIndex();
+  //  G4int index = aMaterial->GetIndex();
   
   G4double Step = stepData.GetStepLength();
 
@@ -386,6 +400,6 @@ G4VParticleChange* G4eLowEnergyLoss::AlongStepDoIt( const G4Track& trackData,
   return &fParticleChange;
 }
 
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+//    
 
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hBetheBlochModel.cc b/source/processes/electromagnetic/lowenergy/src/G4hBetheBlochModel.cc
index df8ee69c8c..7eb81ed9a9 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hBetheBlochModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hBetheBlochModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hBetheBlochModel
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hICRU49He.cc b/source/processes/electromagnetic/lowenergy/src/G4hICRU49He.cc
index 9d6febf91d..3465981347 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hICRU49He.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hICRU49He.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49He
 //
@@ -22,6 +36,7 @@
 // 20/07/2000  V.Ivanchenko First implementation
 // 18/09/2000  V.Ivanchenko clean up - all variable are the same as in ICRU
 // 03/10/2000  V.Ivanchenko clean up accoding to CodeWizard
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -81,10 +96,8 @@ G4bool G4hICRU49He::HasMaterial(const G4Material* material)
     chFormula = G4String("H_2O-Gas");
   }
 
-  G4int i;
-
   // Search for the material in the table
-  for (i=0; i<numberOfMolecula; i++) {
+  for (size_t i=0; i<numberOfMolecula; i++) {
       if (chFormula == name[i]) {
         SetMoleculaNumber(i) ;
 	return true ;
@@ -114,36 +127,36 @@ G4double G4hICRU49He::StoppingPower(const G4Material* material,
     G4double T = kineticEnergy*rateMass/MeV ;  
   
     static G4double c[30][7] = {
-       8.0080,  3.6287,  23.0700,  14.9900,  0.8507, 0.60, 2.0
-    , 13.3100,  3.7432,  39.4130,  12.1990,  1.0950, 0.38, 1.4
-    , 22.7240,  3.6040,  47.1810,  17.5490,  0.9040, 0.40, 1.4
-    , 24.4040,  2.4032,  48.9440,  27.9730,  1.2933, 0.40, 1.6
-    , 58.4719,  1.5115,  77.6421,  102.490,  1.5811, 0.50, 2.0
-    , 60.5408,  1.6297,  91.7601,  94.1260,  1.3662, 0.50, 2.0
-    , 48.4480,  6.4323,  59.2890,  18.3810,  0.4937, 0.48, 1.6
-    , 59.0346,  5.1305,  47.0866,  30.0857,  0.3500, 0.60, 2.0
-    , 71.8691,  2.8250,  51.1658,  57.1235,  0.4477, 0.60, 2.0
-    , 78.3520,  4.0961,  136.731,  28.4470,  1.0621, 0.52, 1.2
-    , 120.553,  1.5374,  49.8740,  82.2980,  0.8733, 0.45, 1.6
-    , 249.896,  0.6996,  -37.274,  248.592,  1.1052, 0.50, 1.5
-    , 246.698,  0.6219,  -58.391,  292.921,  0.8186, 0.56, 1.8
-    , 248.563,  0.6235,  -36.8968, 306.960,  1.3214, 0.50, 2.0
-    , 25.5860,  1.7125,  154.723,  118.620,  2.2580, 0.50, 2.0
-    , 138.294,  25.6413, 231.873,  17.3780,  0.3218, 0.58, 1.3
-    , 83.2091,  1.1294,  135.7457, 190.865,  2.3461, 0.50, 2.0
-    , 263.542,  1.4754,  1541.446, 781.898,  1.9209, 0.40, 2.0
-    , 59.5545,  1.5354,  132.1523, 153.3537, 2.0262, 0.50, 2.0
-    , 31.7380,  19.820,  125.2100, 6.8910,   0.7242, 0.50, 1.1
-    , 31.7549,  1.5682,  97.4777,  106.0774, 2.3204, 0.50, 2.0
-    , 230.465,  4.8967,  1845.320, 358.641,  1.0774, 0.46, 1.2
-    , 423.444,  5.3761,  1189.114, 319.030,  0.7652, 0.48, 1.5
-    , 86.3410,  3.3322,  91.0433,  73.1091,  0.4650, 0.50, 2.0
-    , 146.105,  9.4344,  515.1500, 82.8860,  0.6239, 0.55, 1.5
-    , 238.050,  5.6901,  372.3575, 146.1835, 0.3992, 0.50, 2.0
-    , 124.2338, 2.6730,  133.8175, 99.4109,  0.7776, 0.50, 2.0
-    , 221.723,  1.5415,  87.7315,  192.5266, 1.0742, 0.50, 2.0
-    , 26.7537,  1.3717,  90.8007,  77.1587,  2.3264, 0.50, 2.0
-    , 37.6121,  1.8052,  73.0250,  66.2070,  1.4038, 0.50, 2.0 };
+      {8.0080,  3.6287,  23.0700,  14.9900,  0.8507, 0.60, 2.0
+   },{ 13.3100,  3.7432,  39.4130,  12.1990,  1.0950, 0.38, 1.4
+   },{ 22.7240,  3.6040,  47.1810,  17.5490,  0.9040, 0.40, 1.4
+   },{ 24.4040,  2.4032,  48.9440,  27.9730,  1.2933, 0.40, 1.6
+   },{ 58.4719,  1.5115,  77.6421,  102.490,  1.5811, 0.50, 2.0
+   },{ 60.5408,  1.6297,  91.7601,  94.1260,  1.3662, 0.50, 2.0
+   },{ 48.4480,  6.4323,  59.2890,  18.3810,  0.4937, 0.48, 1.6
+   },{ 59.0346,  5.1305,  47.0866,  30.0857,  0.3500, 0.60, 2.0
+   },{ 71.8691,  2.8250,  51.1658,  57.1235,  0.4477, 0.60, 2.0
+   },{ 78.3520,  4.0961,  136.731,  28.4470,  1.0621, 0.52, 1.2
+   },{ 120.553,  1.5374,  49.8740,  82.2980,  0.8733, 0.45, 1.6
+   },{ 249.896,  0.6996,  -37.274,  248.592,  1.1052, 0.50, 1.5
+   },{ 246.698,  0.6219,  -58.391,  292.921,  0.8186, 0.56, 1.8
+   },{ 248.563,  0.6235,  -36.8968, 306.960,  1.3214, 0.50, 2.0
+   },{ 25.5860,  1.7125,  154.723,  118.620,  2.2580, 0.50, 2.0
+   },{ 138.294,  25.6413, 231.873,  17.3780,  0.3218, 0.58, 1.3
+   },{ 83.2091,  1.1294,  135.7457, 190.865,  2.3461, 0.50, 2.0
+   },{ 263.542,  1.4754,  1541.446, 781.898,  1.9209, 0.40, 2.0
+   },{ 59.5545,  1.5354,  132.1523, 153.3537, 2.0262, 0.50, 2.0
+   },{ 31.7380,  19.820,  125.2100, 6.8910,   0.7242, 0.50, 1.1
+   },{ 31.7549,  1.5682,  97.4777,  106.0774, 2.3204, 0.50, 2.0
+   },{ 230.465,  4.8967,  1845.320, 358.641,  1.0774, 0.46, 1.2
+   },{ 423.444,  5.3761,  1189.114, 319.030,  0.7652, 0.48, 1.5
+   },{ 86.3410,  3.3322,  91.0433,  73.1091,  0.4650, 0.50, 2.0
+   },{ 146.105,  9.4344,  515.1500, 82.8860,  0.6239, 0.55, 1.5
+   },{ 238.050,  5.6901,  372.3575, 146.1835, 0.3992, 0.50, 2.0
+   },{ 124.2338, 2.6730,  133.8175, 99.4109,  0.7776, 0.50, 2.0
+   },{ 221.723,  1.5415,  87.7315,  192.5266, 1.0742, 0.50, 2.0
+   },{ 26.7537,  1.3717,  90.8007,  77.1587,  2.3264, 0.50, 2.0
+   },{ 37.6121,  1.8052,  73.0250,  66.2070,  1.4038, 0.50, 2.0} };
 
     G4double a1,a2 ;
 
@@ -195,98 +208,98 @@ G4double G4hICRU49He::ElectronicStoppingPower(G4double z,
   G4double T = kineticEnergy*rateMass/MeV ;  
   
   static G4double a[92][5] = {
-    0.35485, 0.6456, 6.01525,  20.8933, 4.3515
-    , 0.58,    0.59,   6.3,	 130.0,   44.07
-    , 1.42,    0.49,   12.25,    32.0,    9.161
-    , 2.1895,  0.47183,7.2362,   134.30,  197.96
-    , 3.691,   0.4128, 18.48,    50.72,   9.0
-    , 3.83523, 0.42993,12.6125,  227.41,  188.97
-    , 1.9259,  0.5550, 27.15125, 26.0665, 6.2768
-    , 2.81015, 0.4759, 50.0253,  10.556,  1.0382
-    , 1.533,   0.531,  40.44,    18.41,   2.718
-    , 2.303,   0.4861, 37.01,    37.96,   5.092
-    , 9.894,   0.3081, 23.65,    0.384,   92.93
-    , 4.3,     0.47,   34.3,     3.3,     12.74
-    , 2.5,     0.625,  45.7,     0.1,     4.359
-    , 2.1,     0.65,   49.34,    1.788,   4.133
-    , 1.729,   0.6562, 53.41,    2.405,   3.845
-    , 1.402,   0.6791, 58.98,    3.528,   3.211
-    , 1.117,   0.7044, 69.69,    3.705,    2.156
-    , 2.291,   0.6284, 73.88,    4.478,    2.066
-    , 8.554,   0.3817, 83.61,    11.84,    1.875
-    , 6.297,   0.4622, 65.39,    10.14,    5.036
-    , 5.307,   0.4918, 61.74,    12.4,	   6.665
-    , 4.71,    0.5087, 65.28,    8.806,    5.948
-    , 6.151,   0.4524, 83.0,	 18.31,    2.71
-    , 6.57,    0.4322, 84.76,    15.53,    2.779
-    , 5.738,   0.4492, 84.6,	 14.18,    3.101
-    , 5.013,   0.4707, 85.8,	 16.55,    3.211
-    , 4.32,    0.4947, 76.14,    10.85,    5.441
-    , 4.652,   0.4571, 80.73,    22.0,	   4.952
-    , 3.114,   0.5236, 76.67,    7.62,	   6.385
-    , 3.114,   0.5236, 76.67,    7.62,	   7.502
-    , 3.114,   0.5236, 76.67,    7.62,	   8.514
-    , 5.746,   0.4662, 79.24,    1.185,    7.993
-    , 2.792,   0.6346, 106.1,    0.2986,   2.331
-    , 4.667,   0.5095, 124.3,    2.102,    1.667
-    , 2.44,    0.6346, 105.0,    0.83,	   2.851
-    , 1.413,   0.7377, 147.9,    1.466,    1.016
-    , 11.72,   0.3826, 102.8,    9.231,    4.371
-    , 7.126,   0.4804, 119.3,    5.784,    2.454
-    , 11.61,   0.3955, 146.7,    7.031,    1.423
-    , 10.99,   0.41,   163.9,	 7.1,	   1.052
-    , 9.241,   0.4275, 163.1,    7.954,    1.102
-    , 9.276,   0.418,  157.1,	 8.038,    1.29
-    , 3.999,   0.6152, 97.6,	 1.297,    5.792
-    , 4.306,   0.5658, 97.99,    5.514,    5.754
-    , 3.615,   0.6197, 86.26,    0.333,    8.689
-    , 5.8,     0.49,   147.2,	 6.903,    1.289
-    , 5.6,     0.49,   130.0,	 10.0,	   2.844
-    , 3.55,    0.6068, 124.7,    1.112,    3.119
-    , 3.6,     0.62,   105.8,	 0.1692,   6.026
-    , 5.4,     0.53,   103.1,	 3.931,    7.767
-    , 3.97,    0.6459, 131.8,    0.2233,   2.723 
-    , 3.65,    0.64,   126.8,	 0.6834,   3.411
-    , 3.118,   0.6519, 164.9,    1.208,    1.51
-    , 3.949,   0.6209, 200.5,    1.878,    0.9126
-    , 14.4,    0.3923, 152.5,    8.354,    2.597
-    , 10.99,   0.4599, 138.4,    4.811,    3.726
-    , 16.6,    0.3773, 224.1,    6.28,	   0.9121 
-    , 10.54,   0.4533, 159.3,	 4.832,	   2.529
-    , 10.33,   0.4502, 162.0,	 5.132,	   2.444
-    , 10.15,   0.4471, 165.6,	 5.378,	   2.328
-    , 9.976,   0.4439, 168.0,	 5.721,	   2.258
-    , 9.804,   0.4408, 176.2,	 5.675,	   1.997
-    , 14.22,   0.363,  228.4,	 7.024,	   1.016
-    , 9.952,   0.4318, 233.5,	 5.065,	   0.9244
-    , 9.272,   0.4345, 210.0,	 4.911,	   1.258
-    , 10.13,   0.4146, 225.7,	 5.525,	   1.055
-    , 8.949,   0.4304, 213.3,	 5.071,	   1.221
-    , 11.94,   0.3783, 247.2,	 6.655,	   0.849
-    , 8.472,   0.4405, 195.5,	 4.051,	   1.604
-    , 8.301,   0.4399, 203.7,	 3.667,	   1.459
-    , 6.567,   0.4858, 193.0,	 2.65,	   1.66
-    , 5.951,   0.5016, 196.1,	 2.662,	   1.589
-    , 7.495,   0.4523, 251.4,	 3.433,	   0.8619
-    , 6.335,   0.4825, 255.1,	 2.834,	   0.8228
-    , 4.314,   0.5558, 214.8,	 2.354,	   1.263
-    , 4.02,    0.5681, 219.9,	 2.402,	   1.191
-    , 3.836,   0.5765, 210.2,	 2.742,	   1.305
-    , 4.68,    0.5247, 244.7,	 2.749,	   0.8962
-    , 3.223,   0.5883, 232.7,	 2.954,	   1.05
-    , 2.892,   0.6204, 208.6,	 2.415,	   1.416
-    , 4.728,   0.5522, 217.0,	 3.091,	   1.386
-    , 6.18,    0.52,   170.0,	 4.0,	   3.224
-    , 9.0,     0.47,   198.0,	 3.8,	   2.032
-    , 2.324,   0.6997, 216.0,	 1.599,	   1.399
-    , 1.961,   0.7286, 223.0,	 1.621,	   1.296
-    , 1.75,    0.7427, 350.1,	 0.9789,   0.5507
-    , 10.31,   0.4613, 261.2,	 4.738,	   0.9899
-    , 7.962,   0.519,  235.7,	 4.347,	   1.313
-    , 6.227,   0.5645, 231.9,	 3.961,	   1.379
-    , 5.246,   0.5947, 228.6,	 4.027,	   1.432
-    , 5.408,   0.5811, 235.7,	 3.961,	   1.358
-    , 5.218,   0.5828, 245.0,	 3.838,	   1.25	
+    {0.35485, 0.6456, 6.01525,  20.8933, 4.3515
+   },{ 0.58,    0.59,   6.3,	 130.0,   44.07
+   },{ 1.42,    0.49,   12.25,    32.0,    9.161
+   },{ 2.1895,  0.47183,7.2362,   134.30,  197.96
+   },{ 3.691,   0.4128, 18.48,    50.72,   9.0
+   },{ 3.83523, 0.42993,12.6125,  227.41,  188.97
+   },{ 1.9259,  0.5550, 27.15125, 26.0665, 6.2768
+   },{ 2.81015, 0.4759, 50.0253,  10.556,  1.0382
+   },{ 1.533,   0.531,  40.44,    18.41,   2.718
+   },{ 2.303,   0.4861, 37.01,    37.96,   5.092
+   },{ 9.894,   0.3081, 23.65,    0.384,   92.93
+   },{ 4.3,     0.47,   34.3,     3.3,     12.74
+   },{ 2.5,     0.625,  45.7,     0.1,     4.359
+   },{ 2.1,     0.65,   49.34,    1.788,   4.133
+   },{ 1.729,   0.6562, 53.41,    2.405,   3.845
+   },{ 1.402,   0.6791, 58.98,    3.528,   3.211
+   },{ 1.117,   0.7044, 69.69,    3.705,    2.156
+   },{ 2.291,   0.6284, 73.88,    4.478,    2.066
+   },{ 8.554,   0.3817, 83.61,    11.84,    1.875
+   },{ 6.297,   0.4622, 65.39,    10.14,    5.036
+   },{ 5.307,   0.4918, 61.74,    12.4,	   6.665
+   },{ 4.71,    0.5087, 65.28,    8.806,    5.948
+   },{ 6.151,   0.4524, 83.0,	 18.31,    2.71
+   },{ 6.57,    0.4322, 84.76,    15.53,    2.779
+   },{ 5.738,   0.4492, 84.6,	 14.18,    3.101
+   },{ 5.013,   0.4707, 85.8,	 16.55,    3.211
+   },{ 4.32,    0.4947, 76.14,    10.85,    5.441
+   },{ 4.652,   0.4571, 80.73,    22.0,	   4.952
+   },{ 3.114,   0.5236, 76.67,    7.62,	   6.385
+   },{ 3.114,   0.5236, 76.67,    7.62,	   7.502
+   },{ 3.114,   0.5236, 76.67,    7.62,	   8.514
+   },{ 5.746,   0.4662, 79.24,    1.185,    7.993
+   },{ 2.792,   0.6346, 106.1,    0.2986,   2.331
+   },{ 4.667,   0.5095, 124.3,    2.102,    1.667
+   },{ 2.44,    0.6346, 105.0,    0.83,	   2.851
+   },{ 1.413,   0.7377, 147.9,    1.466,    1.016
+   },{ 11.72,   0.3826, 102.8,    9.231,    4.371
+   },{ 7.126,   0.4804, 119.3,    5.784,    2.454
+   },{ 11.61,   0.3955, 146.7,    7.031,    1.423
+   },{ 10.99,   0.41,   163.9,	 7.1,	   1.052
+   },{ 9.241,   0.4275, 163.1,    7.954,    1.102
+   },{ 9.276,   0.418,  157.1,	 8.038,    1.29
+   },{ 3.999,   0.6152, 97.6,	 1.297,    5.792
+   },{ 4.306,   0.5658, 97.99,    5.514,    5.754
+   },{ 3.615,   0.6197, 86.26,    0.333,    8.689
+   },{ 5.8,     0.49,   147.2,	 6.903,    1.289
+   },{ 5.6,     0.49,   130.0,	 10.0,	   2.844
+   },{ 3.55,    0.6068, 124.7,    1.112,    3.119
+   },{ 3.6,     0.62,   105.8,	 0.1692,   6.026
+   },{ 5.4,     0.53,   103.1,	 3.931,    7.767
+   },{ 3.97,    0.6459, 131.8,    0.2233,   2.723 
+   },{ 3.65,    0.64,   126.8,	 0.6834,   3.411
+   },{ 3.118,   0.6519, 164.9,    1.208,    1.51
+   },{ 3.949,   0.6209, 200.5,    1.878,    0.9126
+   },{ 14.4,    0.3923, 152.5,    8.354,    2.597
+   },{ 10.99,   0.4599, 138.4,    4.811,    3.726
+   },{ 16.6,    0.3773, 224.1,    6.28,	   0.9121 
+   },{ 10.54,   0.4533, 159.3,	 4.832,	   2.529
+   },{ 10.33,   0.4502, 162.0,	 5.132,	   2.444
+   },{ 10.15,   0.4471, 165.6,	 5.378,	   2.328
+   },{ 9.976,   0.4439, 168.0,	 5.721,	   2.258
+   },{ 9.804,   0.4408, 176.2,	 5.675,	   1.997
+   },{ 14.22,   0.363,  228.4,	 7.024,	   1.016
+   },{ 9.952,   0.4318, 233.5,	 5.065,	   0.9244
+   },{ 9.272,   0.4345, 210.0,	 4.911,	   1.258
+   },{ 10.13,   0.4146, 225.7,	 5.525,	   1.055
+   },{ 8.949,   0.4304, 213.3,	 5.071,	   1.221
+   },{ 11.94,   0.3783, 247.2,	 6.655,	   0.849
+   },{ 8.472,   0.4405, 195.5,	 4.051,	   1.604
+   },{ 8.301,   0.4399, 203.7,	 3.667,	   1.459
+   },{ 6.567,   0.4858, 193.0,	 2.65,	   1.66
+   },{ 5.951,   0.5016, 196.1,	 2.662,	   1.589
+   },{ 7.495,   0.4523, 251.4,	 3.433,	   0.8619
+   },{ 6.335,   0.4825, 255.1,	 2.834,	   0.8228
+   },{ 4.314,   0.5558, 214.8,	 2.354,	   1.263
+   },{ 4.02,    0.5681, 219.9,	 2.402,	   1.191
+   },{ 3.836,   0.5765, 210.2,	 2.742,	   1.305
+   },{ 4.68,    0.5247, 244.7,	 2.749,	   0.8962
+   },{ 3.223,   0.5883, 232.7,	 2.954,	   1.05
+   },{ 2.892,   0.6204, 208.6,	 2.415,	   1.416
+   },{ 4.728,   0.5522, 217.0,	 3.091,	   1.386
+   },{ 6.18,    0.52,   170.0,	 4.0,	   3.224
+   },{ 9.0,     0.47,   198.0,	 3.8,	   2.032
+   },{ 2.324,   0.6997, 216.0,	 1.599,	   1.399
+   },{ 1.961,   0.7286, 223.0,	 1.621,	   1.296
+   },{ 1.75,    0.7427, 350.1,	 0.9789,   0.5507
+   },{ 10.31,   0.4613, 261.2,	 4.738,	   0.9899
+   },{ 7.962,   0.519,  235.7,	 4.347,	   1.313
+   },{ 6.227,   0.5645, 231.9,	 3.961,	   1.379
+   },{ 5.246,   0.5947, 228.6,	 4.027,	   1.432
+   },{ 5.408,   0.5811, 235.7,	 3.961,	   1.358
+   },{ 5.218,   0.5828, 245.0,	 3.838,	   1.25}
   };
   
   // Free electron gas model
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hICRU49Nuclear.cc b/source/processes/electromagnetic/lowenergy/src/G4hICRU49Nuclear.cc
index 61969bc854..fea5a76a8b 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hICRU49Nuclear.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hICRU49Nuclear.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49Nuclear
 //
@@ -20,6 +34,7 @@
 //
 // Modifications: 
 // 20/07/2000  V.Ivanchenko First implementation
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -57,129 +72,129 @@ G4double G4hICRU49Nuclear::NuclearStoppingPower(G4double kineticEnergy,
                                 G4double m1, G4double m2) const
 {  
   G4double energy = kineticEnergy/keV ;  // energy in keV
-  G4double ionloss ;
+  G4double ionloss = 0.0;
   
   G4double rm = (m1 + m2) * sqrt( pow(z1, .23) + pow(z2, .23) ) ;
   
   G4double er = 32.536 * m2 * energy / ( z1 * z2 * rm ) ;  // reduced energy
   
   static G4double a[104][2] = {
-    1.0E+8,	5.831E-8,
-    8.0E+7,	7.288E-8,
-    6.0E+7,	9.719E-8,
-    5.0E+7,	1.166E-7,
-    4.0E+7,	1.457E-7,
-    3.0E+7,	1.942E-7,
-    2.0E+7,	2.916E-7,
-    1.5E+7,	3.887E-7,
+  { 1.0E+8, 5.831E-8},
+  { 8.0E+7, 7.288E-8},
+  { 6.0E+7, 9.719E-8},
+  { 5.0E+7, 1.166E-7},
+  { 4.0E+7, 1.457E-7},
+  { 3.0E+7, 1.942E-7},
+  { 2.0E+7, 2.916E-7},
+  { 1.5E+7, 3.887E-7},
 
-    1.0E+7,	5.833E-7,
-    8.0E+6,	7.287E-7,
-    6.0E+6,	9.712E-7,
-    5.0E+6,	1.166E-6,
-    4.0E+6,	1.457E-6,
-    3.0E+6,	1.941E-6,
-    2.0E+6,	2.911E-6,
-    1.5E+6,	3.878E-6,
+  { 1.0E+7, 5.833E-7},
+  { 8.0E+6, 7.287E-7},
+  { 6.0E+6, 9.712E-7},
+  { 5.0E+6, 1.166E-6},
+  { 4.0E+6, 1.457E-6},
+  { 3.0E+6, 1.941E-6},
+  { 2.0E+6, 2.911E-6},
+  { 1.5E+6, 3.878E-6},
 
-    1.0E+6,	5.810E-6,
-    8.0E+5,	7.262E-6,
-    6.0E+5,	9.663E-6,
-    5.0E+5,	1.157E-5,
-    4.0E+5,	1.442E-5,
-    3.0E+5,	1.913E-5,
-    2.0E+5,	2.845E-5,
-    1.5E+5,	3.762E-5,
+  { 1.0E+6, 5.810E-6},
+  { 8.0E+5, 7.262E-6},
+  { 6.0E+5, 9.663E-6},
+  { 5.0E+5, 1.157E-5},
+  { 4.0E+5, 1.442E-5},
+  { 3.0E+5, 1.913E-5},
+  { 2.0E+5, 2.845E-5},
+  { 1.5E+5, 3.762E-5},
 
-    1.0E+5,	5.554E-5,
-    8.0E+4,	6.866E-5,
-    6.0E+4,	9.020E-5,
-    5.0E+4,	1.070E-4,
-    4.0E+4,	1.319E-4,
-    3.0E+4,	1.722E-4,
-    2.0E+4,	2.499E-4,
-    1.5E+4,	3.248E-4,
+  { 1.0E+5, 5.554E-5},
+  { 8.0E+4, 6.866E-5},
+  { 6.0E+4, 9.020E-5},
+  { 5.0E+4, 1.070E-4},
+  { 4.0E+4, 1.319E-4},
+  { 3.0E+4, 1.722E-4},
+  { 2.0E+4, 2.499E-4},
+  { 1.5E+4, 3.248E-4},
 
-    1.0E+4,	4.688E-4,
-    8.0E+3,	5.729E-4,
-    6.0E+3,	7.411E-4,
-    5.0E+3,	8.718E-4,
-    4.0E+3,	1.063E-3,
-    3.0E+3,	1.370E-3,
-    2.0E+3,	1.955E-3,
-    1.5E+3,	2.511E-3,
+  { 1.0E+4, 4.688E-4},
+  { 8.0E+3, 5.729E-4},
+  { 6.0E+3, 7.411E-4},
+  { 5.0E+3, 8.718E-4},
+  { 4.0E+3, 1.063E-3},
+  { 3.0E+3, 1.370E-3},
+  { 2.0E+3, 1.955E-3},
+  { 1.5E+3, 2.511E-3},
 
-    1.0E+3,	3.563E-3,
-    8.0E+2,	4.314E-3,
-    6.0E+2,	5.511E-3,
-    5.0E+2,	6.430E-3,
-    4.0E+2,	7.756E-3,
-    3.0E+2,	9.855E-3,
-    2.0E+2,	1.375E-2,
-    1.5E+2,	1.736E-2,
+  { 1.0E+3, 3.563E-3},
+  { 8.0E+2, 4.314E-3},
+  { 6.0E+2, 5.511E-3},
+  { 5.0E+2, 6.430E-3},
+  { 4.0E+2, 7.756E-3},
+  { 3.0E+2, 9.855E-3},
+  { 2.0E+2, 1.375E-2},
+  { 1.5E+2, 1.736E-2},
 
-    1.0E+2,	2.395E-2,
-    8.0E+1,	2.850E-2,
-    6.0E+1,	3.552E-2,
-    5.0E+1,	4.073E-2,
-    4.0E+1,	4.802E-2,
-    3.0E+1,	5.904E-2,
-    1.5E+1,	9.426E-2,
+  { 1.0E+2, 2.395E-2},
+  { 8.0E+1, 2.850E-2},
+  { 6.0E+1, 3.552E-2},
+  { 5.0E+1, 4.073E-2},
+  { 4.0E+1, 4.802E-2},
+  { 3.0E+1, 5.904E-2},
+  { 1.5E+1, 9.426E-2},
 
-    1.0E+1,	1.210E-1,
-    8.0E+0,	1.377E-1,
-    6.0E+0,	1.611E-1,
-    5.0E+0,	1.768E-1,
-    4.0E+0,	1.968E-1,
-    3.0E+0,	2.235E-1,
-    2.0E+0,	2.613E-1,
-    1.5E+0,	2.871E-1,
+  { 1.0E+1, 1.210E-1},
+  { 8.0E+0, 1.377E-1},
+  { 6.0E+0, 1.611E-1},
+  { 5.0E+0, 1.768E-1},
+  { 4.0E+0, 1.968E-1},
+  { 3.0E+0, 2.235E-1},
+  { 2.0E+0, 2.613E-1},
+  { 1.5E+0, 2.871E-1},
 
-    1.0E+0,	3.199E-1,
-    8.0E-1,	3.354E-1,
-    6.0E-1,	3.523E-1,
-    5.0E-1,	3.609E-1,
-    4.0E-1,	3.693E-1,
-    3.0E-1,	3.766E-1,
-    2.0E-1,	3.803E-1,
-    1.5E-1,	3.788E-1,
+  { 1.0E+0, 3.199E-1},
+  { 8.0E-1, 3.354E-1},
+  { 6.0E-1, 3.523E-1},
+  { 5.0E-1, 3.609E-1},
+  { 4.0E-1, 3.693E-1},
+  { 3.0E-1, 3.766E-1},
+  { 2.0E-1, 3.803E-1},
+  { 1.5E-1, 3.788E-1},
 
-    1.0E-1,	3.711E-1,
-    8.0E-2,	3.644E-1,
-    6.0E-2,	3.530E-1,
-    5.0E-2,	3.444E-1,
-    4.0E-2,	3.323E-1,
-    3.0E-2,	3.144E-1,
-    2.0E-2,	2.854E-1,
-    1.5E-2,	2.629E-1,
+  { 1.0E-1, 3.711E-1},
+  { 8.0E-2, 3.644E-1},
+  { 6.0E-2, 3.530E-1},
+  { 5.0E-2, 3.444E-1},
+  { 4.0E-2, 3.323E-1},
+  { 3.0E-2, 3.144E-1},
+  { 2.0E-2, 2.854E-1},
+  { 1.5E-2, 2.629E-1},
 
-    1.0E-2,	2.298E-1,
-    8.0E-3,	2.115E-1,
-    6.0E-3,	1.883E-1,
-    5.0E-3,	1.741E-1,
-    4.0E-3,	1.574E-1,
-    3.0E-3,	1.372E-1,
-    2.0E-3,	1.116E-1,
-    1.5E-3,	9.559E-2,
+  { 1.0E-2, 2.298E-1},
+  { 8.0E-3, 2.115E-1},
+  { 6.0E-3, 1.883E-1},
+  { 5.0E-3, 1.741E-1},
+  { 4.0E-3, 1.574E-1},
+  { 3.0E-3, 1.372E-1},
+  { 2.0E-3, 1.116E-1},
+  { 1.5E-3, 9.559E-2},
 
-    1.0E-3,	7.601E-2,
-    8.0E-4,	6.668E-2,
-    6.0E-4,	5.605E-2,
-    5.0E-4,	5.008E-2,
-    4.0E-4,	4.352E-2,
-    3.0E-4,	3.617E-2,
-    2.0E-4,	2.768E-2,
-    1.5E-4,	2.279E-2,
+  { 1.0E-3, 7.601E-2},
+  { 8.0E-4, 6.668E-2},
+  { 6.0E-4, 5.605E-2},
+  { 5.0E-4, 5.008E-2},
+  { 4.0E-4, 4.352E-2},
+  { 3.0E-4, 3.617E-2},
+  { 2.0E-4, 2.768E-2},
+  { 1.5E-4, 2.279E-2},
 
-    1.0E-4,	1.723E-2,
-    8.0E-5,	1.473E-2,
-    6.0E-5,	1.200E-2,
-    5.0E-5,	1.052E-2,
-    4.0E-5,	8.950E-3,
-    3.0E-5,	7.246E-3,
-    2.0E-5,	5.358E-3,
-    1.5E-5,	4.313E-3,
-    0.0,	3.166E-3
+  { 1.0E-4, 1.723E-2},
+  { 8.0E-5, 1.473E-2},
+  { 6.0E-5, 1.200E-2},
+  { 5.0E-5, 1.052E-2},
+  { 4.0E-5, 8.950E-3},
+  { 3.0E-5, 7.246E-3},
+  { 2.0E-5, 5.358E-3},
+  { 1.5E-5, 4.313E-3},
+  { 0.0, 3.166E-3}
   };
   
   for (G4int i=1; i<104; i++)
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hICRU49p.cc b/source/processes/electromagnetic/lowenergy/src/G4hICRU49p.cc
index 48c1c62be5..dcb093b72f 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hICRU49p.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hICRU49p.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hICRU49p
 //
@@ -22,6 +36,7 @@
 // 20/07/2000  V.Ivanchenko First implementation
 // 18/09/2000  V.Ivanchenko clean up - all variable are the same as in ICRU
 // 03/10/2000  V.Ivanchenko clean up accoding to CodeWizard
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -42,8 +57,8 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 G4hICRU49p::G4hICRU49p():G4VhElectronicStoppingPower(), 
-  protonMassAMU(1.007276),
-  iMolecula(0)
+  iMolecula(0),
+  protonMassAMU(1.007276)
 {;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -78,11 +93,9 @@ G4bool G4hICRU49p::HasMaterial(const G4Material* material)
   if( theState == kStateGas && myFormula == chFormula) {
     chFormula = G4String("H_2O-Gas");
   }
-
-  G4int i;
   
   // Search for the material in the table
-  for (i=0; i<numberOfMolecula; i++) {
+  for (size_t i=0; i<numberOfMolecula; i++) {
       if (chFormula == name[i]) {
         SetMoleculaNumber(i) ;    
 	return true ;
@@ -101,7 +114,7 @@ G4double G4hICRU49p::StoppingPower(const G4Material* material,
   // pure material (normally not the case for this function)
   if(1 == (material->GetNumberOfElements())) {
     G4double z = material->GetZ() ;
-    G4double ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
+    ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
 
   } else if (iMolecula < 11) {
   
@@ -112,17 +125,17 @@ G4double G4hICRU49p::StoppingPower(const G4Material* material,
     G4double T = kineticEnergy/(keV*protonMassAMU) ; 
 
      static G4double a[11][5] = {
-    1.187E+1, 1.343E+1, 1.069E+4, 7.723E+2, 2.153E-2, 
-    7.802E+0, 8.814E+0, 8.303E+3, 7.446E+2, 7.966E-3, 
-    7.294E+0, 8.284E+0, 5.010E+3, 4.544E+2, 8.153E-3, 
-    8.646E+0, 9.800E+0, 7.066E+3, 4.581E+2, 9.383E-3, 
-    1.286E+1, 1.462E+1, 5.625E+3, 2.621E+3, 3.512E-2, 
-    3.229E+1, 3.696E+1, 8.918E+3, 3.244E+3, 1.273E-1, 
-    1.604E+1, 1.825E+1, 6.967E+3, 2.307E+3, 3.775E-2, 
-    8.049E+0, 9.099E+0, 9.257E+3, 3.846E+2, 1.007E-2, 
-    4.015E+0, 4.542E+0, 3.955E+3, 4.847E+2, 7.904E-3, 
-    4.571E+0, 5.173E+0, 4.346E+3, 4.779E+2, 8.572E-3, 
-    2.631E+0, 2.601E+0, 1.701E+3, 1.279E+3, 1.638E-2 };
+   {1.187E+1, 1.343E+1, 1.069E+4, 7.723E+2, 2.153E-2}, 
+   {7.802E+0, 8.814E+0, 8.303E+3, 7.446E+2, 7.966E-3}, 
+   {7.294E+0, 8.284E+0, 5.010E+3, 4.544E+2, 8.153E-3}, 
+   {8.646E+0, 9.800E+0, 7.066E+3, 4.581E+2, 9.383E-3}, 
+   {1.286E+1, 1.462E+1, 5.625E+3, 2.621E+3, 3.512E-2}, 
+   {3.229E+1, 3.696E+1, 8.918E+3, 3.244E+3, 1.273E-1}, 
+   {1.604E+1, 1.825E+1, 6.967E+3, 2.307E+3, 3.775E-2}, 
+   {8.049E+0, 9.099E+0, 9.257E+3, 3.846E+2, 1.007E-2}, 
+   {4.015E+0, 4.542E+0, 3.955E+3, 4.847E+2, 7.904E-3}, 
+   {4.571E+0, 5.173E+0, 4.346E+3, 4.779E+2, 8.572E-3}, 
+   {2.631E+0, 2.601E+0, 1.701E+3, 1.279E+3, 1.638E-2} };
       
 
     if ( T < 10.0 ) {
@@ -177,98 +190,98 @@ G4double G4hICRU49p::ElectronicStoppingPower(G4double z,
   G4double T = kineticEnergy/(keV*protonMassAMU) ; 
   
   static G4double a[92][5] = {
-    1.254E+0, 1.440E+0, 2.426E+2, 1.200E+4, 1.159E-1,
-    1.229E+0, 1.397E+0, 4.845E+2, 5.873E+3, 5.225E-2,
-    1.411E+0, 1.600E+0, 7.256E+2, 3.013E+3, 4.578E-2,
-    2.248E+0, 2.590E+0, 9.660E+2, 1.538E+2, 3.475E-2,
-    2.474E+0, 2.815E+0, 1.206E+3, 1.060E+3, 2.855E-2,
-    2.631E+0, 2.601E+0, 1.701E+3, 1.279E+3, 1.638E-2,
-    2.954E+0, 3.350E+0, 1.683E+3, 1.900E+3, 2.513E-2,
-    2.652E+0, 3.000E+0, 1.920E+3, 2.000E+3, 2.230E-2,
-    2.085E+0, 2.352E+0, 2.157E+3, 2.634E+3, 1.816E-2,
-    1.951E+0, 2.199E+0, 2.393E+3, 2.699E+3, 1.568E-2,
-    2.542E+0, 2.869E+0, 2.628E+3, 1.854E+3, 1.472E-2,
-    3.791E+0, 4.293E+0, 2.862E+3, 1.009E+3, 1.397E-2,
-    4.154E+0, 4.739E+0, 2.766E+3, 1.645E+2, 2.023E-2,
-    4.914E+0, 5.598E+0, 3.193E+3, 2.327E+2, 1.419E-2,
-    3.232E+0, 3.647E+0, 3.561E+3, 1.560E+3, 1.267E-2,
-    3.447E+0, 3.891E+0, 3.792E+3, 1.219E+3, 1.211E-2,
-    5.301E+0, 6.008E+0, 3.969E+3, 6.451E+2, 1.183E-2,
-    5.731E+0, 6.500E+0, 4.253E+3, 5.300E+2, 1.123E-2,
-    5.152E+0, 5.833E+0, 4.482E+3, 5.457E+2, 1.129E-2,
-    5.521E+0, 6.252E+0, 4.710E+3, 5.533E+2, 1.112E-2,
-    5.201E+0, 5.884E+0, 4.938E+3, 5.609E+2, 9.995E-3,
-    4.858E+0, 5.489E+0, 5.260E+3, 6.511E+2, 8.930E-3,
-    4.479E+0, 5.055E+0, 5.391E+3, 9.523E+2, 9.117E-3,
-    3.983E+0, 4.489E+0, 5.616E+3, 1.336E+3, 8.413E-3,
-    3.469E+0, 3.907E+0, 5.725E+3, 1.461E+3, 8.829E-3,
-    3.519E+0, 3.963E+0, 6.065E+3, 1.243E+3, 7.782E-3,
-    3.140E+0, 3.535E+0, 6.288E+3, 1.372E+3, 7.361E-3,
-    3.553E+0, 4.004E+0, 6.205E+3, 5.551E+2, 8.763E-3,
-    3.696E+0, 4.194E+0, 4.649E+3, 8.113E+1, 2.242E-2,
-    4.210E+0, 4.750E+0, 6.953E+3, 2.952E+2, 6.809E-3,
-    5.041E+0, 5.697E+0, 7.173E+3, 2.026E+2, 6.725E-3,
-    5.554E+0, 6.300E+0, 6.496E+3, 1.100E+2, 9.689E-3,
-    5.323E+0, 6.012E+0, 7.611E+3, 2.925E+2, 6.447E-3,
-    5.874E+0, 6.656E+0, 7.395E+3, 1.175E+2, 7.684E-3,
-    6.658E+0, 7.536E+0, 7.694E+3, 2.223E+2, 6.509E-3,
-    6.413E+0, 7.240E+0, 1.185E+4, 1.537E+2, 2.880E-3,
-    5.694E+0, 6.429E+0, 8.478E+3, 2.929E+2, 6.087E-3,
-    6.339E+0, 7.159E+0, 8.693E+3, 3.303E+2, 6.003E-3,
-    6.407E+0, 7.234E+0, 8.907E+3, 3.678E+2, 5.889E-3,
-    6.734E+0, 7.603E+0, 9.120E+3, 4.052E+2, 5.765E-3,
-    6.901E+0, 7.791E+0, 9.333E+3, 4.427E+2, 5.587E-3,
-    6.424E+0, 7.248E+0, 9.545E+3, 4.802E+2, 5.376E-3,
-    6.799E+0, 7.671E+0, 9.756E+3, 5.176E+2, 5.315E-3,
-    6.109E+0, 6.887E+0, 9.966E+3, 5.551E+2, 5.151E-3,
-    5.924E+0, 6.677E+0, 1.018E+4, 5.925E+2, 4.919E-3,
-    5.238E+0, 5.900E+0, 1.038E+4, 6.300E+2, 4.758E-3,
-    5.345E+0, 6.038E+0, 6.790E+3, 3.978E+2, 1.676E-2,
-    5.814E+0, 6.554E+0, 1.080E+4, 3.555E+2, 4.626E-3,
-    6.229E+0, 7.024E+0, 1.101E+4, 3.709E+2, 4.540E-3,
-    6.409E+0, 7.227E+0, 1.121E+4, 3.864E+2, 4.474E-3,
-    7.500E+0, 8.480E+0, 8.608E+3, 3.480E+2, 9.074E-3,
-    6.979E+0, 7.871E+0, 1.162E+4, 3.924E+2, 4.402E-3,
-    7.725E+0, 8.716E+0, 1.183E+4, 3.948E+2, 4.376E-3,
-    8.337E+0, 9.425E+0, 1.051E+4, 2.696E+2, 6.206E-3,
-    7.287E+0, 8.218E+0, 1.223E+4, 3.997E+2, 4.447E-3,
-    7.899E+0, 8.911E+0, 1.243E+4, 4.021E+2, 4.511E-3,
-    8.041E+0, 9.071E+0, 1.263E+4, 4.045E+2, 4.540E-3,
-    7.488E+0, 8.444E+0, 1.283E+4, 4.069E+2, 4.420E-3,
-    7.291E+0, 8.219E+0, 1.303E+4, 4.093E+2, 4.298E-3,
-    7.098E+0, 8.000E+0, 1.323E+4, 4.118E+2, 4.182E-3,
-    6.909E+0, 7.786E+0, 1.343E+4, 4.142E+2, 4.058E-3,
-    6.728E+0, 7.580E+0, 1.362E+4, 4.166E+2, 3.976E-3,
-    6.551E+0, 7.380E+0, 1.382E+4, 4.190E+2, 3.877E-3,
-    6.739E+0, 7.592E+0, 1.402E+4, 4.214E+2, 3.863E-3,
-    6.212E+0, 6.996E+0, 1.421E+4, 4.239E+2, 3.725E-3,
-    5.517E+0, 6.210E+0, 1.440E+4, 4.263E+2, 3.632E-3,
-    5.220E+0, 5.874E+0, 1.460E+4, 4.287E+2, 3.498E-3,
-    5.071E+0, 5.706E+0, 1.479E+4, 4.330E+2, 3.405E-3,
-    4.926E+0, 5.542E+0, 1.498E+4, 4.335E+2, 3.342E-3,
-    4.788E+0, 5.386E+0, 1.517E+4, 4.359E+2, 3.292E-3,
-    4.893E+0, 5.505E+0, 1.536E+4, 4.384E+2, 3.243E-3,
-    5.028E+0, 5.657E+0, 1.555E+4, 4.408E+2, 3.195E-3,
-    4.738E+0, 5.329E+0, 1.574E+4, 4.432E+2, 3.186E-3,
-    4.587E+0, 5.160E+0, 1.541E+4, 4.153E+2, 3.406E-3,
-    5.201E+0, 5.851E+0, 1.612E+4, 4.416E+2, 3.122E-3,
-    5.071E+0, 5.704E+0, 1.630E+4, 4.409E+2, 3.082E-3,
-    4.946E+0, 5.563E+0, 1.649E+4, 4.401E+2, 2.965E-3,
-    4.477E+0, 5.034E+0, 1.667E+4, 4.393E+2, 2.871E-3,
-    4.844E+0, 5.458E+0, 7.852E+3, 9.758E+2, 2.077E-2,
-    4.307E+0, 4.843E+0, 1.704E+4, 4.878E+2, 2.882E-3,
-    4.723E+0, 5.311E+0, 1.722E+4, 5.370E+2, 2.913E-3,
-    5.319E+0, 5.982E+0, 1.740E+4, 5.863E+2, 2.871E-3,
-    5.956E+0, 6.700E+0, 1.780E+4, 6.770E+2, 2.660E-3,
-    6.158E+0, 6.928E+0, 1.777E+4, 5.863E+2, 2.812E-3,
-    6.203E+0, 6.979E+0, 1.795E+4, 5.863E+2, 2.776E-3,
-    6.181E+0, 6.954E+0, 1.812E+4, 5.863E+2, 2.748E-3,
-    6.949E+0, 7.820E+0, 1.830E+4, 5.863E+2, 2.737E-3,
-    7.506E+0, 8.448E+0, 1.848E+4, 5.863E+2, 2.727E-3,
-    7.648E+0, 8.609E+0, 1.866E+4, 5.863E+2, 2.697E-3,
-    7.711E+0, 8.679E+0, 1.883E+4, 5.863E+2, 2.641E-3,
-    7.407E+0, 8.336E+0, 1.901E+4, 5.863E+2, 2.603E-3,
-    7.290E+0, 8.204E+0, 1.918E+4, 5.863E+2, 2.673E-3
+   {1.254E+0, 1.440E+0, 2.426E+2, 1.200E+4, 1.159E-1},
+   {1.229E+0, 1.397E+0, 4.845E+2, 5.873E+3, 5.225E-2},
+   {1.411E+0, 1.600E+0, 7.256E+2, 3.013E+3, 4.578E-2},
+   {2.248E+0, 2.590E+0, 9.660E+2, 1.538E+2, 3.475E-2},
+   {2.474E+0, 2.815E+0, 1.206E+3, 1.060E+3, 2.855E-2},
+   {2.631E+0, 2.601E+0, 1.701E+3, 1.279E+3, 1.638E-2},
+   {2.954E+0, 3.350E+0, 1.683E+3, 1.900E+3, 2.513E-2},
+   {2.652E+0, 3.000E+0, 1.920E+3, 2.000E+3, 2.230E-2},
+   {2.085E+0, 2.352E+0, 2.157E+3, 2.634E+3, 1.816E-2},
+   {1.951E+0, 2.199E+0, 2.393E+3, 2.699E+3, 1.568E-2},
+   {2.542E+0, 2.869E+0, 2.628E+3, 1.854E+3, 1.472E-2},
+   {3.791E+0, 4.293E+0, 2.862E+3, 1.009E+3, 1.397E-2},
+   {4.154E+0, 4.739E+0, 2.766E+3, 1.645E+2, 2.023E-2},
+   {4.914E+0, 5.598E+0, 3.193E+3, 2.327E+2, 1.419E-2},
+   {3.232E+0, 3.647E+0, 3.561E+3, 1.560E+3, 1.267E-2},
+   {3.447E+0, 3.891E+0, 3.792E+3, 1.219E+3, 1.211E-2},
+   {5.301E+0, 6.008E+0, 3.969E+3, 6.451E+2, 1.183E-2},
+   {5.731E+0, 6.500E+0, 4.253E+3, 5.300E+2, 1.123E-2},
+   {5.152E+0, 5.833E+0, 4.482E+3, 5.457E+2, 1.129E-2},
+   {5.521E+0, 6.252E+0, 4.710E+3, 5.533E+2, 1.112E-2},
+   {5.201E+0, 5.884E+0, 4.938E+3, 5.609E+2, 9.995E-3},
+   {4.858E+0, 5.489E+0, 5.260E+3, 6.511E+2, 8.930E-3},
+   {4.479E+0, 5.055E+0, 5.391E+3, 9.523E+2, 9.117E-3},
+   {3.983E+0, 4.489E+0, 5.616E+3, 1.336E+3, 8.413E-3},
+   {3.469E+0, 3.907E+0, 5.725E+3, 1.461E+3, 8.829E-3},
+   {3.519E+0, 3.963E+0, 6.065E+3, 1.243E+3, 7.782E-3},
+   {3.140E+0, 3.535E+0, 6.288E+3, 1.372E+3, 7.361E-3},
+   {3.553E+0, 4.004E+0, 6.205E+3, 5.551E+2, 8.763E-3},
+   {3.696E+0, 4.194E+0, 4.649E+3, 8.113E+1, 2.242E-2},
+   {4.210E+0, 4.750E+0, 6.953E+3, 2.952E+2, 6.809E-3},
+   {5.041E+0, 5.697E+0, 7.173E+3, 2.026E+2, 6.725E-3},
+   {5.554E+0, 6.300E+0, 6.496E+3, 1.100E+2, 9.689E-3},
+   {5.323E+0, 6.012E+0, 7.611E+3, 2.925E+2, 6.447E-3},
+   {5.874E+0, 6.656E+0, 7.395E+3, 1.175E+2, 7.684E-3},
+   {6.658E+0, 7.536E+0, 7.694E+3, 2.223E+2, 6.509E-3},
+   {6.413E+0, 7.240E+0, 1.185E+4, 1.537E+2, 2.880E-3},
+   {5.694E+0, 6.429E+0, 8.478E+3, 2.929E+2, 6.087E-3},
+   {6.339E+0, 7.159E+0, 8.693E+3, 3.303E+2, 6.003E-3},
+   {6.407E+0, 7.234E+0, 8.907E+3, 3.678E+2, 5.889E-3},
+   {6.734E+0, 7.603E+0, 9.120E+3, 4.052E+2, 5.765E-3},
+   {6.901E+0, 7.791E+0, 9.333E+3, 4.427E+2, 5.587E-3},
+   {6.424E+0, 7.248E+0, 9.545E+3, 4.802E+2, 5.376E-3},
+   {6.799E+0, 7.671E+0, 9.756E+3, 5.176E+2, 5.315E-3},
+   {6.109E+0, 6.887E+0, 9.966E+3, 5.551E+2, 5.151E-3},
+   {5.924E+0, 6.677E+0, 1.018E+4, 5.925E+2, 4.919E-3},
+   {5.238E+0, 5.900E+0, 1.038E+4, 6.300E+2, 4.758E-3},
+   {5.345E+0, 6.038E+0, 6.790E+3, 3.978E+2, 1.676E-2},
+   {5.814E+0, 6.554E+0, 1.080E+4, 3.555E+2, 4.626E-3},
+   {6.229E+0, 7.024E+0, 1.101E+4, 3.709E+2, 4.540E-3},
+   {6.409E+0, 7.227E+0, 1.121E+4, 3.864E+2, 4.474E-3},
+   {7.500E+0, 8.480E+0, 8.608E+3, 3.480E+2, 9.074E-3},
+   {6.979E+0, 7.871E+0, 1.162E+4, 3.924E+2, 4.402E-3},
+   {7.725E+0, 8.716E+0, 1.183E+4, 3.948E+2, 4.376E-3},
+   {8.337E+0, 9.425E+0, 1.051E+4, 2.696E+2, 6.206E-3},
+   {7.287E+0, 8.218E+0, 1.223E+4, 3.997E+2, 4.447E-3},
+   {7.899E+0, 8.911E+0, 1.243E+4, 4.021E+2, 4.511E-3},
+   {8.041E+0, 9.071E+0, 1.263E+4, 4.045E+2, 4.540E-3},
+   {7.488E+0, 8.444E+0, 1.283E+4, 4.069E+2, 4.420E-3},
+   {7.291E+0, 8.219E+0, 1.303E+4, 4.093E+2, 4.298E-3},
+   {7.098E+0, 8.000E+0, 1.323E+4, 4.118E+2, 4.182E-3},
+   {6.909E+0, 7.786E+0, 1.343E+4, 4.142E+2, 4.058E-3},
+   {6.728E+0, 7.580E+0, 1.362E+4, 4.166E+2, 3.976E-3},
+   {6.551E+0, 7.380E+0, 1.382E+4, 4.190E+2, 3.877E-3},
+   {6.739E+0, 7.592E+0, 1.402E+4, 4.214E+2, 3.863E-3},
+   {6.212E+0, 6.996E+0, 1.421E+4, 4.239E+2, 3.725E-3},
+   {5.517E+0, 6.210E+0, 1.440E+4, 4.263E+2, 3.632E-3},
+   {5.220E+0, 5.874E+0, 1.460E+4, 4.287E+2, 3.498E-3},
+   {5.071E+0, 5.706E+0, 1.479E+4, 4.330E+2, 3.405E-3},
+   {4.926E+0, 5.542E+0, 1.498E+4, 4.335E+2, 3.342E-3},
+   {4.788E+0, 5.386E+0, 1.517E+4, 4.359E+2, 3.292E-3},
+   {4.893E+0, 5.505E+0, 1.536E+4, 4.384E+2, 3.243E-3},
+   {5.028E+0, 5.657E+0, 1.555E+4, 4.408E+2, 3.195E-3},
+   {4.738E+0, 5.329E+0, 1.574E+4, 4.432E+2, 3.186E-3},
+   {4.587E+0, 5.160E+0, 1.541E+4, 4.153E+2, 3.406E-3},
+   {5.201E+0, 5.851E+0, 1.612E+4, 4.416E+2, 3.122E-3},
+   {5.071E+0, 5.704E+0, 1.630E+4, 4.409E+2, 3.082E-3},
+   {4.946E+0, 5.563E+0, 1.649E+4, 4.401E+2, 2.965E-3},
+   {4.477E+0, 5.034E+0, 1.667E+4, 4.393E+2, 2.871E-3},
+   {4.844E+0, 5.458E+0, 7.852E+3, 9.758E+2, 2.077E-2},
+   {4.307E+0, 4.843E+0, 1.704E+4, 4.878E+2, 2.882E-3},
+   {4.723E+0, 5.311E+0, 1.722E+4, 5.370E+2, 2.913E-3},
+   {5.319E+0, 5.982E+0, 1.740E+4, 5.863E+2, 2.871E-3},
+   {5.956E+0, 6.700E+0, 1.780E+4, 6.770E+2, 2.660E-3},
+   {6.158E+0, 6.928E+0, 1.777E+4, 5.863E+2, 2.812E-3},
+   {6.203E+0, 6.979E+0, 1.795E+4, 5.863E+2, 2.776E-3},
+   {6.181E+0, 6.954E+0, 1.812E+4, 5.863E+2, 2.748E-3},
+   {6.949E+0, 7.820E+0, 1.830E+4, 5.863E+2, 2.737E-3},
+   {7.506E+0, 8.448E+0, 1.848E+4, 5.863E+2, 2.727E-3},
+   {7.648E+0, 8.609E+0, 1.866E+4, 5.863E+2, 2.697E-3},
+   {7.711E+0, 8.679E+0, 1.883E+4, 5.863E+2, 2.641E-3},
+   {7.407E+0, 8.336E+0, 1.901E+4, 5.863E+2, 2.603E-3},
+   {7.290E+0, 8.204E+0, 1.918E+4, 5.863E+2, 2.673E-3}
   };
 
   G4double fac = 1.0 ;
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hIonEffChargeSquare.cc b/source/processes/electromagnetic/lowenergy/src/G4hIonEffChargeSquare.cc
index 55ed00b1c4..dfc0dc047e 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hIonEffChargeSquare.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hIonEffChargeSquare.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hIonEffChargeSquare
 //
@@ -212,8 +226,6 @@ G4double G4hIonEffChargeSquare::IonEffChargeSquare(
     lF /= norm ;
   }
 
-  G4double w, q ;
-
   // Helium ion case
   if( ionCharge < 2.5 ) {
 
@@ -224,7 +236,7 @@ G4double G4hIonEffChargeSquare::IonEffChargeSquare(
       y *= e ;
       x += y * c[i] ;
     }
-    q = 7.6 -  e ; 
+    G4double q = 7.6 -  e ; 
     q = 1.0 + ( 0.007 + 0.00005 * z ) * exp( -q*q ) ;
     return  4.0 * q * q * (1.0 - exp(-x)) ;
 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
index a70797a5cf..8d555b3f0e 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hLowEnergyIonisation physics process -------
@@ -48,6 +62,9 @@
 //                utils tag not being accepted yet by system testing)
 // 21 Nov.  2000 V.Ivanchenko Fix a problem in fluctuations
 // 23 Nov.  2000 V.Ivanchenko Ion type fluctuations only for charge>0
+// 10 May   2001 V.Ivanchenko Clean up againist Linux compilation with -Wall
+// 23 May   2001 V.Ivanchenko Minor fix in PostStepDoIt
+// 07 June  2001 V.Ivanchenko Clean up AntiProtonDEDX + add print out
 // -----------------------------------------------------------------------
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -68,19 +85,19 @@
 
 G4hLowEnergyIonisation::G4hLowEnergyIonisation(const G4String& processName)
   : G4hLowEnergyLoss(processName),
-    theMeanFreePathTable(NULL),
+    theBetheBlochModel(0),
+    theProtonModel(0),
+    theAntiProtonModel(0),
+    theIonEffChargeModel(0),
+    theNuclearStoppingModel(0),
+    theIonChuFluctuationModel(0),
+    theIonYangFluctuationModel(0),
     theProtonTable("ICRU_R49p"),
     theAntiProtonTable("ICRU_R49p"),
     theNuclearTable("ICRU_R49"),
-    theBetheBlochModel(NULL),
-    theProtonModel(NULL),
-    theAntiProtonModel(NULL),
-    theNuclearStoppingModel(NULL),
-    theIonEffChargeModel(NULL),
-    theIonChuFluctuationModel(NULL),
-    theIonYangFluctuationModel(NULL),
     nStopping(true),
     theBarkas(true),
+    theMeanFreePathTable(0),
     paramStepLimit (0.005)
 { 
   InitializeMe();
@@ -176,6 +193,10 @@ void G4hLowEnergyIonisation::BuildPhysicsTable(
   
   //  just call BuildLossTable+BuildLambdaTable
 {
+  if(verboseLevel > 0) {
+    G4cout << "G4hLowEnergyIonisation::BuildPhysicsTable for "
+           << aParticleType.GetParticleName() << G4endl;
+  }
   InitializeParametrisation() ;
   G4Proton* theProton = G4Proton::Proton();
   G4AntiProton* theAntiProton = G4AntiProton::AntiProton();
@@ -190,7 +211,7 @@ void G4hLowEnergyIonisation::BuildPhysicsTable(
     {
 
       if( (ptableElectronCutInRange != electronCutInRange)  
-	  || (theDEDXpTable == NULL))
+	  || (theDEDXpTable == 0))
 	{
 	  BuildLossTable(*theProton) ;
 	  RecorderOfpProcess[CounterOfpProcess] = theLossTable ;
@@ -200,19 +221,34 @@ void G4hLowEnergyIonisation::BuildPhysicsTable(
     } else{
 
       if( (pbartableElectronCutInRange != electronCutInRange)  
-	  || (theDEDXpbarTable == NULL))
+	  || (theDEDXpbarTable == 0))
 	{
 	  BuildLossTable(*theAntiProton) ;
 	  RecorderOfpbarProcess[CounterOfpbarProcess] = theLossTable ;
 	  CounterOfpbarProcess++;
 	}
     }
+
+  if(verboseLevel > 0) {
+    G4cout << "G4hLowEnergyIonisation::BuildPhysicsTable: "
+           << "Loss table is built" << G4endl;
+  }
   
   BuildLambdaTable(aParticleType) ;
 
+  if(verboseLevel > 0) {
+    G4cout << "G4hLowEnergyIonisation::BuildPhysicsTable: "
+           << "DEDX table will be built" << G4endl;
+  }
+
   BuildDEDXTable(aParticleType) ;
 
   if((&aParticleType == theProton) ) PrintInfoDefinition() ;
+
+  if(verboseLevel > 0) {
+    G4cout << "G4hLowEnergyIonisation::BuildPhysicsTable: end for "
+           << aParticleType.GetParticleName() << G4endl;
+  }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -225,7 +261,6 @@ void G4hLowEnergyIonisation::BuildLossTable(
   G4double lowEdgeEnergy , ionloss, ionlossBB, paramB ;
   G4double lowEnergy, highEnergy;
   G4Proton* theProton = G4Proton::Proton();
-  G4AntiProton* theAntiProton = G4AntiProton::AntiProton();
 
   if(aParticleType == *theProton) {
     lowEnergy = protonLowEnergy ;
@@ -326,8 +361,7 @@ void G4hLowEnergyIonisation::BuildLambdaTable(
   // Build mean free path tables for the delta ray production process
   //     tables are built for MATERIALS 
   
-  G4double lowEdgeEnergy , value ,sigma ;
-  G4bool isOutRange ;
+  G4double lowEdgeEnergy, value;
   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
   charge = aParticleType.GetPDGCharge()/eplus ;
   chargeSquare = charge*charge ;
@@ -470,8 +504,7 @@ G4double G4hLowEnergyIonisation::GetConstraints(
   G4AntiProton* theAntiProton = G4AntiProton::AntiProton();
 
   G4double stepLimit = 0.0 ;
-  G4bool isOut ;
-  G4double dx, s, highEnergy;
+  G4double dx, highEnergy;
   
   G4double massRatio = proton_mass_c2/(particle->GetMass()) ;
   G4double kineticEnergy = particle->GetKineticEnergy() ;
@@ -594,7 +627,6 @@ G4VParticleChange* G4hLowEnergyIonisation::AlongStepDoIt(
   
   const G4DynamicParticle* particle = trackData.GetDynamicParticle() ;
   
-  G4int index = material->GetIndex() ;
   G4double kineticEnergy = particle->GetKineticEnergy() ;
   G4double massRatio = proton_mass_c2/(particle->GetMass()) ;
   G4double tscaled= kineticEnergy*massRatio ; 
@@ -723,6 +755,13 @@ G4double G4hLowEnergyIonisation::ProtonParametrisedDEDX(
   // Delta rays energy
   eloss -= DeltaRaysEnergy(material,kineticEnergy,proton_mass_c2) ;
 
+  if(verboseLevel > 1) {
+    G4cout << "p E(MeV)= " << kineticEnergy/MeV
+           << " dE/dx(MeV/mm)= " << eloss*mm/MeV 
+           << " for " << material->GetName() 
+           << " model: " << theProtonModel << G4endl;
+  }
+
   if(eloss < 0.0) eloss = 0.0 ;  
   
   return eloss ;
@@ -736,37 +775,43 @@ G4double G4hLowEnergyIonisation::AntiProtonParametrisedDEDX(
 {
   G4AntiProton* theAntiProton = G4AntiProton::AntiProton();
   G4double eloss = 0.0 ;
-  G4double goldenRule = 1.0 ;
 
-  // Choose the model
-  G4VLowEnergyModel * theModel ;
+  // Antiproton model is used
   if(theAntiProtonModel->IsInCharge(theAntiProton,material)) {
-    theModel = theAntiProtonModel ;
+    if(kineticEnergy < antiProtonLowEnergy) {
+      eloss = theAntiProtonModel->TheValue(theAntiProton,material,
+                                           antiProtonLowEnergy);
+    
+    // Parametrisation 
+    } else {
+      eloss = theAntiProtonModel->TheValue(theAntiProton,material,
+                                           kineticEnergy);
+    }
+
+  // The proton model is used + Barkas correction
   } else { 
-    theModel = theProtonModel ;
-    // goldenRule = AntiProtonGoldenRule(kineticEnergy) ;
-  }
-
-    // Free Electron Gas Model is not used for antiprotons  
-  if(kineticEnergy < antiProtonLowEnergy) {
-    eloss = theModel->TheValue(theAntiProton, material, antiProtonLowEnergy);
-    //          * sqrt(kineticEnergy/protonLowEnergy) ;
+    if(kineticEnergy < antiProtonLowEnergy) {
+      eloss = theProtonModel->TheValue(G4Proton::Proton(),material,
+                                       antiProtonLowEnergy);
     
-    // Parametrisation using golden rule for antiprotons
-  } else {
-    eloss = theModel->TheValue(theAntiProton, material, kineticEnergy) ;
+    // Parametrisation 
+    } else {
+      eloss = theProtonModel->TheValue(G4Proton::Proton(),material,
+                                       kineticEnergy);
+    }
+    if(theBarkas) eloss -= 2.0*BarkasTerm(material, kineticEnergy);
   }
-    
-  // Taken into account golden rule for antiprotons
-  eloss *= goldenRule ;
-
-    // Proton model is used
-  if(theBarkas && (theModel == theProtonModel)) 
-                  eloss -= 2.0*BarkasTerm(material, kineticEnergy);
   
   // Delta rays energy
   eloss -= DeltaRaysEnergy(material,kineticEnergy,proton_mass_c2) ;
 
+  if(verboseLevel > 0) {
+    G4cout << "pbar E(MeV)= " << kineticEnergy/MeV
+           << " dE/dx(MeV/mm)= " << eloss*mm/MeV 
+           << " for " << material->GetName() 
+           << " model: " << theProtonModel << G4endl;
+  }
+
   if(eloss < 0.0) eloss = 0.0 ;  
   
   return eloss ;
@@ -784,7 +829,6 @@ G4double G4hLowEnergyIonisation::DeltaRaysEnergy(
   G4double deltaCutNow = deltaCutInKineticEnergy[(material->GetIndex())] ;   
   G4double electronDensity = material->GetElectronDensity();
   G4double eexc = material->GetIonisation()->GetMeanExcitationEnergy();
-  G4double eexc2 = eexc*eexc ;
 
   G4double tau = kineticEnergy/particleMass ;    
   G4double rateMass = electron_mass_c2/particleMass ;
@@ -821,12 +865,11 @@ G4VParticleChange* G4hLowEnergyIonisation::PostStepDoIt(
            betasquare,MaxKineticEnergyTransfer,
            DeltaKineticEnergy,DeltaTotalMomentum,costheta,sintheta,phi,
            dirx,diry,dirz,finalKineticEnergy,finalPx,finalPy,finalPz,
-           x,xc,te2,grej,Psquare,Esquare,summass,rate,grejc,finalMomentum ;
+           x,xc,grej,Psquare,Esquare,summass,rate,finalMomentum ;
   
   aParticleChange.Initialize(trackData) ;
   G4Material* aMaterial = trackData.GetMaterial() ;
   G4double Eexc = aMaterial->GetIonisation()->GetMeanExcitationEnergy();
-  G4double Eexc2 = Eexc*Eexc ;
   
   const G4DynamicParticle* aParticle = trackData.GetDynamicParticle() ;
   
@@ -858,8 +901,8 @@ G4VParticleChange* G4hLowEnergyIonisation::PostStepDoIt(
       // pathological case (it should not happen ,
       // there is no change at all).....
       
-      // return &aParticleChange;
-      return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
+      return &aParticleChange;
+      //return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
     }
   else
     {
@@ -957,7 +1000,6 @@ G4VParticleChange* G4hLowEnergyIonisation::PostStepDoIt(
   aParticleChange.AddSecondary( theDeltaRay );
   aParticleChange.SetLocalEnergyDeposit (Edep);
   
-  //ResetNumberOfInteractionLengthLeft();
   return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
 }
 
@@ -1008,18 +1050,53 @@ G4double G4hLowEnergyIonisation::BarkasTerm(const G4Material* material,
 //
 {
   static double FTable[47][2] = { 
-    0.02, 21.5,	0.03, 20.0,	0.04, 18.0,	0.05, 15.6,
-    0.06, 15.0,	0.07, 14.0,   	0.08, 13.5,   	0.09, 13,
-    0.1,  12.2,  	0.2,   9.25,  	0.3,   7.0,     0.4,   6.0,   
-    0.5,  4.5, 	0.6,   3.5,   	0.7,   3.0,     0.8,   2.5,   
-    0.9,  2.0,  	1.0,   1.7,  	1.2,   1.2,   	1.3,   1.0,     
-    1.4,  0.86,  	1.5,   0.7,	1.6,   0.61,  	1.7,   0.52,  
-    1.8,  0.5,   	1.9,   0.43,	2.0,   0.42,  	2.1,   0.3,   
-    2.4,  0.2,	3.0,   0.13,  	3.08,  0.1,   	3.1,   0.09, 
-    3.3,  0.08,     3.5,   0.07,  	3.8,   0.06,	4.0,   0.051, 
-    4.1,  0.04,  	4.8,   0.03,    5.0,   0.024,   5.1,   0.02,
-    6.0,  0.013,    6.5,   0.01,	7.0,   0.009, 	7.1,   0.008,
-    8.0,  0.006, 	9.0,   0.0032, 10.0,   0.0025 };
+   { 0.02, 21.5},
+   { 0.03, 20.0},	
+   { 0.04, 18.0},	
+   { 0.05, 15.6},
+   { 0.06, 15.0},	
+   { 0.07, 14.0},	
+   { 0.08, 13.5},	
+   { 0.09, 13.},
+   { 0.1,  12.2},  	
+   { 0.2,  9.25},  	
+   { 0.3,  7.0},  
+   { 0.4,  6.0},
+   { 0.5,  4.5}, 	
+   { 0.6,  3.5},	
+   { 0.7,  3.0},  
+   { 0.8,  2.5},
+   { 0.9,  2.0},  	
+   { 1.0,  1.7},  	
+   { 1.2,  1.2},	
+   { 1.3,  1.0},  
+   { 1.4,  0.86},  	
+   { 1.5,  0.7},	
+   { 1.6,  0.61},  	
+   { 1.7,  0.52},  
+   { 1.8,  0.5},	
+   { 1.9,  0.43},	
+   { 2.0,  0.42},  	
+   { 2.1,  0.3},
+   { 2.4,  0.2},	
+   { 3.0,  0.13},  	
+   { 3.08, 0.1},	
+   { 3.1,  0.09}, 
+   { 3.3,  0.08},  
+   { 3.5,  0.07},  	
+   { 3.8,  0.06},	
+   { 4.0,  0.051}, 
+   { 4.1,  0.04},  	
+   { 4.8,  0.03}, 
+   { 5.0,  0.024},
+   { 5.1,  0.02},
+   { 6.0,  0.013},
+   { 6.5,  0.01},
+   { 7.0,  0.009}, 	
+   { 7.1,  0.008},
+   { 8.0,  0.006}, 	
+   { 9.0,  0.0032}, 
+   { 10.0, 0.0025} };
 
   // Information on particle and material
   G4double kinE  = kineticEnergy ;
@@ -1190,7 +1267,7 @@ G4double G4hLowEnergyIonisation::ElectronicLossFluctuation(
   G4int p1,p2,p3;
   G4int nb;
   G4double corrfac, na,alfa,rfac,namean,sa,alfa1,ea,sea;
-  G4double dp1,dp3;
+  G4double dp3;
 
   G4double f1Fluct     = material->GetIonisation()->GetF1fluct();
   G4double f2Fluct     = material->GetIonisation()->GetF2fluct();
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
index ba77cb4982..1e82fe2063 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hLowEnergyLoss.cc,v 1.8 2000/11/05 12:17:06 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hLowEnergyLoss.cc,v 1.9.2.2 2001/06/28 20:19:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hEnergyLoss physics process -----------
@@ -23,12 +37,13 @@
 // It calculates the energy loss of charged hadrons.
 // **************************************************************
 //
-// 7/10/98: bug fixes + some cleanup , L.Urban 
-// 22/10/98 : cleanup , L.Urban
-// 07/12/98 : works for ions as well+ bug corrected, L.Urban
-// 02/02/99 : several bugs fixed, L.Urban
-// 31/03/00 : rename to lowenergy as G4hLowEnergyLoss.cc V.Ivanchenko
-// 05/11/00 : new method to calculate particle ranges
+// 7/10/98    bug fixes + some cleanup , L.Urban 
+// 22/10/98   cleanup , L.Urban
+// 07/12/98   works for ions as well+ bug corrected, L.Urban
+// 02/02/99   several bugs fixed, L.Urban
+// 31/03/00   rename to lowenergy as G4hLowEnergyLoss.cc V.Ivanchenko
+// 05/11/00   new method to calculate particle ranges
+// 10/05/01   V.Ivanchenko Clean up againist Linux compilation with -Wall
 // --------------------------------------------------------------
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -62,33 +77,33 @@ G4int            G4hLowEnergyLoss::CounterOfpbarProcess = 0 ;
 G4PhysicsTable** G4hLowEnergyLoss::RecorderOfpbarProcess =
                                            new G4PhysicsTable*[10] ;
 
-G4PhysicsTable* G4hLowEnergyLoss::theDEDXpTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theDEDXpbarTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theRangepTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theRangepbarTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theInverseRangepTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theInverseRangepbarTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theLabTimepTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theLabTimepbarTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theProperTimepTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theProperTimepbarTable = NULL ;
+G4PhysicsTable* G4hLowEnergyLoss::theDEDXpTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theDEDXpbarTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangepTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangepbarTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theInverseRangepTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theInverseRangepbarTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theLabTimepTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theLabTimepbarTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theProperTimepTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theProperTimepbarTable = 0 ;
 
-G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffATable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffBTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffCTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffATable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffBTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffCTable = NULL ;
+G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffATable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffBTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::thepRangeCoeffCTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffATable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffBTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::thepbarRangeCoeffCTable = 0 ;
 
-G4PhysicsTable* G4hLowEnergyLoss::theDEDXTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theRangeTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theInverseRangeTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theLabTimeTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theProperTimeTable = NULL ;
+G4PhysicsTable* G4hLowEnergyLoss::theDEDXTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangeTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theInverseRangeTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theLabTimeTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theProperTimeTable = 0 ;
 
-G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffATable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffBTable = NULL ;
-G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffCTable = NULL ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffATable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffBTable = 0 ;
+G4PhysicsTable* G4hLowEnergyLoss::theRangeCoeffCTable = 0 ;
 
 //const G4Proton* G4hLowEnergyLoss::theProton=G4Proton::Proton() ;
 //const G4AntiProton* G4hLowEnergyLoss::theAntiProton=G4AntiProton::AntiProton() ;
@@ -125,15 +140,15 @@ G4double G4hLowEnergyLoss::RTable,G4hLowEnergyLoss::LOGRTable;
  
 G4hLowEnergyLoss::G4hLowEnergyLoss(const G4String& processName)
    : G4VContinuousDiscreteProcess (processName),
-     theLossTable (NULL),
-     MinKineticEnergy(0.0), 
-     linLossLimit(0.05),
-     lastMaterial (NULL),
+     lastMaterial (0),
      MaxExcitationNumber (1.e6),
      probLimFluct (0.01),
      nmaxDirectFluct (100),
      nmaxCont1(4),
-     nmaxCont2(16) 
+     nmaxCont2(16),
+     theLossTable(0),
+     linLossLimit(0.05),
+     MinKineticEnergy(0.0) 
 {;}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -173,10 +188,10 @@ void G4hLowEnergyLoss::BuildDEDXTable(
   else           {theDEDXTable= theDEDXpbarTable;}
 
   if(
-     ((Charge>0.) && ((theDEDXTable==NULL) || 
+     ((Charge>0.) && ((theDEDXTable==0) || 
      (ElectronCutInRange != ptableElectronCutInRange)))
      ||  
-     ((Charge<0.) && ((theDEDXTable==NULL) || 
+     ((Charge<0.) && ((theDEDXTable==0) || 
      (ElectronCutInRange != pbartableElectronCutInRange)))
     )
       MakeTable = true ;
@@ -440,8 +455,7 @@ void G4hLowEnergyLoss::BuildLabTimeVector(G4int materialIndex,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
@@ -501,8 +515,7 @@ void G4hLowEnergyLoss::BuildProperTimeVector(G4int materialIndex,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hNuclearStoppingModel.cc b/source/processes/electromagnetic/lowenergy/src/G4hNuclearStoppingModel.cc
index b102fd1048..93dd1e7fc6 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hNuclearStoppingModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hNuclearStoppingModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hNuclearStoppingModel
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hParametrisedLossModel.cc b/source/processes/electromagnetic/lowenergy/src/G4hParametrisedLossModel.cc
index 925c588d24..2c6bc93af5 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hParametrisedLossModel.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hParametrisedLossModel.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hParametrisedLossModel
 //
@@ -22,6 +36,7 @@
 // 20/07/2000  V.Ivanchenko First implementation
 // 18/08/2000  V.Ivanchenko TRIM85 model is added
 // 03/10/2000  V.Ivanchenko CodeWizard clean up
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -102,6 +117,8 @@ void G4hParametrisedLossModel::InitializeMe()
     highEnergyLimit = 2.0*MeV;
     lowEnergyLimit  = 1.0*keV;
   }  
+  //G4cout << "G4hParametrisedLossModel: the model <" << modelName 
+  //       << "> is accepted" << G4endl;
 }
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -136,6 +153,9 @@ G4double G4hParametrisedLossModel::TheValue(
 
   G4double eloss = StoppingPower(material,scaledEnergy) * theZieglerFactor; 
 
+  // G4cout << "G4hParametrisedLossModel: the model <" << modelName 
+  //       << "> return " << eloss*mm/MeV << G4endl;
+
   return eloss;
 }
 
@@ -196,7 +216,7 @@ G4double G4hParametrisedLossModel::StoppingPower(
                           const G4Material* material,
                                 G4double kineticEnergy) 
 {
-  G4double eloss = 0.0, eloss125 = 0.0;
+  G4double eloss = 0.0;
   const G4int numberOfElements = material->GetNumberOfElements() ;
   const G4double* theAtomicNumDensityVector =
                                  material->GetAtomicNumDensityVector() ;
@@ -344,7 +364,7 @@ G4bool G4hParametrisedLossModel::MolecIsInZiegler1988(
   } ;
 
   // Search for the compaund in the table
-  for (G4int i=0; i<numberOfMolecula; i++)
+  for (size_t i=0; i<numberOfMolecula; i++)
     { 
       if(chFormula == name[i]) { 
         G4double exp125 = expStopping[i] * 
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977He.cc b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977He.cc
index f0d883004d..16b95b275a 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977He.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977He.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977He
 //
@@ -20,6 +34,7 @@
 //
 // Modifications: 
 // 20/07/2000  V.Ivanchenko First implementation
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -92,102 +107,102 @@ G4double G4hZiegler1977He::ElectronicStoppingPower(G4double z,
   
   static G4double a[92][9] = {
     //H-Solid 0.9661,0.4126,6.92,8.831,2.582,2.371,0.5462,-0.07932,-0.006853,
-    0.39,0.63,  4.17, 85.55,  19.55, 2.371, 0.5462,   -0.07932,-0.006853,
+   {0.39,0.63,  4.17, 85.55,  19.55, 2.371, 0.5462,   -0.07932,-0.006853},
     //He-Solid 2.027,0.2931,26.34,6.66,0.3409,2.809,0.4847,-0.08756,-0.007281,
-    0.58, 0.59, 6.3, 130.0,   44.07, 2.809, 0.4847,   -0.08756,-0.007281,
-    1.42,  0.49,   12.25,32.,     9.161, 3.095, 0.4434,   -0.09259,-0.007459,
-    2.206, 0.51,   15.32, 0.25,   8.995, 3.28,  0.4188,   -0.09564,-0.007604,
-    3.691, 0.4128, 18.48,50.72,   9.,    3.426, 0.4,      -0.09796,-0.007715,
-    4.232, 0.3877, 22.99,35.,     7.993, 3.588, 0.3921,   -0.09935,-0.007804,
+   {0.58, 0.59, 6.3, 130.0,   44.07, 2.809, 0.4847,   -0.08756,-0.007281},
+   {1.42,  0.49,   12.25,32.,     9.161, 3.095, 0.4434,   -0.09259,-0.007459},
+   {2.206, 0.51,   15.32, 0.25,   8.995, 3.28,  0.4188,   -0.09564,-0.007604},
+   {3.691, 0.4128, 18.48,50.72,   9.,    3.426, 0.4,      -0.09796,-0.007715},
+   {4.232, 0.3877, 22.99,35.,     7.993, 3.588, 0.3921,   -0.09935,-0.007804},
     //N-solid 2.51,0.4752,38.26,13.02,1.892,3.759,0.4094,-0.09646,-0.007661,
-    2.0,  0.548, 29.82,18.11,   4.37, 3.759, 0.4094,   -0.09646,-0.007661,
+   {2.0,  0.548, 29.82,18.11,   4.37, 3.759, 0.4094,   -0.09646,-0.007661},
     //O-solid 1.766,0.5261,37.11,15.24,2.804,3.782,0.3734,-0.1011,-0.007874,
-    2.717, 0.4858, 32.88, 25.88, 4.336, 3.782, 0.3734,   -0.1011, -0.007874,
-    1.533, 0.531,  40.44,18.41,   2.718, 3.816, 0.3504,   -0.1046, -0.008074,
+   {2.717, 0.4858, 32.88, 25.88, 4.336, 3.782, 0.3734,   -0.1011, -0.007874},
+   {1.533, 0.531,  40.44,18.41,   2.718, 3.816, 0.3504,   -0.1046, -0.008074},
     //Ne-solid 1.183,0.55,39.83,17.49,4.001,3.863,0.3342,-0.1072,-0.008231,
-    2.303, 0.4861,   37.01, 37.96,   5.092, 3.863, 0.3342,-0.1072, -0.008231,
-    9.894, 0.3081, 23.65, 0.384, 92.93,  3.898, 0.3191,   -0.1086, -0.008271,
-    4.3,   0.47,   34.3,  3.3,   12.74,  3.961, 0.314,    -0.1091, -0.008297,
-    2.5,   0.625,  45.7,  0.1,    4.359, 4.024, 0.3113,   -0.1093, -0.008306,
-    2.1,   0.65,   49.34, 1.788,  4.133, 4.077, 0.3074,   -0.1089, -0.008219,
-    1.729, 0.6562, 53.41, 2.405,  3.845, 4.124, 0.3023,   -0.1094, -0.00824,
-    1.402, 0.6791, 58.98, 3.528,  3.211, 4.164, 0.2964,   -0.1101, -0.008267,
-    1.117, 0.7044, 69.69, 3.705,  2.156, 4.21,  0.2936,   -0.1103, -0.00827,
-    0.9172,0.724,  79.44, 3.648,  1.646, 4.261, 0.2994,   -0.1085, -0.008145,
-    8.554, 0.3817, 83.61,11.84,   1.875, 4.3,   0.2903,   -0.1103, -0.008259,
-    6.297, 0.4622, 65.39,10.14,   5.036, 4.334, 0.2897,   -0.1102, -0.008245,
-    5.307, 0.4918, 61.74,12.4,    6.665, 4.327, 0.2707,   -0.1127, -0.00837,
-    4.71,  0.5087, 65.28, 8.806,  5.948, 4.34,  0.2618,   -0.1138, -0.00842,
-    6.151, 0.4524, 83.,  18.31,   2.71,  4.361, 0.2559,   -0.1145, -0.008447,
-    6.57,  0.4322, 84.76,15.53,   2.779, 4.349, 0.24,     -0.1166, -0.00855,
-    5.738, 0.4492, 84.61,14.18,   3.101, 4.362, 0.2327,   -0.1174, -0.008588,
-    5.013, 0.4707, 85.58,16.55,   3.211, 4.375, 0.2253,   -0.1185, -0.008648,
-    4.32,  0.4947, 76.14,10.85,   5.441, 4.362, 0.2069,   -0.1214, -0.008815,
-    4.652, 0.4571, 80.73,22.,     4.952, 4.346, 0.1857,   -0.1249, -0.009021,
-    3.114, 0.5236, 76.67, 7.62,   6.385, 4.355, 0.18,     -0.1255, -0.009045,
-    3.114, 0.5236, 76.67, 7.62,   7.502, 4.389, 0.1806,   -0.1253, -0.009028,
-    3.114, 0.5236, 76.67, 7.62,   8.514, 4.407, 0.1759,   -0.1258, -0.009054,
-    5.746, 0.4662, 79.24, 1.185,  7.993, 4.419, 0.1694,   -0.1267, -0.009094,
-    2.792, 0.6346,106.1,  0.2986, 2.331, 4.412, 0.1545,   -0.1289, -0.009202,
-    4.667, 0.5095,124.3,  2.102,  1.667, 4.419, 0.1448,   -0.1303, -0.009269,
-    2.44,  0.6346,105.,   0.83,   2.851, 4.436, 0.1443,   -0.1299, -0.009229,
-    1.491, 0.7118,120.6,  1.101,  1.877, 4.478, 0.1608,   -0.1262, -0.008983,
-    11.72, 0.3826,102.8,  9.231,  4.371, 4.489, 0.1517,   -0.1278, -0.009078,
-    7.126, 0.4804,119.3,  5.784,  2.454, 4.514, 0.1551,   -0.1268, -0.009005,
-    11.61, 0.3955,146.7,  7.031,  1.423, 4.533, 0.1568,   -0.1261, -0.008945,
-    10.99, 0.41,  163.9,  7.1,    1.052, 4.548, 0.1572,   -0.1256, -0.008901,
-    9.241, 0.4275,163.1,  7.954,  1.102, 4.553, 0.1544,   -0.1255, -0.008883,
-    9.276, 0.418, 157.1,  8.038,  1.29,  4.548, 0.1485,   -0.1259, -0.008889,
-    3.999, 0.6152, 97.6,  1.297,  5.792, 4.489, 0.1128,   -0.1309, -0.009107,
-    4.306, 0.5658, 97.99, 5.514,  5.754, 4.402, 0.06656,  -0.1375, -0.009421,
-    3.615, 0.6197, 86.26, 0.333,  8.689, 4.292, 0.01012,  -0.1459, -0.009835,
-    5.8,   0.49,  147.2,  6.903,  1.289, 4.187,-0.04539,  -0.1542, -0.01025,
-    5.6,   0.49,  130.,  10.,     2.844, 4.577, 0.13,     -0.1285, -0.009067,
-    3.55,  0.6068,124.7,  1.112,  3.119, 4.583, 0.1253,   -0.1291, -0.009084,
-    3.6,   0.62,  105.8,  0.1692, 6.026, 4.58,  0.1174,   -0.1301, -0.009129,
-    5.4,   0.53,  103.1,  3.931,  7.767, 4.581, 0.111,    -0.1309, -0.009161,
-    3.97,  0.6459,131.8,  0.2233, 2.723, 4.582, 0.1046,   -0.1317, -0.009193,
-    3.65,  0.64,  126.8,  0.6834, 3.411, 4.6,   0.1052,   -0.1315, -0.009178,
-    3.118, 0.6519,164.9,  1.208,  1.51,  4.614, 0.1043,   -0.1315, -0.009175,
-    2.031, 0.7181,153.1,  1.362,  1.958, 4.619, 0.09769,  -0.1325, -0.009231,
-    14.4,  0.3923,152.5,  8.354,  2.597, 4.671, 0.1136,   -0.1298, -0.009078,
-    10.99, 0.4599,138.4,  4.811,  3.726, 4.706, 0.1206,   -0.1287, -0.009009,
-    16.6,  0.3773,224.1,  6.28,   0.9121,4.732, 0.1244,   -0.128,  -0.008968,
-    10.54, 0.4533,159.3,  4.832,  2.529, 4.722, 0.1156,   -0.1292, -0.00903,
-    10.33, 0.4502,162.,   5.132,  2.444, 4.71,  0.106,    -0.1305, -0.0091, 
-    10.15, 0.4471,165.6,  5.378,  2.328, 4.698, 0.09647,  -0.1319, -0.009169,
-    9.976, 0.4439,168.,   5.721,  2.258, 4.681, 0.08536,  -0.1335, -0.009252,
-    9.804, 0.4408,176.2,  5.675,  1.997, 4.676, 0.07819,  -0.1345, -0.009302,
-    14.22, 0.363, 228.4,  7.024,  1.016, 4.663, 0.06867,  -0.1358, -0.009373,
-    9.952, 0.4318,233.5,  5.065,  0.9244,4.676, 0.06861,  -0.1357, -0.009363,
-    9.272, 0.4345,210.,   4.911,  1.258, 4.649, 0.05362,  -0.1379, -0.00948,
-    10.13, 0.4146,225.7,  5.525,  1.055, 4.634, 0.04335,  -0.1394, -0.009558,
-    8.949, 0.4304,213.3,  5.071,  1.221, 4.603, 0.02679,  -0.1418, -0.00969,
-    11.94, 0.3783,247.2,  6.655,  0.849, 4.584, 0.01494,  -0.1436, -0.009783,
-    8.472, 0.4405,195.5,  4.051,  1.604, 4.576, 0.007043, -0.1447, -0.009841,
-    8.301, 0.4399,203.7,  3.667,  1.459, 4.571, 0.0007046,-0.1456, -0.009886,
-    6.567, 0.4858,193.,   2.65,   1.66,  4.566,-0.005626, -0.1464, -0.00993,
-    5.951, 0.5016,196.1,  2.662,  1.589, 4.561,-0.01197,  -0.1473, -0.009975,
-    7.495, 0.4523,251.4,  3.433,  0.8619,4.572,-0.012,    -0.1472, -0.009965,
-    6.335, 0.4825,255.1,  2.834,  0.8228,4.569,-0.01755,  -0.148,  -0.01,   
-    4.314, 0.5558,214.8,  2.354,  1.263, 4.573,-0.01992,  -0.1482, -0.01001,
-    4.02,  0.5681,219.9,  2.402,  1.191, 4.57, -0.02547,  -0.149,  -0.01005,
-    3.836, 0.5765,210.2,  2.742,  1.305, 4.528,-0.04613,  -0.1521, -0.01022,
-    4.68,  0.5247,244.7,  2.749,  0.8962,4.494,-0.0637,   -0.1548, -0.01037,
-    3.223, 0.5883,232.7,  2.954,  1.05,  4.564,-0.027,    -0.1471, -0.009852,
-    2.892, 0.6204,208.6,  2.415,  1.416, 4.546,-0.04963,  -0.1523, -0.01022,
-    4.728, 0.5522,217.,   3.091,  1.386, 4.594,-0.03339,  -0.1496, -0.01006,
-    6.18,  0.52,  170.,   4.,     3.224, 4.608,-0.02886,  -0.1485, -0.00999,
-    9.,    0.47,  198.,   3.8,    2.032, 4.624,-0.02639,  -0.1481, -0.009971,
-    2.324, 0.6997,216.,   1.599,  1.399, 4.636,-0.02422,  -0.1477, -0.009939,
-    1.961, 0.7286,223.,   1.621,  1.296, 4.648,-0.02172,  -0.1471, -0.009903,
-    1.75,  0.7427,350.1,  0.9789, 0.5507,4.662,-0.1192,   -0.1752, -0.01196,
-    10.31, 0.4613,261.2,  4.738,  0.9899,4.69, -0.009867, -0.1449, -0.009771,
-    7.962, 0.519, 235.7,  4.347,  1.313, 4.715,-0.002113, -0.1435, -0.009689,
-    6.227, 0.5645,231.9,  3.961,  1.379, 4.729, 0.001392, -0.1428, -0.009644,
-    5.246, 0.5947,228.6,  4.027,  1.423, 4.729,-0.0005983,-0.143,  -0.009647,
-    5.408, 0.5811,235.7,  3.961,  1.358, 4.738, 0.001075, -0.1425, -0.009618,
-    5.218, 0.5828,245.,   3.838,  1.25,  4.751, 0.004244, -0.1419, -0.009576
+   {2.303, 0.4861,   37.01, 37.96,   5.092, 3.863, 0.3342,-0.1072, -0.008231},
+   {9.894, 0.3081, 23.65, 0.384, 92.93,  3.898, 0.3191,   -0.1086, -0.008271},
+   {4.3,   0.47,   34.3,  3.3,   12.74,  3.961, 0.314,    -0.1091, -0.008297},
+   {2.5,   0.625,  45.7,  0.1,    4.359, 4.024, 0.3113,   -0.1093, -0.008306},
+   {2.1,   0.65,   49.34, 1.788,  4.133, 4.077, 0.3074,   -0.1089, -0.008219},
+   {1.729, 0.6562, 53.41, 2.405,  3.845, 4.124, 0.3023,   -0.1094, -0.00824},
+   {1.402, 0.6791, 58.98, 3.528,  3.211, 4.164, 0.2964,   -0.1101, -0.008267},
+   {1.117, 0.7044, 69.69, 3.705,  2.156, 4.21,  0.2936,   -0.1103, -0.00827},
+   {0.9172,0.724,  79.44, 3.648,  1.646, 4.261, 0.2994,   -0.1085, -0.008145},
+   {8.554, 0.3817, 83.61,11.84,   1.875, 4.3,   0.2903,   -0.1103, -0.008259},
+   {6.297, 0.4622, 65.39,10.14,   5.036, 4.334, 0.2897,   -0.1102, -0.008245},
+   {5.307, 0.4918, 61.74,12.4,    6.665, 4.327, 0.2707,   -0.1127, -0.00837},
+   {4.71,  0.5087, 65.28, 8.806,  5.948, 4.34,  0.2618,   -0.1138, -0.00842},
+   {6.151, 0.4524, 83.,  18.31,   2.71,  4.361, 0.2559,   -0.1145, -0.008447},
+   {6.57,  0.4322, 84.76,15.53,   2.779, 4.349, 0.24,     -0.1166, -0.00855},
+   {5.738, 0.4492, 84.61,14.18,   3.101, 4.362, 0.2327,   -0.1174, -0.008588},
+   {5.013, 0.4707, 85.58,16.55,   3.211, 4.375, 0.2253,   -0.1185, -0.008648},
+   {4.32,  0.4947, 76.14,10.85,   5.441, 4.362, 0.2069,   -0.1214, -0.008815},
+   {4.652, 0.4571, 80.73,22.,     4.952, 4.346, 0.1857,   -0.1249, -0.009021},
+   {3.114, 0.5236, 76.67, 7.62,   6.385, 4.355, 0.18,     -0.1255, -0.009045},
+   {3.114, 0.5236, 76.67, 7.62,   7.502, 4.389, 0.1806,   -0.1253, -0.009028},
+   {3.114, 0.5236, 76.67, 7.62,   8.514, 4.407, 0.1759,   -0.1258, -0.009054},
+   {5.746, 0.4662, 79.24, 1.185,  7.993, 4.419, 0.1694,   -0.1267, -0.009094},
+   {2.792, 0.6346,106.1,  0.2986, 2.331, 4.412, 0.1545,   -0.1289, -0.009202},
+   {4.667, 0.5095,124.3,  2.102,  1.667, 4.419, 0.1448,   -0.1303, -0.009269},
+   {2.44,  0.6346,105.,   0.83,   2.851, 4.436, 0.1443,   -0.1299, -0.009229},
+   {1.491, 0.7118,120.6,  1.101,  1.877, 4.478, 0.1608,   -0.1262, -0.008983},
+   {11.72, 0.3826,102.8,  9.231,  4.371, 4.489, 0.1517,   -0.1278, -0.009078},
+   {7.126, 0.4804,119.3,  5.784,  2.454, 4.514, 0.1551,   -0.1268, -0.009005},
+   {11.61, 0.3955,146.7,  7.031,  1.423, 4.533, 0.1568,   -0.1261, -0.008945},
+   {10.99, 0.41,  163.9,  7.1,    1.052, 4.548, 0.1572,   -0.1256, -0.008901},
+   {9.241, 0.4275,163.1,  7.954,  1.102, 4.553, 0.1544,   -0.1255, -0.008883},
+   {9.276, 0.418, 157.1,  8.038,  1.29,  4.548, 0.1485,   -0.1259, -0.008889},
+   {3.999, 0.6152, 97.6,  1.297,  5.792, 4.489, 0.1128,   -0.1309, -0.009107},
+   {4.306, 0.5658, 97.99, 5.514,  5.754, 4.402, 0.06656,  -0.1375, -0.009421},
+   {3.615, 0.6197, 86.26, 0.333,  8.689, 4.292, 0.01012,  -0.1459, -0.009835},
+   {5.8,   0.49,  147.2,  6.903,  1.289, 4.187,-0.04539,  -0.1542, -0.01025},
+   {5.6,   0.49,  130.,  10.,     2.844, 4.577, 0.13,     -0.1285, -0.009067},
+   {3.55,  0.6068,124.7,  1.112,  3.119, 4.583, 0.1253,   -0.1291, -0.009084},
+   {3.6,   0.62,  105.8,  0.1692, 6.026, 4.58,  0.1174,   -0.1301, -0.009129},
+   {5.4,   0.53,  103.1,  3.931,  7.767, 4.581, 0.111,    -0.1309, -0.009161},
+   {3.97,  0.6459,131.8,  0.2233, 2.723, 4.582, 0.1046,   -0.1317, -0.009193},
+   {3.65,  0.64,  126.8,  0.6834, 3.411, 4.6,   0.1052,   -0.1315, -0.009178},
+   {3.118, 0.6519,164.9,  1.208,  1.51,  4.614, 0.1043,   -0.1315, -0.009175},
+   {2.031, 0.7181,153.1,  1.362,  1.958, 4.619, 0.09769,  -0.1325, -0.009231},
+   {14.4,  0.3923,152.5,  8.354,  2.597, 4.671, 0.1136,   -0.1298, -0.009078},
+   {10.99, 0.4599,138.4,  4.811,  3.726, 4.706, 0.1206,   -0.1287, -0.009009},
+   {16.6,  0.3773,224.1,  6.28,   0.9121,4.732, 0.1244,   -0.128,  -0.008968},
+   {10.54, 0.4533,159.3,  4.832,  2.529, 4.722, 0.1156,   -0.1292, -0.00903},
+   {10.33, 0.4502,162.,   5.132,  2.444, 4.71,  0.106,    -0.1305, -0.0091}, 
+   {10.15, 0.4471,165.6,  5.378,  2.328, 4.698, 0.09647,  -0.1319, -0.009169},
+   {9.976, 0.4439,168.,   5.721,  2.258, 4.681, 0.08536,  -0.1335, -0.009252},
+   {9.804, 0.4408,176.2,  5.675,  1.997, 4.676, 0.07819,  -0.1345, -0.009302},
+   {14.22, 0.363, 228.4,  7.024,  1.016, 4.663, 0.06867,  -0.1358, -0.009373},
+   {9.952, 0.4318,233.5,  5.065,  0.9244,4.676, 0.06861,  -0.1357, -0.009363},
+   {9.272, 0.4345,210.,   4.911,  1.258, 4.649, 0.05362,  -0.1379, -0.00948},
+   {10.13, 0.4146,225.7,  5.525,  1.055, 4.634, 0.04335,  -0.1394, -0.009558},
+   {8.949, 0.4304,213.3,  5.071,  1.221, 4.603, 0.02679,  -0.1418, -0.00969},
+   {11.94, 0.3783,247.2,  6.655,  0.849, 4.584, 0.01494,  -0.1436, -0.009783},
+   {8.472, 0.4405,195.5,  4.051,  1.604, 4.576, 0.007043, -0.1447, -0.009841},
+   {8.301, 0.4399,203.7,  3.667,  1.459, 4.571, 0.0007046,-0.1456, -0.009886},
+   {6.567, 0.4858,193.,   2.65,   1.66,  4.566,-0.005626, -0.1464, -0.00993},
+   {5.951, 0.5016,196.1,  2.662,  1.589, 4.561,-0.01197,  -0.1473, -0.009975},
+   {7.495, 0.4523,251.4,  3.433,  0.8619,4.572,-0.012,    -0.1472, -0.009965},
+   {6.335, 0.4825,255.1,  2.834,  0.8228,4.569,-0.01755,  -0.148,  -0.01},   
+   {4.314, 0.5558,214.8,  2.354,  1.263, 4.573,-0.01992,  -0.1482, -0.01001},
+   {4.02,  0.5681,219.9,  2.402,  1.191, 4.57, -0.02547,  -0.149,  -0.01005},
+   {3.836, 0.5765,210.2,  2.742,  1.305, 4.528,-0.04613,  -0.1521, -0.01022},
+   {4.68,  0.5247,244.7,  2.749,  0.8962,4.494,-0.0637,   -0.1548, -0.01037},
+   {3.223, 0.5883,232.7,  2.954,  1.05,  4.564,-0.027,    -0.1471, -0.009852},
+   {2.892, 0.6204,208.6,  2.415,  1.416, 4.546,-0.04963,  -0.1523, -0.01022},
+   {4.728, 0.5522,217.,   3.091,  1.386, 4.594,-0.03339,  -0.1496, -0.01006},
+   {6.18,  0.52,  170.,   4.,     3.224, 4.608,-0.02886,  -0.1485, -0.00999},
+   {9.,    0.47,  198.,   3.8,    2.032, 4.624,-0.02639,  -0.1481, -0.009971},
+   {2.324, 0.6997,216.,   1.599,  1.399, 4.636,-0.02422,  -0.1477, -0.009939},
+   {1.961, 0.7286,223.,   1.621,  1.296, 4.648,-0.02172,  -0.1471, -0.009903},
+   {1.75,  0.7427,350.1,  0.9789, 0.5507,4.662,-0.1192,   -0.1752, -0.01196},
+   {10.31, 0.4613,261.2,  4.738,  0.9899,4.69, -0.009867, -0.1449, -0.009771},
+   {7.962, 0.519, 235.7,  4.347,  1.313, 4.715,-0.002113, -0.1435, -0.009689},
+   {6.227, 0.5645,231.9,  3.961,  1.379, 4.729, 0.001392, -0.1428, -0.009644},
+   {5.246, 0.5947,228.6,  4.027,  1.423, 4.729,-0.0005983,-0.143,  -0.009647},
+   {5.408, 0.5811,235.7,  3.961,  1.358, 4.738, 0.001075, -0.1425, -0.009618},
+   {5.218, 0.5828,245.,   3.838,  1.25,  4.751, 0.004244, -0.1419, -0.009576}
   };
 
   if ( energy < 1.0 ) {
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977Nuclear.cc b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977Nuclear.cc
index da97289101..913ca38368 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977Nuclear.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977Nuclear.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977Nuclear
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977p.cc b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977p.cc
index fdc8500ace..a332196d26 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977p.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1977p.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1977p
 //
@@ -21,6 +35,7 @@
 // Modifications: 
 // 20/07/2000  V.Ivanchenko First implementation
 // 18/09/2000  V.Ivanchenko clean up - all variable are the same as in ICRU
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -68,7 +83,7 @@ G4double G4hZiegler1977p::StoppingPower(const G4Material* material,
   // pure material (normally not the case for this function)
   if(1 == (material->GetNumberOfElements())) {
     G4double z = material->GetZ() ;
-    G4double ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
+    ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
   }
   
   return ionloss;
@@ -92,98 +107,98 @@ G4double G4hZiegler1977p::ElectronicStoppingPower(G4double z,
   G4double T = kineticEnergy/(keV*protonMassAMU) ; 
   
   static G4double a[92][12] = {
-    1.262,1.440,  242.6,12000.,0.115900,0.0005099,54360.0,-5.0520,2.0490,-0.30440,0.019660,-0.0004659,
-    1.229,1.397,  484.5,5873.0,0.052250,0.0010200,24510.0,-2.1580,0.8278,-0.11720,0.007259,-0.000166,
-    1.411,1.600,  725.6,3013.0,0.045780,0.0015300,21470.0,-0.5831,0.5620,-0.11830,0.009298,-0.0002498,
-    2.248,2.590,  966.0, 153.8,0.034750,0.0020390,16300.0, 0.2779,0.1745,-0.05684,0.005155,-0.0001488,
-    2.474,2.815, 1206.0,1060.0,0.028550,0.0025490,13450.0,-2.4450,1.2830,-0.22050,0.015600,-0.0003930,
-    2.631,2.989, 1445.0, 957.2,0.028190,0.0030590,13220.0,-4.3800,2.0440,-0.32830,0.022210,-0.0005417,
-    2.954,3.350, 1683.0,1900.0,0.025130,0.0035690,11790.0,-5.0540,2.3250,-0.37130,0.025060,-0.0006109,
-    2.652,3.000, 1920.0,2000.0,0.022300,0.0040790,10460.0,-6.7340,3.0190,-0.47480,0.031710,-0.0007669,
-    2.085,2.352, 2157.0,2634.0,0.018160,0.0045890,8517.0, -5.5710,2.4490,-0.37810,0.024830,-0.0005919,
-    1.951,2.199, 2393.0,2699.0,0.015680,0.0050990,7353.0, -4.4080,1.8790,-0.28140,0.017960,-0.0004168,
-    2.542,2.869, 2628.0,1854.0,0.014720,0.0056090,6905.0, -4.9590,2.0730,-0.30540,0.019210,-0.0004403,
-    3.792,4.293, 2862.0,1009.0,0.013970,0.0061180,6551.0, -5.5100,2.2660,-0.32950,0.020470,-0.0004637,
-    4.154,4.739, 2766.0, 164.5,0.020230,0.0066280,6309.0, -6.0610,2.4600,-0.35350,0.021730,-0.0004871,
-    4.150,4.700, 3329.0, 550.0,0.013210,0.0071380,6194.0, -6.2940,2.5380,-0.36280,0.022200,-0.0004956,
-    3.232,3.647, 3561.0,1560.0,0.012670,0.0076480,5942.0, -6.5270,2.6160,-0.37210,0.022670,-0.0005040,
-    3.447,3.891, 3792.0,1219.0,0.012110,0.0081580,5678.0, -6.7610,2.6940,-0.38140,0.023140,-0.0005125,
-    5.047,5.714, 4023.0, 878.6,0.011780,0.0086680,5524.0, -6.9940,2.7730,-0.39070,0.023610,-0.0005209,
-    5.731,6.500, 4253.0, 530.0,0.011230,0.0091780,5268.0, -7.2270,2.8510,-0.40000,0.024070,-0.0005294,
-    5.151,5.833, 4482.0, 545.7,0.011290,0.0096870,5295.0, -7.4400,2.9230,-0.40940,0.024620,-0.0005411,
-    5.521,6.252, 4710.0, 553.3,0.011120,0.0102000,5214.0, -7.6530,2.9950,-0.41870,0.025160,-0.0005529,
-    5.201,5.884, 4938.0, 560.9,0.009995,0.0107100,4688.0, -8.0120,3.1230,-0.43500,0.026050,-0.0005707,
-    4.862,5.496, 5165.0, 568.5,0.009474,0.0112200,4443.0, -8.3710,3.2510,-0.45130,0.026940,-0.0005886,
-    4.480,5.055, 5391.0, 952.3,0.009117,0.0117300,4276.0, -8.7310,3.3790,-0.46760,0.027830,-0.0006064,
-    3.983,4.489, 5616.0,1336.0,0.008413,0.0122400,3946.0, -9.0900,3.5070,-0.48380,0.028720,-0.0006243,
-    3.469,3.907, 5725.0,1461.0,0.008829,0.0127500,3785.0, -9.4490,3.6350,-0.50010,0.029610,-0.0006421,
-    3.519,3.963, 6065.0,1243.0,0.007782,0.0132600,3650.0, -9.8090,3.7630,-0.51640,0.030500,-0.0006600,
-    3.140,3.535, 6288.0,1372.0,0.007361,0.0137700,3453.0,-10.1700,3.8910,-0.53270,0.031390,-0.0006779,
-    3.553,4.004, 6205.0, 555.1,0.008763,0.0142800,3297.0,-10.5300,4.0190,-0.54900,0.032290,-0.0006957,
-    3.696,4.175, 4673.0, 387.8,0.021880,0.0147900,3174.0,-11.1800,4.2520,-0.57910,0.033990,-0.0007314,
-    4.210,4.750, 6953.0, 295.2,0.006809,0.0153000,3194.0,-11.5700,4.3940,-0.59800,0.035060,-0.0007537,
-    5.041,5.697, 7173.0, 202.6,0.006725,0.0158100,3154.0,-11.9500,4.5370,-0.61690,0.036130,-0.0007759,
-    5.554,6.300, 6496.0, 110.0,0.009689,0.0163200,3097.0,-12.3400,4.6800,-0.63580,0.037210,-0.0007981,
-    5.323,6.012, 7611.0, 292.5,0.006447,0.0168300,3024.0,-12.7200,4.8230,-0.65470,0.038280,-0.0008203,
-    5.847,6.656, 7395.0, 117.5,0.007684,0.0173400,3006.0,-13.1100,4.9650,-0.67350,0.039350,-0.0008425,
-    5.611,6.335, 8046.0, 365.2,0.006244,0.0178500,2928.0,-13.4000,5.0830,-0.69060,0.040420,-0.0008675,
-    6.411,7.250, 8262.0, 220.0,0.006087,0.0183600,2855.0,-13.6900,5.2000,-0.70760,0.041500,-0.0008925,
-    5.694,6.429, 8478.0, 292.9,0.006087,0.0188600,2855.0,-13.9200,5.2660,-0.71400,0.041730,-0.0008943,
-    6.339,7.159, 8693.0, 330.3,0.006003,0.0193700,2815.0,-14.1400,5.3310,-0.72050,0.041960,-0.0008962,
-    6.407,7.234, 8907.0, 367.8,0.005889,0.0198800,2762.0,-14.3600,5.3970,-0.72690,0.042190,-0.0008980,
-    6.734,7.603, 9120.0, 405.2,0.005765,0.0203900,2704.0,-14.5900,5.4630,-0.73330,0.042420,-0.0008998,
-    6.902,7.791, 9333.0, 442.7,0.005587,0.0209000,2621.0,-16.2200,6.0940,-0.82250,0.047910,-0.0010240,
-    6.425,7.248, 9545.0, 480.2,0.005367,0.0214100,2517.0,-17.8500,6.7250,-0.91160,0.053390,-0.0011480,
-    6.799,7.671, 9756.0, 517.6,0.005315,0.0219200,2493.0,-17.9600,6.7520,-0.91350,0.053410,-0.001147,
-    6.108,6.887, 9966.0, 555.1,0.005151,0.0224300,2416.0,-18.0700,6.7790,-0.91540,0.053420,-0.0011450,
-    5.924,6.677,10180.0, 592.5,0.004919,0.0229400,2307.0,-18.1800,6.8060,-0.91730,0.053430,-0.0011430,
-    5.238,5.900,10380.0, 630.0,0.004758,0.0234500,2231.0,-18.2800,6.8330,-0.91920,0.053450,-0.0011420,
-    5.623,6.354, 7160.0, 337.6,0.013940,0.0239600,2193.0,-18.3900,6.8600,-0.92110,0.053460,-0.0011400,
-    5.814,6.554,10800.0, 355.5,0.004626,0.0244700,2170.0,-18.6200,6.9150,-0.92430,0.053400,-0.0011340,
-    6.230,7.024,11010.0, 370.9,0.004540,0.0249800,2129.0,-18.8500,6.9690,-0.92750,0.053350,-0.0011270,
-    6.410,7.227,11210.0, 386.4,0.004474,0.0254900,2099.0,-19.0700,7.0240,-0.93080,0.053290,-0.0011210,
-    7.500,8.480, 8608.0, 348.0,0.009074,0.0260000,2069.0,-19.5700,7.2250,-0.96030,0.055180,-0.0011650,
-    6.979,7.871,11620.0, 392.4,0.004402,0.0265100,2065.0,-20.0700,7.4260,-0.98990,0.057070,-0.0012090,
-    7.725,8.716,11830.0, 394.8,0.004376,0.0270200,2052.0,-20.5600,7.6270,-1.01900,0.058960,-0.0012540,
-    8.231,9.289,12030.0, 397.3,0.004384,0.0275300,2056.0,-21.0600,7.8280,-1.04900,0.060850,-0.0012980,
-    7.287,8.218,12230.0, 399.7,0.004447,0.0280400,2086.0,-20.4000,7.5400,-1.00400,0.057820,-0.0012240,
-    7.899,8.911,12430.0, 402.1,0.004511,0.0285500,2116.0,-19.7400,7.2520,-0.95880,0.054790,-0.0011510,
-    8.041,9.071,12630.0, 404.5,0.004540,0.0290600,2129.0,-19.0800,6.9640,-0.91360,0.051760,-0.0010770,
-    7.489,8.444,12830.0, 406.9,0.004420,0.0295700,2073.0,-18.4300,6.6770,-0.86840,0.048720,-0.0010030,
-    7.291,8.219,13030.0, 409.3,0.004298,0.0300800,2016.0,-17.7700,6.3890,-0.82330,0.045690,-0.0009292,
-    7.098,8.000,13230.0, 411.8,0.004182,0.0305900,1962.0,-17.1100,6.1010,-0.77810,0.042660,-0.0008553,
-    6.910,7.786,13430.0, 414.2,0.004058,0.0311000,1903.0,-16.4500,5.8130,-0.73300,0.039630,-0.0007815,
-    6.728,7.580,13620.0, 416.6,0.003976,0.0316100,1865.0,-15.7900,5.5260,-0.68780,0.036600,-0.0007077,
-    6.551,7.380,13820.0, 419.0,0.003877,0.0321200,1819.0,-15.1300,5.2380,-0.64260,0.033570,-0.0006339,
-    6.739,7.592,14020.0, 421.4,0.003863,0.0326300,1812.0,-14.4700,4.9500,-0.59750,0.030530,-0.0005601,
-    6.212,6.996,14210.0, 423.9,0.003725,0.0331400,1747.0,-14.5600,4.9840,-0.60220,0.030820,-0.0005668,
-    5.517,6.210,14400.0, 426.3,0.003632,0.0336500,1703.0,-14.6500,5.0180,-0.60690,0.031110,-0.0005734,
-    5.219,5.874,14600.0, 428.7,0.003498,0.0341600,1640.0,-14.7400,5.0510,-0.61170,0.031410,-0.0005801,
-    5.071,5.706,14790.0, 433.0,0.003405,0.0346700,1597.0,-14.8300,5.0850,-0.61640,0.031700,-0.0005867,
-    4.926,5.542,14980.0, 433.5,0.003342,0.0351800,1567.0,-14.9100,5.1190,-0.62110,0.031990,-0.0005933,
-    4.787,5.386,15170.0, 435.9,0.003292,0.0356900,1544.0,-15.0000,5.1530,-0.62580,0.032280,-0.0006000,
-    4.893,5.505,15360.0, 438.4,0.003243,0.0362000,1521.0,-15.0900,5.1860,-0.63050,0.032570,-0.0006066,
-    5.028,5.657,15550.0, 440.8,0.003195,0.0367100,1499.0,-15.1800,5.2200,-0.63530,0.032860,-0.0006133,
-    4.738,5.329,15740.0, 443.2,0.003186,0.0372200,1494.0,-15.2700,5.2540,-0.64000,0.033150,-0.0006199,
-    4.574,5.144,15930.0, 442.4,0.003144,0.0377300,1475.0,-15.6700,5.3920,-0.65770,0.034180,-0.0006426,
-    5.200,5.851,16120.0, 441.6,0.003122,0.0382400,1464.0,-16.0700,5.5290,-0.67550,0.035210,-0.0006654,
-    5.070,5.704,16300.0, 440.9,0.003082,0.0387500,1446.0,-16.4700,5.6670,-0.69320,0.036240,-0.0006881,
-    4.945,5.563,16490.0, 440.1,0.002965,0.0392600,1390.0,-16.8800,5.8040,-0.71100,0.037270,-0.0007109,
-    4.476,5.034,16670.0, 439.3,0.002871,0.0397700,1347.0,-17.2800,5.9420,-0.72870,0.038300,-0.0007336,
-    4.856,5.460,18320.0, 438.5,0.002542,0.0402800,1354.0,-17.0200,5.8460,-0.71490,0.037400,-0.0007114,
-    4.308,4.843,17040.0, 487.8,0.002882,0.0407900,1352.0,-17.8400,6.1830,-0.76590,0.040760,-0.0007925,
-    4.723,5.311,17220.0, 537.0,0.002913,0.0413000,1366.0,-18.6600,6.5200,-0.81690,0.044110,-0.0008737,
-    5.319,5.982,17400.0, 586.3,0.002871,0.0418100,1347.0,-19.4800,6.8570,-0.86780,0.047470,-0.0009548,
-    5.956,6.700,17800.0, 677.0,0.002660,0.0423200,1336.0,-19.5500,6.8710,-0.86860,0.047480,-0.0009544,
-    6.158,6.928,17770.0, 586.3,0.002812,0.0428300,1319.0,-19.6200,6.8840,-0.86940,0.047480,-0.0009540,
-    6.204,6.979,17950.0, 586.3,0.002776,0.0433400,1302.0,-19.6900,6.8980,-0.87020,0.047490,-0.0009536,
-    6.181,6.954,18120.0, 586.3,0.002748,0.0438500,1289.0,-19.7600,6.9120,-0.87100,0.047490,-0.0009532,
-    6.949,7.820,18300.0, 586.3,0.002737,0.0443600,1284.0,-19.8300,6.9260,-0.87180,0.047500,-0.0009528,
-    7.506,8.448,18480.0, 586.3,0.002727,0.0448700,1279.0,-19.9000,6.9400,-0.87260,0.047510,-0.0009524,
-    7.649,8.609,18660.0, 586.3,0.002697,0.0453800,1265.0,-19.9700,6.9530,-0.87330,0.047510,-0.0009520,
-    7.710,8.679,18830.0, 586.3,0.002641,0.0458900,1239.0,-20.0400,6.9670,-0.87410,0.047520,-0.0009516,
-    7.407,8.336,19010.0, 586.3,0.002603,0.0464000,1221.0,-20.1100,6.9810,-0.87490,0.047520,-0.0009512,
-    7.290,8.204,19180.0, 586.3,0.002573,0.0469100,1207.0,-20.1800,6.9950,-0.87570,0.047530,-0.0009508
+  {1.262,1.440,  242.6,12000.,0.115900,0.0005099,54360.0,-5.0520,2.0490,-0.30440,0.019660,-0.0004659},
+  {1.229,1.397,  484.5,5873.0,0.052250,0.0010200,24510.0,-2.1580,0.8278,-0.11720,0.007259,-0.000166},
+  {1.411,1.600,  725.6,3013.0,0.045780,0.0015300,21470.0,-0.5831,0.5620,-0.11830,0.009298,-0.0002498},
+  {2.248,2.590,  966.0, 153.8,0.034750,0.0020390,16300.0, 0.2779,0.1745,-0.05684,0.005155,-0.0001488},
+  {2.474,2.815, 1206.0,1060.0,0.028550,0.0025490,13450.0,-2.4450,1.2830,-0.22050,0.015600,-0.0003930},
+  {2.631,2.989, 1445.0, 957.2,0.028190,0.0030590,13220.0,-4.3800,2.0440,-0.32830,0.022210,-0.0005417},
+  {2.954,3.350, 1683.0,1900.0,0.025130,0.0035690,11790.0,-5.0540,2.3250,-0.37130,0.025060,-0.0006109},
+  {2.652,3.000, 1920.0,2000.0,0.022300,0.0040790,10460.0,-6.7340,3.0190,-0.47480,0.031710,-0.0007669},
+  {2.085,2.352, 2157.0,2634.0,0.018160,0.0045890,8517.0, -5.5710,2.4490,-0.37810,0.024830,-0.0005919},
+  {1.951,2.199, 2393.0,2699.0,0.015680,0.0050990,7353.0, -4.4080,1.8790,-0.28140,0.017960,-0.0004168},
+  {2.542,2.869, 2628.0,1854.0,0.014720,0.0056090,6905.0, -4.9590,2.0730,-0.30540,0.019210,-0.0004403},
+  {3.792,4.293, 2862.0,1009.0,0.013970,0.0061180,6551.0, -5.5100,2.2660,-0.32950,0.020470,-0.0004637},
+  {4.154,4.739, 2766.0, 164.5,0.020230,0.0066280,6309.0, -6.0610,2.4600,-0.35350,0.021730,-0.0004871},
+  {4.150,4.700, 3329.0, 550.0,0.013210,0.0071380,6194.0, -6.2940,2.5380,-0.36280,0.022200,-0.0004956},
+  {3.232,3.647, 3561.0,1560.0,0.012670,0.0076480,5942.0, -6.5270,2.6160,-0.37210,0.022670,-0.0005040},
+  {3.447,3.891, 3792.0,1219.0,0.012110,0.0081580,5678.0, -6.7610,2.6940,-0.38140,0.023140,-0.0005125},
+  {5.047,5.714, 4023.0, 878.6,0.011780,0.0086680,5524.0, -6.9940,2.7730,-0.39070,0.023610,-0.0005209},
+  {5.731,6.500, 4253.0, 530.0,0.011230,0.0091780,5268.0, -7.2270,2.8510,-0.40000,0.024070,-0.0005294},
+  {5.151,5.833, 4482.0, 545.7,0.011290,0.0096870,5295.0, -7.4400,2.9230,-0.40940,0.024620,-0.0005411},
+  {5.521,6.252, 4710.0, 553.3,0.011120,0.0102000,5214.0, -7.6530,2.9950,-0.41870,0.025160,-0.0005529},
+  {5.201,5.884, 4938.0, 560.9,0.009995,0.0107100,4688.0, -8.0120,3.1230,-0.43500,0.026050,-0.0005707},
+  {4.862,5.496, 5165.0, 568.5,0.009474,0.0112200,4443.0, -8.3710,3.2510,-0.45130,0.026940,-0.0005886},
+  {4.480,5.055, 5391.0, 952.3,0.009117,0.0117300,4276.0, -8.7310,3.3790,-0.46760,0.027830,-0.0006064},
+  {3.983,4.489, 5616.0,1336.0,0.008413,0.0122400,3946.0, -9.0900,3.5070,-0.48380,0.028720,-0.0006243},
+  {3.469,3.907, 5725.0,1461.0,0.008829,0.0127500,3785.0, -9.4490,3.6350,-0.50010,0.029610,-0.0006421},
+  {3.519,3.963, 6065.0,1243.0,0.007782,0.0132600,3650.0, -9.8090,3.7630,-0.51640,0.030500,-0.0006600},
+  {3.140,3.535, 6288.0,1372.0,0.007361,0.0137700,3453.0,-10.1700,3.8910,-0.53270,0.031390,-0.0006779},
+  {3.553,4.004, 6205.0, 555.1,0.008763,0.0142800,3297.0,-10.5300,4.0190,-0.54900,0.032290,-0.0006957},
+  {3.696,4.175, 4673.0, 387.8,0.021880,0.0147900,3174.0,-11.1800,4.2520,-0.57910,0.033990,-0.0007314},
+  {4.210,4.750, 6953.0, 295.2,0.006809,0.0153000,3194.0,-11.5700,4.3940,-0.59800,0.035060,-0.0007537},
+  {5.041,5.697, 7173.0, 202.6,0.006725,0.0158100,3154.0,-11.9500,4.5370,-0.61690,0.036130,-0.0007759},
+  {5.554,6.300, 6496.0, 110.0,0.009689,0.0163200,3097.0,-12.3400,4.6800,-0.63580,0.037210,-0.0007981},
+  {5.323,6.012, 7611.0, 292.5,0.006447,0.0168300,3024.0,-12.7200,4.8230,-0.65470,0.038280,-0.0008203},
+  {5.847,6.656, 7395.0, 117.5,0.007684,0.0173400,3006.0,-13.1100,4.9650,-0.67350,0.039350,-0.0008425},
+  {5.611,6.335, 8046.0, 365.2,0.006244,0.0178500,2928.0,-13.4000,5.0830,-0.69060,0.040420,-0.0008675},
+  {6.411,7.250, 8262.0, 220.0,0.006087,0.0183600,2855.0,-13.6900,5.2000,-0.70760,0.041500,-0.0008925},
+  {5.694,6.429, 8478.0, 292.9,0.006087,0.0188600,2855.0,-13.9200,5.2660,-0.71400,0.041730,-0.0008943},
+  {6.339,7.159, 8693.0, 330.3,0.006003,0.0193700,2815.0,-14.1400,5.3310,-0.72050,0.041960,-0.0008962},
+  {6.407,7.234, 8907.0, 367.8,0.005889,0.0198800,2762.0,-14.3600,5.3970,-0.72690,0.042190,-0.0008980},
+  {6.734,7.603, 9120.0, 405.2,0.005765,0.0203900,2704.0,-14.5900,5.4630,-0.73330,0.042420,-0.0008998},
+  {6.902,7.791, 9333.0, 442.7,0.005587,0.0209000,2621.0,-16.2200,6.0940,-0.82250,0.047910,-0.0010240},
+  {6.425,7.248, 9545.0, 480.2,0.005367,0.0214100,2517.0,-17.8500,6.7250,-0.91160,0.053390,-0.0011480},
+  {6.799,7.671, 9756.0, 517.6,0.005315,0.0219200,2493.0,-17.9600,6.7520,-0.91350,0.053410,-0.001147},
+  {6.108,6.887, 9966.0, 555.1,0.005151,0.0224300,2416.0,-18.0700,6.7790,-0.91540,0.053420,-0.0011450},
+  {5.924,6.677,10180.0, 592.5,0.004919,0.0229400,2307.0,-18.1800,6.8060,-0.91730,0.053430,-0.0011430},
+  {5.238,5.900,10380.0, 630.0,0.004758,0.0234500,2231.0,-18.2800,6.8330,-0.91920,0.053450,-0.0011420},
+  {5.623,6.354, 7160.0, 337.6,0.013940,0.0239600,2193.0,-18.3900,6.8600,-0.92110,0.053460,-0.0011400},
+  {5.814,6.554,10800.0, 355.5,0.004626,0.0244700,2170.0,-18.6200,6.9150,-0.92430,0.053400,-0.0011340},
+  {6.230,7.024,11010.0, 370.9,0.004540,0.0249800,2129.0,-18.8500,6.9690,-0.92750,0.053350,-0.0011270},
+  {6.410,7.227,11210.0, 386.4,0.004474,0.0254900,2099.0,-19.0700,7.0240,-0.93080,0.053290,-0.0011210},
+  {7.500,8.480, 8608.0, 348.0,0.009074,0.0260000,2069.0,-19.5700,7.2250,-0.96030,0.055180,-0.0011650},
+  {6.979,7.871,11620.0, 392.4,0.004402,0.0265100,2065.0,-20.0700,7.4260,-0.98990,0.057070,-0.0012090},
+  {7.725,8.716,11830.0, 394.8,0.004376,0.0270200,2052.0,-20.5600,7.6270,-1.01900,0.058960,-0.0012540},
+  {8.231,9.289,12030.0, 397.3,0.004384,0.0275300,2056.0,-21.0600,7.8280,-1.04900,0.060850,-0.0012980},
+  {7.287,8.218,12230.0, 399.7,0.004447,0.0280400,2086.0,-20.4000,7.5400,-1.00400,0.057820,-0.0012240},
+  {7.899,8.911,12430.0, 402.1,0.004511,0.0285500,2116.0,-19.7400,7.2520,-0.95880,0.054790,-0.0011510},
+  {8.041,9.071,12630.0, 404.5,0.004540,0.0290600,2129.0,-19.0800,6.9640,-0.91360,0.051760,-0.0010770},
+  {7.489,8.444,12830.0, 406.9,0.004420,0.0295700,2073.0,-18.4300,6.6770,-0.86840,0.048720,-0.0010030},
+  {7.291,8.219,13030.0, 409.3,0.004298,0.0300800,2016.0,-17.7700,6.3890,-0.82330,0.045690,-0.0009292},
+  {7.098,8.000,13230.0, 411.8,0.004182,0.0305900,1962.0,-17.1100,6.1010,-0.77810,0.042660,-0.0008553},
+  {6.910,7.786,13430.0, 414.2,0.004058,0.0311000,1903.0,-16.4500,5.8130,-0.73300,0.039630,-0.0007815},
+  {6.728,7.580,13620.0, 416.6,0.003976,0.0316100,1865.0,-15.7900,5.5260,-0.68780,0.036600,-0.0007077},
+  {6.551,7.380,13820.0, 419.0,0.003877,0.0321200,1819.0,-15.1300,5.2380,-0.64260,0.033570,-0.0006339},
+  {6.739,7.592,14020.0, 421.4,0.003863,0.0326300,1812.0,-14.4700,4.9500,-0.59750,0.030530,-0.0005601},
+  {6.212,6.996,14210.0, 423.9,0.003725,0.0331400,1747.0,-14.5600,4.9840,-0.60220,0.030820,-0.0005668},
+  {5.517,6.210,14400.0, 426.3,0.003632,0.0336500,1703.0,-14.6500,5.0180,-0.60690,0.031110,-0.0005734},
+  {5.219,5.874,14600.0, 428.7,0.003498,0.0341600,1640.0,-14.7400,5.0510,-0.61170,0.031410,-0.0005801},
+  {5.071,5.706,14790.0, 433.0,0.003405,0.0346700,1597.0,-14.8300,5.0850,-0.61640,0.031700,-0.0005867},
+  {4.926,5.542,14980.0, 433.5,0.003342,0.0351800,1567.0,-14.9100,5.1190,-0.62110,0.031990,-0.0005933},
+  {4.787,5.386,15170.0, 435.9,0.003292,0.0356900,1544.0,-15.0000,5.1530,-0.62580,0.032280,-0.0006000},
+  {4.893,5.505,15360.0, 438.4,0.003243,0.0362000,1521.0,-15.0900,5.1860,-0.63050,0.032570,-0.0006066},
+  {5.028,5.657,15550.0, 440.8,0.003195,0.0367100,1499.0,-15.1800,5.2200,-0.63530,0.032860,-0.0006133},
+  {4.738,5.329,15740.0, 443.2,0.003186,0.0372200,1494.0,-15.2700,5.2540,-0.64000,0.033150,-0.0006199},
+  {4.574,5.144,15930.0, 442.4,0.003144,0.0377300,1475.0,-15.6700,5.3920,-0.65770,0.034180,-0.0006426},
+  {5.200,5.851,16120.0, 441.6,0.003122,0.0382400,1464.0,-16.0700,5.5290,-0.67550,0.035210,-0.0006654},
+  {5.070,5.704,16300.0, 440.9,0.003082,0.0387500,1446.0,-16.4700,5.6670,-0.69320,0.036240,-0.0006881},
+  {4.945,5.563,16490.0, 440.1,0.002965,0.0392600,1390.0,-16.8800,5.8040,-0.71100,0.037270,-0.0007109},
+  {4.476,5.034,16670.0, 439.3,0.002871,0.0397700,1347.0,-17.2800,5.9420,-0.72870,0.038300,-0.0007336},
+  {4.856,5.460,18320.0, 438.5,0.002542,0.0402800,1354.0,-17.0200,5.8460,-0.71490,0.037400,-0.0007114},
+  {4.308,4.843,17040.0, 487.8,0.002882,0.0407900,1352.0,-17.8400,6.1830,-0.76590,0.040760,-0.0007925},
+  {4.723,5.311,17220.0, 537.0,0.002913,0.0413000,1366.0,-18.6600,6.5200,-0.81690,0.044110,-0.0008737},
+  {5.319,5.982,17400.0, 586.3,0.002871,0.0418100,1347.0,-19.4800,6.8570,-0.86780,0.047470,-0.0009548},
+  {5.956,6.700,17800.0, 677.0,0.002660,0.0423200,1336.0,-19.5500,6.8710,-0.86860,0.047480,-0.0009544},
+  {6.158,6.928,17770.0, 586.3,0.002812,0.0428300,1319.0,-19.6200,6.8840,-0.86940,0.047480,-0.0009540},
+  {6.204,6.979,17950.0, 586.3,0.002776,0.0433400,1302.0,-19.6900,6.8980,-0.87020,0.047490,-0.0009536},
+  {6.181,6.954,18120.0, 586.3,0.002748,0.0438500,1289.0,-19.7600,6.9120,-0.87100,0.047490,-0.0009532},
+  {6.949,7.820,18300.0, 586.3,0.002737,0.0443600,1284.0,-19.8300,6.9260,-0.87180,0.047500,-0.0009528},
+  {7.506,8.448,18480.0, 586.3,0.002727,0.0448700,1279.0,-19.9000,6.9400,-0.87260,0.047510,-0.0009524},
+  {7.649,8.609,18660.0, 586.3,0.002697,0.0453800,1265.0,-19.9700,6.9530,-0.87330,0.047510,-0.0009520},
+  {7.710,8.679,18830.0, 586.3,0.002641,0.0458900,1239.0,-20.0400,6.9670,-0.87410,0.047520,-0.0009516},
+  {7.407,8.336,19010.0, 586.3,0.002603,0.0464000,1221.0,-20.1100,6.9810,-0.87490,0.047520,-0.0009512},
+  {7.290,8.204,19180.0, 586.3,0.002573,0.0469100,1207.0,-20.1800,6.9950,-0.87570,0.047530,-0.0009508}
   };
   
   if ( T < 10.0 ) {
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985Nuclear.cc b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985Nuclear.cc
index 8d6ed5c496..c8e0e5a6a8 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985Nuclear.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985Nuclear.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1985Nuclear
 //
diff --git a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985p.cc b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985p.cc
index aaeb38da43..efda6c0903 100644
--- a/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985p.cc
+++ b/source/processes/electromagnetic/lowenergy/src/G4hZiegler1985p.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //
 // GEANT4 Class file
 //
-// For information related to this code contact:
-// Geant4 Collaboration
 //
 // File name:     G4hZiegler1985p
 //
@@ -21,6 +35,7 @@
 // Modifications: 
 // 20/07/2000  V.Ivanchenko First implementation
 // 18/09/2000  V.Ivanchenko clean up - all variable are the same as in ICRU
+// 10/05/2001  V.Ivanchenko Clean up againist Linux compilation with -Wall
 //
 // Class Description: 
 //
@@ -39,6 +54,110 @@
 #include "globals.hh"
 #include "G4Material.hh"
 
+G4double G4hZiegler1985p::a[92][8] = {
+   {0.0091827, 0.0053496, 0.69741, 0.48493, 316.07 , 1.0143, 9329.3, 0.053989},
+   {0.11393,   0.0051984, 1.0822,  0.39252, 1081.0 , 1.0645, 4068.5, 0.017699},
+   {0.85837,   0.0050147, 1.6044,  0.38844, 1337.3 , 1.047,  2659.2, 0.01898},
+   {0.8781,    0.0051049, 5.4232,  0.2032 , 1200.6 , 1.0211, 1401.8, 0.038529},
+   {1.4608,    0.0048836, 2.338,   0.44249, 1801.3 , 1.0352, 1784.1, 0.02024},
+   {3.2579,    0.0049148, 2.7156,  0.36473, 2092.2 , 1.0291, 2643.6, 0.018237},
+   {0.59674,   0.0050837, 4.2073,  0.30612, 2394.2 , 1.0255, 4892.1, 0.016006},
+   {0.75253,   0.0050314, 4.0824,  0.30067, 2455.8 , 1.0181, 5069.7, 0.017426},
+   {1.226,     0.0051385, 3.2246,  0.32703, 2525.0 , 1.0142, 7563.6, 0.019469},
+   {1.0332,    0.0051645, 3.004,   0.33889, 2338.6 ,0.99997, 6991.2, 0.021799},
+
+   {6.0972,    0.0044292, 3.1929,  0.45763, 1363.3 , 0.95182, 2380.6, 0.081835},
+   {14.013,    0.0043646, 2.2641,  0.36326, 2187.4 , 0.99098, 6264.8, 0.0462},
+   {0.039001,  0.0045415, 5.5463,  0.39562, 1589.2 , 0.95316, 816.16, 0.047484},
+   {2.072,     0.0044516, 3.5585,  0.53933, 1515.2 , 0.93161, 1790.3, 0.035189},
+   {17.575,    0.0038346, 0.078694,1.2388,  2806.0 , 0.97284, 1037.6, 0.012879},
+   {16.126,    0.0038315, 0.054164,1.3104,  2813.3 , 0.96587, 1251.4, 0.011847},
+   {3.217,     0.0044579, 3.6696,  0.5091,  2734.6 , 0.96253, 2187.5, 0.016907},
+   {2.0379,    0.0044775, 3.0743,  0.54773, 3505.0 , 0.96575, 1714.0, 0.011701},
+   {0.74171,   0.0043051, 1.1515,  0.95083, 917.21 , 0.8782,  389.93, 0.18926},
+   {9.1316,    0.0043809, 5.4611,  0.31327, 3891.8 , 0.97933, 6267.9, 0.015196},
+
+   {7.2247,    0.0043718, 6.1017,  0.37511, 2829.2 , 0.95218, 6376.1, 0.020398},
+   {0.147,     0.0048456, 6.3485,  0.41057, 2164.1 , 0.94028, 5292.6, 0.050263},
+   {5.0611,    0.0039867, 2.6174,  0.57957, 2218.9 , 0.92361, 6323.0, 0.025669},
+   {0.53267,   0.0042968, 0.39005, 1.2725,  1872.7 , 0.90776, 64.166, 0.030107},
+   {0.47697,   0.0043038, 0.31452, 1.3289,  1920.5 , 0.90649, 45.576, 0.027469},
+   {0.027426,  0.0035443, 0.031563,2.1755,  1919.5 , 0.90099, 23.902, 0.025363},
+   {0.16383,   0.0043042, 0.073454,1.8592,  1918.4 , 0.89678, 27.61,  0.023184},
+   {4.2562,    0.0043737, 1.5606,  0.72067, 1546.8 , 0.87958, 302.02, 0.040944},
+   {2.3508,    0.0043237, 2.882,   0.50113, 1837.7 , 0.89992, 2377.0, 0.04965},
+   {3.1095,    0.0038455, 0.11477, 1.5037,  2184.7 , 0.89309, 67.306, 0.016588},
+
+  {15.322,     0.0040306, 0.65391, 0.67668, 3001.7 , 0.92484, 3344.2, 0.016366},
+   {3.6932,    0.0044813, 8.608,   0.27638, 2982.7 , 0.9276,  3166.6, 0.030874},
+   {7.1373,    0.0043134, 9.4247,  0.27937, 2725.8 , 0.91597, 3166.1, 0.025008},
+   {4.8979,    0.0042937, 3.7793,  0.50004, 2824.5 , 0.91028, 1282.4, 0.017061},
+   {1.3683,    0.0043024, 2.5679,  0.60822, 6907.8 , 0.9817,  628.01, 0.0068055},
+   {1.8301,    0.0042983, 2.9057,  0.6038,  4744.6 , 0.94722, 936.64, 0.0092242},
+   {0.42056,   0.0041169, 0.01695, 2.3616,  2252.7 , 0.89192, 39.752, 0.027757},
+   {30.78,     0.0037736, 0.55813, 0.76816, 7113.2 , 0.97697, 1604.4, 0.0065268},
+   {11.576,    0.0042119, 7.0244,  0.37764, 4713.5 , 0.94264, 2493.2, 0.01127},
+   {6.2406,    0.0041916, 5.2701,  0.49453, 4234.6 , 0.93232, 2063.9, 0.011844},
+
+   {0.33073,   0.0041243, 1.7246,  1.1062,  1930.2 , 0.86907, 27.416, 0.038208},
+   {0.017747,  0.0041715, 0.14586, 1.7305,  1803.6 , 0.86315, 29.669, 0.032123},
+   {3.7229,    0.0041768, 4.6286,  0.56769, 1678.0 , 0.86202, 3094.0, 0.06244},
+   {0.13998,   0.0041329, 0.25573, 1.4241,  1919.3 , 0.86326, 72.797, 0.032235},
+   {0.2859,    0.0041386, 0.31301, 1.3424,  1954.8 , 0.86175, 115.18, 0.029342},
+   {0.76002,   0.0042179, 3.386,   0.76285, 1867.4 , 0.85805, 69.994, 0.036448},
+   {6.3957,    0.0041935, 5.4689,  0.41378, 1712.6 , 0.85397, 18493., 0.056471},
+   {3.4717,    0.0041344, 3.2337,  0.63788, 1116.4 , 0.81959, 4766.0, 0.1179},
+   {2.5265,    0.0042282, 4.532,   0.53562, 1030.8 , 0.81652, 16252., 0.19722},
+   {7.3683,    0.0041007, 4.6791,  0.51428, 1160.0 , 0.82454, 17956., 0.13316},
+
+   {7.7197,    0.004388,  3.242,   0.68434, 1428.1 , 0.83389, 1786.7, 0.066512},
+   {16.78,     0.0041918, 9.3198,  0.29569, 3370.9 , 0.90298, 7431.7, 0.02616},
+   {4.2132,    0.0042098, 4.6753,  0.57945, 3503.9 , 0.89261, 1468.9, 0.014359},
+   {4.0818,    0.004214,  4.4425,  0.58393, 3945.3 , 0.90281, 1340.5, 0.013414},
+   {0.18517,   0.0036215,0.00058788,3.5315, 2931.3 , 0.88936,  26.18, 0.026393},
+   {4.8248,    0.0041458, 6.0934,  0.57026, 2300.1 , 0.86359, 2980.7, 0.038679},
+   {0.49857,   0.0041054, 1.9775,  0.95877, 786.55 , 0.78509,  806.6, 0.40882},
+   {3.2754,    0.0042177, 5.768,   0.54054, 6631.3 , 0.94282, 744.07, 0.0083026},
+   {2.9978,    0.0040901, 4.5299,  0.62025, 2161.2 , 0.85669, 1268.6, 0.043031},
+   {2.8701,    0.004096,  4.2568,  0.6138,  2130.4 , 0.85235, 1704.1, 0.039385},
+
+   {10.853,    0.0041149, 5.8906,  0.46834, 2857.2 , 0.87550, 3654.2, 0.029955},
+   {3.6407,    0.0041782, 4.8742,  0.57861, 1267.7 , 0.82211, 3508.2, 0.24174},
+   {17.645,    0.0040992, 6.5855,  0.32734, 3931.3 , 0.90754, 5156.7, 0.036278},
+   {7.5309,    0.0040814, 4.9389,  0.50679, 2519.7 , 0.85819, 3314.6, 0.030514},
+   {5.4742,    0.0040829, 4.897,   0.51113, 2340.1 , 0.85296, 2342.7, 0.035662},
+   {4.2661,    0.0040667, 4.5032,  0.55257, 2076.4 , 0.84151, 1666.6, 0.040801},
+   {6.8313,    0.0040486, 4.3987,  0.51675, 2003.0 , 0.83437, 1410.4, 0.03478},
+   {1.2707,    0.0040553, 4.6295,  0.57428, 1626.3 , 0.81858, 995.68, 0.055319},
+   {5.7561,    0.0040491, 4.357,   0.52496, 2207.3 , 0.83796, 1579.5, 0.027165},
+   {14.127,    0.0040596, 5.8304,  0.37755, 3645.9 , 0.87823, 3411.8, 0.016392},
+
+   {6.6948,    0.0040603, 4.9361,  0.47961, 2719.0 , 0.85249, 1885.8, 0.019713},
+   {3.0619,    0.0040511, 3.5803,  0.59082, 2346.1 , 0.83713, 1222.0, 0.020072},
+   {10.811,    0.0033008, 1.3767,  0.76512, 2003.7 , 0.82269, 1110.6, 0.024958},
+   {2.7101,    0.0040961, 1.2289,  0.98598, 1232.4 , 0.79066, 155.42, 0.047294},
+   {0.52345,   0.0040244, 1.4038,  0.8551,  1461.4 , 0.79677, 503.34, 0.036789},
+   {0.4616,    0.0040203, 1.3014,  0.87043, 1473.5 , 0.79687, 443.09, 0.036301},
+   {0.97814,   0.0040374, 2.0127,  0.7225,  1890.8 , 0.81747, 930.7,  0.02769},
+   {3.2086,    0.0040510, 3.6658,  0.53618, 3091.2 , 0.85602, 1508.1, 0.015401},
+   {2.0035,    0.0040431, 7.4882,  0.3561,  4464.3 , 0.88836, 3966.5, 0.012839},
+   {15.43,     0.0039432, 1.1237,  0.70703, 4595.7 , 0.88437, 1576.5, 0.0088534},
+
+   {3.1512,    0.0040524, 4.0996,  0.5425,  3246.3 , 0.85772, 1691.8, 0.015058},
+   {7.1896,    0.0040588, 8.6927,  0.35842, 4760.6 , 0.88833, 2888.3, 0.011029},
+   {9.3209,    0.0040540, 11.543,  0.32027, 4866.2 , 0.89124, 3213.4, 0.011935},
+   {29.242,    0.0036195, 0.16864, 1.1226,  5688.0 , 0.89812, 1033.3, 0.0071303},
+   {1.8522,    0.0039973, 3.1556,  0.65096, 3755.0 , 0.86383, 1602.0, 0.012042},
+   {3.222,     0.0040041, 5.9024,  0.52678, 4040.2 , 0.86804, 1658.4, 0.011747},
+   {9.3412,    0.0039661, 7.921,   0.42977, 5180.9 , 0.88773, 2173.2, 0.0092007},
+   {36.183,    0.0036003, 0.58341, 0.86747, 6990.2 , 0.91082, 1417.1, 0.0062187},
+   {5.9284,    0.0039695, 6.4082,  0.52122, 4619.5 , 0.88083, 2323.5, 0.011627},
+   {5.2454,    0.0039744, 6.7969,  0.48542, 4586.3 , 0.87794, 2481.5, 0.011282},
+
+   {33.702,    0.0036901, 0.47257, 0.89235, 5295.7 , 0.8893,  2053.3, 0.0091908},
+   {2.7589,    0.0039806, 3.2092,  0.66122, 2505.4 , 0.82863, 2065.1, 0.022816}
+  };
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 G4hZiegler1985p::G4hZiegler1985p():G4VhElectronicStoppingPower(), 
@@ -68,7 +187,7 @@ G4double G4hZiegler1985p::StoppingPower(const G4Material* material,
   // pure material (normally not the case for this function)
   if(1 == (material->GetNumberOfElements())) {
     G4double z = material->GetZ() ;
-    G4double ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
+    ionloss = ElectronicStoppingPower( z, kineticEnergy ) ;  
   }
   
   return ionloss;
@@ -91,109 +210,7 @@ G4double G4hZiegler1985p::ElectronicStoppingPower(G4double z,
   
   G4double T = kineticEnergy/(keV*protonMassAMU) ; 
   
-  static G4double a[92][8] = {
-   0.0091827, 0.0053496, 0.69741, 0.48493, 316.07 , 1.0143, 9329.3, 0.053989,
-   0.11393,   0.0051984, 1.0822,  0.39252, 1081.0 , 1.0645, 4068.5, 0.017699,
-   0.85837,   0.0050147, 1.6044,  0.38844, 1337.3 , 1.047,  2659.2, 0.01898,
-   0.8781,    0.0051049, 5.4232,  0.2032 , 1200.6 , 1.0211, 1401.8, 0.038529,
-   1.4608,    0.0048836, 2.338,   0.44249, 1801.3 , 1.0352, 1784.1, 0.02024,
-   3.2579,    0.0049148, 2.7156,  0.36473, 2092.2 , 1.0291, 2643.6, 0.018237,
-   0.59674,   0.0050837, 4.2073,  0.30612, 2394.2 , 1.0255, 4892.1, 0.016006,
-   0.75253,   0.0050314, 4.0824,  0.30067, 2455.8 , 1.0181, 5069.7, 0.017426,
-   1.226,     0.0051385, 3.2246,  0.32703, 2525.0 , 1.0142, 7563.6, 0.019469,
-   1.0332,    0.0051645, 3.004,   0.33889, 2338.6 ,0.99997, 6991.2, 0.021799,
-
-   6.0972,    0.0044292, 3.1929,  0.45763, 1363.3 , 0.95182, 2380.6, 0.081835,
-   14.013,    0.0043646, 2.2641,  0.36326, 2187.4 , 0.99098, 6264.8, 0.0462,
-   0.039001,  0.0045415, 5.5463,  0.39562, 1589.2 , 0.95316, 816.16, 0.047484,
-   2.072,     0.0044516, 3.5585,  0.53933, 1515.2 , 0.93161, 1790.3, 0.035189,
-   17.575,    0.0038346, 0.078694,1.2388,  2806.0 , 0.97284, 1037.6, 0.012879,
-   16.126,    0.0038315, 0.054164,1.3104,  2813.3 , 0.96587, 1251.4, 0.011847,
-   3.217,     0.0044579, 3.6696,  0.5091,  2734.6 , 0.96253, 2187.5, 0.016907,
-   2.0379,    0.0044775, 3.0743,  0.54773, 3505.0 , 0.96575, 1714.0, 0.011701,
-   0.74171,   0.0043051, 1.1515,  0.95083, 917.21 , 0.8782,  389.93, 0.18926,
-   9.1316,    0.0043809, 5.4611,  0.31327, 3891.8 , 0.97933, 6267.9, 0.015196,
-
-   7.2247,    0.0043718, 6.1017,  0.37511, 2829.2 , 0.95218, 6376.1, 0.020398,
-   0.147,     0.0048456, 6.3485,  0.41057, 2164.1 , 0.94028, 5292.6, 0.050263,
-   5.0611,    0.0039867, 2.6174,  0.57957, 2218.9 , 0.92361, 6323.0, 0.025669,
-   0.53267,   0.0042968, 0.39005, 1.2725,  1872.7 , 0.90776, 64.166, 0.030107,
-   0.47697,   0.0043038, 0.31452, 1.3289,  1920.5 , 0.90649, 45.576, 0.027469,
-   0.027426,  0.0035443, 0.031563,2.1755,  1919.5 , 0.90099, 23.902, 0.025363,
-   0.16383,   0.0043042, 0.073454,1.8592,  1918.4 , 0.89678, 27.61,  0.023184,
-   4.2562,    0.0043737, 1.5606,  0.72067, 1546.8 , 0.87958, 302.02, 0.040944,
-   2.3508,    0.0043237, 2.882,   0.50113, 1837.7 , 0.89992, 2377.0, 0.04965,
-   3.1095,    0.0038455, 0.11477, 1.5037,  2184.7 , 0.89309, 67.306, 0.016588,
-
-  15.322,     0.0040306, 0.65391, 0.67668, 3001.7 , 0.92484, 3344.2, 0.016366,
-   3.6932,    0.0044813, 8.608,   0.27638, 2982.7 , 0.9276,  3166.6, 0.030874,
-   7.1373,    0.0043134, 9.4247,  0.27937, 2725.8 , 0.91597, 3166.1, 0.025008,
-   4.8979,    0.0042937, 3.7793,  0.50004, 2824.5 , 0.91028, 1282.4, 0.017061,
-   1.3683,    0.0043024, 2.5679,  0.60822, 6907.8 , 0.9817,  628.01, 0.0068055,
-   1.8301,    0.0042983, 2.9057,  0.6038,  4744.6 , 0.94722, 936.64, 0.0092242,
-   0.42056,   0.0041169, 0.01695, 2.3616,  2252.7 , 0.89192, 39.752, 0.027757,
-   30.78,     0.0037736, 0.55813, 0.76816, 7113.2 , 0.97697, 1604.4, 0.0065268,
-   11.576,    0.0042119, 7.0244,  0.37764, 4713.5 , 0.94264, 2493.2, 0.01127,
-   6.2406,    0.0041916, 5.2701,  0.49453, 4234.6 , 0.93232, 2063.9, 0.011844,
-
-   0.33073,   0.0041243, 1.7246,  1.1062,  1930.2 , 0.86907, 27.416, 0.038208,
-   0.017747,  0.0041715, 0.14586, 1.7305,  1803.6 , 0.86315, 29.669, 0.032123,
-   3.7229,    0.0041768, 4.6286,  0.56769, 1678.0 , 0.86202, 3094.0, 0.06244,
-   0.13998,   0.0041329, 0.25573, 1.4241,  1919.3 , 0.86326, 72.797, 0.032235,
-   0.2859,    0.0041386, 0.31301, 1.3424,  1954.8 , 0.86175, 115.18, 0.029342,
-   0.76002,   0.0042179, 3.386,   0.76285, 1867.4 , 0.85805, 69.994, 0.036448,
-   6.3957,    0.0041935, 5.4689,  0.41378, 1712.6 , 0.85397, 18493., 0.056471,
-   3.4717,    0.0041344, 3.2337,  0.63788, 1116.4 , 0.81959, 4766.0, 0.1179,
-   2.5265,    0.0042282, 4.532,   0.53562, 1030.8 , 0.81652, 16252., 0.19722,
-   7.3683,    0.0041007, 4.6791,  0.51428, 1160.0 , 0.82454, 17956., 0.13316,
-
-   7.7197,    0.004388,  3.242,   0.68434, 1428.1 , 0.83389, 1786.7, 0.066512,
-   16.78,     0.0041918, 9.3198,  0.29569, 3370.9 , 0.90298, 7431.7, 0.02616,
-   4.2132,    0.0042098, 4.6753,  0.57945, 3503.9 , 0.89261, 1468.9, 0.014359,
-   4.0818,    0.004214,  4.4425,  0.58393, 3945.3 , 0.90281, 1340.5, 0.013414,
-   0.18517,   0.0036215,0.00058788,3.5315, 2931.3 , 0.88936,  26.18, 0.026393,
-   4.8248,    0.0041458, 6.0934,  0.57026, 2300.1 , 0.86359, 2980.7, 0.038679,
-   0.49857,   0.0041054, 1.9775,  0.95877, 786.55 , 0.78509,  806.6, 0.40882,
-   3.2754,    0.0042177, 5.768,   0.54054, 6631.3 , 0.94282, 744.07, 0.0083026,
-   2.9978,    0.0040901, 4.5299,  0.62025, 2161.2 , 0.85669, 1268.6, 0.043031,
-   2.8701,    0.004096,  4.2568,  0.6138,  2130.4 , 0.85235, 1704.1, 0.039385,
-
-   10.853,    0.0041149, 5.8906,  0.46834, 2857.2 , 0.87550, 3654.2, 0.029955,
-   3.6407,    0.0041782, 4.8742,  0.57861, 1267.7 , 0.82211, 3508.2, 0.24174,
-   17.645,    0.0040992, 6.5855,  0.32734, 3931.3 , 0.90754, 5156.7, 0.036278,
-   7.5309,    0.0040814, 4.9389,  0.50679, 2519.7 , 0.85819, 3314.6, 0.030514,
-   5.4742,    0.0040829, 4.897,   0.51113, 2340.1 , 0.85296, 2342.7, 0.035662,
-   4.2661,    0.0040667, 4.5032,  0.55257, 2076.4 , 0.84151, 1666.6, 0.040801,
-   6.8313,    0.0040486, 4.3987,  0.51675, 2003.0 , 0.83437, 1410.4, 0.03478,
-   1.2707,    0.0040553, 4.6295,  0.57428, 1626.3 , 0.81858, 995.68, 0.055319,
-   5.7561,    0.0040491, 4.357,   0.52496, 2207.3 , 0.83796, 1579.5, 0.027165,
-   14.127,    0.0040596, 5.8304,  0.37755, 3645.9 , 0.87823, 3411.8, 0.016392,
-
-   6.6948,    0.0040603, 4.9361,  0.47961, 2719.0 , 0.85249, 1885.8, 0.019713,
-   3.0619,    0.0040511, 3.5803,  0.59082, 2346.1 , 0.83713, 1222.0, 0.020072,
-   10.811,    0.0033008, 1.3767,  0.76512, 2003.7 , 0.82269, 1110.6, 0.024958,
-   2.7101,    0.0040961, 1.2289,  0.98598, 1232.4 , 0.79066, 155.42, 0.047294,
-   0.52345,   0.0040244, 1.4038,  0.8551,  1461.4 , 0.79677, 503.34, 0.036789,
-   0.4616,    0.0040203, 1.3014,  0.87043, 1473.5 , 0.79687, 443.09, 0.036301,
-   0.97814,   0.0040374, 2.0127,  0.7225,  1890.8 , 0.81747, 930.7,  0.02769,
-   3.2086,    0.0040510, 3.6658,  0.53618, 3091.2 , 0.85602, 1508.1, 0.015401,
-   2.0035,    0.0040431, 7.4882,  0.3561,  4464.3 , 0.88836, 3966.5, 0.012839,
-   15.43,     0.0039432, 1.1237,  0.70703, 4595.7 , 0.88437, 1576.5, 0.0088534,
-
-   3.1512,    0.0040524, 4.0996,  0.5425,  3246.3 , 0.85772, 1691.8, 0.015058,
-   7.1896,    0.0040588, 8.6927,  0.35842, 4760.6 , 0.88833, 2888.3, 0.011029,
-   9.3209,    0.0040540, 11.543,  0.32027, 4866.2 , 0.89124, 3213.4, 0.011935,
-   29.242,    0.0036195, 0.16864, 1.1226,  5688.0 , 0.89812, 1033.3, 0.0071303,
-   1.8522,    0.0039973, 3.1556,  0.65096, 3755.0 , 0.86383, 1602.0, 0.012042,
-   3.222,     0.0040041, 5.9024,  0.52678, 4040.2 , 0.86804, 1658.4, 0.011747,
-   9.3412,    0.0039661, 7.921,   0.42977, 5180.9 , 0.88773, 2173.2, 0.0092007,
-   36.183,    0.0036003, 0.58341, 0.86747, 6990.2 , 0.91082, 1417.1, 0.0062187,
-   5.9284,    0.0039695, 6.4082,  0.52122, 4619.5 , 0.88083, 2323.5, 0.011627,
-   5.2454,    0.0039744, 6.7969,  0.48542, 4586.3 , 0.87794, 2481.5, 0.011282,
-
-   33.702,    0.0036901, 0.47257, 0.89235, 5295.7 , 0.8893,  2053.3, 0.0091908,
-   2.7589,    0.0039806, 3.2092,  0.66122, 2505.4 , 0.82863, 2065.1, 0.022816
-  };
+  
   
   G4double e = T ;
   if ( T < 25.0 ) e = 25.0 ;
diff --git a/source/processes/electromagnetic/muons/History b/source/processes/electromagnetic/muons/History
index 8b33bad7d1..6042c25963 100644
--- a/source/processes/electromagnetic/muons/History
+++ b/source/processes/electromagnetic/muons/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.11 2001/03/23 15:09:37 maire Exp $
+$Id: History,v 1.12 2001/05/30 14:33:44 vnivanch Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+29 may 01: V.Ivanchenko 
+- clean up againist Linux ANSI strict compilation mode.
+
 23 mar 01 L.Urban (muons-V03-00-05)
 - R.Kokoulin's correction to energy loss has been commented out
   in G4MuIonisation.cc
diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
index ab2b8e0704..0988c61b98 100644
--- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuBremsstrahlung.hh,v 1.8 2000/05/23 09:55:37 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuBremsstrahlung.hh,v 1.8.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuBremsstrahlung physics process ---------
diff --git a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
index 654f747a70..1d12aca746 100644
--- a/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuBremsstrahlung.icc
@@ -1,23 +1,44 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuBremsstrahlung.icc,v 1.3 1999/12/15 14:51:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuBremsstrahlung.icc,v 1.4.2.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuBremsstrahlung physics process ---------
 //                by Laszlo Urban, September 1997
 // ***************************************************************
+//
+// Modified:
+//
+// 29.05.01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
+//
+// ---------------------------------------------------------------
+//
 
 inline G4double G4MuBremsstrahlung::GetMeanFreePath(const G4Track& trackData,
                                                     G4double previousStepSize,
@@ -56,7 +77,7 @@ inline G4double G4MuBremsstrahlung::ComputeMeanFreePath(
                                      aMaterial->GetAtomicNumDensityVector();
   G4double GammaEnergyCut = (G4Gamma::GetCutsInEnergy())[aMaterial->GetIndex()];   
   G4double SIGMA = 0 ;
-  for ( G4int i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
+  for ( size_t i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
       {             
             SIGMA += theAtomNumDensityVector[i] * 
                      ComputeMicroscopicCrossSection(
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
index 39f69a8265..38d1a47ee5 100644
--- a/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuIonisation.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuIonisation.hh,v 1.8 2000/04/25 14:18:58 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuIonisation.hh,v 1.8.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuIonisation physics process ------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuIonisation.icc b/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
index 64805fc6d2..b64c92b978 100644
--- a/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuIonisation.icc,v 1.2 1999/12/15 14:51:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuIonisation.icc,v 1.2.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuIonisation physics process -------------
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
index fcd4079590..914089730a 100644
--- a/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
+++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuPairProduction.hh,v 1.8 2000/05/23 16:03:25 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuPairProduction.hh,v 1.8.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuPairProduction physics process ---------
diff --git a/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc b/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
index 02fd70222f..ba0ebede96 100644
--- a/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
+++ b/source/processes/electromagnetic/muons/include/G4MuPairProduction.icc
@@ -1,23 +1,44 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuPairProduction.icc,v 1.3 2000/02/10 08:29:13 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuPairProduction.icc,v 1.4.2.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuPairProduction physics process ---------
 //                by Laszlo Urban, May 1998  
 // ***************************************************************
+//
+// Modified:
+//
+// 29.05.01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
+//
+// ---------------------------------------------------------------
+//
 
 inline G4double G4MuPairProduction::GetMeanFreePath(const G4Track& trackData,
                                                     G4double previousStepSize,
@@ -59,7 +80,7 @@ inline G4double G4MuPairProduction::ComputeMeanFreePath(
                        (G4Positron::GetCutsInEnergy())[aMaterial->GetIndex()];  
 
   G4double SIGMA = 0 ;
-  for ( G4int i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
+  for ( size_t i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
       {             
             SIGMA += theAtomNumDensityVector[i] * 
                   ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
index 30c7cb916b..edb60ed383 100644
--- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
+++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.hh
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMuEnergyLoss.hh,v 1.2 2000/06/07 16:50:21 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMuEnergyLoss.hh,v 1.2.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 // -------------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VMuEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
index 1c663c62ac..6c5f5a500d 100644
--- a/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
+++ b/source/processes/electromagnetic/muons/include/G4VMuEnergyLoss.icc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMuEnergyLoss.icc,v 1.1 2000/04/25 14:18:59 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMuEnergyLoss.icc,v 1.1.4.2 2001/06/28 20:19:44 gunter Exp $
+// GEANT4 tag $Name:  $
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VMuEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
index 51d20156b1..2152db2dff 100644
--- a/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuBremsstrahlung.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuBremsstrahlung.cc,v 1.14 2001/02/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuBremsstrahlung.cc,v 1.15.2.2 2001/06/28 20:19:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //    
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuBremsstrahlung physics process ---------
@@ -22,7 +36,9 @@
 // 08-04-98: remove 'tracking cut' of muon in oIt, MMa
 // 26/10/98: new cross section of R.Kokoulin,cleanup , L.Urban
 // 10/02/00  modifications , new e.m. structure, L.Urban
+// 29/05/01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
+
 #include "G4MuBremsstrahlung.hh"
 #include "G4UnitsTable.hh"
  
@@ -33,8 +49,10 @@ G4double G4MuBremsstrahlung::adat[]={1.01,9.01,26.98,63.55,238.03};
 G4int G4MuBremsstrahlung::ntdat = 8 ;
 G4double G4MuBremsstrahlung::tdat[]={1.e3,1.e4,1.e5,1.e6,1.e7,1.e8,1.e9,1.e10};
 G4int G4MuBremsstrahlung::NBIN = 1000;    // 100 ;
-G4double G4MuBremsstrahlung::ya[1001]={0.};
-G4double G4MuBremsstrahlung::proba[5][8][1001]={0.};
+//G4double G4MuBremsstrahlung::ya[1001]={0.};
+//G4double G4MuBremsstrahlung::proba[5][8][1001]={0.};
+G4double G4MuBremsstrahlung::ya[1001];
+G4double G4MuBremsstrahlung::proba[5][8][1001];
 G4double G4MuBremsstrahlung::CutFixed=0.98*keV ;
 
 
@@ -214,7 +232,7 @@ void G4MuBremsstrahlung::BuildLambdaTable(
   PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
   G4PhysicsLogVector* ptrVector;
-  for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
+  for ( size_t J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
   { 
     ptrVector = new G4PhysicsLogVector(
               LowerBoundLambda,UpperBoundLambda,NbinLambda);
@@ -408,9 +426,9 @@ void G4MuBremsstrahlung::MakeSamplingTables(
 
        G4double CrossSection = 0.0 ;
 
-       G4double c,y,ymin,ymax,dy,yy,dx,x,ep,ybin ;
+       G4double c,y,ymin,ymax,dy,yy,dx,x,ep;
 
-       G4int NbofIntervals ;
+       //G4int NbofIntervals ;
        // calculate the differential cross section
        // numerical integration in
        //  log ...............
@@ -495,13 +513,17 @@ G4VParticleChange* G4MuBremsstrahlung::PostStepDoIt(const G4Track& trackData,
     return G4VContinuousDiscreteProcess::PostStepDoIt(trackData,stepData);
 
   //  sampling using tables 
-  G4double v,xc,x,yc,y ;
-  G4int iZ,iT,iy ;
+  //G4double v,xc,x,yc,y ;
+  //G4int iZ,iT,iy ;
+  G4double v,x,y ;
+  G4int iy;
   // select sampling table ;
   G4double lnZ = log(anElement->GetZ()) ;
   G4double delmin = 1.e10 ;
   G4double del ;
-  G4int izz,itt,NBINminus1 ;
+  G4int izz = 0;
+  G4int itt = 0;
+  G4int NBINminus1;
   NBINminus1 = NBIN-1 ;
   for (G4int iz=0; iz<nzdat; iz++)
   {
diff --git a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
index 1a286e3d0e..92acbe93af 100644
--- a/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuIonisation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuIonisation.cc,v 1.12 2001/03/23 07:27:29 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuIonisation.cc,v 1.13.2.2 2001/06/28 20:19:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuIonisation physics process -------------
@@ -26,6 +40,7 @@
 // 26/10/98: new stuff from R.Kokoulin + cleanup , L.Urban
 // 10/02/00  modifications , new e.m. structure, L.Urban
 // 23/03/01: R.Kokoulin's correction is commented out, L.Urban
+// 29.05.01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
  
 
@@ -95,7 +110,7 @@ void G4MuIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
   G4double LowEdgeEnergy , ionloss ;
   G4double deltaloss ;
   G4double RateMass ;
-  G4bool isOutRange ;
+  //G4bool isOutRange ;
   static const G4MaterialTable* theMaterialTable=
                                    G4Material::GetMaterialTable();
   const G4double twoln10 = 2.*log(10.) ;
@@ -143,7 +158,7 @@ void G4MuIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
                    material->GetNumberOfElements() ;
     DeltaCutInKineticEnergyNow = DeltaCutInKineticEnergy[J] ;
 
-    G4double tau,tau0,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
+    G4double tau,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
     for (G4int i = 0 ; i < TotBin ; i++)
     {
       LowEdgeEnergy = aVector->GetLowEdgeEnergy(i) ;
@@ -249,8 +264,8 @@ void G4MuIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
 void G4MuIonisation::BuildLambdaTable(const G4ParticleDefinition& aParticleType)
 {
   // Build mean free path tables for the delta ray production process
-  G4double LowEdgeEnergy,Tmax , Value ,sigma ;
-  G4bool isOutRange ;
+  G4double LowEdgeEnergy, Value ,sigma ;
+  //G4bool isOutRange ;
   const G4MaterialTable* theMaterialTable=G4Material::GetMaterialTable();
 
   G4int numOfMaterials = theMaterialTable->length();
diff --git a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
index a7c5f3395a..70c0bb4f07 100644
--- a/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
+++ b/source/processes/electromagnetic/muons/src/G4MuPairProduction.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuPairProduction.cc,v 1.16 2001/02/05 17:50:29 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuPairProduction.cc,v 1.17.2.2 2001/06/28 20:19:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuPairProduction physics process ---------
@@ -22,6 +36,7 @@
 // 26/10/98, new stuff from R. Kokoulin + cleanup , L.Urban
 // 06/05/99 , bug fixed , L.Urban
 // 10/02/00  modifications+bug fix , new e.m. structure, L.Urban
+// 29/05/01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 
 #include "G4MuPairProduction.hh"
@@ -35,8 +50,10 @@ G4double G4MuPairProduction::zdat[]={1.,4.,13.,26.,92.};
 G4int G4MuPairProduction::ntdat = 8 ;
 G4double G4MuPairProduction::tdat[]={1.e3,1.e4,1.e5,1.e6,1.e7,1.e8,1.e9,1.e10};
 G4int G4MuPairProduction::NBIN = 1000 ; //100 ;
-G4double G4MuPairProduction::ya[1001]={0.};
-G4double G4MuPairProduction::proba[5][8][1001]={0.};
+//G4double G4MuPairProduction::ya[1001]={0.};
+//G4double G4MuPairProduction::proba[5][8][1001]={0.};
+G4double G4MuPairProduction::ya[1001];
+G4double G4MuPairProduction::proba[5][8][1001];
 G4double G4MuPairProduction::MinPairEnergy = 4.*electron_mass_c2 ;
 
 G4double G4MuPairProduction::LowerBoundLambda = 1.*keV ;
@@ -242,7 +259,7 @@ void G4MuPairProduction::BuildLambdaTable(
   PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
 
    G4PhysicsLogVector* ptrVector;
-   for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
+   for ( size_t J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
    { 
       ptrVector = new G4PhysicsLogVector(
                LowerBoundLambda,UpperBoundLambda,NbinLambda);
@@ -374,7 +391,7 @@ void G4MuPairProduction::MakeSamplingTables(
 
       G4double CrossSection = 0.0 ;
 
-      G4int NbofIntervals ;
+      //G4int NbofIntervals ;
       c = log(MaxPairEnergy/MinPairEnergy) ;
 
       ymin = -5. ;
@@ -627,7 +644,7 @@ G4VParticleChange* G4MuPairProduction::PostStepDoIt(const G4Track& trackData,
 
    // limits of the energy sampling
    G4double TotalEnergy = KineticEnergy + ParticleMass ;
-   G4double TotalMomentum = sqrt(KineticEnergy*(TotalEnergy+ParticleMass)) ;
+   //G4double TotalMomentum = sqrt(KineticEnergy*(TotalEnergy+ParticleMass)) ;
    G4double Z3 = anElement->GetIonisation()->GetZ3() ;
    G4double MaxPairEnergy = TotalEnergy-0.75*esq*ParticleMass*Z3 ;
 
@@ -636,14 +653,16 @@ G4VParticleChange* G4MuPairProduction::PostStepDoIt(const G4Track& trackData,
 
    // sample e-e+ energy, pair energy first
    G4double PairEnergy,xc,x,yc,y ;
-   G4int iZ,iT,iy ;
+   // G4int iZ,iT;
+   G4int iy ;
 
    // select sampling table ;
    G4double lnZ = log(anElement->GetZ()) ;
    G4double delmin = 1.e10 ;
    G4double del ;
-   G4int izz,itt,NBINminus1 ;
-   NBINminus1 = NBIN-1 ;
+   G4int izz = 0;
+   G4int itt = 0;
+   G4int NBINminus1 = NBIN-1;
    for (G4int iz=0; iz<nzdat; iz++)
    {
      del = abs(lnZ-log(zdat[iz])) ;
@@ -718,9 +737,10 @@ G4VParticleChange* G4MuPairProduction::PostStepDoIt(const G4Track& trackData,
    G4int numberofsecondaries = 1 ;
    G4int flagelectron = 0 ;
    G4int flagpositron = 1 ; 
-   G4DynamicParticle *aParticle1,*aParticle2 ;
+   G4DynamicParticle* aParticle1 = 0;
+   G4DynamicParticle* aParticle2 = 0;
    G4double ElectronMomentum , PositronMomentum ;
-   G4double finalPx,finalPy,finalPz ;
+   //G4double finalPx,finalPy,finalPz ;
 
    G4double ElectKineEnergy = ElectronEnergy - electron_mass_c2 ;
 
@@ -771,8 +791,7 @@ G4VParticleChange* G4MuPairProduction::PostStepDoIt(const G4Track& trackData,
         aParticleChange.AddSecondary( aParticle2 ) ; 
 
    G4double NewKinEnergy = KineticEnergy - ElectronEnergy - PositronEnergy ;
-   G4double finalMomentum=sqrt(NewKinEnergy*
-                         (NewKinEnergy+2.*ParticleMass)) ;
+   //G4double finalMomentum=sqrt(NewKinEnergy*(NewKinEnergy+2.*ParticleMass));
 
    aParticleChange.SetMomentumChange( ParticleDirection );
 
diff --git a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
index 26ef05608b..c2f3e84cd8 100644
--- a/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
+++ b/source/processes/electromagnetic/muons/src/G4VMuEnergyLoss.cc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VMuEnergyLoss.cc,v 1.8 2001/01/11 10:42:52 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VMuEnergyLoss.cc,v 1.9.2.2 2001/06/28 20:19:45 gunter Exp $
+// GEANT4 tag $Name:  $
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VMuEnergyLoss physics process -----------
@@ -25,6 +39,7 @@
 // cleanup  L.Urban on 23/10/98
 // corrections due to new e.m. structure L.Urban 10/02/00
 // signature in GetLossWithFluct changed L.Urban 30/10/00
+// 29/05/01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
  
 
@@ -43,46 +58,46 @@ G4int       G4VMuEnergyLoss::CounterOfmuplusProcess  = 0 ;
 G4int       G4VMuEnergyLoss::CounterOfmuminusProcess = 0 ;
 
 
-G4PhysicsTable* G4VMuEnergyLoss::theDEDXmuplusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theRangemuplusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theInverseRangemuplusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theLabTimemuplusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theProperTimemuplusTable = NULL ;
+G4PhysicsTable* G4VMuEnergyLoss::theDEDXmuplusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theRangemuplusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theInverseRangemuplusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theLabTimemuplusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theProperTimemuplusTable = 0 ;
 
-G4PhysicsTable* G4VMuEnergyLoss::theDEDXmuminusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theRangemuminusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theInverseRangemuminusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theLabTimemuminusTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::theProperTimemuminusTable = NULL ;
+G4PhysicsTable* G4VMuEnergyLoss::theDEDXmuminusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theRangemuminusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theInverseRangemuminusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theLabTimemuminusTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::theProperTimemuminusTable = 0 ;
 
-G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffATable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffBTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffCTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffATable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffBTable = NULL ;
-G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffCTable = NULL ;
+G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffATable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffBTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::themuplusRangeCoeffCTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffATable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffBTable = 0 ;
+G4PhysicsTable* G4VMuEnergyLoss::themuminusRangeCoeffCTable = 0 ;
  
 G4double G4VMuEnergyLoss::LowerBoundEloss = 1.*keV ;
 G4double G4VMuEnergyLoss::UpperBoundEloss = 1000000.*TeV ;
 G4int    G4VMuEnergyLoss::NbinEloss = 150 ;
 G4double G4VMuEnergyLoss::RTable,G4VMuEnergyLoss::LOGRTable;
 
-G4EnergyLossMessenger* G4VMuEnergyLoss::eLossMessenger = NULL ;
+G4EnergyLossMessenger* G4VMuEnergyLoss::eLossMessenger = 0 ;
 
 // constructor and destructor
  
 G4VMuEnergyLoss::G4VMuEnergyLoss(const G4String& processName)
    : G4VEnergyLoss (processName),
-     theLossTable(NULL),
-     theRangeCoeffATable(NULL),
-     theRangeCoeffBTable(NULL),
-     theRangeCoeffCTable(NULL),
+     theLossTable(0),
      lastgammaCutInRange(0.),
      lastelectronCutInRange(0.),
      theElectron ( G4Electron::Electron() ),
      thePositron ( G4Positron::Positron() ),
      theMuonPlus ( G4MuonPlus::MuonPlus() ),
-     theMuonMinus ( G4MuonMinus::MuonMinus() )
+     theMuonMinus ( G4MuonMinus::MuonMinus() ),
+     theRangeCoeffATable(0),
+     theRangeCoeffBTable(0),
+     theRangeCoeffCTable(0)
 { 
 }
 
@@ -90,7 +105,7 @@ G4VMuEnergyLoss::~G4VMuEnergyLoss()
 {
      if(theLossTable) {
         theLossTable->clearAndDestroy();
-        delete theLossTable; theLossTable = NULL; 
+        delete theLossTable; theLossTable = 0; 
      }
 
 }
@@ -398,7 +413,7 @@ G4VParticleChange* G4VMuEnergyLoss::AlongStepDoIt(
   G4double charge = aParticle->GetDefinition()->GetPDGCharge();
  
   G4Material* aMaterial = trackData.GetMaterial();
-  G4int index = aMaterial->GetIndex();
+  //G4int index = aMaterial->GetIndex();
  
   G4double Step = stepData.GetStepLength();
  
diff --git a/source/processes/electromagnetic/standard/History b/source/processes/electromagnetic/standard/History
index f68d8ffb50..512af767a1 100644
--- a/source/processes/electromagnetic/standard/History
+++ b/source/processes/electromagnetic/standard/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.21 2001/03/27 15:10:51 maire Exp $
+$Id: History,v 1.22 2001/05/30 14:32:18 vnivanch Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,9 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+29 may 01: V.Ivanchenko 
+- clean up againist Linux ANSI strict compilation mode.
      
 27 mar 01 mma (stand-V03-00-05)
 - commented out the printing of subcutoff energies at initialization
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
index 97a0fc4f2e..fdaf127eec 100644
--- a/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ComptonScattering.hh,v 1.4 1999/12/17 16:20:49 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ComptonScattering.hh,v 1.4.4.1 2001/06/28 19:12:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //      ------------ G4ComptonScattering physics process ------
 //                   by Michel Maire, April 1996
diff --git a/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc b/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
index 493cf96139..093451b1b0 100644
--- a/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
+++ b/source/processes/electromagnetic/standard/include/G4ComptonScattering.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ComptonScattering.icc,v 1.2 1999/12/15 14:51:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ComptonScattering.icc,v 1.3.2.2 2001/06/28 20:19:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4ComptonScattering physics process ---------
@@ -24,6 +38,7 @@
 // 12-03-97, new Physics scheme
 // 21-11-97, change for lowest energy limit default action
 // 15-12-98, return DBL_MAX below LowestEnergyLimit
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // ---------------------------------------------------------------
 
 
@@ -72,7 +87,7 @@ inline G4double G4ComptonScattering::ComputeMeanFreePath(G4double GammaEnergy,
 
   G4double SIGMA = 0. ;
 
-  for ( G4int elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
+  for ( size_t elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
       {             
             SIGMA += NbOfAtomsPerVolume[elm] * 
                      ComputeCrossSectionPerAtom( GammaEnergy,
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
index a64be68891..d6a6ff5dc5 100644
--- a/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
+++ b/source/processes/electromagnetic/standard/include/G4GammaConversion.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GammaConversion.hh,v 1.4 1999/12/17 18:26:11 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GammaConversion.hh,v 1.4.4.1 2001/06/28 19:12:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //      ------------ G4GammaConversion physics process ------
 //                   by Michel Maire, 24 May 1996
diff --git a/source/processes/electromagnetic/standard/include/G4GammaConversion.icc b/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
index 3dc44da1b0..723efd899f 100644
--- a/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
+++ b/source/processes/electromagnetic/standard/include/G4GammaConversion.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GammaConversion.icc,v 1.2 1999/12/15 14:51:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GammaConversion.icc,v 1.3.2.2 2001/06/28 20:19:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4GammaConversion physics process ---------
@@ -25,6 +39,7 @@
 // 14-01-97, crossection table + meanfreepath table.
 //           PartialSumSigma removed, by M.Maire
 // 14-01-97, new physics scheme for geant4alpha, M.Maire
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // ---------------------------------------------------------------
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -98,7 +113,7 @@ inline G4double G4GammaConversion::ComputeMeanFreePath(G4double GammaEnergy,
 
   G4double SIGMA = 0 ;
 
-  for ( G4int i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
+  for ( size_t i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
       {             
             SIGMA += theAtomNumDensityVector[i] * 
                      ComputeMicroscopicCrossSection(GammaEnergy,
diff --git a/source/processes/electromagnetic/standard/include/G4IonisationByLogicalVolume.hh b/source/processes/electromagnetic/standard/include/G4IonisationByLogicalVolume.hh
index 28e8d40a6b..cd49aaa529 100644
--- a/source/processes/electromagnetic/standard/include/G4IonisationByLogicalVolume.hh
+++ b/source/processes/electromagnetic/standard/include/G4IonisationByLogicalVolume.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // It is process which allows to select PAIonisation model for some logic volume
 // in an application. In other logical volumes standard ionisation models
 // depending on particle type are realised.
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.hh b/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
index 0a12499e3a..6e222de74f 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4PAIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIonisation.hh,v 1.7 2000/09/22 14:44:07 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIonisation.hh,v 1.8.2.2 2001/06/28 20:19:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hIonisation physics process -----------
@@ -27,6 +41,7 @@
 // corrected by V. Grichine on 24/11/97
 // 12.07.00 V.Grichine GetFreePath and GetdEdx were added
 // 22.09.00 V.Grichine and K.Assamagan new function GetEnergyTransfer(G4d,G4i)
+// 28.05.01 V.Ivanchenko minor changes to provide ANSI -wall compilation 
 
  
 #ifndef G4PAIonisation_h
@@ -135,7 +150,7 @@ class G4PAIonisation : public G4VPAIenergyLoss
 
     //  private data members 
 
-    G4int fMatIndex ;  // index of material, where dE/dx is calculated
+    size_t fMatIndex ;  // index of material, where dE/dx is calculated
 
     G4PhysicsTable* theMeanFreePathTable;
 
diff --git a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
index a629a7e48c..8207194565 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4PAIonisation.icc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4PAIonisation physics process ------------
 //                  by Laszlo Urban, 30 May 1997
 // ***************************************************************
@@ -32,7 +46,7 @@ inline G4double
  G4PAIonisation::GetConstraints(const G4DynamicParticle *aParticle,
                                               G4Material *aMaterial    ) 
 {  
-  G4int index = aMaterial->GetIndex() ;
+  size_t index = aMaterial->GetIndex() ;
 
 //  G4cout<<"G4PAIonisation::GetConstraints is called"<<G4endl ;
 
diff --git a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
index 195703168c..1f9ed44e34 100644
--- a/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
+++ b/source/processes/electromagnetic/standard/include/G4PAIxSection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIxSection.hh,v 1.4 1999/12/15 14:51:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIxSection.hh,v 1.4.4.1 2001/06/28 19:12:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4PAIxSection.hh -- header file
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
index cc57083d0e..1e447ef08f 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhotoElectricEffect.hh,v 1.6 2001/02/22 16:05:42 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhotoElectricEffect.hh,v 1.6.2.1 2001/06/28 19:12:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //
diff --git a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
index c204945c2a..1d28c9226a 100644
--- a/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
+++ b/source/processes/electromagnetic/standard/include/G4PhotoElectricEffect.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhotoElectricEffect.icc,v 1.4 2001/02/22 16:05:43 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhotoElectricEffect.icc,v 1.5.2.1 2001/06/28 19:12:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -18,6 +34,7 @@
 // 20-11-97, change for lowest energy limit default action
 // 17-11-98, use table of atomic shells in PostStepDoIt, mma
 // 06-01-99, use Sandia crossSection, V.Grichine mma
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -93,7 +110,7 @@ inline G4double G4PhotoElectricEffect::ComputeMeanFreePath(G4double GammaEnergy,
 
   G4double SIGMA = 0 ;
 
-  for ( G4int elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
+  for ( size_t elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
       {             
             SIGMA += NbOfAtomsPerVolume[elm] * 
                      ComputeCrossSectionPerAtom(GammaEnergy,
diff --git a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
index 5202d87116..c1d35f3759 100644
--- a/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
+++ b/source/processes/electromagnetic/standard/include/G4PolarizedComptonScattering.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolarizedComptonScattering.hh,v 1.4 2000/11/17 15:03:16 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolarizedComptonScattering.hh,v 1.4.4.1 2001/06/28 19:12:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------- G4PolarizedComptonScattering physics process -----
 //                   by Vicente Lara, March 1998
diff --git a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
index a34ff29eef..4f9de65b0c 100644
--- a/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
+++ b/source/processes/electromagnetic/standard/include/G4SynchrotronRadiation.hh
@@ -1,23 +1,37 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SynchrotronRadiation.hh,v 1.4 2001/02/05 17:53:51 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SynchrotronRadiation.hh,v 1.5.2.2 2001/06/28 20:19:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      
 //      History: 
 //      21-5-98  1 version , V. Grichine
-//                   
+//      28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // 
 //
 // ------------------------------------------------------------
@@ -130,7 +144,7 @@ G4SynchrotronRadiation::GetMeanFreePath( const G4Track& trackData,
    const G4DynamicParticle* aDynamicParticle;
    G4Material* aMaterial;
    G4double MeanFreePath;
-   G4bool isOutRange ;
+   //G4bool isOutRange ;
  
    *condition = NotForced ;
 
diff --git a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
index 087c8b8393..d6587c713a 100644
--- a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPAIenergyLoss.hh,v 1.2 2000/06/07 17:00:48 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPAIenergyLoss.hh,v 1.2.4.2 2001/06/28 20:19:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VPAIenergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.icc
index 940c98ac9c..8280828b77 100644
--- a/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4VPAIenergyLoss.icc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VPAIenergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
index d90f09e13b..d8c88596e7 100644
--- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VeEnergyLoss.hh,v 1.5 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VeEnergyLoss.hh,v 1.5.4.1 2001/06/28 19:12:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ---------------------------------------------------------------
diff --git a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
index 507ca987b7..1b8a9bad40 100644
--- a/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4VeEnergyLoss.icc
@@ -1,31 +1,35 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VeEnergyLoss.icc,v 1.2 2000/05/23 14:39:26 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
-// ---------------------------------------------------------------
-//      GEANT 4 class inlined methods file 
+// $Id: G4VeEnergyLoss.icc,v 1.3.2.1 2001/06/28 19:12:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
-//      History: based on object model of
-//      2nd December 1995, G.Cosmo
-//      ------------ G4VeEnergyLoss physics process ------------
-//                  by Laszlo Urban, 20 March 1997
-// ***************************************************************
-// It is the first implementation of the NEW UNIFIED ENERGY LOSS PROCESS.               
-// It calculates the energy loss of e+/e-.
-// -------------------------------------------------------------
-// 18/11/98  , L. Urban
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+// 
+// 18/11/98, L. Urban
 //  It is a modified version of G4VeEnergyLoss:
 //  continuous energy loss with generation of subcutoff delta rays
-// ---------------------------------------------------------------
-
+// 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 inline G4double G4VeEnergyLoss::GetConstraints(
@@ -36,17 +40,11 @@ inline G4double G4VeEnergyLoss::GetConstraints(
   // dRoverRange is the max. allowed relative range loss in one Step
   // it calculates dEdx and the range as well....
 
-  G4double CutInRange,StepLimit;
-  G4bool isOutRange;
-
+  G4double StepLimit;
   const G4ParticleDefinition* ParticleType=aParticle->GetDefinition();
 
   Charge = aParticle->GetDefinition()->GetPDGCharge();
-  if(Charge != lastCharge)
-  {
-    lastCharge = Charge ;
-  
-  }
+  if (Charge != lastCharge) lastCharge = Charge;
 
   G4double KineticEnergy = aParticle->GetKineticEnergy();
 
diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
index 47539140af..5a9e46c402 100644
--- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
+++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VhEnergyLoss.hh,v 1.7 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VhEnergyLoss.hh,v 1.7.4.2 2001/06/28 20:19:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VhEnergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
index a8bcf89c35..cf6d3ed530 100644
--- a/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
+++ b/source/processes/electromagnetic/standard/include/G4VhEnergyLoss.icc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VhEnergyLoss.icc,v 1.2 2000/05/23 14:39:27 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VhEnergyLoss.icc,v 1.2.4.2 2001/06/28 20:19:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4VhEnergyLoss physics process ------------
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
index f4024fcdf1..84cea9cbae 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.hh
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eBremsstrahlung.hh,v 1.8 2001/01/11 10:39:48 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eBremsstrahlung.hh,v 1.8.2.2 2001/06/28 20:19:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4eBremsstrahlung physics process ------
diff --git a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
index 7925e0d77c..473a106ec7 100644
--- a/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
+++ b/source/processes/electromagnetic/standard/include/G4eBremsstrahlung.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eBremsstrahlung.icc,v 1.3 2000/05/23 15:44:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eBremsstrahlung.icc,v 1.4.2.2 2001/06/28 20:19:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4eBremsstrahlung physics process ---------
@@ -21,6 +35,7 @@
 // ***************************************************************
 // 13-12-96 : Sign corrected in the ScreenFunctions, L.Urban
 // 20/03/97 : new energy loss+ionisation+brems scheme, L.Urban
+// 28/05/01  V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // ***************************************************************
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -100,8 +115,7 @@ inline G4double G4eBremsstrahlung::GetLambda(
                               G4Material* material)
 {
   G4bool isOut;
-  const G4MaterialTable* theMaterialTable =
-                       G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
  
   G4double lambda = (*theMeanFreePathTable)
                     [material->GetIndex()]->
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.hh b/source/processes/electromagnetic/standard/include/G4eIonisation.hh
index 4edf934a1d..ea3f2dda17 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4eIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eIonisation.hh,v 1.7 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eIonisation.hh,v 1.7.4.2 2001/06/28 20:19:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4eIonisation physics process -----------
diff --git a/source/processes/electromagnetic/standard/include/G4eIonisation.icc b/source/processes/electromagnetic/standard/include/G4eIonisation.icc
index ca62605b79..736171b447 100644
--- a/source/processes/electromagnetic/standard/include/G4eIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4eIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eIonisation.icc,v 1.3 1999/12/15 14:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eIonisation.icc,v 1.4.2.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4eIonisation physics process ------------
 //                  by Laszlo Urban, 20 March 1997
 // ***************************************************************
@@ -22,6 +36,7 @@
 // ***************************************************************
 //
 // 24-11-97: correction on MeanFreePath for KinEnergy > HighestLimit
+// 28-05-01: V.Ivanchenko minor changes to provide ANSI -wall compilation 
 //
 // ---------------------------------------------------------------
 
@@ -55,7 +70,7 @@ inline G4double G4eIonisation::GetMeanFreePath(
      MeanFreePath = ((*theMeanFreePathTable)(aMaterial->GetIndex()))->
                     GetValue( KineticEnergy, isOutRange);
      }
-
+   
    return MeanFreePath ;
 }
 
@@ -66,8 +81,7 @@ inline G4double G4eIonisation::GetLambda(
                               G4Material* material)
 {
   G4bool isOut;
-  const G4MaterialTable* theMaterialTable =
-                       G4Material::GetMaterialTable() ;
+  //const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
  
   G4double lambda = (*theMeanFreePathTable)
                     [material->GetIndex()]->
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
index 505ee0fc93..f0ce5abc6f 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eplusAnnihilation.hh,v 1.4 2001/02/22 18:26:07 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eplusAnnihilation.hh,v 1.4.2.1 2001/06/28 19:12:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
diff --git a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
index 08012b9aa3..8156253d8d 100644
--- a/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
+++ b/source/processes/electromagnetic/standard/include/G4eplusAnnihilation.icc
@@ -1,17 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eplusAnnihilation.icc,v 1.3 2001/02/22 18:26:08 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eplusAnnihilation.icc,v 1.4.2.1 2001/06/28 19:12:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 // 10-01-97, crossection table + meanfreepath table, M.Maire
 // 17-03-97, merge 'in fly' and 'at rest', M.Maire
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -85,7 +102,7 @@ inline G4double G4eplusAnnihilation::ComputeMeanFreePath(G4double PositKinEnergy
 
   G4double SIGMA = 0 ;
 
-  for ( G4int elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
+  for ( size_t elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
       {             
             SIGMA += NbOfAtomsPerVolume[elm] * 
                      ComputeCrossSectionPerAtom(PositKinEnergy,
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.hh b/source/processes/electromagnetic/standard/include/G4hIonisation.hh
index 95600214e9..2690fc6472 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisation.hh
+++ b/source/processes/electromagnetic/standard/include/G4hIonisation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hIonisation.hh,v 1.10 2000/10/30 06:56:19 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hIonisation.hh,v 1.10.4.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hIonisation physics process -----------
diff --git a/source/processes/electromagnetic/standard/include/G4hIonisation.icc b/source/processes/electromagnetic/standard/include/G4hIonisation.icc
index 12b9f7b33f..decd31baf0 100644
--- a/source/processes/electromagnetic/standard/include/G4hIonisation.icc
+++ b/source/processes/electromagnetic/standard/include/G4hIonisation.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hIonisation.icc,v 1.3 1999/12/15 14:51:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hIonisation.icc,v 1.3.4.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4hIonisation physics process ------------
 //                  by Laszlo Urban, 30 May 1997
 // ***************************************************************
diff --git a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
index b99d3607f2..d5f6073ff2 100644
--- a/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4ComptonScattering.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ComptonScattering.cc,v 1.4 2000/11/17 15:03:17 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ComptonScattering.cc,v 1.5.2.1 2001/06/28 19:12:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //------------ G4ComptonScattering physics process --------
@@ -24,6 +40,7 @@
 // 04-06-98, in DoIt, secondary production condition: range>G4std::min(threshold,safety)
 // 13-08-98, new methods SetBining()  PrintInfo()
 // 15-12-98, cross section=0 below 10 keV
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 
 #include "G4ComptonScattering.hh"
@@ -84,7 +101,7 @@ void G4ComptonScattering::BuildPhysicsTable(const G4ParticleDefinition& GammaTyp
    theCrossSectionTable = new G4PhysicsTable(G4Element::GetNumberOfElements()) ;
    const G4ElementTable* theElementTable = G4Element::GetElementTable() ;
    G4double AtomicNumber;
-   G4int J;
+   size_t J;
 
    for ( J=0 ; J < G4Element::GetNumberOfElements(); J++ )  
        { 
diff --git a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
index 776d0005a7..59c1284a2b 100644
--- a/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
+++ b/source/processes/electromagnetic/standard/src/G4GammaConversion.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GammaConversion.cc,v 1.4 2000/08/03 08:36:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GammaConversion.cc,v 1.5.2.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      GEANT4 Collaboration
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4GammaConversion physics process --------
@@ -37,6 +51,7 @@
 // 19-06-97, correction in ComputeMicroscopicCrossSection, L.Urban
 // 04-06-98, in DoIt, secondary production condition: range>G4std::min(threshold,safety)
 // 13-08-98, new methods SetBining() PrintInfo()
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 
 #include "G4GammaConversion.hh"
@@ -97,7 +112,7 @@ void G4GammaConversion::BuildPhysicsTable(const G4ParticleDefinition& GammaType)
    theCrossSectionTable = new G4PhysicsTable(G4Element::GetNumberOfElements()) ;
    const G4ElementTable* theElementTable = G4Element::GetElementTable() ;
    G4double AtomicNumber;
-   G4int J;
+   size_t J;
 
    for ( J=0 ; J < G4Element::GetNumberOfElements(); J++ )  
        { 
diff --git a/source/processes/electromagnetic/standard/src/G4IonisationByLogicalVolume.cc b/source/processes/electromagnetic/standard/src/G4IonisationByLogicalVolume.cc
index 7f95fa1887..a88c63c767 100644
--- a/source/processes/electromagnetic/standard/src/G4IonisationByLogicalVolume.cc
+++ b/source/processes/electromagnetic/standard/src/G4IonisationByLogicalVolume.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Implementation of class for selecting ionisation model depending on
 // logical volume
 //
diff --git a/source/processes/electromagnetic/standard/src/G4PAIonisation.cc b/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
index 455053800d..1b54e1e034 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIonisation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIonisation.cc,v 1.14 2001/02/01 15:12:50 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIonisation.cc,v 1.14.2.1 2001/06/28 19:12:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // **************************************************************
diff --git a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
index c192252cec..d004d1e45f 100644
--- a/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
+++ b/source/processes/electromagnetic/standard/src/G4PAIxSection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PAIxSection.cc,v 1.4 1999/12/15 14:51:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PAIxSection.cc,v 1.4.4.1 2001/06/28 19:12:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4PAIxSection.cc -- class implementation file
diff --git a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
index 67cfd23d86..84ef39de2d 100644
--- a/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
+++ b/source/processes/electromagnetic/standard/src/G4PhotoElectricEffect.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhotoElectricEffect.cc,v 1.12 2001/02/22 16:05:43 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhotoElectricEffect.cc,v 1.13.2.1 2001/06/28 19:12:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -26,6 +42,8 @@
 // 21-06-00, in DoIt, killing photon: aParticleChange.SetEnergyChange(0.); mma
 // 22-06-00, in DoIt, absorbe very low energy photon (back to 20-05-99); mma
 // 22-02-01, back to 08-06-99 after correc in SandiaTable (materials-V03-00-05)  
+// 28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
+
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -88,7 +106,7 @@ void G4PhotoElectricEffect::BuildPhysicsTable(const G4ParticleDefinition& Photon
    theCrossSectionTable = new G4PhysicsTable( G4Element::GetNumberOfElements()) ;
    const G4ElementTable* theElementTable = G4Element::GetElementTable() ;
    G4double AtomicNumber;
-   G4int J;
+   size_t J;
 
    for ( J=0 ; J < G4Element::GetNumberOfElements(); J++ )  
       { 
diff --git a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
index 9734380e4c..7dc8c556b0 100644
--- a/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
+++ b/source/processes/electromagnetic/standard/src/G4PolarizedComptonScattering.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PolarizedComptonScattering.cc,v 1.4 2000/11/17 15:03:18 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PolarizedComptonScattering.cc,v 1.4.4.1 2001/06/28 19:12:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------- G4PolarizedComptonScattering physics process -------
diff --git a/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc b/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
index 21d8c727b9..388873f8c7 100644
--- a/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
+++ b/source/processes/electromagnetic/standard/src/G4SynchrotronRadiation.cc
@@ -1,21 +1,36 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SynchrotronRadiation.cc,v 1.3 2000/11/01 15:30:46 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SynchrotronRadiation.cc,v 1.4.2.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, 
 //      21-5-98 V.Grichine
+//      28-05-01, V.Ivanchenko minor changes to provide ANSI -wall compilation 
 //      
 //                    
 // 
@@ -202,7 +217,7 @@ G4SynchrotronRadiation::GetPhotonEnergy( const G4Track& trackData,
 {
   G4int i ;
   G4double energyOfSR = -1.0 ;
-  G4Material* aMaterial=trackData.GetMaterial() ;
+  //G4Material* aMaterial=trackData.GetMaterial() ;
 
   const G4DynamicParticle* aDynamicParticle=trackData.GetDynamicParticle();
 
@@ -253,20 +268,20 @@ G4SynchrotronRadiation::GetPhotonEnergy( const G4Track& trackData,
       {
         return -1.0 ;
       }
-      G4double kineticEnergy = aDynamicParticle->GetKineticEnergy();
-      G4ParticleMomentum 
-      particleDirection = aDynamicParticle->GetMomentumDirection();
+      //G4double kineticEnergy = aDynamicParticle->GetKineticEnergy();
+      //G4ParticleMomentum 
+      //particleDirection = aDynamicParticle->GetMomentumDirection();
 
       // Gamma production cut in this material
-      G4double 
-      gammaEnergyCut = (G4Gamma::GetCutsInEnergy())[aMaterial->GetIndex()];
+      //G4double 
+      //gammaEnergyCut = (G4Gamma::GetCutsInEnergy())[aMaterial->GetIndex()];
 
       // SR photon has energy more than the current material cut
       // M-C of its direction
       
-      G4double Teta = G4UniformRand()/gamma ;    // Very roughly
+      //G4double Teta = G4UniformRand()/gamma ;    // Very roughly
 
-      G4double Phi  = twopi * G4UniformRand() ;
+      //G4double Phi  = twopi * G4UniformRand() ;
     }       
     else
     {
diff --git a/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
index eff33e3ab4..ecf03b28be 100644
--- a/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VPAIenergyLoss.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPAIenergyLoss.cc,v 1.1 2000/04/25 14:33:10 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPAIenergyLoss.cc,v 1.1.4.2 2001/06/28 20:19:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4VPAIenergyLoss physics process -----------
diff --git a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
index d3c55fd0da..f1fcb419b1 100644
--- a/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VeEnergyLoss.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VeEnergyLoss.cc,v 1.11 2001/03/27 15:10:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VeEnergyLoss.cc,v 1.12.2.1 2001/06/28 19:12:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //  
 
 // --------------------------------------------------------------
@@ -18,6 +34,7 @@
 // 10/02/00  modifications , new e.m. structure, L.Urban
 // 23/01/01  bug fixed in AlongStepDoIt , L.Urban
 // 27/03/01 : commented out the printing of subcutoff energies
+// 28/05/01  V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 
  
@@ -39,23 +56,23 @@ G4PhysicsTable** G4VeEnergyLoss::RecorderOfElectronProcess =
 G4PhysicsTable** G4VeEnergyLoss::RecorderOfPositronProcess =
                                            new G4PhysicsTable*[10];
                                            
-G4PhysicsTable*  G4VeEnergyLoss::theDEDXElectronTable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theDEDXPositronTable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theRangeElectronTable        = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theRangePositronTable        = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theInverseRangeElectronTable = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theInverseRangePositronTable = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theLabTimeElectronTable      = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theLabTimePositronTable      = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theProperTimeElectronTable   = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theProperTimePositronTable   = NULL;
+G4PhysicsTable*  G4VeEnergyLoss::theDEDXElectronTable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theDEDXPositronTable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theRangeElectronTable        = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theRangePositronTable        = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theInverseRangeElectronTable = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theInverseRangePositronTable = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theLabTimeElectronTable      = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theLabTimePositronTable      = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theProperTimeElectronTable   = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theProperTimePositronTable   = 0;
 
-G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffATable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffBTable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffCTable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffATable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffBTable         = NULL;
-G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffCTable         = NULL;
+G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffATable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffBTable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::theeRangeCoeffCTable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffATable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffBTable         = 0;
+G4PhysicsTable*  G4VeEnergyLoss::thepRangeCoeffCTable         = 0;
 
 G4double G4VeEnergyLoss::LowerBoundEloss =0.1*keV ;
 G4double G4VeEnergyLoss::UpperBoundEloss = 100.*TeV ;
@@ -68,10 +85,11 @@ G4double G4VeEnergyLoss::RTable,G4VeEnergyLoss::LOGRTable;
  
 G4VeEnergyLoss::G4VeEnergyLoss(const G4String& processName)
    : G4VEnergyLoss (processName),
-     theLossTable(NULL),
-     theDEDXTable(NULL),
-     Charge(-1.),lastCharge(0.),
+     theLossTable(0),
      MinKineticEnergy(1.*eV),
+     Charge(-1.),
+     lastCharge(0.),
+     theDEDXTable(0),
      linLossLimit(0.05),
      c1N(2.86e-23*MeV*mm*mm),
      c2N(c1N*MeV/10.),
@@ -85,7 +103,7 @@ G4VeEnergyLoss::~G4VeEnergyLoss()
      if (theLossTable) 
        {
          theLossTable->clearAndDestroy();
-         delete theLossTable; theLossTable = NULL;
+         delete theLossTable; theLossTable = 0;
        }
 }
 
@@ -391,10 +409,11 @@ G4VParticleChange* G4VeEnergyLoss::AlongStepDoIt( const G4Track& trackData,
   if((E > TmintoProduceDelta) && (MeanLoss > MinDeltaEnergyNow)
                                    && (finalT > MinKineticEnergy)) 
   {
-    G4double rcut,Tc,T0,presafety,postsafety,safety,
-             delta,fragment ;
-    G4double frperstep,x1,y1,z1,dx,dy,dz,dTime,time0,DeltaTime;
-    G4double epsil= MinKineticEnergy/2. ;
+    G4double rcut,Tc,T0,presafety,postsafety,safety,delta;
+    G4double fragment = Step;
+    G4double frperstep= 1.0;
+    G4double x1,y1,z1,dx,dy,dz,dTime,time0,DeltaTime;
+    //G4double epsil= MinKineticEnergy/2. ;
 
     if(Charge < 0.)
     {
@@ -487,10 +506,9 @@ G4VParticleChange* G4VeEnergyLoss::AlongStepDoIt( const G4Track& trackData,
         if(N > 0)
         {
           G4double Tkin,Etot,P,T,p,costheta,sintheta,phi,dirx,diry,dirz,
-                   Pnew,delToverTc,
-                   sumT,delTkin,delLoss,rate,
-                   urandom ;
-          G4StepPoint *point ;
+                   Pnew,delToverTc,sumT,urandom ;
+          //delTkin,delLoss,rate,
+          //G4StepPoint *point ;
    
           sumT=0.;
 
diff --git a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
index 1ca6e41cc6..a724af1a61 100644
--- a/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
+++ b/source/processes/electromagnetic/standard/src/G4VhEnergyLoss.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VhEnergyLoss.cc,v 1.16 2001/03/27 15:10:52 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VhEnergyLoss.cc,v 1.17.2.1 2001/06/28 19:12:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // -----------------------------------------------------------
@@ -25,6 +41,7 @@
 // 18/08/00 : V.Ivanchenko bug fixed in GetConstrained 
 // 23/01/01 : bug fixed in AlongStepDoIt , L.Urban
 // 27/03/01 : commented out the printing of subcutoff energies
+// 28/05/01 : V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -375,7 +392,7 @@ G4double G4VhEnergyLoss::GetConstraints(const G4DynamicParticle *aParticle,
   // it calculates dEdx and the range as well....
 
   G4double KineticEnergy,StepLimit;
-  G4bool isOut ;
+  //G4bool isOut ;
 
   Charge = aParticle->GetDefinition()->GetPDGCharge()/eplus ;
 
@@ -488,10 +505,11 @@ G4VParticleChange* G4VhEnergyLoss::AlongStepDoIt(
  if(subSecFlag)
  {
   G4double MinDeltaEnergyNow,Tc,TmintoProduceDelta,w,ww ;
-  G4double rcut,T0,presafety,postsafety,safety,
-           delta,fragment,Tmax,mass ;
-  G4double frperstep,x1,y1,z1,dx,dy,dz,dTime,time0,DeltaTime;
-  G4double epsil = MinKineticEnergy/2. ;
+  G4double rcut,T0,presafety,postsafety,safety,delta,Tmax,mass ;
+  G4double fragment = Step;
+  G4double frperstep = 1.0;
+  G4double x1,y1,z1,dx,dy,dz,dTime,time0,DeltaTime;
+  //G4double epsil = MinKineticEnergy/2. ;
 
   MinDeltaEnergyNow = MinDeltaEnergy[index] ;
   Tc=G4Electron::Electron()->GetCutsInEnergy()[index];
@@ -591,10 +609,9 @@ G4VParticleChange* G4VhEnergyLoss::AlongStepDoIt(
         if(N > 0)
         {
           G4double Tkin,Etot,P,T,p,costheta,sintheta,phi,dirx,diry,dirz,
-                   Pnew,delToverTc,
-                   delTkin,delLoss,rate,
-                   urandom ;
-          G4StepPoint *point ;
+                   Pnew,delToverTc,urandom;
+	  //delTkin,delLoss,rate,
+          //G4StepPoint *point ;
   
           Tkin = E ;
           Etot = Tkin+mass ;
diff --git a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
index 6e033f0a66..76a038b084 100644
--- a/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
+++ b/source/processes/electromagnetic/standard/src/G4eBremsstrahlung.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eBremsstrahlung.cc,v 1.15 2001/02/05 17:53:52 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eBremsstrahlung.cc,v 1.16.2.2 2001/06/28 20:19:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4eBremsstrahlung physics process --------
@@ -32,6 +46,7 @@
 // 10/02/00  modifications , new e.m. structure, L.Urban
 // 07/08/00  new cross section/en.loss parametrisation, LPM flag , L.Urban
 // 21/09/00 : corrections in the LPM implementation, L.Urban
+// 28/05/01 : V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
 
 #include "G4eBremsstrahlung.hh"
@@ -288,43 +303,43 @@ G4double G4eBremsstrahlung::ComputeBremLoss(G4double Z,G4double natom,
         {2.,4.,6.,14.,26.,50.,82.,92.};
   static const G4double coefloss[NZ][Nloss] = {
   // Z=2
-        0.98916,        0.47564,        -0.2505,       -0.45186,        0.14462,
-        0.21307,      -0.013738,      -0.045689,     -0.0042914,      0.0034429,
-     0.00064189,
+ { 0.98916,        0.47564,        -0.2505,       -0.45186,        0.14462,
+   0.21307,      -0.013738,      -0.045689,     -0.0042914,      0.0034429,
+   0.00064189},
 
   // Z=4
-         1.0626,        0.37662,       -0.23646,       -0.45188,        0.14295,
-        0.22906,      -0.011041,      -0.051398,     -0.0055123,      0.0039919,
-     0.00078003,
+ { 1.0626,        0.37662,       -0.23646,       -0.45188,        0.14295,
+   0.22906,      -0.011041,      -0.051398,     -0.0055123,      0.0039919,
+   0.00078003},
   // Z=6
-         1.0954,          0.315,       -0.24011,       -0.43849,        0.15017,
-        0.23001,      -0.012846,      -0.052555,     -0.0055114,      0.0041283,
-     0.00080318,
+ { 1.0954,          0.315,       -0.24011,       -0.43849,        0.15017,
+   0.23001,      -0.012846,      -0.052555,     -0.0055114,      0.0041283,
+   0.00080318},
 
   // Z=14
-         1.1649,        0.18976,       -0.24972,       -0.30124,         0.1555,
-        0.13565,      -0.024765,      -0.027047,    -0.00059821,      0.0019373,
-     0.00027647,
+ { 1.1649,        0.18976,       -0.24972,       -0.30124,         0.1555,
+   0.13565,      -0.024765,      -0.027047,    -0.00059821,      0.0019373,
+   0.00027647},
 
   // Z=26
-         1.2261,        0.14272,       -0.25672,       -0.28407,        0.13874,
-        0.13586,      -0.020562,      -0.026722,    -0.00089557,      0.0018665,
-     0.00026981,
+ { 1.2261,        0.14272,       -0.25672,       -0.28407,        0.13874,
+   0.13586,      -0.020562,      -0.026722,    -0.00089557,      0.0018665,
+   0.00026981},
 
   // Z=50
-         1.3147,       0.020049,       -0.35543,       -0.13927,        0.17666,
-       0.073746,      -0.036076,      -0.013407,      0.0025727,     0.00084005,
-    -1.4082e-05,
+ { 1.3147,       0.020049,       -0.35543,       -0.13927,        0.17666,
+   0.073746,      -0.036076,      -0.013407,      0.0025727,     0.00084005,
+  -1.4082e-05},
 
   // Z=82
-         1.3986,       -0.10586,       -0.49187,     -0.0048846,        0.23621,
-       0.031652,      -0.052938,     -0.0076639,      0.0048181,     0.00056486,
-    -0.00011995,
+ { 1.3986,       -0.10586,       -0.49187,     -0.0048846,        0.23621,
+   0.031652,      -0.052938,     -0.0076639,      0.0048181,     0.00056486,
+  -0.00011995},
 
   // Z=92
-         1.4217,         -0.116,       -0.55497,      -0.044075,        0.27506,
-       0.081364,      -0.058143,      -0.023402,      0.0031322,      0.0020201,
-     0.00017519
+ { 1.4217,         -0.116,       -0.55497,      -0.044075,        0.27506,
+   0.081364,      -0.058143,      -0.023402,      0.0031322,      0.0020201,
+   0.00017519}
 
     } ;
  static G4double aaa=0.414 ;
@@ -421,7 +436,7 @@ void G4eBremsstrahlung::BuildLambdaTable(const G4ParticleDefinition& ParticleTyp
    PartialSumSigma.resize(G4Material::GetNumberOfMaterials());
  
    G4PhysicsLogVector* ptrVector;
-   for ( G4int J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
+   for ( size_t J=0 ; J < G4Material::GetNumberOfMaterials(); J++ )  
        { 
         //create physics vector then fill it ....
         ptrVector = new G4PhysicsLogVector(LowerBoundLambda, UpperBoundLambda,
@@ -459,7 +474,7 @@ G4double G4eBremsstrahlung::ComputeMeanFreePath(
      
   G4double SIGMA = 0 ;
 
-  for ( G4int i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
+  for ( size_t i=0 ; i < aMaterial->GetNumberOfElements() ; i++ )
       {             
             SIGMA += theAtomNumDensityVector[i] * 
                      ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
@@ -556,44 +571,44 @@ G4double G4eBremsstrahlung::ComputeMicroscopicCrossSection(
         {2.,4.,6.,14.,26.,50.,82.,92.} ;
   static const G4double coefsig[NZ][Nsig] = {
   // Z=2
-         0.4638,        0.37748,        0.32249,      -0.060362,      -0.065004,
-      -0.033457,      -0.004583,       0.011954,      0.0030404,     -0.0010077,
-    -0.00028131,
+  { 0.4638,        0.37748,        0.32249,      -0.060362,      -0.065004,
+   -0.033457,      -0.004583,       0.011954,      0.0030404,     -0.0010077,
+   -0.00028131},
 
   // Z=4
-        0.50008,        0.33483,        0.34364,      -0.086262,      -0.055361,
-      -0.028168,     -0.0056172,       0.011129,      0.0027528,    -0.00092265,
-    -0.00024348,
+  { 0.50008,        0.33483,        0.34364,      -0.086262,      -0.055361,
+   -0.028168,     -0.0056172,       0.011129,      0.0027528,    -0.00092265,
+   -0.00024348},
 
   // Z=6
-        0.51587,        0.31095,        0.34996,       -0.11623,      -0.056167,
-     -0.0087154,     0.00053943,      0.0054092,     0.00077685,    -0.00039635,
-    -6.7818e-05,
+  { 0.51587,        0.31095,        0.34996,       -0.11623,      -0.056167,
+   -0.0087154,     0.00053943,      0.0054092,     0.00077685,    -0.00039635,
+   -6.7818e-05},
 
   // Z=14
-        0.55058,        0.25629,        0.35854,      -0.080656,      -0.054308,
-      -0.049933,    -0.00064246,       0.016597,      0.0021789,      -0.001327,
-    -0.00025983,
+  { 0.55058,        0.25629,        0.35854,      -0.080656,      -0.054308,
+   -0.049933,    -0.00064246,       0.016597,      0.0021789,      -0.001327,
+   -0.00025983},
 
   // Z=26
-         0.5791,        0.26152,        0.38953,       -0.17104,      -0.099172,
-       0.024596,       0.023718,     -0.0039205,     -0.0036658,     0.00041749,
-     0.00023408,
+  { 0.5791,        0.26152,        0.38953,       -0.17104,      -0.099172,
+    0.024596,       0.023718,     -0.0039205,     -0.0036658,     0.00041749,
+    0.00023408},
 
   // Z=50
-        0.62085,        0.27045,        0.39073,       -0.37916,       -0.18878,
-        0.23905,       0.095028,      -0.068744,      -0.023809,      0.0062408,
-      0.0020407,
+  { 0.62085,        0.27045,        0.39073,       -0.37916,       -0.18878,
+    0.23905,       0.095028,      -0.068744,      -0.023809,      0.0062408,
+    0.0020407},
 
   // Z=82
-        0.66053,        0.24513,        0.35404,       -0.47275,       -0.22837,
-        0.35647,        0.13203,        -0.1049,      -0.034851,      0.0095046,
-      0.0030535,
+  { 0.66053,        0.24513,        0.35404,       -0.47275,       -0.22837,
+    0.35647,        0.13203,        -0.1049,      -0.034851,      0.0095046,
+    0.0030535},
 
   // Z=92
-        0.67143,        0.23079,        0.32256,       -0.46248,       -0.20013,
-         0.3506,        0.11779,        -0.1024,      -0.032013,      0.0092279,
-      0.0028592
+  { 0.67143,        0.23079,        0.32256,       -0.46248,       -0.20013,
+    0.3506,        0.11779,        -0.1024,      -0.032013,      0.0092279,
+    0.0028592}
 
     } ;
 
@@ -733,15 +748,15 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
   static const G4double MigdalConstant = classic_electr_radius
                                         *electron_Compton_length
                                         *electron_Compton_length/pi;
-  const G4double LPMconstant = fine_structure_const*electron_mass_c2*
-                                electron_mass_c2/(8.*pi*hbarc) ;
+  // const G4double LPMconstant = fine_structure_const*electron_mass_c2*
+  //                              electron_mass_c2/(8.*pi*hbarc) ;
    G4double GammaEnergy ;
    G4bool LPMOK = false ;
 
    aParticleChange.Initialize(trackData);
    G4Material* aMaterial=trackData.GetMaterial() ;
 
-   G4double LPMEnergy = LPMconstant*(aMaterial->GetRadlen()) ;
+   //G4double LPMEnergy = LPMconstant*(aMaterial->GetRadlen()) ;
 
    const G4DynamicParticle* aDynamicParticle=trackData.GetDynamicParticle();
    G4double charge = aDynamicParticle->GetDefinition()->GetPDGCharge();   
@@ -773,8 +788,8 @@ G4VParticleChange* G4eBremsstrahlung::PostStepDoIt(const G4Track& trackData,
 
    // limits of the energy sampling
    G4double TotalEnergy = KineticEnergy + electron_mass_c2;
-   G4double TotalEnergysquare = TotalEnergy*TotalEnergy ;
-   G4double LPMGammaEnergyLimit = TotalEnergysquare/LPMEnergy ;
+   //G4double TotalEnergysquare = TotalEnergy*TotalEnergy ;
+   //G4double LPMGammaEnergyLimit = TotalEnergysquare/LPMEnergy ;
    G4double xmin = GammaEnergyCut/KineticEnergy, epsilmin = GammaEnergyCut/TotalEnergy;
    G4double epsilmax = KineticEnergy/TotalEnergy;
 
diff --git a/source/processes/electromagnetic/standard/src/G4eIonisation.cc b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
index e4c73a5af5..605d42a5ec 100644
--- a/source/processes/electromagnetic/standard/src/G4eIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eIonisation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eIonisation.cc,v 1.10 2000/05/23 14:42:21 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eIonisation.cc,v 1.11.2.2 2001/06/28 20:19:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4eIonisation physics process -----------
@@ -28,6 +42,7 @@
 // 07-09-98: Cleanup
 // 02/02/99: correction inDoIt , L.Urban
 // 10/02/00  modifications , new e.m. structure, L.Urban
+// 28/05/01  V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
  
 #include "G4eIonisation.hh"
@@ -356,7 +371,7 @@ G4VParticleChange* G4eIonisation::PostStepDoIt( const G4Track& trackData,
   G4double TotalEnergy = KineticEnergy + ParticleMass;
   G4double Psquare = KineticEnergy*(TotalEnergy+ParticleMass);
   G4double TotalMomentum = sqrt(Psquare);
-  G4double Esquare=TotalEnergy*TotalEnergy;
+  //G4double Esquare=TotalEnergy*TotalEnergy;
   G4ParticleMomentum ParticleDirection = aParticle->GetMomentumDirection();
 
   //  get kinetic energy cut for the electron
diff --git a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
index 7d4ea6f3e5..e25244ac7f 100644
--- a/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
+++ b/source/processes/electromagnetic/standard/src/G4eplusAnnihilation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4eplusAnnihilation.cc,v 1.3 2001/02/22 18:26:09 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4eplusAnnihilation.cc,v 1.4.2.1 2001/06/28 19:12:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -15,6 +31,7 @@
 // 23-03-97, protection in BuildPhysicsTable, M.Maire
 // 31-08-98, new methods SetBining() and PrintInfo()
 // 22-02-01, postStepDoIt: fStopButAlive instead of kineEnergy == 0.  
+// 28-05-01  V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -77,7 +94,7 @@ void G4eplusAnnihilation::BuildPhysicsTable(const G4ParticleDefinition& Positron
    theCrossSectionTable = new G4PhysicsTable( G4Element::GetNumberOfElements()) ;
    const G4ElementTable* theElementTable = G4Element::GetElementTable() ;
    G4double AtomicNumber;
-   G4int J;
+   size_t J;
 
    for ( J=0 ; J < G4Element::GetNumberOfElements(); J++ )  
        { 
diff --git a/source/processes/electromagnetic/standard/src/G4hIonisation.cc b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
index 0905f9f437..b253e5f904 100644
--- a/source/processes/electromagnetic/standard/src/G4hIonisation.cc
+++ b/source/processes/electromagnetic/standard/src/G4hIonisation.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4hIonisation.cc,v 1.12 2000/08/10 22:13:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4hIonisation.cc,v 1.13.2.2 2001/06/28 20:19:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      History: based on object model of
 //      2nd December 1995, G.Cosmo
 //      ---------- G4hIonisation physics process -----------
@@ -32,6 +46,7 @@
 //            simulate energy losses of ions; correction to
 //            cross section for particles with spin 1 is inserted
 //            as well
+// 28/05/01  V.Ivanchenko minor changes to provide ANSI -wall compilation 
 // --------------------------------------------------------------
  
 
@@ -48,10 +63,10 @@ G4double G4hIonisation::Tmincut = 1.*keV  ;
  
 G4hIonisation::G4hIonisation(const G4String& processName)
    : G4VhEnergyLoss(processName),
-     theMeanFreePathTable(NULL),
+     theMeanFreePathTable(0),
+     theElectron ( G4Electron::Electron()),
      theProton (G4Proton::Proton()),
-     theAntiProton (G4AntiProton::AntiProton()),
-     theElectron ( G4Electron::Electron() )
+     theAntiProton (G4AntiProton::AntiProton())
 { }
      
 G4hIonisation::~G4hIonisation() 
@@ -119,7 +134,7 @@ void G4hIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
   G4double LowEdgeEnergy , ionloss ;
   G4double deltaloss ;
   G4double  RateMass ;
-  G4bool isOutRange ;
+  //G4bool isOutRange ;
   static const G4MaterialTable* theMaterialTable=
                                    G4Material::GetMaterialTable();
   const G4double twoln10 = 2.*log(10.) ;
@@ -182,7 +197,7 @@ void G4hIonisation::BuildLossTable(const G4ParticleDefinition& aParticleType)
     DeltaCutInKineticEnergyNow = G4std::max(DeltaCutInKineticEnergy[J],Tmincut) ;
 
     // some local variables -------------------
-    G4double tau,tau0,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
+    G4double tau,Tmax,gamma,bg2,beta2,rcut,delta,x,sh ;
 
     // now comes the loop for the kinetic energy values*****************
 
@@ -295,7 +310,7 @@ void G4hIonisation::BuildLambdaTable(const G4ParticleDefinition& aParticleType)
 
       G4double chargeSquare = Charge*Charge ;
       G4double LowEdgeEnergy , Value ,sigma ;
-      G4bool isOutRange ;
+      //G4bool isOutRange ;
       const G4MaterialTable* theMaterialTable=
                                          G4Material::GetMaterialTable();
 
diff --git a/source/processes/electromagnetic/utils/History b/source/processes/electromagnetic/utils/History
index 034ab13263..5bae85dbdc 100644
--- a/source/processes/electromagnetic/utils/History
+++ b/source/processes/electromagnetic/utils/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.15 2001/03/27 14:34:05 maire Exp $
+$Id: History,v 1.20 2001/05/18 15:14:11 maire Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,11 +16,33 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+18 may 01: V.Ivanchenko (utils-V03-01-01)
+- clean up againist Linux ANSI strict compilation mode.
+    
+16 may 01: L.Urban (utils-V03-01-00)
+- value of the member cpar has been changed back to the original
+  value 1.5 in G4MultipleScattering.cc. The same is done in
+  G4MultipleScatteringx.cc (the data member name is cparm there).
+  This change affects all the results for low energy (< 1 MeV
+  for electrons).
+  
+15 may 01: L.Urban
+- new multiple scattering version committed under the class name
+  G4MultipleScatteringx. It gives better msc angle distribution
+  than the standard G4MultipleScattering. It uses a distribution
+  to simulate the geom./true pathlengths (standard : mean values
+  only) and has a framework implemented in it to perform special
+  stepping near to a boundary (this algorithm works, but some
+  further development/tuning needed - this algorithm is disabled
+  by default). This new version can be used after the change:
+       G4MultipleScattering  --> G4MultipleScatteringx 
+  in the PhysicsList. 
      
 27 mar 01: L.Urban (utils-V03-00-06)
-- another bug fixed in G4VEnergyLoss.cc , in the fluct code.
+- another bug fixed in G4VEnergyLoss.cc, in the fluct code.
   The code gave in some cases (very rarely) small negative energy loss
-  for small (~ micrometer) step size , now it is cured.
+  for small (~ micrometer) step size, now it is cured.
 
 23 mar 01: L.Urban (utils-V03-00-05)
 - bug fixed in fluct in G4VEnergyLoss.cc
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
index ac007e54e2..28c0b74ec5 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyLossMessenger.hh,v 1.3 2000/11/09 15:52:23 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyLossMessenger.hh,v 1.3.4.1 2001/06/28 19:12:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Class Description:
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
index 3ea95fe71c..6fad81e926 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyLossTables.hh,v 1.10 2000/11/04 16:47:28 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyLossTables.hh,v 1.10.4.1 2001/06/28 19:12:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 //
diff --git a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
index 17441a0ddd..71ed3bdf5e 100644
--- a/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
+++ b/source/processes/electromagnetic/utils/include/G4EnergyLossTables.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyLossTables.icc,v 1.12 2000/11/04 16:47:28 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyLossTables.icc,v 1.13.2.1 2001/06/28 19:12:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 // Inline members of the G4EnergyLossTables class
@@ -17,6 +33,7 @@
 // cache mechanism , L.Urban , 11/02/99
 // bug fixed , L.Urban , 12/04/99
 // 10/11/99: moved from RWT hash dictionary to STL map, G.Barrand, M.Maire
+// 18/05/01 V.Ivanchenko Clean up againist Linux ANSI compilation 
 //
 // -------------------------------------------------------------------
 
@@ -457,7 +474,6 @@ inline G4double G4EnergyLossTables::GetPreciseEnergyFromRange(
                     QQPositron ;
     oldIndex = -1 ;
   }
-  const G4PhysicsTable* rangeTable= t.theRangeTable;
   const G4PhysicsTable*  dEdxTable= t.theDEDXTable;
   const G4PhysicsTable*  inverseRangeTable= t.theInverseRangeTable;
 
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh b/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
index e9a8aa0cd8..04c7d907dc 100644
--- a/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScattering.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MultipleScattering.hh,v 1.1 2000/03/20 14:44:04 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MultipleScattering.hh,v 1.1.4.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 // --------------------------------------------------------------
 //    GEANT 4 class header file
 //  
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //    --------- G4MultipleScattering physics process --------
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc b/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
index 69d0956496..76fa19f736 100644
--- a/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScattering.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MultipleScattering.icc,v 1.2 2000/03/24 08:08:08 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MultipleScattering.icc,v 1.3.2.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // -------------------------------------------------------------
 //    GEANT 4 class inlined methods file
 //
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //    ------- G4MultipleScattering physics process ------
@@ -22,6 +36,7 @@
 // 25/11/97: mods for KinEnergy > HighestLimit
 // 22/10/98: cleanup , L.Urban
 // 15/10/99: bugfix, some accuracy problems fixed , L.Urban
+// 18/05/01 V.Ivanchenko Clean up againist Linux ANSI compilation 
 //---------------------------------------------------------------
 
 inline G4double G4MultipleScattering::GetContinuousStepLimit(
@@ -171,8 +186,6 @@ inline G4double G4MultipleScattering::GetLambda(
                               G4Material* material)
 {
   G4bool isOut;
-  const G4MaterialTable* theMaterialTable =
-                       G4Material::GetMaterialTable() ;
   
   G4double lambda = (*theTransportMeanFreePathTable)
                     (material->GetIndex())->
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.hh b/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.hh
new file mode 100644
index 0000000000..bb8579d0bb
--- /dev/null
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.hh
@@ -0,0 +1,189 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4MultipleScatteringx.hh,v 1.1.2.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// $Id:
+// --------------------------------------------------------------
+//    GEANT 4 class header file
+//  
+//    History: based on object model of
+//    2nd December 1995, G.Cosmo
+//    --------- G4MultipleScatteringx physics process --------
+//               by Laszlo Urban, March 2001   
+// **************************************************************
+//            New version of MSC model              
+// --------------------------------------------------------------
+
+#ifndef G4MultipleScatteringx_h
+#define G4MultipleScatteringx_h 1
+
+#include "G4ios.hh"
+#include "globals.hh"
+#include "Randomize.hh"
+#include "G4EnergyLossTables.hh"
+#include "G4Electron.hh"
+#include "G4Positron.hh"
+#include "G4MuonPlus.hh"
+#include "G4PionPlus.hh"
+#include "G4Proton.hh"
+#include "G4PhysicsLogVector.hh"
+#include "G4GPILSelection.hh"
+#include "G4VContinuousDiscreteProcess.hh"
+#include "G4Step.hh"
+#include "G4Track.hh"
+#include "G4Material.hh"
+#include "G4ParticleChangeForMSC.hh"
+#include "G4UnitsTable.hh"
+
+class G4MultipleScatteringx : public G4VContinuousDiscreteProcess
+
+{
+ public:
+
+   G4MultipleScatteringx(const G4String& processName="mscx") ;
+
+   ~G4MultipleScatteringx() ;
+          
+   G4bool IsApplicable ( const G4ParticleDefinition& ) ;
+
+   void BuildPhysicsTable(const G4ParticleDefinition& aParticleType) ;
+
+   void PrintInfoDefinition();
+
+   G4double GetContinuousStepLimit(const G4Track& aTrack,
+                                   G4double previousStepSize,
+                                   G4double currentMinimumStep,
+                                   G4double& currentSafety) ; 
+
+   G4double GetMeanFreePath(const G4Track& aTrack,
+                            G4double previousStepSize,
+                            G4ForceCondition* condition) ;
+
+   G4VParticleChange* AlongStepDoIt(const G4Track& aTrack,const G4Step& aStep);
+
+   G4VParticleChange* PostStepDoIt(const G4Track& aTrack,const G4Step& aStep) ;
+
+
+   G4double AlongStepGetPhysicalInteractionLength(
+                             const G4Track&,
+                             G4double  previousStepSize,
+                             G4double  currentMinimumStep,
+                             G4double& currentSafety,
+                             G4GPILSelection* selection
+                            );
+
+   G4double GetLambda(G4double KineticEnergy,G4Material* material);
+
+   void SetScatteringParameter1(G4double value)
+           { scatteringparameter1 = value ; } ;
+   void SetScatteringParameter2(G4double value)
+           { scatteringparameter2 = value ; } ;
+   void SetScatteringParameter3(G4double value)
+           { scatteringparameter3 = value ; } ;
+   void SetBoundary(G4bool value) { boundary = value ;} ;
+
+   void SetTuning(G4double value) { tuning = value ; };
+   void SetCparm (G4double value) { cparm  = value ; };
+   void SetTlimitmsc  (G4double value) { Tlimit = value ; };
+   void SetLateralDisplacementFlag(G4bool flag) {fLatDisplFlag = flag;};
+   
+   void SetNuclCorrPar(G4double val) { NuclCorrPar = val; } ;
+   void SetFactPar(G4double val) { FactPar = val ; } ;
+
+ protected:
+
+   G4double ComputeTransportCrossSection(
+                             const G4ParticleDefinition& aParticleType,
+                                   G4double KineticEnergy,
+                                   G4double AtomicNumber,
+                                   G4double AtomicWeight) ;
+
+   G4double TrueToGeomTransformation(const G4DynamicParticle* aParticle,
+                                     G4Material* aMaterial,
+                                     G4double truePathLength) ;
+
+ private:
+
+ //  hide assignment operator as  private
+   G4MultipleScatteringx & operator = (const G4MultipleScatteringx &right) ;
+   G4MultipleScatteringx ( const G4MultipleScatteringx &) ;
+
+
+ // data members ...................................................
+ private:
+
+   G4PhysicsTable* theTransportMeanFreePathTable ;
+
+   G4double fTransportMeanFreePath ;
+   G4double range,alpha1 ;
+   G4int stepFlag ;
+
+   G4double biglambda ;
+
+   G4double LowestKineticEnergy ;
+   G4double HighestKineticEnergy ;
+   G4int TotBin ;
+
+   const G4Electron* theElectron ;
+   const G4Positron* thePositron ;
+
+   G4Material* lastMaterial;
+   G4double lastKineticEnergy;
+   G4int materialIndex ;
+  
+   G4double tLast ;
+   G4double zLast ;
+
+   G4double Tlimit ;
+
+   // model parameters
+   G4double scatteringparameter1;  // for low energy scattering
+   G4double scatteringparameter2;  // alfamax in scattering
+   G4double scatteringparameter3;  // param. for z/t distr.
+
+   G4bool boundary ;               // spec. handling near boundaries
+   G4GPILSelection  valueGPILSelectionMSC ;
+
+   G4double tuning;        //  param. for lambda tuning
+   G4double cparm;         //          "
+
+   // with/without lateral displacement
+   G4bool fLatDisplFlag ;
+
+   // nuclear size effect correction
+   G4double NuclCorrPar ;
+   G4double FactPar ;
+
+   //New ParticleChange
+   G4ParticleChangeForMSC fParticleChange ;
+   
+};
+
+#include "G4MultipleScatteringx.icc"
+
+#endif
+ 
+
+ 
diff --git a/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.icc b/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.icc
new file mode 100644
index 0000000000..faf20e25d6
--- /dev/null
+++ b/source/processes/electromagnetic/utils/include/G4MultipleScatteringx.icc
@@ -0,0 +1,290 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4MultipleScatteringx.icc,v 1.2.2.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// $Id: 
+// -------------------------------------------------------------
+//    GEANT 4 class inlined methods file
+//
+//    History: based on object model of
+//    2nd December 1995, G.Cosmo
+//    ------- G4MultipleScatteringx physics process ------
+//              by Laszlo Urban, March 2001
+//---------------------------------------------------------------
+//            New version of MSC model
+//---------------------------------------------------------------
+// Modified:
+// 18/05/01 V.Ivanchenko Clean up againist Linux ANSI compilation 
+//
+//---------------------------------------------------------------
+
+
+inline G4double G4MultipleScatteringx::AlongStepGetPhysicalInteractionLength(
+                             const G4Track& track,
+                             G4double previousStepSize,
+                             G4double currentMinimumStep,
+                             G4double& currentSafety,
+                             G4GPILSelection* selection
+                            )
+{
+  // get Step limit proposed by the process
+  G4double steplength = 
+     GetContinuousStepLimit(track,previousStepSize,currentMinimumStep, currentSafety);
+
+  // set return value for G4GPILSelection
+  *selection = valueGPILSelectionMSC;
+
+  return  steplength ;
+}
+
+
+inline G4double G4MultipleScatteringx::GetContinuousStepLimit(
+                                     const G4Track& track,                  
+                                     G4double,
+                                     G4double currentMinimumStep,
+                                     G4double&)
+{
+  G4double zPathLength,tPathLength ;
+  const G4DynamicParticle* aParticle ;
+  G4Material* aMaterial ;
+  G4double KineticEnergy,tau ;
+  G4bool isOut ;
+
+  static const G4double toler = 1.0e-6*mm ;
+  static const G4double factlim = 0.10 ;
+  G4double tlimit ;
+
+
+  static G4double tausmall = 1.e-20 ;
+  static G4double taulow   = 1.e-10 ;
+  static G4double clim=1./3. ;
+  G4double etau,beta2,cc,ccc,u  ;
+
+  // this process is not a candidate for selection by default !!!!!!!!
+  valueGPILSelectionMSC = NotCandidateForSelection;
+
+  if(track.GetCurrentStepNumber() == 1)
+    stepFlag = 0 ;
+
+  tPathLength = currentMinimumStep ;
+
+  aMaterial = track.GetMaterial() ;
+  materialIndex = aMaterial->GetIndex() ;
+
+  aParticle = track.GetDynamicParticle() ;
+  KineticEnergy = aParticle->GetKineticEnergy() ;
+
+  if((lastMaterial != aMaterial) || (lastKineticEnergy != KineticEnergy))
+  {
+    lastKineticEnergy = KineticEnergy ;
+    materialIndex = aMaterial->GetIndex() ;
+
+    if((lastMaterial != aMaterial)||(KineticEnergy >= Tlimit)||(stepFlag != 1))
+    fTransportMeanFreePath = (*theTransportMeanFreePathTable)
+                             (materialIndex)->GetValue(KineticEnergy,isOut);
+
+    lastMaterial = aMaterial;
+
+    if(KineticEnergy < Tlimit)
+    {
+      stepFlag = 1 ;
+      range = G4EnergyLossTables::GetRange(aParticle->GetDefinition(),
+                                       KineticEnergy,aMaterial) ;
+
+      alpha1 = range/fTransportMeanFreePath+1 ;
+    }
+  }
+
+  //  special treatment near boundaries ?
+  if(boundary)   
+  {                     
+    // step limitation at boundary ?
+    if(track.GetCurrentStepNumber() > 1)
+    {
+      if(track.GetStep()->GetPreStepPoint()->GetSafety() < toler)
+      {
+        tlimit = factlim*fTransportMeanFreePath ;
+        if(tPathLength > tlimit)
+        { 
+          tPathLength = tlimit*G4UniformRand() ;
+          valueGPILSelectionMSC = CandidateForSelection;
+        }
+      } 
+    }    
+  }               
+
+  //  do the true -> geom transformation
+  if( fTransportMeanFreePath > biglambda )
+  {
+    zPathLength = tPathLength ;
+  }
+  else if(stepFlag == 0)
+  {
+    tau = tPathLength/fTransportMeanFreePath ;
+    if(tau < tausmall)
+       zPathLength = tPathLength*(1.-0.5*tau)  ;
+    else
+    {
+      // sample zPathLength
+      etau = exp(-tau) ;
+      if(scatteringparameter3 <= clim)
+      {
+        ccc = 1.-scatteringparameter3 ;
+      }
+      else
+      {
+        cc=0.5/scatteringparameter3-1.5 ;
+        ccc=2.*scatteringparameter3*exp(cc) ;
+      }
+      if(tau < taulow)
+        beta2 = (1.+scatteringparameter3)*(1.-2.*tau/3.)/tau ;
+      else
+        beta2 = 0.5*(1.+scatteringparameter3)*(1.-etau)/(tau-1+etau) ;
+      do {
+           u = -log(1.-G4UniformRand())/beta2 ;
+         } while (G4UniformRand() > (1.-scatteringparameter3+
+                   2.*scatteringparameter3*beta2*u)*exp(-beta2*u)/ccc ) ;
+      zPathLength = tPathLength/(1.+u) ;
+    }
+  }
+  else
+  {
+    tau = tPathLength/range ; 
+    if(tau<perMillion)
+      zPathLength = range*(1.-exp(-alpha1*tau))/alpha1 ;
+    else if(tau<0.99) 
+      zPathLength = range*(1.-exp(alpha1*log(1.-tau)))/alpha1 ;
+    else
+      zPathLength = range/alpha1 ;
+  }  
+
+  tLast = tPathLength ;
+  zLast = zPathLength ; 
+
+  return zPathLength ;
+}
+
+inline G4double G4MultipleScatteringx::GetMeanFreePath(
+                                            const G4Track& track,
+                                            G4double,
+                                            G4ForceCondition* condition)
+
+ //  it does not limit the Step size , but it sets condition to
+ //   Forced , because the PostStepDoIt always has to be called
+
+  {
+    *condition = Forced ;
+
+    return DBL_MAX ;
+  }
+
+inline G4VParticleChange* G4MultipleScatteringx::AlongStepDoIt(
+                                       const G4Track& track,const G4Step& Step)          
+ //   only a geom path->true path transformation is performed
+{
+  static const G4double tfacmx = 10. ;
+  G4double tau,geomPathLength, truePathLength ;
+
+  static G4double tausmall = 1.e-20 ;
+  static G4double taulow   = 1.e-10 ;
+  static G4double clim=1./3. ;
+  G4double ltau,cc,ccc,beta2,u ;
+
+  fParticleChange.Initialize(track);
+
+  geomPathLength = track.GetStepLength() ;
+
+  if(geomPathLength == zLast)
+  { 
+    truePathLength = tLast ;
+  }
+  else if( fTransportMeanFreePath > biglambda )
+  {
+    truePathLength = geomPathLength ;  
+  }
+  else if(stepFlag == 0)
+  {
+    tau = geomPathLength/fTransportMeanFreePath ;
+    if(tau < tausmall)
+      truePathLength = geomPathLength*(1.+0.5*tau) ;
+    else if(tau < 1.)
+    {
+      // sample tPathLength
+      ltau = -log(1.-tau) ;
+      if(scatteringparameter3 <= clim)
+      {
+        ccc = 1.-scatteringparameter3 ;
+      }
+      else
+      {
+        cc=0.5/scatteringparameter3-1.5 ;
+        ccc=2.*scatteringparameter3*exp(cc) ;
+      }
+      if(tau < taulow)
+        beta2 = (1.+scatteringparameter3)*(1.-2.*tau/3.)/tau ;
+      else
+        beta2 = (1.+scatteringparameter3)*tau/(2.*(ltau-tau)) ;
+      do {
+           u = -log(1.-G4UniformRand())/beta2 ;
+         } while (G4UniformRand() > (1.-scatteringparameter3+
+                          2.*scatteringparameter3*beta2*u)*exp(-beta2*u)/ccc ) ;
+      truePathLength = geomPathLength*(1.+u) ;
+    }
+    else
+      truePathLength = tfacmx*fTransportMeanFreePath ;
+  }
+  else 
+  {
+    if(geomPathLength/range < perMillion)
+      truePathLength = range*(1.-exp(-geomPathLength/range)) ;
+    else
+      truePathLength = range*(1.-exp(log(1.-alpha1*geomPathLength/range)/
+                                     alpha1)) ;
+  }
+
+  fParticleChange.SetTrueStepLength(truePathLength) ;
+
+  return &fParticleChange ;
+  
+}
+
+
+inline G4bool G4MultipleScatteringx::IsApplicable(
+                                    const G4ParticleDefinition& particle)
+  {
+   return(particle.GetPDGCharge() != 0.);
+  }
+
+inline G4double G4MultipleScatteringx::GetLambda(
+                              G4double KineticEnergy,
+                              G4Material* material)
+{
+  G4bool isOut;
+  
+  G4double lambda = (*theTransportMeanFreePathTable)
+                    (material->GetIndex())->
+                    GetValue(KineticEnergy,isOut);
+  return lambda;
+}
diff --git a/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh b/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
index a4a714335c..7f273d66a7 100644
--- a/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
+++ b/source/processes/electromagnetic/utils/include/G4VEnergyLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VEnergyLoss.hh,v 1.9 2000/10/30 06:49:46 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VEnergyLoss.hh,v 1.9.4.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // Class Description 
 //
diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
index dc5cb1d1c0..6e2c8dde27 100644
--- a/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
+++ b/source/processes/electromagnetic/utils/src/G4EnergyLossMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyLossMessenger.cc,v 1.3 2000/11/09 15:52:24 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyLossMessenger.cc,v 1.3.4.1 2001/06/28 19:12:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
index fafcd802bf..c065ae9047 100644
--- a/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
+++ b/source/processes/electromagnetic/utils/src/G4EnergyLossTables.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//  
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
 //
-// $Id: G4EnergyLossTables.cc,v 1.13 2000/11/04 16:47:29 maire Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4EnergyLossTables.cc,v 1.14.2.1 2001/06/28 19:12:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------------- 
 // first version created by P.Urban , 06/04/1998
diff --git a/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc b/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc
index 2bb5adfe5d..17c4ef86b0 100644
--- a/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc
+++ b/source/processes/electromagnetic/utils/src/G4MultipleScattering.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MultipleScattering.cc,v 1.6 2001/01/11 10:44:34 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MultipleScattering.cc,v 1.8.2.2 2001/06/28 20:19:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //    GEANT 4 class implementation file
 //
-//    For information related to this code contact:
-//    CERN, IT Division, ASD Group
 //    History: based on object model of
 //    2nd December 1995, G.Cosmo
 //   -------- G4MultipleScattering physics process ------------
@@ -28,6 +42,8 @@
 // 20/06/00: nuclear size correction for particles other than e+/e- only ,  L.Urban
 // 10/08/00 values of some data members has been changed, L.Urban
 // 09/11/00 bug corrected in sigma computation, L.Urban
+// 16/05/01 value of cpar changed back to the old value, L.Urban
+// 18/05/01 V.Ivanchenko Clean up againist Linux ANSI compilation 
 // --------------------------------------------------------------
 
 #include "G4MultipleScattering.hh"
@@ -36,10 +52,7 @@
 
   G4MultipleScattering::G4MultipleScattering(const G4String& processName)
      : G4VContinuousDiscreteProcess(processName),
-       theTransportMeanFreePathTable(NULL),
-       lastMaterial(NULL),
-       lastKineticEnergy(0.),
-       materialIndex(0),
+       theTransportMeanFreePathTable(0),
        fTransportMeanFreePath (1.e12),
        range(1.e10*mm),
        alpha1(5.),
@@ -50,14 +63,18 @@
        TotBin(100),
        theElectron(G4Electron::Electron()),
        thePositron(G4Positron::Positron()),
+       lastMaterial(0),
+       lastKineticEnergy(0.),
+       materialIndex(0),
        tLast (0.0),
        zLast (0.0),
        Tlimit(1.*keV),
        scatteringparameter(0.9),
        tuning (1.00),
-       cpar (0.0),
-       NuclCorrPar (0.0615),FactPar(0.40),
-       fLatDisplFlag(true) 
+       cpar (1.50),
+       fLatDisplFlag(true), 
+       NuclCorrPar (0.0615),
+       FactPar(0.40)
   { }
 
   G4MultipleScattering::~G4MultipleScattering()
@@ -420,10 +437,8 @@
     static const G4double tausmall = 5.e-5,taubig =50.,
           kappa = 2.5, kappapl1 = kappa+1., kappami1 = kappa-1. ;
     const G4DynamicParticle* aParticle ;
-    G4Material* aMaterial ;
     G4double KineticEnergy,truestep,tau,prob,cth,sth,phi,
-             dirx,diry,dirz,w,w1,etau,rmean,safetyminustolerance,
-             xnew,ynew,znew ;
+             dirx,diry,dirz,w,w1,etau,rmean,safetyminustolerance;
     G4double rand ;
     G4bool isOut;
 
diff --git a/source/processes/electromagnetic/utils/src/G4MultipleScatteringx.cc b/source/processes/electromagnetic/utils/src/G4MultipleScatteringx.cc
new file mode 100644
index 0000000000..46f72bd5a7
--- /dev/null
+++ b/source/processes/electromagnetic/utils/src/G4MultipleScatteringx.cc
@@ -0,0 +1,643 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4MultipleScatteringx.cc,v 1.4.2.1 2001/06/28 19:12:48 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// --------------------------------------------------------------
+// 16/05/01  value of cparm changed , L.Urban
+// 18/05/01  V.Ivanchenko Clean up againist Linux ANSI compilation 
+// --------------------------------------------------------------
+
+#include "G4MultipleScatteringx.hh"
+#include "G4Navigator.hh"
+#include "G4TransportationManager.hh"
+
+  G4MultipleScatteringx::G4MultipleScatteringx(const G4String& processName)
+     : G4VContinuousDiscreteProcess(processName),
+       theTransportMeanFreePathTable(0),
+       fTransportMeanFreePath (1.e12),
+       range(1.e10*mm),
+       alpha1(5.),
+       stepFlag(0),
+       biglambda (1.e10*mm), 
+       LowestKineticEnergy(0.1*keV),
+       HighestKineticEnergy(100.*TeV),
+       TotBin(100),
+       theElectron(G4Electron::Electron()),
+       thePositron(G4Positron::Positron()),
+       lastMaterial(0),
+       lastKineticEnergy(0.),
+       materialIndex(0),
+       tLast (0.0),
+       zLast (0.0),
+       Tlimit(1.*keV),
+       scatteringparameter1(0.9),
+       scatteringparameter2(5.0),
+       scatteringparameter3(1.0),
+       boundary(false),
+       tuning (1.00),
+       cparm (1.5),
+       fLatDisplFlag(true),
+       NuclCorrPar (0.0615),
+       FactPar(0.40)
+  { }
+
+  G4MultipleScatteringx::~G4MultipleScatteringx()
+  {
+    if(theTransportMeanFreePathTable)
+    {
+      theTransportMeanFreePathTable->clearAndDestroy() ;
+      delete theTransportMeanFreePathTable ;
+    }
+  }
+
+//  .........methods..............................
+
+  void G4MultipleScatteringx::BuildPhysicsTable(
+                              const G4ParticleDefinition& aParticleType)
+
+  //   tables are built for MATERIALS
+  {
+    const G4double sigmafactor = twopi*classic_electr_radius*
+                                       classic_electr_radius ;
+    G4double KineticEnergy,AtomicNumber,AtomicWeight,
+             sigma,lambda ;
+    G4double density ;
+
+  // destroy old tables if any
+    if(theTransportMeanFreePathTable)
+    {
+      theTransportMeanFreePathTable->clearAndDestroy() ;
+      delete theTransportMeanFreePathTable ;
+    }
+
+  //  create table
+    const G4MaterialTable* theMaterialTable=
+                                   G4Material::GetMaterialTable();
+    G4int numOfMaterials = theMaterialTable->length() ;
+
+    theTransportMeanFreePathTable = new G4PhysicsTable(numOfMaterials) ;
+
+  //  loop for materials
+    for (G4int J=0; J<numOfMaterials; J++)
+    {
+
+  //  create physics vector and fill it
+      G4PhysicsLogVector* aVector = new G4PhysicsLogVector(
+                          LowestKineticEnergy,HighestKineticEnergy,TotBin) ;
+
+  //  get elements in the material
+      const G4Material* material = (*theMaterialTable)(J) ;
+      const G4ElementVector* theElementVector =
+                             material->GetElementVector() ;
+      const G4double* theAtomicNumDensityVector =
+                             material->GetAtomicNumDensityVector() ;       
+      const G4int NumberOfElements =
+                             material->GetNumberOfElements() ;
+      density = material->GetDensity() ;
+ 
+  //  loop for kinetic energy values
+      for (G4int i=0; i<TotBin; i++)
+      {
+          KineticEnergy = aVector->GetLowEdgeEnergy(i) ;
+          sigma = 0. ;
+
+  //   loop for element in the material
+          for (G4int iel=0; iel<NumberOfElements; iel++)
+          {
+            AtomicNumber = (*theElementVector)(iel)->GetZ() ;
+            AtomicWeight = (*theElementVector)(iel)->GetA() ;
+            sigma += theAtomicNumDensityVector[iel]*
+                     ComputeTransportCrossSection(aParticleType,
+                                     KineticEnergy,
+                                     AtomicNumber,AtomicWeight) ;
+          }
+          sigma *= sigmafactor ;
+ 
+          lambda = 1./sigma ;
+
+        aVector->PutValue(i,lambda) ;
+      }
+
+     theTransportMeanFreePathTable->insert(aVector) ;
+
+    }
+
+    if(   (&aParticleType == G4Electron::Electron())  ||
+          (&aParticleType == G4MuonPlus::MuonPlus())  ||
+          (&aParticleType == G4Proton::Proton())         ) 
+    {
+      PrintInfoDefinition() ;
+    }
+  }
+
+
+  G4double G4MultipleScatteringx::ComputeTransportCrossSection(
+                   const G4ParticleDefinition& aParticleType,
+                         G4double KineticEnergy,
+                         G4double AtomicNumber,G4double AtomicWeight)
+  {
+    const G4double epsfactor = 2.*electron_mass_c2*electron_mass_c2*
+                               Bohr_radius*Bohr_radius/(hbarc*hbarc) ;
+    const G4double epsmin = 1.e-4 , epsmax = 1.e10 ;
+
+
+    const G4double Zdat[15] = {4.,6.,13.,20.,26.,29.,32.,38.,47.,
+                               50.,56.,64.,74.,79.,82. } ;
+
+    const G4double Tdat[22] = 
+                      { 0.0001*MeV,0.0002*MeV,0.0004*MeV,0.0007*MeV,
+                       0.001*MeV,0.002*MeV,0.004*MeV,0.007*MeV,0.01*MeV,
+                       0.02*MeV,0.04*MeV,0.07*MeV,0.1*MeV,0.2*MeV,
+                       0.4*MeV,0.7*MeV,1.*MeV,2.*MeV,4.*MeV,
+                       7.*MeV,10.*MeV,20.*MeV} ;
+
+  // corr. factors for e-/e+ lambda
+
+    const G4double celectron[15][22] =
+          {{1.125,1.072,1.051,1.047,1.047,1.050,1.052,1.054,
+            1.054,1.057,1.062,1.069,1.075,1.090,1.105,1.111,
+            1.112,1.108,1.100,1.093,1.089,1.087            },
+           {1.408,1.246,1.143,1.096,1.077,1.059,1.053,1.051,
+            1.052,1.053,1.058,1.065,1.072,1.087,1.101,1.108,
+            1.109,1.105,1.097,1.090,1.086,1.082            },
+           {2.833,2.268,1.861,1.612,1.486,1.309,1.204,1.156,
+            1.136,1.114,1.106,1.106,1.109,1.119,1.129,1.132,
+            1.131,1.124,1.113,1.104,1.099,1.098            },
+           {3.879,3.016,2.380,2.007,1.818,1.535,1.340,1.236,
+            1.190,1.133,1.107,1.099,1.098,1.103,1.110,1.113,
+            1.112,1.105,1.096,1.089,1.085,1.098            },
+           {6.937,4.330,2.886,2.256,1.987,1.628,1.395,1.265,
+            1.203,1.122,1.080,1.065,1.061,1.063,1.070,1.073,
+            1.073,1.070,1.064,1.059,1.056,1.056            },
+           {9.616,5.708,3.424,2.551,2.204,1.762,1.485,1.330,
+            1.256,1.155,1.099,1.077,1.070,1.068,1.072,1.074,
+            1.074,1.070,1.063,1.059,1.056,1.052            },
+           {11.72,6.364,3.811,2.806,2.401,1.884,1.564,1.386,
+            1.300,1.180,1.112,1.082,1.073,1.066,1.068,1.069,
+            1.068,1.064,1.059,1.054,1.051,1.050            },
+           {18.08,8.601,4.569,3.183,2.662,2.025,1.646,1.439,
+            1.339,1.195,1.108,1.068,1.053,1.040,1.039,1.039,
+            1.039,1.037,1.034,1.031,1.030,1.036            },
+           {18.22,10.48,5.333,3.713,3.115,2.367,1.898,1.631,
+            1.498,1.301,1.171,1.105,1.077,1.048,1.036,1.033,
+            1.031,1.028,1.024,1.022,1.021,1.024            },
+           {14.14,10.65,5.710,3.929,3.266,2.453,1.951,1.669,
+            1.528,1.319,1.178,1.106,1.075,1.040,1.027,1.022,
+            1.020,1.017,1.015,1.013,1.013,1.020            },
+           {14.11,11.73,6.312,4.240,3.478,2.566,2.022,1.720,
+            1.569,1.342,1.186,1.102,1.065,1.022,1.003,0.997,
+            0.995,0.993,0.993,0.993,0.993,1.011            },
+           {22.76,20.01,8.835,5.287,4.144,2.901,2.219,1.855,
+            1.677,1.410,1.224,1.121,1.073,1.014,0.986,0.976,
+            0.974,0.972,0.973,0.974,0.975,0.987            },
+           {50.77,40.85,14.13,7.184,5.284,3.435,2.520,2.059,
+            1.837,1.512,1.283,1.153,1.091,1.010,0.969,0.954,
+            0.950,0.947,0.949,0.952,0.954,0.963            },
+           {65.87,59.06,15.87,7.570,5.567,3.650,2.682,2.182,
+            1.939,1.579,1.325,1.178,1.108,1.014,0.965,0.947,
+            0.941,0.938,0.940,0.944,0.946,0.954            },
+          // {45.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239, // paper.....
+           {55.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239, 
+            1.985,1.609,1.343,1.188,1.113,1.013,0.960,0.939,
+            0.933,0.930,0.933,0.936,0.939,0.949            }};
+
+     const G4double cpositron[15][22] = {
+           {2.589,2.044,1.658,1.446,1.347,1.217,1.144,1.110,
+            1.097,1.083,1.080,1.086,1.092,1.108,1.123,1.131,
+            1.131,1.126,1.117,1.108,1.103,1.100            },
+           {3.904,2.794,2.079,1.710,1.543,1.325,1.202,1.145,
+            1.122,1.096,1.089,1.092,1.098,1.114,1.130,1.137,
+            1.138,1.132,1.122,1.113,1.108,1.102            },
+           {7.970,6.080,4.442,3.398,2.872,2.127,1.672,1.451,
+            1.357,1.246,1.194,1.179,1.178,1.188,1.201,1.205,
+            1.203,1.190,1.173,1.159,1.151,1.145            },
+           {9.714,7.607,5.747,4.493,3.815,2.777,2.079,1.715,
+            1.553,1.353,1.253,1.219,1.211,1.214,1.225,1.228,
+            1.225,1.210,1.191,1.175,1.166,1.174            },
+           {17.97,12.95,8.628,6.065,4.849,3.222,2.275,1.820,
+            1.624,1.382,1.259,1.214,1.202,1.202,1.214,1.219,
+            1.217,1.203,1.184,1.169,1.160,1.151            },
+           {24.83,17.06,10.84,7.355,5.767,3.707,2.546,1.996,
+            1.759,1.465,1.311,1.252,1.234,1.228,1.238,1.241,
+            1.237,1.222,1.201,1.184,1.174,1.159            },
+           {23.26,17.15,11.52,8.049,6.375,4.114,2.792,2.155,
+            1.880,1.535,1.353,1.281,1.258,1.247,1.254,1.256,
+            1.252,1.234,1.212,1.194,1.183,1.170            },
+           {22.33,18.01,12.86,9.212,7.336,4.702,3.117,2.348,
+            2.015,1.602,1.385,1.297,1.268,1.251,1.256,1.258,
+            1.254,1.237,1.214,1.195,1.185,1.179            },
+           {33.91,24.13,15.71,10.80,8.507,5.467,3.692,2.808,
+            2.407,1.873,1.564,1.425,1.374,1.330,1.324,1.320,
+            1.312,1.288,1.258,1.235,1.221,1.205            },
+           {32.14,24.11,16.30,11.40,9.015,5.782,3.868,2.917,
+            2.490,1.925,1.596,1.447,1.391,1.342,1.332,1.327,
+            1.320,1.294,1.264,1.240,1.226,1.214            },
+           {29.51,24.07,17.19,12.28,9.766,6.238,4.112,3.066,
+            2.602,1.995,1.641,1.477,1.414,1.356,1.342,1.336,
+            1.328,1.302,1.270,1.245,1.231,1.233            },
+           {38.19,30.85,21.76,15.35,12.07,7.521,4.812,3.498,
+            2.926,2.188,1.763,1.563,1.484,1.405,1.382,1.371,
+            1.361,1.330,1.294,1.267,1.251,1.239            },
+           {49.71,39.80,27.96,19.63,15.36,9.407,5.863,4.155,
+            3.417,2.478,1.944,1.692,1.589,1.480,1.441,1.423,
+            1.409,1.372,1.330,1.298,1.280,1.258            },
+           {59.25,45.08,30.36,20.83,16.15,9.834,6.166,4.407,
+            3.641,2.648,2.064,1.779,1.661,1.531,1.482,1.459,
+            1.442,1.400,1.354,1.319,1.299,1.272            },
+           {56.38,44.29,30.50,21.18,16.51,10.11,6.354,4.542,
+            3.752,2.724,2.116,1.817,1.692,1.554,1.499,1.474,
+            1.456,1.412,1.364,1.328,1.307,1.282            }};
+
+     G4double Z23,ParticleMass,rat2,Charge,TotalEnergy,beta2,bg2,
+              eps,Z1,Z2,ratZ,T,E,b2small,b2big,ratb2,c1,c2,cc1,cc2,
+              corr,sigma,corrfactor,ChargeSquare ;
+     G4int iZ,iT ;
+
+     Z23 = 2.*log(AtomicNumber)/3. ;
+     Z23 = exp(Z23) ;
+
+     ParticleMass = aParticleType.GetPDGMass() ;
+
+     rat2 = ParticleMass/electron_mass_c2 ;
+     rat2 = rat2*rat2 ;
+
+     Charge = aParticleType.GetPDGCharge() ;
+     ChargeSquare = Charge*Charge/(eplus*eplus) ;
+
+     TotalEnergy = KineticEnergy + ParticleMass ;
+
+     beta2 = KineticEnergy*(TotalEnergy+ParticleMass)/
+             (TotalEnergy*TotalEnergy) ;
+     bg2 = KineticEnergy*(TotalEnergy+ParticleMass)/
+           (ParticleMass*ParticleMass) ;
+
+     eps = rat2*epsfactor*bg2/Z23 ;
+
+     if(eps<epsmin)
+       sigma = 2.*eps*eps ;
+     else if(eps<epsmax)
+       sigma = log(1.+2.*eps)-2.*eps/(1.+2.*eps) ;
+     else
+       sigma = log(2.*eps)-1.+1./eps ;
+
+     sigma *=ChargeSquare*AtomicNumber*AtomicNumber/rat2 ;
+     sigma /= beta2*bg2 ;
+
+  // nuclear size effect correction for high energy
+  // ( a simple approximation at present)
+     G4double corrnuclsize,a,x0,w1,w2,w ;
+
+     x0 = 1. - NuclCorrPar*ParticleMass/(KineticEnergy*
+               exp(log(AtomicWeight/(g/mole))/3.)) ;
+     if((x0 < -1.) || (KineticEnergy  <= 10.*MeV))
+     {
+       x0=-1. ;
+       corrnuclsize = 1. ;
+     }
+     else
+     {
+     a = 1.+1./eps ;
+     if(eps > epsmax)
+       w1=log(2.*eps)+1./eps-3./(8.*eps*eps) ;
+     else
+       w1=log((a+1.)/(a-1.))-2./(a+1.) ;
+
+     w = 1./((1.-x0)*eps) ;
+     if(w < epsmin)
+       w2=-log(w)-1.+2.*w-1.5*w*w ;
+     else
+       w2 = log((a-x0)/(a-1.))-(1.-x0)/(a-x0) ;
+ 
+     corrnuclsize = w1/w2 ;
+
+     // ####################################################
+     corrnuclsize = exp(-FactPar*proton_mass_c2/KineticEnergy)*
+                    (corrnuclsize-1.)+1. ;
+     }
+
+  //  correct this value using the corrections computed for e+/e-
+     KineticEnergy *= electron_mass_c2/ParticleMass ;
+
+     //  interpolate in AtomicNumber and beta2
+
+     //  get bin number in Z
+       iZ = 14 ;
+
+       while ((iZ>=0)&&(Zdat[iZ]>=AtomicNumber)) iZ -= 1 ;
+       if (iZ==14)                               iZ = 13 ;
+       if (iZ==-1)                               iZ = 0 ;
+
+       Z1 = Zdat[iZ] ;
+       Z2 = Zdat[iZ+1] ;
+       ratZ = (AtomicNumber-Z1)/(Z2-Z1) ;
+
+     // get bin number in T (beta2)
+       iT = 21 ;
+       while ((iT>=0)&&(Tdat[iT]>=KineticEnergy))
+         iT -= 1 ;
+       if(iT==21)
+         iT = 20 ;
+       if(iT==-1)
+         iT = 0 ;
+
+     //  calculate betasquare values
+       T = Tdat[iT] ;
+       E = T + electron_mass_c2 ;
+       b2small = T*(E+electron_mass_c2)/(E*E) ;
+       T = Tdat[iT+1] ;
+       E = T + electron_mass_c2 ;
+       b2big = T*(E+electron_mass_c2)/(E*E) ;
+       ratb2 = (beta2-b2small)/(b2big-b2small) ;
+ 
+       corrfactor = tuning*(1.+cparm)/(1.+cparm*beta2) ;
+
+     if(Charge < 0.)
+     {
+       c1 = celectron[iZ][iT] ;
+       c2 = celectron[iZ+1][iT] ;
+       cc1 = c1+ratZ*(c2-c1) ;
+
+       c1 = celectron[iZ][iT+1] ;
+       c2 = celectron[iZ+1][iT+1] ;
+       cc2 = c1+ratZ*(c2-c1) ;
+
+       corr = cc1+ratb2*(cc2-cc1) ;
+
+       sigma /= corr ;
+
+     }
+
+     if(Charge > 0.)
+     {
+       c1 = cpositron[iZ][iT] ;
+       c2 = cpositron[iZ+1][iT] ;
+       cc1 = c1+ratZ*(c2-c1) ;
+
+       c1 = cpositron[iZ][iT+1] ;
+       c2 = cpositron[iZ+1][iT+1] ;
+       cc2 = c1+ratZ*(c2-c1) ;
+
+       corr = cc1+ratb2*(cc2-cc1) ;
+
+       sigma /= corr ;
+     }
+
+     sigma *= corrfactor ;
+
+    //  nucl. size correction for particles other than e+/e- only at present !!!!
+    if((&aParticleType != G4Electron::Electron()) &&
+       (&aParticleType != G4Positron::Positron())  )    
+       sigma /= corrnuclsize ;
+
+     return sigma ;
+  } 
+
+
+  G4VParticleChange* G4MultipleScatteringx::PostStepDoIt(
+                                               const G4Track& trackData,
+                                               const G4Step& stepData)
+  {
+    static G4double taulim=1.e-6,randlim = 0.25*taulim*taulim  ;
+    static const G4double tausmall = 5.e-5,taubig =10.,
+          kappa = 2.5, kappapl1 = kappa+1., kappami1 = kappa-1. ;
+    const G4DynamicParticle* aParticle ;
+    G4double KineticEnergy,truestep,tau,cth,sth,phi,
+             dirx,diry,dirz,w,etau,rmean,safetyminustolerance;
+    G4double prob = 0.0;
+    G4bool isOut;
+
+    fParticleChange.Initialize(trackData) ;
+
+    truestep = stepData.GetStepLength() ;
+
+    aParticle = trackData.GetDynamicParticle() ;
+
+    KineticEnergy = aParticle->GetKineticEnergy() ;
+
+    if(stepFlag == 0)
+    {
+       fTransportMeanFreePath = (*theTransportMeanFreePathTable)
+                               (materialIndex)->GetValue(KineticEnergy,isOut);
+    } 
+
+    //  change direction first ( scattering ) ..........................
+
+    static G4double cp0 = 3.218 ; 
+    static G4double cp1 = 118.08 ; 
+    static G4double cmax=5.0 ;
+
+    static G4double alfa0=0.180 ;
+    static G4double alfa1=53.08 ;
+    static G4double alfamax = 1.0 ;
+
+    G4double alfa ;
+    G4double a,ap1,am1,b,c,c1,c2,c3,u1,u2,u3,v1,v2,v3,I0,I1,I2,e ;
+    G4double w1,w2 ;
+
+    if(stepFlag == 0)
+    {
+      tau = truestep/fTransportMeanFreePath ;
+    }
+    else
+    {
+      tau = truestep/range ;
+      if(tau < taulim)
+        prob = exp(-(alpha1-1.)*tau)*(1.+scatteringparameter1*tau) ;
+      else if(tau < 1.) 
+        prob = exp((alpha1-1.)*log(1.-tau))*(1.+scatteringparameter1*tau) ;
+      else
+        prob = 0. ;
+    }
+
+    if(tau >= taulim)
+    {  
+      if(stepFlag == 0)
+      {
+        if(tau < taubig)        
+        {                  
+
+          e=exp(-tau) ;
+
+          alfa =alfa0+alfa1*tau ;
+          if(alfa > alfamax) alfa=alfamax ;
+          a = exp(alfa*tau) ;
+          am1 = a-1. ;
+          ap1 = a+1. ;
+    
+          c=cp0+cp1*tau ;
+          if(c > cmax) c=cmax ;
+          if(c > scatteringparameter2) c=scatteringparameter2 ;
+          c1=c-1. ;
+          c2=c-2. ;
+          c3=c-3. ;
+
+          u3=exp(log(ap1)*c3) ;
+          v3=exp(log(am1)*c3) ;
+          u2=u3*ap1 ;
+          v2=v3*am1 ;
+          u1=u2*ap1 ;
+          v1=v2*am1 ;
+ 
+          I0 = (1./v1-1./u1)/c1 ;
+          I1 = a*I0-(1./v2-1./u2)/c2 ;
+          I2 = a*a*I0-2.*a*(1./v2-1./u2)/c2+(1./v3-1./u3)/c3 ;
+
+          b = c/(am1+c) ;
+          if(b > 1.) b = 1. ;           //  from the definition of f(x)
+
+          prob = e*(I0-b*I1)/(I1-b*I2) ;
+          if(prob > 1.) prob = 1. ;
+
+          if(G4UniformRand() <= prob)
+          {
+            w1 = 1.-a*b ;
+            w2 = G4std::max(w1/am1,w1/ap1)+b ;
+
+            do
+            {
+              cth = a -am1*ap1/exp(log(v2+G4UniformRand()*(u2-v2))/c2) ;
+            } while ( G4UniformRand() > (w1/(a-cth)+b)/w2 ) ;
+          }
+          else
+          {
+            cth = -1.+2.*G4UniformRand() ;
+          }
+        }             
+        else
+        {
+          cth = -1.+2.*G4UniformRand() ;
+        }        
+     } 
+     else
+     {
+       if(G4UniformRand()<prob)
+       {
+         w = 1.+scatteringparameter1*tau ;
+         w1 = w-1. ;
+         cth = w-w1*(w+1.)/sqrt(w1*w1+4.*w*G4UniformRand()) ;
+       }
+       else
+         cth = -1.+2.*G4UniformRand() ;
+     }
+  
+   }
+   else
+     cth = 1. ;
+
+    sth = sqrt(1.-cth*cth) ;
+
+    phi = twopi*G4UniformRand() ;
+
+    dirx = sth*cos(phi) ;
+    diry = sth*sin(phi) ;
+    dirz = cth ;
+
+    G4ParticleMomentum ParticleDirection = aParticle->GetMomentumDirection();
+
+    G4ThreeVector newDirection(dirx,diry,dirz) ;
+
+
+    newDirection.rotateUz(ParticleDirection) ;
+    fParticleChange.SetMomentumChange(newDirection.x(),
+                                      newDirection.y(),
+                                      newDirection.z()) ;
+
+    if(fLatDisplFlag)
+    {
+      //  compute mean lateral displacement ...............
+      //  only for safety > tolerance !!!!!!!!!
+      safetyminustolerance = stepData.GetPostStepPoint()->GetSafety();
+
+      if(safetyminustolerance > 0.)
+      {
+        if(tau<tausmall)
+          rmean = 5.*tau*tau*tau/12. ;
+        else
+        {
+          if(tau<taubig)
+            etau = exp(-tau) ;
+          else
+            etau = 0. ;
+          rmean = -kappa*tau ;
+          rmean = -exp(rmean)/(kappa*kappami1) ;
+          rmean += tau-kappapl1/kappa+kappa*etau/kappami1 ;
+        }
+
+        if(rmean>0.)
+          rmean = 2.*fTransportMeanFreePath*sqrt(rmean/3.) ;
+        else
+          rmean = 0. ;
+
+        // for rmean > 0) only
+        if(rmean>0.)
+        {
+          if(rmean>safetyminustolerance)
+            rmean = safetyminustolerance ;
+
+          //  sample direction of lateral displacement
+          phi = twopi*G4UniformRand() ;
+
+          dirx = cos(phi) ;
+          diry = sin(phi) ;
+          dirz = 0. ;
+
+          G4ThreeVector latDirection(dirx,diry,dirz);
+
+          latDirection.rotateUz(ParticleDirection) ;
+
+          // compute new endpoint of the Step
+	  G4ThreeVector newPosition= 
+			 stepData.GetPostStepPoint()->GetPosition()+
+					     rmean*latDirection;
+    
+	  G4Navigator *navigator= 
+	   G4TransportationManager::GetTransportationManager()
+				   ->GetNavigatorForTracking();
+	  navigator->LocateGlobalPointWithinVolume( newPosition );
+
+	  fParticleChange.SetPositionChange(newPosition) ;
+        }
+      }
+    }
+
+
+    return &fParticleChange ;
+ 
+  }
+
+  
+void G4MultipleScatteringx::PrintInfoDefinition()
+{
+  G4String comments = " Tables of transport mean free paths.";
+        comments += "\n          New model of MSC , computes the lateral \n";
+        comments += "          displacement of the particle , too.";
+
+  G4cout << G4endl << GetProcessName() << ":  " << comments
+         << "\n        PhysicsTables from " << G4BestUnit(LowestKineticEnergy,
+                                                  "Energy")
+         << " to " << G4BestUnit(HighestKineticEnergy,"Energy")
+         << " in " << TotBin << " bins. \n";
+}
+
diff --git a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
index fafa031931..400920122d 100644
--- a/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
+++ b/source/processes/electromagnetic/utils/src/G4VEnergyLoss.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VEnergyLoss.cc,v 1.20 2001/03/27 12:16:35 urban Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VEnergyLoss.cc,v 1.21.2.1 2001/06/28 19:12:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // --------------------------------------------------------------
@@ -16,6 +32,7 @@
 //  bug fixed in fluct., L.Urban 22/11/00
 //  bugfix in fluct.
 //  (some variables are doubles instead of ints now),L.Urban 23/03/01
+//  18/05/01 V.Ivanchenko Clean up againist Linux ANSI compilation 
 // 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -140,8 +157,6 @@ void G4VEnergyLoss::BuildRangeVector(G4PhysicsTable* theDEDXTable,
   G4double oldValue,tauold ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
 
   // cure 'accidental' 0. dE/dx vales first .....
   G4double lossmin = +1.e10 ;
@@ -409,8 +424,6 @@ void G4VEnergyLoss::BuildLabTimeVector(G4PhysicsTable* theDEDXTable,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
@@ -471,8 +484,6 @@ void G4VEnergyLoss::BuildProperTimeVector(G4PhysicsTable* theDEDXTable,
            LowEdgeEnergy,tau,Value ;
 
   G4PhysicsVector* physicsVector= (*theDEDXTable)[materialIndex];
-  const G4MaterialTable* theMaterialTable =
-                                G4Material::GetMaterialTable() ;
 
   // low energy part first...
   losslim = physicsVector->GetValue(tlim,isOut);
@@ -911,7 +922,7 @@ G4double G4VEnergyLoss::GetLossWithFluct(const G4DynamicParticle* aParticle,
   G4double p1,p2,p3 ;
   G4int nb;
   G4double Corrfac, na,alfa,rfac,namean,sa,alfa1,ea,sea;
-  G4double dp1,dp3;
+  G4double dp3;
   G4double siga ;
 
   // shortcut for very very small loss 
diff --git a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
index e8bd48db51..96face4757 100644
--- a/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
+++ b/source/processes/electromagnetic/xrays/include/G4Cerenkov.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Cerenkov.hh,v 1.4 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Cerenkov.hh,v 1.4.4.1 2001/06/28 19:12:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
index 896be7e6a9..140008697c 100644
--- a/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
+++ b/source/processes/electromagnetic/xrays/include/G4ForwardXrayTR.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ForwardXrayTR.hh,v 1.6 2000/04/06 13:55:23 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ForwardXrayTR.hh,v 1.6.4.1 2001/06/28 19:12:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4ForwardXrayTR -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
index 3241544976..fc9093f764 100644
--- a/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
+++ b/source/processes/electromagnetic/xrays/include/G4Scintillation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Scintillation.hh,v 1.4 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Scintillation.hh,v 1.4.4.1 2001/06/28 19:12:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
index f6c94b4f5f..5f244e11de 100644
--- a/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
+++ b/source/processes/electromagnetic/xrays/include/G4TransitionRadiation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransitionRadiation.hh,v 1.5 2000/04/03 13:45:28 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransitionRadiation.hh,v 1.5.4.1 2001/06/28 19:12:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4TransitionRadiation  -- header file
 //
diff --git a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
index 30d4a3a4c8..3f823fca77 100644
--- a/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Cerenkov.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Cerenkov.cc,v 1.9 2000/11/13 01:09:48 gum Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Cerenkov.cc,v 1.9.4.1 2001/06/28 19:12:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Cerenkov Radiation Class Implementation
diff --git a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
index 626adbbe40..0334334124 100644
--- a/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
+++ b/source/processes/electromagnetic/xrays/src/G4ForwardXrayTR.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ForwardXrayTR.cc,v 1.4 2000/02/09 10:41:18 grichine Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ForwardXrayTR.cc,v 1.4.4.1 2001/06/28 19:12:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4ForwardXrayTR class -- implementation file
 
diff --git a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
index 16794f60d0..f23176c55f 100644
--- a/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
+++ b/source/processes/electromagnetic/xrays/src/G4Scintillation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Scintillation.cc,v 1.5 2000/09/19 03:13:04 gum Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Scintillation.cc,v 1.5.4.1 2001/06/28 19:12:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Scintillation Light Class Implementation
diff --git a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
index 08643492db..5a4cba3b1f 100644
--- a/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
+++ b/source/processes/electromagnetic/xrays/src/G4TransitionRadiation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TransitionRadiation.cc,v 1.2 1999/12/15 14:52:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TransitionRadiation.cc,v 1.2.4.1 2001/06/28 19:12:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4TransitionRadiation class -- implementation file
 
diff --git a/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh b/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
index 4f84cb1a3e..1ed675f1fd 100644
--- a/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
+++ b/source/processes/hadronic/cross_sections/include/G4CrossSectionDataStore.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CrossSectionDataStore.hh,v 1.3 2000/12/14 08:33:02 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4CrossSectionDataStore -- header file
@@ -41,7 +54,7 @@ public:
    }
 
    G4double GetCrossSection(const G4DynamicParticle*, 
-                            const G4Element*);
+                            const G4Element*, G4double aTemperature);
 
    void AddDataSet(G4VCrossSectionDataSet*);
 
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
index ac07da7e79..efebd1360f 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronCaptureDataSet.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCaptureDataSet.hh,v 1.3 2000/12/14 08:33:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4HadronCaptureDataSet -- header file
@@ -48,7 +61,7 @@ public:
    }
 
    G4double GetCrossSection(const G4DynamicParticle* aParticle,
-                            const G4Element* anElement)
+                            const G4Element* anElement, G4double aTemperature)
    {
       return theHadronCrossSections->GetCaptureCrossSection(aParticle,
                                                               anElement);
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh b/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
index 69f49f5ced..9bc657c977 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronCrossSections.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCrossSections.hh,v 1.4 2000/12/14 08:33:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronCrossSections.hh,v 1.4.6.1 2001/06/28 19:12:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // GEANT4 Hadron physics class -- header file
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
index 0c71e7d062..fe50e01873 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronElasticDataSet.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronElasticDataSet.hh,v 1.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4HadronElasticDataSet -- header file
@@ -47,7 +60,7 @@ public:
    }
 
    G4double GetCrossSection(const G4DynamicParticle* aParticle,
-                            const G4Element* anElement)
+                            const G4Element* anElement, G4double aTemperature)
    {
       return theHadronCrossSections->GetElasticCrossSection(aParticle,
                                                               anElement);
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
index 836061701e..60330da4d4 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronFissionDataSet.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronFissionDataSet.hh,v 1.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4HadronFissionDataSet -- header file
@@ -46,7 +59,7 @@ public:
    }
 
    G4double GetCrossSection(const G4DynamicParticle* aParticle,
-                            const G4Element* anElement)
+                            const G4Element* anElement, G4double aTemperature)
    {
       return theHadronCrossSections->GetFissionCrossSection(aParticle,
                                                               anElement);
diff --git a/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh b/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
index fe1ea02f01..d4acb3fc54 100644
--- a/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4HadronInelasticDataSet.hh
@@ -1,12 +1,24 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4HadronInelasticDataSet.hh,v 1.3 2000/12/14 08:33:04 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
 // GEANT4 physics class: G4HadronInelasticDataSet -- header file
@@ -46,7 +58,7 @@ public:
    }
 
    G4double GetCrossSection(const G4DynamicParticle* aParticle,
-                            const G4Element* anElement)
+                            const G4Element* anElement, G4double aTemperature)
    {
       return theHadronCrossSections->GetInelasticCrossSection(aParticle,
                                                               anElement);
diff --git a/source/processes/hadronic/cross_sections/include/G4IonProtonCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4IonProtonCrossSection.hh
index 7db51ea2dd..ef4173956e 100644
--- a/source/processes/hadronic/cross_sections/include/G4IonProtonCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4IonProtonCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4IonProtonCrossSection_h
 #define G4IonProtonCrossSection_h
 
@@ -29,7 +51,8 @@ class G4IonProtonCrossSection : public G4VCrossSectionDataSet
    }
 
    virtual
-   G4double GetCrossSection(const G4DynamicParticle* aPart, const G4Element*anEle)
+   G4double GetCrossSection(const G4DynamicParticle* aPart, 
+                            const G4Element*anEle, G4double aTemperature)
    {
      G4ProtonInelasticCrossSection theForward;
      G4double result = theForward.GetCrossSection(aPart->GetKineticEnergy(),
diff --git a/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
index 57c2d2d20c..ee5927d6f8 100644
--- a/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4NeutronInelasticCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // by JPW, working, but to be cleaned up. @@@@
 
 #ifndef G4NeutronInelasticCrossSection_h
@@ -29,7 +51,8 @@ class G4NeutronInelasticCrossSection : public G4VCrossSectionDataSet
    }
 
    virtual
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, 
+                            const G4Element*, G4double aTemperature);
    
    G4double GetCrossSection(G4double anEnergy, G4double anA, G4double aZ);
 
diff --git a/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
index 63216fc679..16176162dd 100644
--- a/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4ProtonInelasticCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // by JPW, working, but to be cleaned up. @@@@
 
 #ifndef G4ProtonInelasticCrossSection_h
@@ -28,7 +50,8 @@ class G4ProtonInelasticCrossSection : public G4VCrossSectionDataSet
    }
 
    virtual
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, 
+                            const G4Element*, G4double aTemperature);
    
    G4double GetCrossSection(G4double anEnergy, G4double anA, G4double aZ);
 
diff --git a/source/processes/hadronic/cross_sections/include/G4TripathiCrossSection.hh b/source/processes/hadronic/cross_sections/include/G4TripathiCrossSection.hh
index 00c71ee410..cb8975eb90 100644
--- a/source/processes/hadronic/cross_sections/include/G4TripathiCrossSection.hh
+++ b/source/processes/hadronic/cross_sections/include/G4TripathiCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // by JPW, working, but to be cleaned up. @@@@
 
 #ifndef G4TripathiCrossSection_h
@@ -27,7 +49,8 @@ class G4TripathiCrossSection : public G4VCrossSectionDataSet
    }
 
    virtual
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, 
+                            const G4Element*, G4double aTemperature);
 
    virtual
    void BuildPhysicsTable(const G4ParticleDefinition&)
diff --git a/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh b/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
index 65f071d9f5..e40cf0c550 100644
--- a/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
+++ b/source/processes/hadronic/cross_sections/include/G4VCrossSectionDataSet.hh
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4VCrossSectionDataSet.hh,v 1.4 2000/12/14 11:25:57 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics abstract class: G4VCrossSectionData -- header file
@@ -45,7 +59,9 @@ public: //with description
    G4bool IsApplicable(const G4DynamicParticle*, const G4Element*) = 0;
 
    virtual
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*) = 0;
+   G4double GetCrossSection(const G4DynamicParticle*, 
+                            const G4Element*, 
+			    G4double aTemperature = 0.) = 0;
 
    virtual
    void BuildPhysicsTable(const G4ParticleDefinition&) = 0;
diff --git a/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc b/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
index 47e4263a65..6493b5c1ac 100644
--- a/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
+++ b/source/processes/hadronic/cross_sections/src/G4CrossSectionDataStore.cc
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CrossSectionDataStore.cc,v 1.2 1999/12/15 14:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // GEANT4 physics class: G4CrossSectionDataStore
@@ -18,7 +31,8 @@
 
 G4double
 G4CrossSectionDataStore::GetCrossSection(const G4DynamicParticle* aParticle,
-                                         const G4Element* anElement)
+                                         const G4Element* anElement,
+					 G4double aTemperature)
 {
    if (NDataSetList == 0) {
       G4Exception("G4CrossSectionDataStore: no data sets registered");
@@ -26,7 +40,7 @@ G4CrossSectionDataStore::GetCrossSection(const G4DynamicParticle* aParticle,
    }
    for (G4int i = NDataSetList-1; i >= 0; i--) {
       if (DataSetList[i]->IsApplicable(aParticle, anElement))
-             return DataSetList[i]->GetCrossSection(aParticle, anElement);
+             return DataSetList[i]->GetCrossSection(aParticle, anElement, aTemperature);
    }
    G4Exception("G4CrossSectionDataStore: no applicable data set found "
                "for particle/element");
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
index c180d04e0b..2c2492d1ce 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronCaptureDataSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCaptureDataSet.cc,v 1.2 1999/12/15 14:52:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronCaptureDataSet.cc,v 1.2.8.1 2001/06/28 19:12:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Physics class: HadronCaptureDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
index 2cb504a808..c34d5393fa 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronCrossSections.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCrossSections.cc,v 1.3 2001/02/26 17:09:14 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronCrossSections.cc,v 1.4.2.1 2001/06/28 19:12:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Hadron Physics class G4HadronCrossSections
@@ -1485,7 +1501,7 @@ G4HadronCrossSections::GetCaptureCrossSection(
 
    G4double ekx = G4std::max(ek, 1.e-9);
    G4double z = anElement->GetZ();
-   G4int izno = z + 0.01;
+   G4int izno = static_cast<G4int> (z + 0.01);
    if (izno > 100) izno = 100;      // Not in GHESIG
    izno = izno - 1;      // For array indexing
    G4double sigcap = 11.12*cscap[izno]/pow(ekx*1.e6, 0.577);
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
index 46da66356c..848766b877 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronElasticDataSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronElasticDataSet.cc,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronElasticDataSet.cc,v 1.2.8.1 2001/06/28 19:12:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Physics class: HadronElasticDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
index 6d6f6e8d67..23ff9baf09 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronFissionDataSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronFissionDataSet.cc,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronFissionDataSet.cc,v 1.2.8.1 2001/06/28 19:12:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Physics class: HadronFissionDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
index bf5766abd2..d1caa00406 100644
--- a/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4HadronInelasticDataSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronInelasticDataSet.cc,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronInelasticDataSet.cc,v 1.2.8.1 2001/06/28 19:12:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Physics class: HadronInelasticDataSet for cross sections
diff --git a/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc
index f3dfb48b90..a9a05abfd9 100644
--- a/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc
+++ b/source/processes/hadronic/cross_sections/src/G4NeutronInelasticCrossSection.cc
@@ -1,10 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // By JPW, working, but to be cleaned up. @@@
 
 #include "G4NeutronInelasticCrossSection.hh"
 #include "globals.hh"
 
    G4double G4NeutronInelasticCrossSection::
-   GetCrossSection(const G4DynamicParticle* aPart, const G4Element* anEle)
+   GetCrossSection(const G4DynamicParticle* aPart, 
+                   const G4Element* anEle, G4double aTemperature)
    {
       G4double atomicNumber = anEle->GetN();
       G4double nOfProtons = anEle->GetZ();
diff --git a/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc
index a43ca16660..b1c4314ecc 100644
--- a/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc
+++ b/source/processes/hadronic/cross_sections/src/G4ProtonInelasticCrossSection.cc
@@ -1,10 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // By JPW, working, but to be cleaned up. @@@
 
 #include "G4ProtonInelasticCrossSection.hh"
 #include "globals.hh"
 
    G4double G4ProtonInelasticCrossSection::
-   GetCrossSection(const G4DynamicParticle* aPart, const G4Element* anEle)
+   GetCrossSection(const G4DynamicParticle* aPart, 
+                   const G4Element* anEle, G4double aTemperature)
    {
       G4double atomicNumber = anEle->GetN();
       G4double nOfProtons = anEle->GetZ();
diff --git a/source/processes/hadronic/cross_sections/src/G4TripathiCrossSection.cc b/source/processes/hadronic/cross_sections/src/G4TripathiCrossSection.cc
index 2fcd0c87e7..90b2eda633 100644
--- a/source/processes/hadronic/cross_sections/src/G4TripathiCrossSection.cc
+++ b/source/processes/hadronic/cross_sections/src/G4TripathiCrossSection.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Implementation of formulas in analogy to NASA technical paper 3621 by Tripathi, et al.
 
 #include "G4TripathiCrossSection.hh"
@@ -5,7 +27,8 @@
 #include "G4IonTable.hh"
 
 G4double G4TripathiCrossSection::
-GetCrossSection(const G4DynamicParticle* aPart, const G4Element*anEle)
+GetCrossSection(const G4DynamicParticle* aPart, 
+                const G4Element*anEle, G4double aTemperature)
 {
   G4double result = 0;
   
diff --git a/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc b/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
index cb66749fef..392d9d07af 100644
--- a/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
+++ b/source/processes/hadronic/cross_sections/src/G4VCrossSectionDataSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VCrossSectionDataSet.cc,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VCrossSectionDataSet.cc,v 1.2.8.1 2001/06/28 19:12:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // GEANT4 physics abstract class: G4VCrossSectionDataSet
diff --git a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
index c6a4073cdb..1a8a24da41 100644
--- a/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
+++ b/source/processes/hadronic/management/include/G4EnergyRangeManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyRangeManager.hh,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyRangeManager.hh,v 1.2.8.1 2001/06/28 19:12:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Energy Range Manager
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh b/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
index da7070fb4b..10b7604537 100644
--- a/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
+++ b/source/processes/hadronic/management/include/G4HadronInelasticProcess.hh
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4HadronInelasticProcess.hh,v 1.4 2000/09/20 16:52:36 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
  // Hadronic Inelastic Process class
  // The specific particle inelastic processes derive from this class
@@ -61,7 +75,8 @@
     
     G4double GetMicroscopicCrossSection(
      const G4DynamicParticle *aParticle,
-     const G4Element *anElement);
+     const G4Element *anElement,
+     G4double aTemp);
 
     G4VParticleChange *PostStepDoIt(
      const G4Track &aTrack, const G4Step &aStep )
diff --git a/source/processes/hadronic/management/include/G4HadronicInteraction.hh b/source/processes/hadronic/management/include/G4HadronicInteraction.hh
index b572a04ec0..ab90f02225 100644
--- a/source/processes/hadronic/management/include/G4HadronicInteraction.hh
+++ b/source/processes/hadronic/management/include/G4HadronicInteraction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronicInteraction.hh,v 1.4 2000/12/14 08:40:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronicInteraction.hh,v 1.4.6.1 2001/06/28 19:12:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Interaction  abstract base class
  // This class is the base class for the model classes.
diff --git a/source/processes/hadronic/management/include/G4HadronicInteractionRegistry.hh b/source/processes/hadronic/management/include/G4HadronicInteractionRegistry.hh
index d4c23c193b..0f9aa56551 100644
--- a/source/processes/hadronic/management/include/G4HadronicInteractionRegistry.hh
+++ b/source/processes/hadronic/management/include/G4HadronicInteractionRegistry.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4HadronicInteractionRegistry_h
 #define G4HadronicInteractionRegistry_h 1
 
diff --git a/source/processes/hadronic/management/include/G4HadronicProcess.hh b/source/processes/hadronic/management/include/G4HadronicProcess.hh
index bf2cb55d09..c5356e16a7 100644
--- a/source/processes/hadronic/management/include/G4HadronicProcess.hh
+++ b/source/processes/hadronic/management/include/G4HadronicProcess.hh
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4HadronicProcess.hh,v 1.5 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
  // This is the top level Hadronic Process class
  // The inelastic, elastic, capture, and fission processes
@@ -79,7 +93,8 @@
     { dispatch=value; }
     
     virtual G4double GetMicroscopicCrossSection( const G4DynamicParticle *aParticle, 
-                                                 const G4Element *anElement ) = 0;
+                                                 const G4Element *anElement, 
+						 G4double aTemp ) = 0;
     
     G4double GetCurrentZ()
     { return currentZ; }
diff --git a/source/processes/hadronic/management/include/G4InelasticInteraction.hh b/source/processes/hadronic/management/include/G4InelasticInteraction.hh
index 5f0e670581..bda03d273e 100644
--- a/source/processes/hadronic/management/include/G4InelasticInteraction.hh
+++ b/source/processes/hadronic/management/include/G4InelasticInteraction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InelasticInteraction.hh,v 1.2 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InelasticInteraction.hh,v 1.2.8.1 2001/06/28 19:12:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Inelastic Interaction 
  // This class is an abstract base class, since the pure virtual
diff --git a/source/processes/hadronic/management/include/G4IsoParticleChange.hh b/source/processes/hadronic/management/include/G4IsoParticleChange.hh
index 1c09807817..d0fab79eb7 100644
--- a/source/processes/hadronic/management/include/G4IsoParticleChange.hh
+++ b/source/processes/hadronic/management/include/G4IsoParticleChange.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4IsoParticleChange_h
 #define G4IsoParticleChange_h
 
diff --git a/source/processes/hadronic/management/include/G4VIsotopeProduction.hh b/source/processes/hadronic/management/include/G4VIsotopeProduction.hh
index 305fd3d56c..72663f5954 100644
--- a/source/processes/hadronic/management/include/G4VIsotopeProduction.hh
+++ b/source/processes/hadronic/management/include/G4VIsotopeProduction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VIsotopeProduction_h
 #define G4VIsotopeProduction_h 1
 
diff --git a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
index 44115c1c25..2262c5606b 100644
--- a/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
+++ b/source/processes/hadronic/management/src/G4EnergyRangeManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EnergyRangeManager.cc,v 1.3 1999/12/15 14:52:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EnergyRangeManager.cc,v 1.3.8.1 2001/06/28 19:12:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Energy Range Manager
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc b/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
index 138907955b..f3cc16b1de 100644
--- a/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
+++ b/source/processes/hadronic/management/src/G4HadronInelasticProcess.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Inelastic Process Class
@@ -43,20 +59,15 @@
     const G4double *theAtomicNumDensityVector =
       aMaterial->GetAtomicNumDensityVector();
     
+    G4double aTemp = aMaterial->GetTemperature();
     G4Element *anElement = (*theElementVector)[0];
     G4int j = anElement->GetIndex();
-    
-    // This apparently should not be here (not useful and dumps core)
-    // FWJ 17-JUN-1998
-    //    G4bool isOutRange;
-    //    G4double xSection = (*((*thePhysicsTable)(j))).GetValue(
-    //     aParticle->GetTotalMomentum()/GeV, isOutRange );
-    
+        
     G4double sigma = 0.0;
     for( G4int i=0; i<nElements; ++i )
     {
       G4double xSection =
-        GetMicroscopicCrossSection( aParticle, (*theElementVector)[i] );
+        GetMicroscopicCrossSection( aParticle, (*theElementVector)[i], aTemp);
       sigma += theAtomicNumDensityVector[i] * xSection;
     }
     sigma *= aScaleFactor;
@@ -91,7 +102,8 @@
  
  G4double G4HadronInelasticProcess::GetMicroscopicCrossSection(
   const G4DynamicParticle *aParticle,
-  const G4Element *anElement)
+  const G4Element *anElement,
+  G4double aTemp)
   {
     // returns the microscopic cross section in GEANT4 internal units
     
@@ -100,7 +112,7 @@
                   "no CrossSectionDataStore");
       return DBL_MIN;
    }
-   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement);
+   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement, aTemp);
 
    //    G4bool isOutRange;
    //    G4int j = anElement->GetIndex();
diff --git a/source/processes/hadronic/management/src/G4HadronicInteraction.cc b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
index e04a39a31e..7ae278e978 100644
--- a/source/processes/hadronic/management/src/G4HadronicInteraction.cc
+++ b/source/processes/hadronic/management/src/G4HadronicInteraction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronicInteraction.cc,v 1.2 1999/12/15 14:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HadronicInteraction.cc,v 1.2.8.1 2001/06/28 19:12:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Interaction  base class
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/management/src/G4HadronicInteractionRegistry.cc b/source/processes/hadronic/management/src/G4HadronicInteractionRegistry.cc
index e271b84122..67bd1220af 100644
--- a/source/processes/hadronic/management/src/G4HadronicInteractionRegistry.cc
+++ b/source/processes/hadronic/management/src/G4HadronicInteractionRegistry.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4HadronicInteractionRegistry.hh"
 #include "G4HadronicInteraction.hh"
 
diff --git a/source/processes/hadronic/management/src/G4HadronicProcess.cc b/source/processes/hadronic/management/src/G4HadronicProcess.cc
index d60054202e..cfd556f650 100644
--- a/source/processes/hadronic/management/src/G4HadronicProcess.cc
+++ b/source/processes/hadronic/management/src/G4HadronicProcess.cc
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4HadronicProcess.cc,v 1.8 1999/12/15 14:52:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
  // HPW to implement the choosing of an element for scattering.
 #include "g4std/fstream"
@@ -38,19 +52,21 @@
     }
     
     const G4double *theAtomicNumberDensity = aMaterial->GetAtomicNumDensityVector();
+    G4double aTemp = aMaterial->GetTemperature();
     G4double crossSectionTotal = 0;
     G4int i;
+    G4std::vector<G4double> runningSum;
     for( i=0; i < numberOfElements; ++i )
-      crossSectionTotal += theAtomicNumberDensity[i] *
-        dispatch->GetMicroscopicCrossSection( aParticle, (*theElementVector)(i) );
+    {
+      runningSum.push_back(theAtomicNumberDensity[i] *
+        dispatch->GetMicroscopicCrossSection( aParticle, (*theElementVector)(i), aTemp));
+      crossSectionTotal+=runningSum[i];
+    }
     
-    G4double crossSectionSum= 0.;
-    G4double random = G4UniformRand()*crossSectionTotal;
+    G4double random = G4UniformRand();
     for( i=0; i < numberOfElements; ++i )
     { 
-      crossSectionSum += theAtomicNumberDensity[i] *
-        dispatch->GetMicroscopicCrossSection( aParticle, (*theElementVector)(i) );
-      if( random<=crossSectionSum )
+      if( random<=runningSum[i]/crossSectionTotal )
       {
         currentZ = G4double((*theElementVector)(i)->GetZ());
         currentN = (*theElementVector)(i)->GetN();
diff --git a/source/processes/hadronic/management/src/G4InelasticInteraction.cc b/source/processes/hadronic/management/src/G4InelasticInteraction.cc
index 3ab758f84d..1c7169e043 100644
--- a/source/processes/hadronic/management/src/G4InelasticInteraction.cc
+++ b/source/processes/hadronic/management/src/G4InelasticInteraction.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: Inelastic Interaction 
@@ -238,7 +254,11 @@
                                             leadingStrangeParticle );
     if( finishedGenXPt )return;
     G4bool finishedTwoClu = false;
-    if( modifiedOriginal.GetTotalMomentum()/MeV < 1.0 )vecLen = 0;
+    if( modifiedOriginal.GetTotalMomentum()/MeV < 1.0 )
+    {
+      for(G4int i=0; i<vecLen; i++) delete vec[i];
+      vecLen = 0;
+    }
     else
     {
       theReactionDynamics.SuppressChargedPions( vec, vecLen,
diff --git a/source/processes/hadronic/models/generator/History b/source/processes/hadronic/models/generator/History
deleted file mode 100644
index c5cff398db..0000000000
--- a/source/processes/hadronic/models/generator/History
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: History,v 1.1 1999/01/07 16:11:38 gunter Exp $
--------------------------------------------------------------------
-
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
-
-               Hadronics/models/Generator History file
-               ---------------------------------------
-This file should be used by G4 developers  to briefly summarize all major
-modifications introduced in the code and keep track of all tags.
-It DOES NOT substitute the  CVS log-message one should put at every
-committal in the CVS repository !
-
-     ----------------------------------------------------------
-     * Reverse chronological order (last date on top), please *
-     ----------------------------------------------------------
-GF 12-May-98: Add more functions to G4Fancy3DNucleus:
-	       doLorentzContraction with algorithm given by Nicolai
-	       give access to all nucleons with a RWTPtrOrederedVector
-              Required a mod to G4Nucleon, ie. add  operator ==
diff --git a/source/processes/hadronic/models/generator/ToDo b/source/processes/hadronic/models/generator/ToDo
deleted file mode 100644
index d814424284..0000000000
--- a/source/processes/hadronic/models/generator/ToDo
+++ /dev/null
@@ -1,18 +0,0 @@
-Known problems/ missing topics
-
-date	 	date	   who	description
-found		fixed
-
-5-Nov 98 		   GF	String models need projectile momentum along +z;
-				G4VPartonStringModel should do this rotation.
-		Nov98           Above is wrong. for the excitation the 
-				transformation to the correct frame is done.		
-				
-5-Nov-98		   GF	G4VPartonStringModel must use momentum corrector
-				Do not forget Nucleus in this.
-		9-Dec98		Done. Nucleon momenta are included by correcting 
-				to sum of strings; these were checked to conserve 
-				E/p. 		
-
-30-Oct			   GF	dtor of G4VPartonStringModel should delete things;
-				Or should derived classes actually do this?
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
index 70a78956ce..b439ca8565 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AlphaCoulombBarrier.hh,v 1.1 2000/06/09 11:36:49 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AlphaCoulombBarrier.hh,v 1.2.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -20,19 +36,19 @@
 class G4AlphaCoulombBarrier : public G4CoulombBarrier
 {
 public:
-	G4AlphaCoulombBarrier() : G4CoulombBarrier(4,2) {};
-	~G4AlphaCoulombBarrier() {};
+  G4AlphaCoulombBarrier() : G4CoulombBarrier(4,2) {};
+  ~G4AlphaCoulombBarrier() {};
 
 private:
-	G4AlphaCoulombBarrier(const G4AlphaCoulombBarrier & right);
+  G4AlphaCoulombBarrier(const G4AlphaCoulombBarrier & right);
 
-	const G4AlphaCoulombBarrier & operator=(const G4AlphaCoulombBarrier & right);
-	G4bool operator==(const G4AlphaCoulombBarrier & right) const;
-	G4bool operator!=(const G4AlphaCoulombBarrier & right) const;
+  const G4AlphaCoulombBarrier & operator=(const G4AlphaCoulombBarrier & right);
+  G4bool operator==(const G4AlphaCoulombBarrier & right) const;
+  G4bool operator!=(const G4AlphaCoulombBarrier & right) const;
   
 private:
 
-	virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
+  virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationChannel.hh
index 3484a9969d..83a0fca526 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AlphaEvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,28 +39,28 @@
 class G4AlphaEvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4AlphaEvaporationChannel() : G4EvaporationChannel(4,2,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4AlphaEvaporationChannel() : G4EvaporationChannel(4,2,"alpha",
+						     &theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4AlphaEvaporationChannel() {};
+  // destructor
+  ~G4AlphaEvaporationChannel() {};
 
 private:
-	const G4AlphaEvaporationChannel & operator=(const G4AlphaEvaporationChannel & right);  
+  const G4AlphaEvaporationChannel & operator=(const G4AlphaEvaporationChannel & right);  
 
-	G4AlphaEvaporationChannel(const G4AlphaEvaporationChannel & right);
+  G4AlphaEvaporationChannel(const G4AlphaEvaporationChannel & right);
 
 
 public:
-	G4bool operator==(const G4AlphaEvaporationChannel & right) const;
-	G4bool operator!=(const G4AlphaEvaporationChannel & right) const;
+  G4bool operator==(const G4AlphaEvaporationChannel & right) const;
+  G4bool operator!=(const G4AlphaEvaporationChannel & right) const;
 
 private:
 
-	G4AlphaCoulombBarrier theCoulombBarrier;
+  G4AlphaCoulombBarrier theCoulombBarrier;
 	
-	G4AlphaEvaporationProbability theEvaporationProbability;
+  G4AlphaEvaporationProbability theEvaporationProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationProbability.hh
index 05416102f6..bada6a8e33 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4AlphaEvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4AlphaEvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,34 +40,34 @@
 class G4AlphaEvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor is default constructor
-	G4AlphaEvaporationProbability();
+  // Only available constructor is default constructor
+  G4AlphaEvaporationProbability();
 
-	~G4AlphaEvaporationProbability() {}
+  ~G4AlphaEvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4AlphaEvaporationProbability(const G4AlphaEvaporationProbability &right);
+  // Copy constructor
+  G4AlphaEvaporationProbability(const G4AlphaEvaporationProbability &right);
 
-	const G4AlphaEvaporationProbability & operator=(const G4AlphaEvaporationProbability &right);
-	G4bool operator==(const G4AlphaEvaporationProbability &right) const;
-	G4bool operator!=(const G4AlphaEvaporationProbability &right) const;
+  const G4AlphaEvaporationProbability & operator=(const G4AlphaEvaporationProbability &right);
+  G4bool operator==(const G4AlphaEvaporationProbability &right) const;
+  G4bool operator!=(const G4AlphaEvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return 0.0; }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return 0.0; }
 
 	
-	G4double CCoeficient(const G4double aZ) const;
+  G4double CCoeficient(const G4double aZ) const;
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 };
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4B9FermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4B9FermiFragment.hh
index ed9a2b5013..b3903f5997 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4B9FermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4B9FermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4B9FermiFragment.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Be8FermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4Be8FermiFragment.hh
index a762d323db..8c21e00562 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Be8FermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Be8FermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Be8FermiFragment.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertPairingCorrections.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertPairingCorrections.hh
index c704be7bd9..b257dd5b09 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertPairingCorrections.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertPairingCorrections.hh
@@ -1,3 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronGilbertPairingCorrections.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
 #ifndef G4CameronGilbertPairingCorrections_h
 #define G4CameronGilbertPairingCorrections_h 1
 
@@ -6,41 +36,41 @@
 class G4CameronGilbertPairingCorrections
 {
 private:
-	// Dummy constructor
-	G4CameronGilbertPairingCorrections(G4double dummy);
+    // Dummy constructor
+    G4CameronGilbertPairingCorrections(G4double dummy);
 	
-	static G4CameronGilbertPairingCorrections theInstance;
+    static G4CameronGilbertPairingCorrections theInstance;
 
 
 public:
 	
-	~G4CameronGilbertPairingCorrections() {};
+    ~G4CameronGilbertPairingCorrections() {};
 
-	G4double GetPairingZ(const G4int Z) {
-		if (Z <= ZTableSize && Z > 1) return PairingZTable[Z-1]*MeV;
-		else {
-			G4cerr << "G4CameronGilbertPairingCorrections: out of table for Z = " << Z << G4endl;
-			return 0.0;
-		}
+    G4double GetPairingZ(const G4int Z) {
+	if (Z <= ZTableSize && Z > 1) return PairingZTable[Z-1]*MeV;
+	else {
+	    G4cerr << "G4CameronGilbertPairingCorrections: out of table for Z = " << Z << G4endl;
+	    return 0.0;
 	}
+    }
 	
-	G4double GetPairingN(const G4int N) {
-		if (N <= NTableSize && N > 0) return PairingNTable[N-1]*MeV;
-		else {
-			G4cerr << "G4CameronGilbertPairingCorrections: out of table for N = " << N << G4endl;
-			return 0.0;
-		}
+    G4double GetPairingN(const G4int N) {
+	if (N <= NTableSize && N > 0) return PairingNTable[N-1]*MeV;
+	else {
+	    G4cerr << "G4CameronGilbertPairingCorrections: out of table for N = " << N << G4endl;
+	    return 0.0;
 	}
+    }
 	
 	
-	enum  { ZTableSize = 98, NTableSize = 150 };
+    enum  { ZTableSize = 98, NTableSize = 150 };
 private:
 
 
 
-	static G4double PairingZTable[ZTableSize];
+    static G4double PairingZTable[ZTableSize];
 
-	static G4double PairingNTable[NTableSize];
+    static G4double PairingNTable[NTableSize];
 	
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertShellCorrections.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertShellCorrections.hh
index 642e34bf8b..c61cc7c89b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertShellCorrections.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronGilbertShellCorrections.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronGilbertShellCorrections.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4CameronGilbertShellCorrections_h
 #define G4CameronGilbertShellCorrections_h 1
 
@@ -6,41 +35,41 @@
 class G4CameronGilbertShellCorrections
 {
 private:
-	// Dummy constructor
-	G4CameronGilbertShellCorrections(G4double dummy);
+    // Dummy constructor
+    G4CameronGilbertShellCorrections(G4double dummy);
 	
-	static G4CameronGilbertShellCorrections theInstance;
+    static G4CameronGilbertShellCorrections theInstance;
 
 
 public:
 	
-	~G4CameronGilbertShellCorrections() {};
+    ~G4CameronGilbertShellCorrections() {};
 
-	G4double GetShellZ(const G4int Z) const {
-		if (Z <= ZTableSize && Z > 1) return ShellZTable[Z-1]*MeV;
-		else {
-			G4cerr << "G4CameronGilbertShellCorrections: out of table for Z = " << Z << G4endl;
-			return 0.0;
-		}
+    G4double GetShellZ(const G4int Z) const {
+	if (Z <= ZTableSize && Z > 1) return ShellZTable[Z-1]*MeV;
+	else {
+	    G4cerr << "G4CameronGilbertShellCorrections: out of table for Z = " << Z << G4endl;
+	    return 0.0;
 	}
+    }
 	
-	G4double GetShellN(const G4int N) const {
-		if (N <= NTableSize && N > 0) return ShellNTable[N-1]*MeV;
-		else {
-			G4cerr << "G4CameronGilbertShellCorrections: out of table for N = " << N << G4endl;
-			return 0.0;
-		}
+    G4double GetShellN(const G4int N) const {
+	if (N <= NTableSize && N > 0) return ShellNTable[N-1]*MeV;
+	else {
+	    G4cerr << "G4CameronGilbertShellCorrections: out of table for N = " << N << G4endl;
+	    return 0.0;
 	}
+    }
 	
 	
-	enum  { ZTableSize = 98, NTableSize = 150 };
+    enum  { ZTableSize = 98, NTableSize = 150 };
 private:
 
 
 
-	static const G4double ShellZTable[ZTableSize];
+    static const G4double ShellZTable[ZTableSize];
 
-	static const G4double ShellNTable[NTableSize];
+    static const G4double ShellNTable[NTableSize];
 	
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronShellPlusPairingCorrections.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronShellPlusPairingCorrections.hh
index f204bb224b..a1e81a529f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronShellPlusPairingCorrections.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronShellPlusPairingCorrections.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronShellPlusPairingCorrections.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4CameronShellPlusPairingCorrections_h
 #define G4CameronShellPlusPairingCorrections_h 1
 
@@ -7,39 +36,39 @@ class G4CameronShellPlusPairingCorrections
 {
 private:
 
-	// Dummy constructor
-	G4CameronShellPlusPairingCorrections(G4double dummy);
+    // Dummy constructor
+    G4CameronShellPlusPairingCorrections(G4double dummy);
 
-	static G4CameronShellPlusPairingCorrections theInstance;
+    static G4CameronShellPlusPairingCorrections theInstance;
 	
 public:
 	
-	~G4CameronShellPlusPairingCorrections() {};
+    ~G4CameronShellPlusPairingCorrections() {};
 
-	static G4double GetShellPlusPairingZ(const G4int Z) {
-		if (Z <= TableSize && Z > 1) return SPZTable[Z-1]*MeV;
-		else {
-			G4cerr << "G4CameronShellPlusPairingCorrections: out of table for Z = " << Z << G4endl;
-			return 0.0;
-		}
+    static G4double GetShellPlusPairingZ(const G4int Z) {
+	if (Z <= TableSize && Z > 1) return SPZTable[Z-1]*MeV;
+	else {
+	    G4cerr << "G4CameronShellPlusPairingCorrections: out of table for Z = " << Z << G4endl;
+	    return 0.0;
 	}
+    }
 	
-	static G4double GetShellPlusPairingN(const G4int N) {
-		if (N <= TableSize && N > 0) return SPNTable[N-1]*MeV;
-		else {
-			G4cerr << "G4CameronShellPlusPairingCorrections: out of table for N = " << N << G4endl;
-			return 0.0;
-		}
+    static G4double GetShellPlusPairingN(const G4int N) {
+	if (N <= TableSize && N > 0) return SPNTable[N-1]*MeV;
+	else {
+	    G4cerr << "G4CameronShellPlusPairingCorrections: out of table for N = " << N << G4endl;
+	    return 0.0;
 	}
+    }
 	
 		
-	enum  { TableSize = 200 };
+    enum  { TableSize = 200 };
 
 private:
 
-	static G4double SPZTable[TableSize];
+    static G4double SPZTable[TableSize];
 
-	static G4double SPNTable[TableSize];
+    static G4double SPNTable[TableSize];
 	
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfPairingCorrections.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfPairingCorrections.hh
index 7596185f7b..1861d943d1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfPairingCorrections.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfPairingCorrections.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronTruranHilfPairingCorrections.hh,v 1.3.2.1 2001/06/28 19:12:58 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4CameronTruranHilfPairingCorrections_h
 #define G4CameronTruranHilfPairingCorrections_h 1
 
@@ -6,41 +35,41 @@
 class G4CameronTruranHilfPairingCorrections
 {
 private:
-	// Dummy constructor
-	G4CameronTruranHilfPairingCorrections(G4double dummy);
+    // Dummy constructor
+    G4CameronTruranHilfPairingCorrections(G4double dummy);
 	
-	static G4CameronTruranHilfPairingCorrections theInstance;
+    static G4CameronTruranHilfPairingCorrections theInstance;
 
 
 public:
 	
-	~G4CameronTruranHilfPairingCorrections() {};
+    ~G4CameronTruranHilfPairingCorrections() {};
 
-	G4double GetPairingZ(const G4int Z) const {
-		if (Z <= ZTableSize && Z > 1) return PairingZTable[Z-1]*MeV;
-		else {
-			G4cerr << "G4CameronTruranHilfPairingCorrections: out of table for Z = " << Z << G4endl;
-			return 0.0;
-		}
+    G4double GetPairingZ(const G4int Z) const {
+	if (Z <= ZTableSize && Z > 1) return PairingZTable[Z-1]*MeV;
+	else {
+	    G4cerr << "G4CameronTruranHilfPairingCorrections: out of table for Z = " << Z << G4endl;
+	    return 0.0;
 	}
+    }
 	
-	G4double GetPairingN(const G4int N) const {
-		if (N <= NTableSize && N > 0) return PairingNTable[N-1]*MeV;
-		else {
-			G4cerr << "G4CameronTruranHilfPairingCorrections: out of table for N = " << N << G4endl;
-			return 0.0;
-		}
+    G4double GetPairingN(const G4int N) const {
+	if (N <= NTableSize && N > 0) return PairingNTable[N-1]*MeV;
+	else {
+	    G4cerr << "G4CameronTruranHilfPairingCorrections: out of table for N = " << N << G4endl;
+	    return 0.0;
 	}
+    }
 	
 	
-	enum  { ZTableSize = 102, NTableSize = 155 };
+    enum  { ZTableSize = 102, NTableSize = 155 };
 private:
 
 
 
-	static const G4double PairingZTable[ZTableSize];
+    static const G4double PairingZTable[ZTableSize];
 
-	static const G4double PairingNTable[NTableSize];
+    static const G4double PairingNTable[NTableSize];
 	
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfShellCorrections.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfShellCorrections.hh
index df49ae35e5..12dbc5d3a5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfShellCorrections.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CameronTruranHilfShellCorrections.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronTruranHilfShellCorrections.hh,v 1.3.2.1 2001/06/28 19:12:59 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4CameronTruranHilfShellCorrections_h
 #define G4CameronTruranHilfShellCorrections_h 1
 
@@ -7,41 +36,41 @@ class G4CameronTruranHilfShellCorrections
 {
 private:
 	
-	// Dummy constructor
-	G4CameronTruranHilfShellCorrections(G4double dummy);
+    // Dummy constructor
+    G4CameronTruranHilfShellCorrections(G4double dummy);
 	
-	static G4CameronTruranHilfShellCorrections theInstance;
+    static G4CameronTruranHilfShellCorrections theInstance;
 
 
 public:
 	
-	~G4CameronTruranHilfShellCorrections() {};
+    ~G4CameronTruranHilfShellCorrections() {};
 
-	static G4double GetShellZ(const G4int Z) {
-		if (Z <= ZTableSize && Z > 1) return ShellZTable[Z-1]*MeV;
-		else {
-			G4cerr << "G4CameronTruranHilfShellCorrections: out of table for Z = " << Z << G4endl;
-			return 0.0;
-		}
+    static G4double GetShellZ(const G4int Z) {
+	if (Z <= ZTableSize && Z > 1) return ShellZTable[Z-1]*MeV;
+	else {
+	    G4cerr << "G4CameronTruranHilfShellCorrections: out of table for Z = " << Z << G4endl;
+	    return 0.0;
 	}
+    }
 	
-	static G4double GetShellN(const G4int N) {
-		if (N <= NTableSize && N > 0) return ShellNTable[N-1]*MeV;
-		else {
-			G4cerr << "G4CameronTruranHilfShellCorrections: out of table for N = " << N << G4endl;
-			return 0.0;
-		}
+    static G4double GetShellN(const G4int N) {
+	if (N <= NTableSize && N > 0) return ShellNTable[N-1]*MeV;
+	else {
+	    G4cerr << "G4CameronTruranHilfShellCorrections: out of table for N = " << N << G4endl;
+	    return 0.0;
 	}
+    }
 	
 	
-	enum  { ZTableSize = 102, NTableSize = 155 };
+    enum  { ZTableSize = 102, NTableSize = 155 };
 private:
 
 
 
-	static G4double ShellZTable[ZTableSize];
+    static G4double ShellZTable[ZTableSize];
 
-	static G4double ShellNTable[NTableSize];
+    static G4double ShellNTable[NTableSize];
 	
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CompetitiveFission.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CompetitiveFission.hh
index 56584f4a0b..4e92256212 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CompetitiveFission.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CompetitiveFission.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4CompetitiveFission.hh,v 1.4.2.1 2001/06/28 19:12:59 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
 
@@ -25,6 +43,8 @@
 #include "G4IonTable.hh"
 #include "Randomize.hh"
 
+//#define debug
+
 class G4CompetitiveFission : public G4VEvaporationChannel
 {
 public:
@@ -46,26 +66,26 @@ public:
   void Initialize(const G4Fragment & fragment);
 
   inline void SetFissionBarrier(G4VFissionBarrier * aBarrier)
-    {
-      if (MyOwnFissionBarrier) delete theFissionBarrierPtr;
-      theFissionBarrierPtr = aBarrier;
-      MyOwnFissionBarrier = false;
-    }
+  {
+    if (MyOwnFissionBarrier) delete theFissionBarrierPtr;
+    theFissionBarrierPtr = aBarrier;
+    MyOwnFissionBarrier = false;
+  }
 
   inline void SetEmissionStrategy(G4VEmissionProbability * aFissionProb)
-    {
-      if (MyOwnFissionProbability) delete theFissionProbabilityPtr;
-      theFissionProbabilityPtr = aFissionProb;
-      MyOwnFissionProbability = false;
-    }
+  {
+    if (MyOwnFissionProbability) delete theFissionProbabilityPtr;
+    theFissionProbabilityPtr = aFissionProb;
+    MyOwnFissionProbability = false;
+  }
 
 
   inline void SetLevelDensityParameter(G4VLevelDensityParameter * aLevelDensity)
-    { 
-      if (MyOwnLevelDensity) delete theLevelDensityPtr;
-      theLevelDensityPtr = aLevelDensity;
-      MyOwnLevelDensity = false;
-    }
+  { 
+    if (MyOwnLevelDensity) delete theLevelDensityPtr;
+    theLevelDensityPtr = aLevelDensity;
+    MyOwnLevelDensity = false;
+  }
 
 
   inline G4double GetFissionBarrier(void) const { return FissionBarrier; }
@@ -113,7 +133,6 @@ private:
 
 
   // Sample Kinetic energy of fission products
-
   G4double FissionKineticEnergy(const G4double A, const G4double Z,
 				const G4double Af1, const G4double Zf1,
 				const G4double Af2, const G4double Zf2,
@@ -128,14 +147,13 @@ private:
 
 
 
-	G4double FissionPairingCorrection(const G4int A, const G4int Z) const;
-
-
-
-
   G4ThreeVector IsotropicVector(const G4double Magnitude = 1.0);
 
 
+#ifdef debug
+  void CheckConservation(const G4Fragment & theInitialState,
+			 G4FragmentVector * Result) const;
+#endif
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ConstantLevelDensityParameter.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ConstantLevelDensityParameter.hh
index e5a4f4d7b6..7cadd34716 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ConstantLevelDensityParameter.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ConstantLevelDensityParameter.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4ConstantLevelDensityParameter.hh,v 1.3.2.1 2001/06/28 19:12:59 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations (photon evaporation)
 // by C. Dallapiccola (Nov 1998) 
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaDeexcitation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaDeexcitation.hh
index 46c5ae78b1..e01996aa21 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaDeexcitation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaDeexcitation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ContinuumGammaDeexcitation
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaTransition.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaTransition.hh
index 0f976d64ba..8552ac6326 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaTransition.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ContinuumGammaTransition.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ContinuumGammaTransition
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
index 4a89d2cfda..ef65181cdb 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4CoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CoulombBarrier.hh,v 1.1 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CoulombBarrier.hh,v 1.2.2.1 2001/06/28 19:13:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -21,26 +37,26 @@
 class G4CoulombBarrier : public G4VCoulombBarrier
 {
 public:
-	G4CoulombBarrier() : G4VCoulombBarrier(1,0) {};
-	G4CoulombBarrier(const G4int anA,const G4int aZ) :
-									G4VCoulombBarrier(anA,aZ) {};
-	~G4CoulombBarrier() {};
+  G4CoulombBarrier() : G4VCoulombBarrier(1,0) {};
+  G4CoulombBarrier(const G4int anA,const G4int aZ) :
+    G4VCoulombBarrier(anA,aZ) {};
+  ~G4CoulombBarrier() {};
 
 private:
-	G4CoulombBarrier(const G4CoulombBarrier & right);
+  G4CoulombBarrier(const G4CoulombBarrier & right);
 
-	const G4CoulombBarrier & operator=(const G4CoulombBarrier & right);
-	G4bool operator==(const G4CoulombBarrier & right) const;
-	G4bool operator!=(const G4CoulombBarrier & right) const;
+  const G4CoulombBarrier & operator=(const G4CoulombBarrier & right);
+  G4bool operator==(const G4CoulombBarrier & right) const;
+  G4bool operator!=(const G4CoulombBarrier & right) const;
   
 public:
-	G4double GetCoulombBarrier(const G4int ARes, const G4int ZRes, 
-									const G4double U) const;
+  G4double GetCoulombBarrier(const G4int ARes, const G4int ZRes, 
+			     const G4double U) const;
 
 
 private:
 
-	virtual G4double BarrierPenetrationFactor(const G4double aZ) const {return 1.0;}
+  virtual G4double BarrierPenetrationFactor(const G4double aZ) const {return 1.0;}
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
index 96c7ad2a9d..d1926e22d7 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DeuteronCoulombBarrier.hh,v 1.1 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DeuteronCoulombBarrier.hh,v 1.1.8.1 2001/06/28 19:13:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationChannel.hh
index 5924dc407d..4e63755b9a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4DeuteronEvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:13:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,27 +39,27 @@
 class G4DeuteronEvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4DeuteronEvaporationChannel() : G4EvaporationChannel(2,1,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4DeuteronEvaporationChannel() : G4EvaporationChannel(2,1,"deuteron",
+							&theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4DeuteronEvaporationChannel() {};
+  // destructor
+  ~G4DeuteronEvaporationChannel() {};
 
 private:
-	const G4DeuteronEvaporationChannel & operator=(const G4DeuteronEvaporationChannel & right);  
+  const G4DeuteronEvaporationChannel & operator=(const G4DeuteronEvaporationChannel & right);  
 
-	G4DeuteronEvaporationChannel(const G4DeuteronEvaporationChannel & right);
+  G4DeuteronEvaporationChannel(const G4DeuteronEvaporationChannel & right);
 
 public:
-	G4bool operator==(const G4DeuteronEvaporationChannel & right) const;
-	G4bool operator!=(const G4DeuteronEvaporationChannel & right) const;
+  G4bool operator==(const G4DeuteronEvaporationChannel & right) const;
+  G4bool operator!=(const G4DeuteronEvaporationChannel & right) const;
 
 private:
 
-	G4DeuteronCoulombBarrier theCoulombBarrier;
+  G4DeuteronCoulombBarrier theCoulombBarrier;
 	
-	G4DeuteronEvaporationProbability theEvaporationProbability;
+  G4DeuteronEvaporationProbability theEvaporationProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationProbability.hh
index 35f1f88dd5..23f5d3a7a1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DeuteronEvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4DeuteronEvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:13:00 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,34 +40,34 @@
 class G4DeuteronEvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor
-	G4DeuteronEvaporationProbability();
+  // Only available constructor
+  G4DeuteronEvaporationProbability();
 
-	~G4DeuteronEvaporationProbability() {}
+  ~G4DeuteronEvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4DeuteronEvaporationProbability(const G4DeuteronEvaporationProbability &right);
+  // Copy constructor
+  G4DeuteronEvaporationProbability(const G4DeuteronEvaporationProbability &right);
 
-	const G4DeuteronEvaporationProbability & operator=(const G4DeuteronEvaporationProbability &right);
-	G4bool operator==(const G4DeuteronEvaporationProbability &right) const;
-	G4bool operator!=(const G4DeuteronEvaporationProbability &right) const;
+  const G4DeuteronEvaporationProbability & operator=(const G4DeuteronEvaporationProbability &right);
+  G4bool operator==(const G4DeuteronEvaporationProbability &right) const;
+  G4bool operator!=(const G4DeuteronEvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return 0.0; }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return 0.0; }
 
 	
-	G4double CCoeficient(const G4double aZ) const;
+  G4double CCoeficient(const G4double aZ) const;
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaDeexcitation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaDeexcitation.hh
index 18c1b3a34b..b92320b8c1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaDeexcitation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaDeexcitation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4DiscreteGammaDeexcitation
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaTransition.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaTransition.hh
index 394fa8eb21..dae2024adc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaTransition.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DiscreteGammaTransition.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4DiscreteGammaTransition
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4DummyProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4DummyProbability.hh
index 20a138fe1f..71e7139c56 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4DummyProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4DummyProbability.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4DummyProbability_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability.hh
index 013d35dd60..8d7e2b4e71 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1Probability_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability001.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability001.hh
index 3a54e69c2a..3d95c343b0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability001.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability001.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1Probability001_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability01.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability01.hh
index b014a12f63..1603d7d4c3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability01.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability01.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1Probability01_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability10.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability10.hh
index 3c35a1037e..c1ca776690 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability10.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability10.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1Probability10_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability100.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability100.hh
index ee7f637910..62b1a9e0d5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability100.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1Probability100.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1Probability100_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability001.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability001.hh
index 29b9623205..4a254b6790 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability001.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability001.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1SingleProbability001_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability01.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability01.hh
index c99dbd8cc5..fea9535a21 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability01.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability01.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1SingleProbability01_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability1.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability1.hh
index 98ac3a7dcf..2e3003e34e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability1.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability1.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1SingleProbability1_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability10.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability10.hh
index dfa0871b60..d84222b749 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability10.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability10.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1SingleProbability10_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability100.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability100.hh
index 44ae45b905..4d2609f348 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability100.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4E1SingleProbability100.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //
 
 #ifndef G4E1SingleProbability100_hh
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Evaporation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4Evaporation.hh
index 8069662386..7bf9d37431 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Evaporation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Evaporation.hh
@@ -1,19 +1,36 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Evaporation.hh,v 1.5.2.1 2001/06/28 19:13:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #ifndef G4Evaporation_h
 #define G4Evaporation_h 1
 
 #include "globals.hh"
-#include "g4rw/tvvector.h"
-#include "g4rw/tpordvec.h"
-#include "g4rw/tvordvec.h"
 
 #include "G4ios.hh"
 #include "G4VEvaporation.hh"
@@ -22,32 +39,39 @@
 #include "G4NucleiProperties.hh"
 #include "Randomize.hh"
 
+//#define debug
 
 class G4Evaporation : public G4VEvaporation
 {
 public:
-	G4Evaporation();
-	G4Evaporation(G4RWTPtrOrderedVector<G4VEvaporationChannel> * aChannelsVector) :
-		theChannels(aChannelsVector),
-		myOwnChannelsVector(false)
-	 {};
+  G4Evaporation();
+  G4Evaporation(G4std::vector<G4VEvaporationChannel*> * aChannelsVector) :
+    theChannels(aChannelsVector),
+    myOwnChannelsVector(false)
+  {};
 	 
-	~G4Evaporation();
+  ~G4Evaporation();
 
 private:
-	G4Evaporation(const G4Evaporation &right);
+  G4Evaporation(const G4Evaporation &right);
 
-	const G4Evaporation & operator=(const G4Evaporation &right);
-	G4bool operator==(const G4Evaporation &right) const;
-	G4bool operator!=(const G4Evaporation &right) const;
+  const G4Evaporation & operator=(const G4Evaporation &right);
+  G4bool operator==(const G4Evaporation &right) const;
+  G4bool operator!=(const G4Evaporation &right) const;
 
 public:
-	G4FragmentVector * BreakItUp(const G4Fragment &theNucleus);
+  G4FragmentVector * BreakItUp(const G4Fragment &theNucleus);
 		
 private:
 
-	G4bool myOwnChannelsVector;
-	G4RWTPtrOrderedVector<G4VEvaporationChannel> * theChannels;
+#ifdef debug
+  void CheckConservation(const G4Fragment & theInitialState,
+			 G4FragmentVector * Result) const;
+#endif
+
+  G4bool myOwnChannelsVector;
+
+  G4std::vector<G4VEvaporationChannel*> * theChannels;
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationChannel.hh
index 0f16c1529f..5311f3766d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4EvaporationChannel.hh,v 1.5.2.1 2001/06/28 19:13:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -28,21 +47,29 @@
 class G4EvaporationChannel : public G4VEvaporationChannel
 {
 public:
-  // only available constructor
+  // Available constructors
   G4EvaporationChannel(const G4int theA, const G4int theZ,
-  								G4VEmissionProbability * aEmissionStrategy,
-								G4VCoulombBarrier * aCoulombBarrier);
+		       G4VEmissionProbability * aEmissionStrategy,
+		       G4VCoulombBarrier * aCoulombBarrier);
+
+  G4EvaporationChannel(const G4int theA, const G4int theZ, const G4String & aName,
+		       G4VEmissionProbability * aEmissionStrategy,
+		       G4VCoulombBarrier * aCoulombBarrier);
+
+  G4EvaporationChannel(const G4int theA, const G4int theZ, const G4String * aName,
+		       G4VEmissionProbability * aEmissionStrategy,
+		       G4VCoulombBarrier * aCoulombBarrier);
 
 public:
   // destructor
   ~G4EvaporationChannel();
   
-	void SetEmissionStrategy(G4VEmissionProbability * aEmissionStrategy)
-	{theEvaporationProbabilityPtr = aEmissionStrategy;}
+  void SetEmissionStrategy(G4VEmissionProbability * aEmissionStrategy)
+  {theEvaporationProbabilityPtr = aEmissionStrategy;}
+  
+  void SetCoulombBarrierStrategy(G4VCoulombBarrier * aCoulombBarrier)
+  {theCoulombBarrierPtr = aCoulombBarrier;} 
   
-	void SetCoulombBarrierStrategy(G4VCoulombBarrier * aCoulombBarrier)
-	{theCoulombBarrierPtr = aCoulombBarrier;} 
-	
 protected:
   // default constructor
   G4EvaporationChannel() {};
@@ -72,26 +99,26 @@ public:
 
 
   inline void SetLevelDensityParameter(G4VLevelDensityParameter * aLevelDensity)
-    {
-      if (MyOwnLevelDensity) delete theLevelDensityPtr;
-      theLevelDensityPtr = aLevelDensity;
-      MyOwnLevelDensity = false;
-    }
-
+  {
+    if (MyOwnLevelDensity) delete theLevelDensityPtr;
+    theLevelDensityPtr = aLevelDensity;
+    MyOwnLevelDensity = false;
+  }
+  
 public:
 
 
   inline G4double GetEmissionProbability(void) const 
-    {return EmissionProbability;}
-
-
+  {return EmissionProbability;}
+  
+  
   inline G4double GetMaximalKineticEnergy(void) const 
-    { return MaximalKineticEnergy; }
-
+  { return MaximalKineticEnergy; }
+  
   // ----------------------
-
+  
 private: 
-
+  
   // Calculate Binding Energy for separate fragment from nucleus
   G4double CalcBindingEnergy(const G4int anA, const G4int aZ);
 
@@ -104,9 +131,6 @@ private:
   // This has to be removed and put in Random Generator
   G4ThreeVector IsotropicVector(const G4double Magnitude  = 1.0);
 
-	G4double PairingCorrection(const G4int A, const G4int Z) const;
-
-
 	// Data Members
 	// ************
 private:
@@ -128,9 +152,9 @@ private:
   G4bool MyOwnLevelDensity;
   G4VLevelDensityParameter * theLevelDensityPtr;
   
-	// For Coulomb Barrier calculation
-	G4VCoulombBarrier * theCoulombBarrierPtr;
-	G4double CoulombBarrier;
+  // For Coulomb Barrier calculation
+  G4VCoulombBarrier * theCoulombBarrierPtr;
+  G4double CoulombBarrier;
 
   //---------------------------------------------------
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationLevelDensityParameter.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationLevelDensityParameter.hh
index f3b0f4f12f..0cf81c65bd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationLevelDensityParameter.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationLevelDensityParameter.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4EvaporationLevelDensityParameter.hh,v 1.4.2.1 2001/06/28 19:13:01 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
@@ -23,34 +41,34 @@ class G4EvaporationLevelDensityParameter : public G4VLevelDensityParameter
 {
 public:
 
-	G4EvaporationLevelDensityParameter()  {};
+  G4EvaporationLevelDensityParameter()  {};
 
-	virtual ~G4EvaporationLevelDensityParameter() {};
+  virtual ~G4EvaporationLevelDensityParameter() {};
 
 private:  
 	
-	G4EvaporationLevelDensityParameter(const G4EvaporationLevelDensityParameter &right);
+  G4EvaporationLevelDensityParameter(const G4EvaporationLevelDensityParameter &right);
 
-	const G4EvaporationLevelDensityParameter & operator=(const G4EvaporationLevelDensityParameter &right);
-	G4bool operator==(const G4EvaporationLevelDensityParameter &right) const;
-	G4bool operator!=(const G4EvaporationLevelDensityParameter &right) const;
+  const G4EvaporationLevelDensityParameter & operator=(const G4EvaporationLevelDensityParameter &right);
+  G4bool operator==(const G4EvaporationLevelDensityParameter &right) const;
+  G4bool operator!=(const G4EvaporationLevelDensityParameter &right) const;
   
 public:
-	G4double LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const;
+  G4double LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const;
 
 private:
 
-	G4double ShellCorrection(const G4int Z, const G4int N) const
-	{ return G4CameronTruranHilfShellCorrections::GetShellZ(Z) + 
-				G4CameronTruranHilfShellCorrections::GetShellN(N);}
+  G4double ShellCorrection(const G4int Z, const G4int N) const
+  { return G4CameronTruranHilfShellCorrections::GetShellZ(Z) + 
+      G4CameronTruranHilfShellCorrections::GetShellN(N);}
 		  		
 private:
 
-	static const G4double ConstEvapLevelDensityParameter;
-	static const G4double alpha;
-	static const G4double beta;
-	static const G4double gamma;
-	static const G4double Bs;
+  static const G4double ConstEvapLevelDensityParameter;
+  static const G4double alpha;
+  static const G4double beta;
+  static const G4double gamma;
+  static const G4double Bs;
 };
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationProbability.hh
index 09ead1a940..e0e7b26060 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4EvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4EvaporationProbability.hh,v 1.4.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
@@ -20,78 +38,76 @@
 #include "G4VLevelDensityParameter.hh"
 #include "G4EvaporationLevelDensityParameter.hh"
 
-#include "g4rw/tvvector.h"
 
 class G4EvaporationProbability : public G4VEmissionProbability
 {
 public:
-	// Only available constructor
-	G4EvaporationProbability(const G4int anA, const G4int aZ, const G4double aGamma) : 
-		theA(anA),
-		theZ(aZ),
-		Gamma(aGamma) 
-		{
-			theEvapLDPptr = new G4EvaporationLevelDensityParameter;
-		}
+  // Only available constructor
+  G4EvaporationProbability(const G4int anA, const G4int aZ, const G4double aGamma) : 
+    theA(anA),
+    theZ(aZ),
+    Gamma(aGamma) 
+  {
+    theEvapLDPptr = new G4EvaporationLevelDensityParameter;
+  }
 
-	~G4EvaporationProbability() 
-	{
-		if (theEvapLDPptr != 0) delete theEvapLDPptr;
-	}
+  ~G4EvaporationProbability() 
+  {
+    if (theEvapLDPptr != 0) delete theEvapLDPptr;
+  }
 
 
 	
-	G4double GetZ(void) const { return theZ; }
+  G4double GetZ(void) const { return theZ; }
 	
-	G4double GetA(void) const { return theA;} 
+  G4double GetA(void) const { return theA;} 
 
 protected:
 
-	void SetExcitationEnergiesPtr(G4RWTValVector<G4double> * anExcitationEnergiesPtr) 
-		{ExcitationEnergies = anExcitationEnergiesPtr;}
+  void SetExcitationEnergiesPtr(G4std::vector<G4double> * anExcitationEnergiesPtr) 
+  {ExcitationEnergies = anExcitationEnergiesPtr;}
 
-	void SetExcitationSpinsPtr(G4RWTValVector<G4int> * anExcitationSpinsPtr)
-		{ExcitationSpins = anExcitationSpinsPtr;}
+  void SetExcitationSpinsPtr(G4std::vector<G4int> * anExcitationSpinsPtr)
+  {ExcitationSpins = anExcitationSpinsPtr;}
 
   
-	// Default constructor
-	G4EvaporationProbability() {}
+  // Default constructor
+  G4EvaporationProbability() {}
 private:
-	// Copy constructor
-	G4EvaporationProbability(const G4EvaporationProbability &right);
+  // Copy constructor
+  G4EvaporationProbability(const G4EvaporationProbability &right);
 
-	const G4EvaporationProbability & operator=(const G4EvaporationProbability &right);
-	G4bool operator==(const G4EvaporationProbability &right) const;
-	G4bool operator!=(const G4EvaporationProbability &right) const;
+  const G4EvaporationProbability & operator=(const G4EvaporationProbability &right);
+  G4bool operator==(const G4EvaporationProbability &right) const;
+  G4bool operator!=(const G4EvaporationProbability &right) const;
   
 public:
-	G4double EmissionProbability(const G4Fragment & fragment, const G4double anEnergy);
+  G4double EmissionProbability(const G4Fragment & fragment, const G4double anEnergy);
 
 private:
 
-	G4double CalcProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy);
-	G4double PairingCorrection(const G4int A, const G4int Z) const;
-	virtual G4double CCoeficient(const G4double aZ) const {return 0.0;};
+  G4double CalcProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy);
+  virtual G4double CCoeficient(const G4double aZ) const {return 0.0;};
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const {return 1.0;}
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const {return 1.0;}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const {return 1.0;}
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const {return 1.0;}
 
-	// Data Members
+  // Data Members
 
-	G4VLevelDensityParameter * theEvapLDPptr;
+  G4VLevelDensityParameter * theEvapLDPptr;
 	
-	G4int theA;
-	G4int theZ;
+  G4int theA;
+  G4int theZ;
 
-	// Gamma is A_f(2S_f+1) factor, where A_f is fragment atomic 
-	// number and S_f is fragment spin
-	G4double Gamma;
+  // Gamma is A_f(2S_f+1) factor, where A_f is fragment atomic 
+  // number and S_f is fragment spin
+  G4double Gamma;
 
-	// Discrete Excitation Energies 
-	G4RWTValVector<G4double> * ExcitationEnergies;
+  // Discrete Excitation Energies 
+  G4std::vector<G4double> * ExcitationEnergies;
 
-	//
-	G4RWTValVector<G4int> * ExcitationSpins;
+  //
+  G4std::vector<G4int> * ExcitationSpins;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
index 837e60d7fe..7155010a42 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ExcitationHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitationHandler.hh,v 1.4 1999/12/15 14:52:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitationHandler.hh,v 1.5.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -40,6 +56,8 @@
 #include "G4PhotonEvaporation.hh"
 #include "G4IonConstructor.hh" 
 
+//#define debug
+
 
 class G4ExcitationHandler 
 {
@@ -86,7 +104,11 @@ private:
   const G4int GetMaxA() const;
   const G4double GetMinE() const;
 
-    
+  
+#ifdef debug
+  void CheckConservation(const G4Fragment & aFragment,
+			 G4FragmentVector * Result) const;
+#endif
 private:
   
   G4VEvaporation *theEvaporation;
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiBreakUp.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiBreakUp.hh
index dfa4e69bd5..8c3d240d61 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiBreakUp.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiBreakUp.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiBreakUp.hh,v 1.3.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfiguration.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfiguration.hh
index 31d3ce2530..1f5aae811e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfiguration.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfiguration.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiConfiguration.hh,v 1.5.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -11,6 +30,8 @@
 #ifndef G4FermiConfiguration_h
 #define G4FermiConfiguration_h 1
 
+#include <deque>
+
 #include "globals.hh"
 #include "Randomize.hh"
 #include "G4VFermiFragment.hh"
@@ -24,11 +45,8 @@
 #include "G4IonTable.hh"
 #include "G4Fragment.hh"
 
-#include "g4rw/tvvector.h"
-#include "g4rw/tvordvec.h"
 
-
-  static const G4int NumberOfFragments = 100;
+static const G4int NumberOfFragments = 100;
 
 class G4FermiConfiguration 
 {
@@ -58,8 +76,7 @@ private:
   G4double CoulombBarrier(void);
 
 
-  //  G4RWTPtrOrderedVector<G4ParticleMomentum>* FragmentsMomentum(G4double KineticEnergy);
-  G4RWTPtrOrderedVector<G4LorentzVector>* FragmentsMomentum(G4double KineticEnergy);
+  G4std::deque<G4LorentzVector*>* FragmentsMomentum(G4double KineticEnergy);
   
   G4double RNKSI(const G4int K);
 
@@ -69,8 +86,8 @@ private:
   // Kappa = V/V_0 it is used in calculation of Coulomb energy
   static const G4double Kappa;
 
-	// Nuclear radius r0 (is a model parameter)
-	static const G4double r0;
+  // Nuclear radius r0 (is a model parameter)
+  static const G4double r0;
 
 
 
@@ -191,7 +208,7 @@ private:
   //  G4VFermiFragment * theConfiguration[MaxConfigSize];
 
   //  G4int Index[MaxConfigSize];
-  G4RWTValOrderedVector<G4int> Index;
+  G4std::vector<G4int> Index;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfigurationList.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfigurationList.hh
index 1cbbe8ce26..1c4aa98f93 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfigurationList.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FermiConfigurationList.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiConfigurationList.hh,v 1.4.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -15,9 +34,6 @@
 #include "G4FermiConfiguration.hh"
 #include "Randomize.hh"
 
-#include "g4rw/tvvector.h"
-#include "g4rw/tvordvec.h"
-
 
 class G4FermiConfigurationList 
 {
@@ -50,9 +66,9 @@ private:
 
   G4double NumOfConfigurations[MaxNumOfFragments]; // NumberOfChannelsPerFragment[MaxNumOfFragments];
 
-  G4RWTValOrderedVector<G4double> NormalizedWeights;
+  G4std::vector<G4double> NormalizedWeights;
   
-  G4RWTValOrderedVector<G4FermiConfiguration> Configurations;
+  G4std::vector<G4FermiConfiguration> Configurations;
 };
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
index 2c3f7c60ed..52bf53357d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FissionBarrier.hh,v 1.3 2000/06/09 11:36:52 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FissionBarrier.hh,v 1.3.8.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionLevelDensityParameter.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionLevelDensityParameter.hh
index 0137f34263..d79a884fff 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionLevelDensityParameter.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionLevelDensityParameter.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4FissionLevelDensityParameter.hh,v 1.4.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionParameters.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionParameters.hh
index 642cdd797c..db292bda66 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionParameters.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionParameters.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4FissionParameters.hh,v 1.4.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionProbability.hh
index 8ed3bcc06f..bb7a000584 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4FissionProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4FissionProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4FissionProbability.hh,v 1.4.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
@@ -40,11 +58,6 @@ public:
 	G4double EmissionProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy);
 
 private:
-	G4double EvaporationPairingCorrection(const G4int A, const G4int Z) const;
-
-	G4double FissionPairingCorrection(const G4int A, const G4int Z) const;
-
-
 	G4EvaporationLevelDensityParameter theEvapLDP;
 	G4FissionLevelDensityParameter theFissLDP;
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
index 9221d652e5..693dd22a29 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4He3CoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4He3CoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4He3CoulombBarrier.hh,v 1.1.8.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationChannel.hh
index 8096781874..2fd544cb74 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4He3EvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,27 +39,27 @@
 class G4He3EvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4He3EvaporationChannel() : G4EvaporationChannel(3,2,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4He3EvaporationChannel() : G4EvaporationChannel(3,2,"He3",
+						   &theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4He3EvaporationChannel() {};
+  // destructor
+  ~G4He3EvaporationChannel() {};
 
 private:
-	const G4He3EvaporationChannel & operator=(const G4He3EvaporationChannel & right);  
+  const G4He3EvaporationChannel & operator=(const G4He3EvaporationChannel & right);  
 
-	G4He3EvaporationChannel(const G4He3EvaporationChannel & right);
+  G4He3EvaporationChannel(const G4He3EvaporationChannel & right);
 
 public:
-	G4bool operator==(const G4He3EvaporationChannel & right) const;
-	G4bool operator!=(const G4He3EvaporationChannel & right) const;
+  G4bool operator==(const G4He3EvaporationChannel & right) const;
+  G4bool operator!=(const G4He3EvaporationChannel & right) const;
 
 private:
 
-	G4He3CoulombBarrier theCoulombBarrier;
+  G4He3CoulombBarrier theCoulombBarrier;
 	
-	G4He3EvaporationProbability theEvaporationProbability;
+  G4He3EvaporationProbability theEvaporationProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationProbability.hh
index fb1359d0e0..700aefe989 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4He3EvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4He3EvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:13:02 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,34 +40,34 @@
 class G4He3EvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor
-	G4He3EvaporationProbability();
+  // Only available constructor
+  G4He3EvaporationProbability();
 
-	~G4He3EvaporationProbability() {}
+  ~G4He3EvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4He3EvaporationProbability(const G4He3EvaporationProbability &right);
+  // Copy constructor
+  G4He3EvaporationProbability(const G4He3EvaporationProbability &right);
 
-	const G4He3EvaporationProbability & operator=(const G4He3EvaporationProbability &right);
-	G4bool operator==(const G4He3EvaporationProbability &right) const;
-	G4bool operator!=(const G4He3EvaporationProbability &right) const;
+  const G4He3EvaporationProbability & operator=(const G4He3EvaporationProbability &right);
+  G4bool operator==(const G4He3EvaporationProbability &right) const;
+  G4bool operator!=(const G4He3EvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return 0.0; }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return 0.0; }
 
 	
-	G4double CCoeficient(const G4double aZ) const;
+  G4double CCoeficient(const G4double aZ) const;
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 };
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4He5FermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4He5FermiFragment.hh
index 7d6b81f740..227e768f41 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4He5FermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4He5FermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4He5FermiFragment.hh,v 1.3.2.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Li5FermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4Li5FermiFragment.hh
index 9aefe8224b..c9ac01225b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Li5FermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Li5FermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Li5FermiFragment.hh,v 1.3.2.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
index a2f2f7b7da..8f17c3aabb 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronCoulombBarrier.hh,v 1.1.8.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationChannel.hh
index 9ccd7e180f..0af7322955 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4NeutronEvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,27 +39,27 @@
 class G4NeutronEvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4NeutronEvaporationChannel() : G4EvaporationChannel(1,0,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4NeutronEvaporationChannel() : G4EvaporationChannel(1,0,"neutron",
+						       &theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4NeutronEvaporationChannel() {};
+  // destructor
+  ~G4NeutronEvaporationChannel() {};
 
 private:
-	const G4NeutronEvaporationChannel & operator=(const G4NeutronEvaporationChannel & right);  
+  const G4NeutronEvaporationChannel & operator=(const G4NeutronEvaporationChannel & right);  
 
-	G4NeutronEvaporationChannel(const G4NeutronEvaporationChannel & right);
+  G4NeutronEvaporationChannel(const G4NeutronEvaporationChannel & right);
 
 public:
-	G4bool operator==(const G4NeutronEvaporationChannel & right) const;
-	G4bool operator!=(const G4NeutronEvaporationChannel & right) const;
+  G4bool operator==(const G4NeutronEvaporationChannel & right) const;
+  G4bool operator!=(const G4NeutronEvaporationChannel & right) const;
 
 private:
 
-	G4NeutronCoulombBarrier theCoulombBarrier;
+  G4NeutronCoulombBarrier theCoulombBarrier;
 	
-	G4NeutronEvaporationProbability theEvaporationProbability;
+  G4NeutronEvaporationProbability theEvaporationProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationProbability.hh
index 1686f64f7a..8cd62b1e44 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NeutronEvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4NeutronEvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,31 +40,31 @@
 class G4NeutronEvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor
-	G4NeutronEvaporationProbability();
+  // Only available constructor
+  G4NeutronEvaporationProbability();
 		
-	~G4NeutronEvaporationProbability() {}
+  ~G4NeutronEvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4NeutronEvaporationProbability(const G4NeutronEvaporationProbability &right);
+  // Copy constructor
+  G4NeutronEvaporationProbability(const G4NeutronEvaporationProbability &right);
 
-	const G4NeutronEvaporationProbability & operator=(const G4NeutronEvaporationProbability &right);
-	G4bool operator==(const G4NeutronEvaporationProbability &right) const;
-	G4bool operator!=(const G4NeutronEvaporationProbability &right) const;
+  const G4NeutronEvaporationProbability & operator=(const G4NeutronEvaporationProbability &right);
+  G4bool operator==(const G4NeutronEvaporationProbability &right) const;
+  G4bool operator!=(const G4NeutronEvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 0.76+2.2/pow(G4double(fragment.GetA()-GetA()),1.0/3.0);}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 0.76+2.2/pow(G4double(fragment.GetA()-GetA()),1.0/3.0);}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return (2.12/pow(G4double(fragment.GetA()-GetA()),2.0/3.0) - 0.05)*MeV/CalcAlphaParam(fragment); }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return (2.12/pow(G4double(fragment.GetA()-GetA()),2.0/3.0) - 0.05)*MeV/CalcAlphaParam(fragment); }
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevel.hh
index 55c834784e..1c4c61d073 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevel.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4NuclearLevel
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
index e460c2eb4f..670518692b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4NuclearLevelManager.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4NuclearLevelManager
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4PairingCorrection.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4PairingCorrection.hh
new file mode 100644
index 0000000000..f770689b25
--- /dev/null
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4PairingCorrection.hh
@@ -0,0 +1,69 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PairingCorrection.hh,v 1.1.2.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+#ifndef G4PairingCorrection_h
+#define G4PairingCorrection_h 1
+
+#include "globals.hh"
+
+class G4PairingCorrection
+{
+private:
+
+  // Dummy constructor
+  G4PairingCorrection(G4double dummy);
+
+  static G4PairingCorrection theInstance;
+   
+public:
+	
+  ~G4PairingCorrection() {};
+
+  static G4double GetPairingCorrection(const G4int anA, const G4int aZ) 
+  {
+    const G4double PairingConstant = 12.0*MeV;
+    const G4int N = anA - aZ;
+    G4double Pair = (1.0 - G4double(aZ) + 2.0*(aZ/2)) + (1.0 - G4double(N) + 2.0*(N/2));
+    G4double PCorrection = Pair*PairingConstant/sqrt(G4double(anA));
+    return PCorrection;
+  }
+
+
+  static G4double GetFissionPairingCorrection(const G4int A, const G4int Z)
+  {
+    const G4double PairingConstant = 14.0*MeV;
+    const G4int N = A - Z;
+    G4double Pair = (1.0 - G4double(Z) + 2.0*(Z/2)) + (1.0 - G4double(N) + 2.0*(N/2));
+    G4double PCorrection = Pair*PairingConstant/sqrt(G4double(A));
+    return PCorrection;
+  }
+
+	
+};
+#endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ParaFissionModel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ParaFissionModel.hh
index 91bb6213fa..4c6f8f2f16 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ParaFissionModel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ParaFissionModel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ParaFissionModel_h
 #define G4ParaFissionModel_h
 
@@ -54,9 +76,9 @@ public:
     
     anInitialState.SetA(anA);
     anInitialState.SetZ(aZ);
+    anInitialState.SetNumberOfParticles(numberOfEx-numberOfHoles);
     anInitialState.SetNumberOfCharged(numberOfCh);
     anInitialState.SetNumberOfHoles(numberOfHoles);
-    anInitialState.SetNumberOfExcitons(numberOfEx);
     anInitialState.SetMomentum(fragment4Momentum);
 
     // do the fission
@@ -64,15 +86,15 @@ public:
     
     // deexcite the fission fragments and fill result
     vector<G4DynamicParticle *> theResult;
-    G4int ll = theFissionResult->length();
+    G4int ll = theFissionResult->size();
     for(G4int i=0; i<ll; i++)
     {
       G4ReactionProductVector * theExcitationResult = 0; 
-      if(theFissionResult->at(i)->GetExcitationEnergy()>1.*eV)
+      if((*theFissionResult)[i]->GetExcitationEnergy()>1.*eV)
       {
-        G4Fragment * aFragment = theFissionResult->at(i);
+        G4Fragment * aFragment = (*theFissionResult)[i];
 	G4double exenergy = aFragment->GetExcitationEnergy();
-	theExcitationResult = theHandler.BreakItUp(*(theFissionResult->at(i)));
+	theExcitationResult = theHandler.BreakItUp(*(*theFissionResult)[i]);
 	// add secondaries
 	for(G4int j=0; j<theExcitationResult->length(); j++)
 	{
@@ -86,8 +108,8 @@ public:
       {
         // add secondary
 	G4DynamicParticle* p0 = new G4DynamicParticle;
-	p0->SetDefinition(theFissionResult->at(i)->GetParticleDefinition());
-	p0->SetMomentum(theFissionResult->at(i)->GetMomentum().vect());
+	p0->SetDefinition((*theFissionResult)[i]->GetParticleDefinition());
+	p0->SetMomentum((*theFissionResult)[i]->GetMomentum().vect());
         theResult.push_back(p0);
       }
     }
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4PhotonEvaporation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4PhotonEvaporation.hh
index aabc796a43..1baf351e79 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4PhotonEvaporation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4PhotonEvaporation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4PhotonEvaporation
@@ -31,6 +45,8 @@
 #include "G4VEmissionProbability.hh"
 #include "G4VGammaDeexcitation.hh"
 
+//#define debug
+
 class G4Fragment;
 
 class G4PhotonEvaporation : public G4VPhotonEvaporation, public G4VEvaporationChannel
@@ -73,6 +89,13 @@ private:
   G4bool operator==(const G4PhotonEvaporation &right) const;
   G4bool operator!=(const G4PhotonEvaporation &right) const;
 
+
+#ifdef debug
+  void CheckConservation(const G4Fragment & theInitialState,
+			 G4FragmentVector * Result) const;
+#endif
+  
+
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
index b90171d250..ea85697633 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProtonCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProtonCoulombBarrier.hh,v 1.1.8.1 2001/06/28 19:13:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationChannel.hh
index 1356707787..bcfeecf8bf 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ProtonEvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:13:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,27 +39,27 @@
 class G4ProtonEvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4ProtonEvaporationChannel() : G4EvaporationChannel(1,1,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4ProtonEvaporationChannel() : G4EvaporationChannel(1,1,"proton",
+						      &theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4ProtonEvaporationChannel() {};
+  // destructor
+  ~G4ProtonEvaporationChannel() {};
 
 private:
-	const G4ProtonEvaporationChannel & operator=(const G4ProtonEvaporationChannel & right);  
+  const G4ProtonEvaporationChannel & operator=(const G4ProtonEvaporationChannel & right);  
 
-	G4ProtonEvaporationChannel(const G4ProtonEvaporationChannel & right);
+  G4ProtonEvaporationChannel(const G4ProtonEvaporationChannel & right);
 
 public:
-	G4bool operator==(const G4ProtonEvaporationChannel & right) const;
-	G4bool operator!=(const G4ProtonEvaporationChannel & right) const;
+  G4bool operator==(const G4ProtonEvaporationChannel & right) const;
+  G4bool operator!=(const G4ProtonEvaporationChannel & right) const;
 
 
 private:
 
-	G4ProtonEvaporationProbability  theEvaporationProbability;
+  G4ProtonEvaporationProbability  theEvaporationProbability;
 	
-	G4ProtonCoulombBarrier  theCoulombBarrier;
+  G4ProtonCoulombBarrier  theCoulombBarrier;
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationProbability.hh
index 8ec366683f..c6aead184b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4ProtonEvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4ProtonEvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:13:04 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,34 +40,34 @@
 class G4ProtonEvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor
-	G4ProtonEvaporationProbability();
+  // Only available constructor
+  G4ProtonEvaporationProbability();
 
-	~G4ProtonEvaporationProbability() {}
+  ~G4ProtonEvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4ProtonEvaporationProbability(const G4ProtonEvaporationProbability &right);
+  // Copy constructor
+  G4ProtonEvaporationProbability(const G4ProtonEvaporationProbability &right);
 
-	const G4ProtonEvaporationProbability & operator=(const G4ProtonEvaporationProbability &right);
-	G4bool operator==(const G4ProtonEvaporationProbability &right) const;
-	G4bool operator!=(const G4ProtonEvaporationProbability &right) const;
+  const G4ProtonEvaporationProbability & operator=(const G4ProtonEvaporationProbability &right);
+  G4bool operator==(const G4ProtonEvaporationProbability &right) const;
+  G4bool operator!=(const G4ProtonEvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return 0.0; }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return 0.0; }
 
 	
-	G4double CCoeficient(const G4double aZ) const;
+  G4double CCoeficient(const G4double aZ) const;
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4PtrLevelVector.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4PtrLevelVector.hh
index 1b835ff597..79c1e66071 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4PtrLevelVector.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4PtrLevelVector.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4PtrLevelVector
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.hh
index 8b6364d53c..e22fdc2087 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.hh
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 // -----------------------------------------------------------------------
 //                             HEP Random
 //                          --- G4RandGeneralTmp ---
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.icc b/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.icc
index 828cf86374..948fb439f0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.icc
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4RandGeneralTmp.icc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // -----------------------------------------------------------------------
 //                             HEP Random
 //                         --- RandGeneralTmp ---
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
index 7a80e662bc..4c257cf7b0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Solver.hh,v 1.3.2.1 2001/06/28 19:13:04 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4Solver_h
 #define G4Solver_h 1
 
@@ -8,67 +37,67 @@
 template <class Function> class G4Solver 
 {
 public:
-	enum {DefaultMaxIter = 100};
+    enum {DefaultMaxIter = 100};
 	
-	// default constructor
-	G4Solver() : MaxIter(DefaultMaxIter), tolerance(DefaultTolerance),
-	a(0.0), b(0.0), root(0.0) {};
+    // default constructor
+    G4Solver() : MaxIter(DefaultMaxIter), tolerance(DefaultTolerance),
+		 a(0.0), b(0.0), root(0.0) {};
 	
-	G4Solver(const G4int iterations, const G4double tol) :
+    G4Solver(const G4int iterations, const G4double tol) :
 	MaxIter(iterations), tolerance(tol),
 	a(0.0), b(0.0), root(0.0) {};
 
-	// copy constructor	
-	G4Solver(const G4Solver & right);
+    // copy constructor	
+    G4Solver(const G4Solver & right);
 
-	// destructor
-	~G4Solver() {};
+    // destructor
+    ~G4Solver() {};
 	
-	// operators
-	G4Solver & operator=(const G4Solver & right);
-	G4bool operator==(const G4Solver & right) const;
-	G4bool operator!=(const G4Solver & right) const;
+    // operators
+    G4Solver & operator=(const G4Solver & right);
+    G4bool operator==(const G4Solver & right) const;
+    G4bool operator!=(const G4Solver & right) const;
 		
-	G4int GetMaxIterations(void) const {return MaxIter;}
-	void SetMaxIterations(const G4int iterations) {MaxIter=iterations;}
+    G4int GetMaxIterations(void) const {return MaxIter;}
+    void SetMaxIterations(const G4int iterations) {MaxIter=iterations;}
 	
-	G4double GetTolerance(void) const {return tolerance;}
-	void SetTolerance(const G4double epsilon) {tolerance = epsilon;}
+    G4double GetTolerance(void) const {return tolerance;}
+    void SetTolerance(const G4double epsilon) {tolerance = epsilon;}
 	
 	
-	G4double GetIntervalLowerLimit(void) const {return a;}
-	G4double GetIntervalUpperLimit(void) const {return b;}
+    G4double GetIntervalLowerLimit(void) const {return a;}
+    G4double GetIntervalUpperLimit(void) const {return b;}
 	
-	void SetIntervalLimits(const G4double Limit1, const G4double Limit2);
+    void SetIntervalLimits(const G4double Limit1, const G4double Limit2);
 
-	G4double GetRoot(void) const {return root;}
+    G4double GetRoot(void) const {return root;}
 	
-	// Calculates the root by the Bisection method
+    // Calculates the root by the Bisection method
 // 	template <class Function> G4bool Bisection(const Function & theFunction);
-	G4bool Bisection(Function & theFunction);	
+    G4bool Bisection(Function & theFunction);	
 	
-	// Calculates the root by the Regula-Falsi method
+    // Calculates the root by the Regula-Falsi method
 // 	template <class Function> G4bool RegulaFalsi(const Function & theFunction);
-	G4bool RegulaFalsi(Function & theFunction);
+    G4bool RegulaFalsi(Function & theFunction);
 	
 	
-	// Calculates the root by the Brent's method
-	G4bool Brent(Function & theFunction);
+    // Calculates the root by the Brent's method
+    G4bool Brent(Function & theFunction);
 	
 private:
 
-	// Maximum number of iterations
-	G4int MaxIter;
+    // Maximum number of iterations
+    G4int MaxIter;
 
-	// 
-	G4double tolerance;
+    // 
+    G4double tolerance;
 
-	// interval limits [a,b] which should bracket the root
-	G4double a;
-	G4double b;
+    // interval limits [a,b] which should bracket the root
+    G4double a;
+    G4double b;
 
-	// The root
-	G4double root;
+    // The root
+    G4double root;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc
index ba2db47494..104a9c3504 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4Solver.icc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 template <class Function>
 G4bool G4Solver<Function>::Bisection(Function & theFunction)
 {
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StableFermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StableFermiFragment.hh
index 7dac7c1993..860073f8b4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StableFermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StableFermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StableFermiFragment.hh,v 1.3.2.1 2001/06/28 19:13:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMF.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMF.hh
index 99d893cab8..41519a8832 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMF.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMF.hh
@@ -1,8 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMF.hh,v 1.4.2.1 2001/06/28 19:13:04 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
 #ifndef G4StatMF_h
 #define G4StatMF_h 1
 
-#include "g4rw/tvordvec.h"
-
 #include "globals.hh"
 #include "G4VMultiFragmentation.hh"
 #include "G4VStatMFEnsemble.hh"
@@ -19,45 +47,57 @@
 class G4StatMF : public G4VMultiFragmentation
 {
 public:
-	// Default constructor
-	G4StatMF();
-	// Destructor
-	~G4StatMF();
+    // Default constructor
+    G4StatMF();
+    // Destructor
+    ~G4StatMF();
 
 private:
-	// Copy constructor	
-	G4StatMF(const G4StatMF & right);
+    // Copy constructor	
+    G4StatMF(const G4StatMF & right);
 
-	// Operators
-	G4StatMF & operator=(const G4StatMF & right);
-	G4bool operator==(const G4StatMF & right);
-	G4bool operator!=(const G4StatMF & right);
+    // Operators
+    G4StatMF & operator=(const G4StatMF & right);
+    G4bool operator==(const G4StatMF & right);
+    G4bool operator!=(const G4StatMF & right);
 
 public:
 
-	G4FragmentVector *BreakItUp(const G4Fragment &theNucleus);
+    G4FragmentVector * BreakItUp(const G4Fragment &theNucleus);
 
 
 
 
 private:
 
-	// This finds temperature of breaking channel.
-	G4bool FindTemperatureOfBreakingChannel(const G4Fragment & theFragment, 
-					  const G4StatMFChannel * aChannel,G4double & Temperature);
+    // This finds temperature of breaking channel.
+    G4bool FindTemperatureOfBreakingChannel(const G4Fragment & theFragment, 
+					    const G4StatMFChannel * aChannel,G4double & Temperature);
 
-	// 
-	G4double CalcEnergy(const G4double A, const G4double Z, 
-							  const G4StatMFChannel * aChannel,
-							  const G4double T);
+    // 
+    G4double CalcEnergy(const G4double A, const G4double Z, 
+			const G4StatMFChannel * aChannel,
+			const G4double T);
 
 
 private:
 
-	G4VStatMFEnsemble * _theEnsemble;
+    G4VStatMFEnsemble * _theEnsemble;
 
 
 
 };
 
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFChannel.hh
index 90fe97efbf..e69432a9cc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFChannel.hh
@@ -1,6 +1,37 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFChannel.hh,v 1.4.2.1 2001/06/28 19:13:05 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFChannel_h
 #define G4StatMFChannel_h 1
 
+#include <deque>
+
 #include "G4StatMFParameters.hh"
 #include "G4StatMFFragment.hh"
 
@@ -8,85 +39,96 @@
 class G4StatMFChannel {
 
 public:
-	// Default Constructor
-	G4StatMFChannel() : 
+    // Default Constructor
+    G4StatMFChannel() : 
 	_NumOfNeutralFragments(0), 
 	_NumOfChargedFragments(0)
 	{}
 
 
-	// Destructor
-	~G4StatMFChannel() { _theFragments.clearAndDestroy(); }
-
+    // Destructor
+    ~G4StatMFChannel() { 
+	while (!_theFragments.empty()) {
+	    delete _theFragments.back();
+	    _theFragments.pop_back(); 
+	}
+    }
 
 private:
 
-	// Copy constructor
-	G4StatMFChannel(const G4StatMFChannel & right);
+    // Copy constructor
+    G4StatMFChannel(const G4StatMFChannel & right);
 
-	// operators
-	G4StatMFChannel & operator=(const G4StatMFChannel & right);
+    // operators
+    G4StatMFChannel & operator=(const G4StatMFChannel & right);
 
 public:
-	G4bool operator==(const G4StatMFChannel & right) const;
-	G4bool operator!=(const G4StatMFChannel & right) const;
+    G4bool operator==(const G4StatMFChannel & right) const;
+    G4bool operator!=(const G4StatMFChannel & right) const;
 	
 public:
 
-	void CreateFragment(const G4double A, const G4double Z);
+    void CreateFragment(const G4double A, const G4double Z);
 // 	{
 // 		_theFragments.insert(new G4StatMFFragment(A,Z));
 // 	}
 	
-	G4int GetMultiplicity(void) { return _theFragments.entries();}
+    G4int GetMultiplicity(void) { return _theFragments.size();}
 	
-	// Return false if there is some unphysical fragment
-	G4bool CheckFragments(void);
+    // Return false if there is some unphysical fragment
+    G4bool CheckFragments(void);
 
 
-	G4double GetFragmentsCoulombEnergy(void);
+    G4double GetFragmentsCoulombEnergy(void);
 
 
-	G4double GetFragmentsEnergy(const G4double T) const;
+    G4double GetFragmentsEnergy(const G4double T) const;
 	
 	
-	G4FragmentVector * GetFragments(const G4double anA, const G4double anZ, const G4double T);
+    G4FragmentVector * GetFragments(const G4double anA, const G4double anZ, const G4double T);
 	
 
 private:
 
 
-	// This method calculates asymptotic fragments momenta.
-	void CoulombImpulse(const G4double anA, const G4double anZ, const G4double T);
+    // This method calculates asymptotic fragments momenta.
+    void CoulombImpulse(const G4double anA, const G4double anZ, const G4double T);
 	
-	void PlaceFragments(const G4double anA);
+    void PlaceFragments(const G4double anA);
 
-	void SolveEqOfMotion(const G4double anA, const G4double anZ, const G4double T);
+    void SolveEqOfMotion(const G4double anA, const G4double anZ, const G4double T);
 
 
-	// Calculates fragments momentum components at the breakup instant.
-	// Fragment kinetic energies will be calculated according to the
-	// Boltzamann distribution at given temperature.
-	void FragmentsMomenta(const G4int NF, const G4int idx, const G4double T);	
+    // Calculates fragments momentum components at the breakup instant.
+    // Fragment kinetic energies will be calculated according to the
+    // Boltzamann distribution at given temperature.
+    void FragmentsMomenta(const G4int NF, const G4int idx, const G4double T);	
 
 
-	// Samples a isotropic random vectorwith a magnitud given by Magnitude.
-	// By default Magnitude = 1
-	G4ThreeVector IsotropicVector(const G4double Magnitude = 1.0);
+    // Samples a isotropic random vectorwith a magnitud given by Magnitude.
+    // By default Magnitude = 1
+    G4ThreeVector IsotropicVector(const G4double Magnitude = 1.0);
 
 
-	// Rotates a 3-vector P to close momentum triangle Pa + V + P = 0
-	G4ThreeVector RotateMomentum(G4ThreeVector Pa, G4ThreeVector V, 
-										  G4ThreeVector P);
+    // Rotates a 3-vector P to close momentum triangle Pa + V + P = 0
+    G4ThreeVector RotateMomentum(G4ThreeVector Pa, G4ThreeVector V, 
+				 G4ThreeVector P);
 
 private:
 
-	G4RWTPtrOrderedVector<G4StatMFFragment> _theFragments;
+    G4std::deque<G4StatMFFragment*> _theFragments;
 
-	G4int _NumOfNeutralFragments;
+    G4int _NumOfNeutralFragments;
 	
-	G4int _NumOfChargedFragments;
+    G4int _NumOfChargedFragments;
 
 };
 
 #endif
+
+
+
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFFragment.hh
index 747dd295ea..f0b76d7e33 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFFragment.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFFragment.hh,v 1.4.2.1 2001/06/28 19:13:05 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFFragment_h
 #define G4StatMFFragment_h 1
 
@@ -8,70 +37,71 @@
 class G4StatMFFragment {
 
 public:
-	// Constructor
-	G4StatMFFragment(const G4int anA, const G4int aZ) :
+    // Constructor
+    G4StatMFFragment(const G4int anA, const G4int aZ) :
 	theA(anA),theZ(aZ),
 	_position(0.0,0.0,0.0),
 	_momentum(0.0,0.0,0.0)
 	{}
 
 
-	// Destructor
-	virtual ~G4StatMFFragment() {};
+    // Destructor
+    virtual ~G4StatMFFragment() {};
 
 
 private:
-	// Default constructor
-	G4StatMFFragment(){};
+    // Default constructor
+    G4StatMFFragment(){};
 	
-	// Copy constructor
-	G4StatMFFragment(const G4StatMFFragment & right);
+    // Copy constructor
+    G4StatMFFragment(const G4StatMFFragment & right);
 
-	// operators
-	G4StatMFFragment & operator=(const G4StatMFFragment & right);
+    // operators
+    G4StatMFFragment & operator=(const G4StatMFFragment & right);
 public:
-	G4bool operator==(const G4StatMFFragment & right) const;
-	G4bool operator!=(const G4StatMFFragment & right) const;
+    G4bool operator==(const G4StatMFFragment & right) const;
+    G4bool operator!=(const G4StatMFFragment & right) const;
 	
 public:
 
-	G4double GetCoulombEnergy(void);
+    G4double GetCoulombEnergy(void);
 	
-	G4double GetEnergy(const G4double T);
+    G4double GetEnergy(const G4double T);
 	
-	G4double GetInvLevelDensity(void);
+    G4double GetInvLevelDensity(void);
 
-	G4double GetA(void) const {return theA;}
+    G4double GetA(void) const {return theA;}
 	
-	G4double GetZ(void) const {return theZ;}
+    G4double GetZ(void) const {return theZ;}
 	
-	void SetPosition(const G4ThreeVector aPosition) {_position = aPosition;}
+    void SetPosition(const G4ThreeVector aPosition) {_position = aPosition;}
 	
-	G4ThreeVector GetPosition(void) {return _position;}
+    G4ThreeVector GetPosition(void) {return _position;}
 	
-	void SetMomentum(const G4ThreeVector aMomentum) {_momentum = aMomentum;}
+    void SetMomentum(const G4ThreeVector aMomentum) {_momentum = aMomentum;}
 
-	G4ThreeVector GetMomentum(void) {return _momentum;}
+    G4ThreeVector GetMomentum(void) {return _momentum;}
 
-	G4Fragment * GetFragment(const G4double T);
+    G4Fragment * GetFragment(const G4double T);
 	
-	G4double GetNuclearMass(void)
+    G4double GetNuclearMass(void)
 	{return G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theZ,theA);}
 	
 
 private:
 
-	G4double CalcExcitationEnergy(const G4double T);
+    G4double CalcExcitationEnergy(const G4double T);
 
 private:
 
-	G4double theA;
+    G4double theA;
 	
-	G4double theZ;
+    G4double theZ;
 	
-	G4ThreeVector _position;
+    G4ThreeVector _position;
 	
-	G4ThreeVector _momentum;
+    G4ThreeVector _momentum;
 };
 
 #endif
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroBiNucleon.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroBiNucleon.hh
index 4824d6766e..cac454c5fd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroBiNucleon.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroBiNucleon.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroBiNucleon.hh,v 1.4.2.1 2001/06/28 19:13:05 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroBiBiNucleon_h
 #define G4StatMFMacroBiNucleon_h 1
 
@@ -8,35 +37,35 @@ class G4StatMFMacroBiNucleon : public G4VStatMFMacroCluster {
 
 public:
 
-	// Default constructor
-	G4StatMFMacroBiNucleon() : G4VStatMFMacroCluster(2) {};
+    // Default constructor
+    G4StatMFMacroBiNucleon() : G4VStatMFMacroCluster(2) {};
 
-	// Destructor
-	~G4StatMFMacroBiNucleon() {};
+    // Destructor
+    ~G4StatMFMacroBiNucleon() {};
 	
 
 private:
 
-	// Copy constructor
-	G4StatMFMacroBiNucleon(const G4StatMFMacroBiNucleon & right);
+    // Copy constructor
+    G4StatMFMacroBiNucleon(const G4StatMFMacroBiNucleon & right);
 
-	// operators
-	G4StatMFMacroBiNucleon & operator=(const G4StatMFMacroBiNucleon & right);
-	G4bool operator==(const G4StatMFMacroBiNucleon & right) const;
-	G4bool operator!=(const G4StatMFMacroBiNucleon & right) const;
+    // operators
+    G4StatMFMacroBiNucleon & operator=(const G4StatMFMacroBiNucleon & right);
+    G4bool operator==(const G4StatMFMacroBiNucleon & right) const;
+    G4bool operator!=(const G4StatMFMacroBiNucleon & right) const;
 
 public:
 
-	G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-											const G4double nu, const G4double T);
+    G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+				  const G4double nu, const G4double T);
 					
 					
 					
-	G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}
+    G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}
 	
-	G4double CalcEnergy(const G4double T);
+    G4double CalcEnergy(const G4double T);
 	
-	G4double CalcEntropy(const G4double T, const G4double FreeVol);
+    G4double CalcEntropy(const G4double T, const G4double FreeVol);
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroChemicalPotential.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroChemicalPotential.hh
index 60a4ac237b..5b1876ef8d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroChemicalPotential.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroChemicalPotential.hh
@@ -1,7 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroChemicalPotential.hh,v 1.4.2.1 2001/06/28 19:13:05 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroChemicalPotential_h
 #define G4StatMFMacroChemicalPotential_h 1
 
-#include "g4rw/tpordvec.h"
+#include <vector>
 
 #include "G4StatMFParameters.hh"
 #include "G4VStatMFMacroCluster.hh"
@@ -14,71 +43,71 @@ class G4StatMFMacroChemicalPotential {
 
 public:
 
-	G4StatMFMacroChemicalPotential(const G4double anA, const G4double aZ,
-									  const G4double kappa, 
-									  const G4double temp, 
-									  G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * ClusterVector) :
-		theA(anA),
-		theZ(aZ),
-		_Kappa(kappa),
-		_MeanMultiplicity(0.0),
-		_MeanTemperature(temp),
-		_ChemPotentialMu(0.0),
-		_ChemPotentialNu(0.0),
-		_theClusters(ClusterVector) 
-		{};
+    G4StatMFMacroChemicalPotential(const G4double anA, const G4double aZ,
+				   const G4double kappa, 
+				   const G4double temp, 
+				   G4std::vector<G4VStatMFMacroCluster*> * ClusterVector) :
+	theA(anA),
+	theZ(aZ),
+	_Kappa(kappa),
+	_MeanMultiplicity(0.0),
+	_MeanTemperature(temp),
+	_ChemPotentialMu(0.0),
+	_ChemPotentialNu(0.0),
+	_theClusters(ClusterVector) 
+	{};
 	
-	~G4StatMFMacroChemicalPotential() {};
+    ~G4StatMFMacroChemicalPotential() {};
    
-	G4double operator()(const G4double nu)
+    G4double operator()(const G4double nu)
 	{ return (theZ - this->CalcMeanZ(nu))/theZ; }	
 
 private:
-	// Default constructor
-	G4StatMFMacroChemicalPotential() {};
+    // Default constructor
+    G4StatMFMacroChemicalPotential() {};
 
-	// copy constructor
-	G4StatMFMacroChemicalPotential(const G4StatMFMacroChemicalPotential &right) {};
+    // copy constructor
+    G4StatMFMacroChemicalPotential(const G4StatMFMacroChemicalPotential &right) {};
 
 
-	// operators
-	G4StatMFMacroChemicalPotential & operator=(const G4StatMFMacroChemicalPotential & right);
-	G4bool operator==(const G4StatMFMacroChemicalPotential & right) const;
-	G4bool operator!=(const G4StatMFMacroChemicalPotential & right) const;
+    // operators
+    G4StatMFMacroChemicalPotential & operator=(const G4StatMFMacroChemicalPotential & right);
+    G4bool operator==(const G4StatMFMacroChemicalPotential & right) const;
+    G4bool operator!=(const G4StatMFMacroChemicalPotential & right) const;
 
 public:
 
-	G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
+    G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
 	
-	G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
+    G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
 
-	G4double GetChemicalPotentialNu(void) const {return _ChemPotentialNu;}
+    G4double GetChemicalPotentialNu(void) const {return _ChemPotentialNu;}
 
-	G4double CalcChemicalPotentialNu(void);
+    G4double CalcChemicalPotentialNu(void);
 
 private:
 	
-	G4double CalcMeanZ(const G4double nu);
+    G4double CalcMeanZ(const G4double nu);
 
-	void CalcChemicalPotentialMu(const G4double nu);
+    void CalcChemicalPotentialMu(const G4double nu);
 
 private:
 
-	G4double theA;
+    G4double theA;
 
-	G4double theZ;
+    G4double theZ;
 
-	G4double _Kappa;
+    G4double _Kappa;
 
-	G4double _MeanMultiplicity;
+    G4double _MeanMultiplicity;
 
-	G4double _MeanTemperature;
+    G4double _MeanTemperature;
 	
-	G4double _ChemPotentialMu;
+    G4double _ChemPotentialMu;
 	
-	G4double _ChemPotentialNu;
+    G4double _ChemPotentialNu;
 	
-	G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * _theClusters; 
+    G4std::vector<G4VStatMFMacroCluster*> * _theClusters; 
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiNucleon.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiNucleon.hh
index cbaa34f089..3003af4c3a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiNucleon.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiNucleon.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroMultiNucleon.hh,v 1.3.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroMultiNucleon_h
 #define G4StatMFMacroMultiNucleon_h 1
 
@@ -8,36 +37,36 @@ class G4StatMFMacroMultiNucleon : public G4VStatMFMacroCluster {
 
 public:
 
-	// Constructor
-	G4StatMFMacroMultiNucleon(const G4int Size) : G4VStatMFMacroCluster(Size) {};
+    // Constructor
+    G4StatMFMacroMultiNucleon(const G4int Size) : G4VStatMFMacroCluster(Size) {};
 
-	// Destructor
-	~G4StatMFMacroMultiNucleon() {};
+    // Destructor
+    ~G4StatMFMacroMultiNucleon() {};
 	
 
 private:
 
-	// Default constructor
-	G4StatMFMacroMultiNucleon();
+    // Default constructor
+    G4StatMFMacroMultiNucleon();
 	
-	// Copy constructor
-	G4StatMFMacroMultiNucleon(const G4StatMFMacroMultiNucleon & right);
+    // Copy constructor
+    G4StatMFMacroMultiNucleon(const G4StatMFMacroMultiNucleon & right);
 
-	// operators
-	G4StatMFMacroMultiNucleon & operator=(const G4StatMFMacroMultiNucleon & right);
-	G4bool operator==(const G4StatMFMacroMultiNucleon & right) const;
-	G4bool operator!=(const G4StatMFMacroMultiNucleon & right) const;
+    // operators
+    G4StatMFMacroMultiNucleon & operator=(const G4StatMFMacroMultiNucleon & right);
+    G4bool operator==(const G4StatMFMacroMultiNucleon & right) const;
+    G4bool operator!=(const G4StatMFMacroMultiNucleon & right) const;
 
 public:
 
-	G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-											const G4double nu, const G4double T);
+    G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+				  const G4double nu, const G4double T);
 								
-	G4double CalcZARatio(const G4double nu); 
+    G4double CalcZARatio(const G4double nu); 
 	
-	G4double CalcEnergy(const G4double T);
+    G4double CalcEnergy(const G4double T);
 
-	G4double CalcEntropy(const G4double T, const G4double FreeVol);
+    G4double CalcEntropy(const G4double T, const G4double FreeVol);
 	
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiplicity.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiplicity.hh
index 86df4feaa4..e15480184f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiplicity.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroMultiplicity.hh
@@ -1,7 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroMultiplicity.hh,v 1.4.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroMultiplicity_h
 #define G4StatMFMacroMultiplicity_h 1
 
-#include "g4rw/tpordvec.h"
+#include <vector>
 
 #include "G4StatMFParameters.hh"
 #include "G4VStatMFMacroCluster.hh"
@@ -13,65 +42,65 @@ class G4StatMFMacroMultiplicity {
 
 public:
 
-	G4StatMFMacroMultiplicity(const G4double anA, 
-									  const G4double kappa, 
-									  const G4double temp, 
-									  const G4double nu,
-									  G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * ClusterVector) :
-		theA(anA),
-		_Kappa(kappa),
-		_MeanMultiplicity(0.0),
-		_MeanTemperature(temp),
-		_ChemPotentialMu(0.0),
-		_ChemPotentialNu(nu),
-		_theClusters(ClusterVector) 
-		{};
+    G4StatMFMacroMultiplicity(const G4double anA, 
+			      const G4double kappa, 
+			      const G4double temp, 
+			      const G4double nu,
+			      G4std::vector<G4VStatMFMacroCluster*> * ClusterVector) :
+	theA(anA),
+	_Kappa(kappa),
+	_MeanMultiplicity(0.0),
+	_MeanTemperature(temp),
+	_ChemPotentialMu(0.0),
+	_ChemPotentialNu(nu),
+	_theClusters(ClusterVector) 
+	{};
 	
-	~G4StatMFMacroMultiplicity() {};
+    ~G4StatMFMacroMultiplicity() {};
    
-	G4double operator()(const G4double mu)
+    G4double operator()(const G4double mu)
 	{ return (theA - this->CalcMeanA(mu))/theA; }	
 
 private:
-	// Default constructor
-	G4StatMFMacroMultiplicity() {};
+    // Default constructor
+    G4StatMFMacroMultiplicity() {};
 
-	// copy constructor
-	G4StatMFMacroMultiplicity(const G4StatMFMacroMultiplicity &right) {};
+    // copy constructor
+    G4StatMFMacroMultiplicity(const G4StatMFMacroMultiplicity &right) {};
 
 
-	// operators
-	G4StatMFMacroMultiplicity & operator=(const G4StatMFMacroMultiplicity & right);
-	G4bool operator==(const G4StatMFMacroMultiplicity & right) const;
-	G4bool operator!=(const G4StatMFMacroMultiplicity & right) const;
+    // operators
+    G4StatMFMacroMultiplicity & operator=(const G4StatMFMacroMultiplicity & right);
+    G4bool operator==(const G4StatMFMacroMultiplicity & right) const;
+    G4bool operator!=(const G4StatMFMacroMultiplicity & right) const;
 
 public:
 
-	G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
+    G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
 	
-	G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
+    G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
 
-	G4double CalcChemicalPotentialMu(void);
+    G4double CalcChemicalPotentialMu(void);
 
 private:
 	
-	G4double CalcMeanA(const G4double mu);
+    G4double CalcMeanA(const G4double mu);
 
 private:
 
-	G4double theA;
+    G4double theA;
 
-	G4double _Kappa;
+    G4double _Kappa;
 
-	G4double _MeanMultiplicity;
+    G4double _MeanMultiplicity;
 
-	G4double _MeanTemperature;
+    G4double _MeanTemperature;
 	
-	G4double _ChemPotentialMu;
+    G4double _ChemPotentialMu;
 	
-	G4double _ChemPotentialNu;
+    G4double _ChemPotentialNu;
 	
-	G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * _theClusters; 
+    G4std::vector<G4VStatMFMacroCluster*> * _theClusters; 
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroNucleon.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroNucleon.hh
index 238f00cc79..459c70fcf7 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroNucleon.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroNucleon.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroNucleon.hh,v 1.4.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroNucleon_h
 #define G4StatMFMacroNucleon_h 1
 
@@ -8,46 +37,46 @@ class G4StatMFMacroNucleon : public G4VStatMFMacroCluster {
 
 public:
 
-	// Default constructor
-	G4StatMFMacroNucleon() : 
+    // Default constructor
+    G4StatMFMacroNucleon() : 
 	_NeutronMeanMultiplicity(0.0),_ProtonMeanMultiplicity(0.0),
 	G4VStatMFMacroCluster(1) {};
 
-	// Destructor
-	~G4StatMFMacroNucleon() {};
+    // Destructor
+    ~G4StatMFMacroNucleon() {};
 	
 
 private:
 
-	// Copy constructor
-	G4StatMFMacroNucleon(const G4StatMFMacroNucleon & right);
+    // Copy constructor
+    G4StatMFMacroNucleon(const G4StatMFMacroNucleon & right);
 
-	// operators
-	G4StatMFMacroNucleon & operator=(const G4StatMFMacroNucleon & right);
-	G4bool operator==(const G4StatMFMacroNucleon & right) const;
-	G4bool operator!=(const G4StatMFMacroNucleon & right) const;
+    // operators
+    G4StatMFMacroNucleon & operator=(const G4StatMFMacroNucleon & right);
+    G4bool operator==(const G4StatMFMacroNucleon & right) const;
+    G4bool operator!=(const G4StatMFMacroNucleon & right) const;
 
 public:
 
-	G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-											const G4double nu, const G4double T);
+    G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+				  const G4double nu, const G4double T);
 	
-	G4double CalcZARatio(const G4double nu) 
+    G4double CalcZARatio(const G4double nu) 
 	{ if (_ProtonMeanMultiplicity+_NeutronMeanMultiplicity > 0.0)
-				return theZARatio = _ProtonMeanMultiplicity/
-						(_ProtonMeanMultiplicity+_NeutronMeanMultiplicity);
-		else return 0.0; }
+	    return theZARatio = _ProtonMeanMultiplicity/
+		(_ProtonMeanMultiplicity+_NeutronMeanMultiplicity);
+	else return 0.0; }
 						
 						
-	G4double CalcEnergy(const G4double T);
+    G4double CalcEnergy(const G4double T);
 	
-	G4double CalcEntropy(const G4double T, const G4double FreeVol);
+    G4double CalcEntropy(const G4double T, const G4double FreeVol);
 
 	
 private:
 
-	G4double _NeutronMeanMultiplicity;
-	G4double _ProtonMeanMultiplicity;
+    G4double _NeutronMeanMultiplicity;
+    G4double _ProtonMeanMultiplicity;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTemperature.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTemperature.hh
index 3e4bae5af0..3466049e07 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTemperature.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTemperature.hh
@@ -1,8 +1,35 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTemperature.hh,v 1.5.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroTemperature_h
 #define G4StatMFMacroTemperature_h 1
 
-#include "g4rw/tpordvec.h"
-
 #include "G4StatMFParameters.hh"
 #include "G4VStatMFMacroCluster.hh"
 #include "G4StatMFMacroChemicalPotential.hh"
@@ -14,83 +41,83 @@ class G4StatMFMacroTemperature {
 
 public:
 
-	G4StatMFMacroTemperature(const G4double anA, const G4double aZ, 
-									 const G4double ExEnergy, const G4double FreeE0, 
-									 const G4double kappa, 
-									 G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * ClusterVector) :
-		theA(anA),
-		theZ(aZ),
-		_ExEnergy(ExEnergy),
-		_Kappa(kappa),
-		_FreeInternalE0(FreeE0),
-		_MeanMultiplicity(0.0),
-		_MeanTemperature(0.0),
-		_ChemPotentialMu(0.0),
-		_ChemPotentialNu(0.0),
-		_theClusters(ClusterVector) 
-		{};
+    G4StatMFMacroTemperature(const G4double anA, const G4double aZ, 
+			     const G4double ExEnergy, const G4double FreeE0, 
+			     const G4double kappa, 
+			     G4std::vector<G4VStatMFMacroCluster*> * ClusterVector) :
+	theA(anA),
+	theZ(aZ),
+	_ExEnergy(ExEnergy),
+	_Kappa(kappa),
+	_FreeInternalE0(FreeE0),
+	_MeanMultiplicity(0.0),
+	_MeanTemperature(0.0),
+	_ChemPotentialMu(0.0),
+	_ChemPotentialNu(0.0),
+	_theClusters(ClusterVector) 
+	{};
 	
-	~G4StatMFMacroTemperature() {};
+    ~G4StatMFMacroTemperature() {};
    
-	G4double operator()(const G4double T)
+    G4double operator()(const G4double T)
 	{ return (_ExEnergy - this->FragsExcitEnergy(T))/_ExEnergy; }	
 
 private:
-	// Default constructor
-	G4StatMFMacroTemperature() {};
+    // Default constructor
+    G4StatMFMacroTemperature() {};
 
-	// copy constructor
-	G4StatMFMacroTemperature(const G4StatMFMacroTemperature &right) {};
+    // copy constructor
+    G4StatMFMacroTemperature(const G4StatMFMacroTemperature &right) {};
 
 
-	// operators
-	G4StatMFMacroTemperature & operator=(const G4StatMFMacroTemperature & right);
-	G4bool operator==(const G4StatMFMacroTemperature & right) const;
-	G4bool operator!=(const G4StatMFMacroTemperature & right) const;
+    // operators
+    G4StatMFMacroTemperature & operator=(const G4StatMFMacroTemperature & right);
+    G4bool operator==(const G4StatMFMacroTemperature & right) const;
+    G4bool operator!=(const G4StatMFMacroTemperature & right) const;
 
 public:
 
-	G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
+    G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity;}
 	
-	G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
+    G4double GetChemicalPotentialMu(void) const {return _ChemPotentialMu;}
 
-	G4double GetChemicalPotentialNu(void) const {return _ChemPotentialNu;}
+    G4double GetChemicalPotentialNu(void) const {return _ChemPotentialNu;}
 
-	G4double GetTemperature(void) const {return _MeanTemperature;}
+    G4double GetTemperature(void) const {return _MeanTemperature;}
 
-	G4double GetEntropy(void) const {return _MeanEntropy;}
+    G4double GetEntropy(void) const {return _MeanEntropy;}
 
-	G4double CalcTemperature(void);
+    G4double CalcTemperature(void);
 
 private:
 	
-	G4double FragsExcitEnergy(const G4double T);
+    G4double FragsExcitEnergy(const G4double T);
 
-	void CalcChemicalPotentialNu(const G4double T);
+    void CalcChemicalPotentialNu(const G4double T);
 
 private:
 
-	G4double theA;
+    G4double theA;
 
-	G4double theZ;
+    G4double theZ;
 
-	G4double _ExEnergy;
+    G4double _ExEnergy;
 	
-	G4double _FreeInternalE0;
+    G4double _FreeInternalE0;
 
-	G4double _Kappa;
+    G4double _Kappa;
 
-	G4double _MeanMultiplicity;
+    G4double _MeanMultiplicity;
 
-	G4double _MeanTemperature;
+    G4double _MeanTemperature;
 	
-	G4double _ChemPotentialMu;
+    G4double _ChemPotentialMu;
 	
-	G4double _ChemPotentialNu;
+    G4double _ChemPotentialNu;
 	
-	G4double _MeanEntropy;
+    G4double _MeanEntropy;
 	
-	G4RWTPtrOrderedVector<G4VStatMFMacroCluster> * _theClusters; 
+    G4std::vector<G4VStatMFMacroCluster*> * _theClusters; 
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTetraNucleon.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTetraNucleon.hh
index 6ff7ad626e..072d7282ee 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTetraNucleon.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTetraNucleon.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTetraNucleon.hh,v 1.4.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroTetraNucleon_h
 #define G4StatMFMacroTetraNucleon_h 1
 
@@ -8,33 +37,33 @@ class G4StatMFMacroTetraNucleon : public G4VStatMFMacroCluster {
 
 public:
 
-	// Default constructor
-	G4StatMFMacroTetraNucleon() : G4VStatMFMacroCluster(4) {};
+    // Default constructor
+    G4StatMFMacroTetraNucleon() : G4VStatMFMacroCluster(4) {};
 
-	// Destructor
-	~G4StatMFMacroTetraNucleon() {};
+    // Destructor
+    ~G4StatMFMacroTetraNucleon() {};
 	
 
 private:
 
-	// Copy constructor
-	G4StatMFMacroTetraNucleon(const G4StatMFMacroTetraNucleon & right);
+    // Copy constructor
+    G4StatMFMacroTetraNucleon(const G4StatMFMacroTetraNucleon & right);
 
-	// operators
-	G4StatMFMacroTetraNucleon & operator=(const G4StatMFMacroTetraNucleon & right);
-	G4bool operator==(const G4StatMFMacroTetraNucleon & right) const;
-	G4bool operator!=(const G4StatMFMacroTetraNucleon & right) const;
+    // operators
+    G4StatMFMacroTetraNucleon & operator=(const G4StatMFMacroTetraNucleon & right);
+    G4bool operator==(const G4StatMFMacroTetraNucleon & right) const;
+    G4bool operator!=(const G4StatMFMacroTetraNucleon & right) const;
 
 public:
 
-	G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-											const G4double nu, const G4double T);
+    G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+				  const G4double nu, const G4double T);
 								
-	G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}								
+    G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}								
 
-	G4double CalcEnergy(const G4double T);
+    G4double CalcEnergy(const G4double T);
 
-	G4double CalcEntropy(const G4double T, const G4double FreeVol);
+    G4double CalcEntropy(const G4double T, const G4double FreeVol);
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTriNucleon.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTriNucleon.hh
index 5e52f52519..7e5ca19d3d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTriNucleon.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacroTriNucleon.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTriNucleon.hh,v 1.4.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroTriNucleon_h
 #define G4StatMFMacroTriNucleon_h 1
 
@@ -8,33 +37,33 @@ class G4StatMFMacroTriNucleon : public G4VStatMFMacroCluster {
 
 public:
 
-	// Default constructor
-	G4StatMFMacroTriNucleon() : G4VStatMFMacroCluster(3) {};
+    // Default constructor
+    G4StatMFMacroTriNucleon() : G4VStatMFMacroCluster(3) {};
 
-	// Destructor
-	~G4StatMFMacroTriNucleon() {};
+    // Destructor
+    ~G4StatMFMacroTriNucleon() {};
 	
 
 private:
 
-	// Copy constructor
-	G4StatMFMacroTriNucleon(const G4StatMFMacroTriNucleon & right);
+    // Copy constructor
+    G4StatMFMacroTriNucleon(const G4StatMFMacroTriNucleon & right);
 
-	// operators
-	G4StatMFMacroTriNucleon & operator=(const G4StatMFMacroTriNucleon & right);
-	G4bool operator==(const G4StatMFMacroTriNucleon & right) const;
-	G4bool operator!=(const G4StatMFMacroTriNucleon & right) const;
+    // operators
+    G4StatMFMacroTriNucleon & operator=(const G4StatMFMacroTriNucleon & right);
+    G4bool operator==(const G4StatMFMacroTriNucleon & right) const;
+    G4bool operator!=(const G4StatMFMacroTriNucleon & right) const;
 
 public:
 
-	G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-											const G4double nu, const G4double T);
+    G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+				  const G4double nu, const G4double T);
 
-	G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}
+    G4double CalcZARatio(const G4double nu) {return theZARatio = 0.5;}
 
-	G4double CalcEnergy(const G4double T);
+    G4double CalcEnergy(const G4double T);
 	
-	G4double CalcEntropy(const G4double T, const G4double FreeVol);
+    G4double CalcEntropy(const G4double T, const G4double FreeVol);
 	
 	
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
index eaee53da41..ed7e363d98 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMacrocanonical.hh
@@ -1,10 +1,35 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroCanonical.hh,v 1.6.2.1 2001/06/28 19:13:05 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMacroCanonical_h
 #define G4StatMFMacroCanonical_h 1
 
-#include "g4rw/tpordvec.h"
-#include "g4rw/tvvector.h"
-#include "g4rw/tvordvec.h"  
-
 #include "G4Fragment.hh"
 #include "G4StatMFFragment.hh"
 #include "G4VStatMFEnsemble.hh"
@@ -24,62 +49,62 @@ class G4StatMFMacroCanonical : public G4VStatMFEnsemble {
 
 public:
 
-	// G4StatMFMacroCanonical class must be initialized with a G4Fragment.
-	G4StatMFMacroCanonical(const G4Fragment & theFragment);
+    // G4StatMFMacroCanonical class must be initialized with a G4Fragment.
+    G4StatMFMacroCanonical(const G4Fragment & theFragment);
 
-	// destructor
-	~G4StatMFMacroCanonical();
+    // destructor
+    ~G4StatMFMacroCanonical();
 
 private:
-	// default constructor
-	G4StatMFMacroCanonical() {};
+    // default constructor
+    G4StatMFMacroCanonical() {};
 
 
-	// copy constructor
-	G4StatMFMacroCanonical(const G4StatMFMacroCanonical &right) {};
+    // copy constructor
+    G4StatMFMacroCanonical(const G4StatMFMacroCanonical &right) {};
 
 
-	// operators
-	G4StatMFMacroCanonical & operator=(const G4StatMFMacroCanonical & right);
-	G4bool operator==(const G4StatMFMacroCanonical & right) const;
-	G4bool operator!=(const G4StatMFMacroCanonical & right) const;
+    // operators
+    G4StatMFMacroCanonical & operator=(const G4StatMFMacroCanonical & right);
+    G4bool operator==(const G4StatMFMacroCanonical & right) const;
+    G4bool operator!=(const G4StatMFMacroCanonical & right) const;
 
 
 public:
 
-	// Choice of fragment atomic numbers and charges.
-	G4StatMFChannel * ChooseAandZ(const G4Fragment &theFragment);
+    // Choice of fragment atomic numbers and charges.
+    G4StatMFChannel * ChooseAandZ(const G4Fragment &theFragment);
 
 private:
 
-	// Initailization method
-	void Initialize(const G4Fragment & theFragment);
+    // Initailization method
+    void Initialize(const G4Fragment & theFragment);
 
-	//
-	void CalculateTemperature(const G4Fragment & theFragment);
+    //
+    void CalculateTemperature(const G4Fragment & theFragment);
 
-	// Determines fragments multiplicities and compute total fragment multiplicity
-	G4double ChooseA(const G4double A, G4RWTValVector<G4double> & ANumbers);
+    // Determines fragments multiplicities and compute total fragment multiplicity
+    G4double ChooseA(const G4double A, G4std::vector<G4double> & ANumbers);
 	
-	// Samples charges of fragments
-	G4StatMFChannel * ChooseZ(const G4int & Z, 
-									G4RWTValOrderedVector<G4double> & FragmentsA);
+    // Samples charges of fragments
+    G4StatMFChannel * ChooseZ(const G4int & Z, 
+			      G4std::vector<G4double> & FragmentsA);
 
-  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 
-	// Chemical Potential \mu
-	G4double _ChemPotentialMu;
+    // Chemical Potential \mu
+    G4double _ChemPotentialMu;
 
-	// Chemical Potential \nu
-	G4double _ChemPotentialNu;
+    // Chemical Potential \nu
+    G4double _ChemPotentialNu;
 
 
-	// Parameter Kappa
-	G4double _Kappa;
+    // Parameter Kappa
+    G4double _Kappa;
 
-	// Clusters
-	G4RWTPtrOrderedVector<G4VStatMFMacroCluster> _theClusters;
+    // Clusters
+    G4std::vector<G4VStatMFMacroCluster*> _theClusters;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroManager.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroManager.hh
index f1f9b965a0..c0ac522f97 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroManager.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroManager.hh
@@ -1,8 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMicroManager.hh,v 1.3.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
 #ifndef G4StatMFMicroManager_h
 #define G4StatMFMicroManager_h 1
 
-#include "g4rw/tvordvec.h"
-
 #include "G4StatMFMicroPartition.hh"
 #include "G4StatMFParameters.hh"
 #include "G4StatMFChannel.hh"
@@ -15,53 +43,53 @@ class G4StatMFMicroManager {
 
 public:
 
-	// G4StatMFMicroManager class must be initialized with a G4Fragment, multiplicity,
-	// free internal energy and the entropy of the compund nucleus.
-	G4StatMFMicroManager(const G4Fragment & theFragment, const G4int multiplicity,
-							   const G4double FreeIntE, const G4double SCompNuc);
+    // G4StatMFMicroManager class must be initialized with a G4Fragment, multiplicity,
+    // free internal energy and the entropy of the compund nucleus.
+    G4StatMFMicroManager(const G4Fragment & theFragment, const G4int multiplicity,
+			 const G4double FreeIntE, const G4double SCompNuc);
 
-	// destructor
-	~G4StatMFMicroManager();
+    // destructor
+    ~G4StatMFMicroManager();
 
 private:
-	// default constructor
-	G4StatMFMicroManager() {};
+    // default constructor
+    G4StatMFMicroManager() {};
 
 
-	// copy constructor
-	G4StatMFMicroManager(const G4StatMFMicroManager &right);
+    // copy constructor
+    G4StatMFMicroManager(const G4StatMFMicroManager &right);
 
 
-	// operators
-	G4StatMFMicroManager & operator=(const G4StatMFMicroManager & right);
+    // operators
+    G4StatMFMicroManager & operator=(const G4StatMFMicroManager & right);
 
 public:
-	G4bool operator==(const G4StatMFMicroManager & right) const;
-	G4bool operator!=(const G4StatMFMicroManager & right) const;
+    G4bool operator==(const G4StatMFMicroManager & right) const;
+    G4bool operator!=(const G4StatMFMicroManager & right) const;
 
 
 public:
 
-	// Choice of fragment atomic numbers and charges.
-	G4StatMFChannel * ChooseChannel(const G4double A0, const G4double Z0, const G4double MeanT);
+    // Choice of fragment atomic numbers and charges.
+    G4StatMFChannel * ChooseChannel(const G4double A0, const G4double Z0, const G4double MeanT);
 	
-	G4double GetProbability(void) const {return _WW;}
+    G4double GetProbability(void) const {return _WW;}
 
-	void Normalize(const G4double Norm);
+    void Normalize(const G4double Norm);
 	
-	G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity; }
+    G4double GetMeanMultiplicity(void) const {return _MeanMultiplicity; }
 
-	G4double GetMeanTemperature(void) const {return _MeanTemperature; }
+    G4double GetMeanTemperature(void) const {return _MeanTemperature; }
 
-	G4double GetMeanEntropy(void) const {return _MeanEntropy; }
+    G4double GetMeanEntropy(void) const {return _MeanEntropy; }
 
 private:
 
-	// Initailization method
-	void Initialize(const G4Fragment & theFragment, const G4int m,
-	                const G4double FreeIntE, const G4double SCompNuc);
+    // Initailization method
+    void Initialize(const G4Fragment & theFragment, const G4int m,
+		    const G4double FreeIntE, const G4double SCompNuc);
 
-	G4bool MakePartition(const G4int k, G4int * ANumbers); 
+    G4bool MakePartition(const G4int k, G4int * ANumbers); 
 								
 
 
@@ -70,21 +98,26 @@ private:
 private:
 
 
-	// Partitions vector
-	G4RWTPtrOrderedVector<G4StatMFMicroPartition> _Partition;
+    // Partitions vector
+    G4std::vector<G4StatMFMicroPartition*> _Partition;
 	
 
-	// Statistical weight
-	G4double _WW;
+    // Statistical weight
+    G4double _WW;
 
-	G4double _Normalization;
+    G4double _Normalization;
 	
-	G4double _MeanMultiplicity;
+    G4double _MeanMultiplicity;
 
-	G4double _MeanTemperature;
+    G4double _MeanTemperature;
 	
-	G4double _MeanEntropy;
+    G4double _MeanEntropy;
 };
 
 #endif
 
+
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroPartition.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroPartition.hh
index b4e4b903bc..5dd4fe2435 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroPartition.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicroPartition.hh
@@ -1,111 +1,141 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMicroPartition.hh,v 1.6.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMicroPartition_h
 #define G4StatMFMicroPartition_h 1
 
+#include  <vector>
+
 #include "globals.hh"
-#include  "g4rw/tvordvec.h"
 #include "G4StatMFParameters.hh"
 #include "G4StatMFChannel.hh"
 
 class G4StatMFMicroPartition {
 
 public:
-	// Constructor
-	G4StatMFMicroPartition(const G4int A, const G4double Z) :
+    // Constructor
+    G4StatMFMicroPartition(const G4int A, const G4double Z) :
 	theA(A), theZ(Z), _Probability(0.0), _Temperature(0.0), 
 	_Entropy(0.0) {};
 
 
-	// Destructor
-	~G4StatMFMicroPartition() {};
+    // Destructor
+    ~G4StatMFMicroPartition() {};
 
 
 private:
-	// Default constructor
-	G4StatMFMicroPartition() {};
+    // Default constructor
+    G4StatMFMicroPartition() {};
 	
-	// Copy constructor
-	G4StatMFMicroPartition(const G4StatMFMicroPartition & right);
+    // Copy constructor
+    G4StatMFMicroPartition(const G4StatMFMicroPartition & right);
 
-	// operators
-	G4StatMFMicroPartition & operator=(const G4StatMFMicroPartition & right);
+    // operators
+    G4StatMFMicroPartition & operator=(const G4StatMFMicroPartition & right);
 public:
-	G4bool operator==(const G4StatMFMicroPartition & right) const;
-	G4bool operator!=(const G4StatMFMicroPartition & right) const;
+    G4bool operator==(const G4StatMFMicroPartition & right) const;
+    G4bool operator!=(const G4StatMFMicroPartition & right) const;
 
 public:
 
-	// Gives fragments charges
-	G4StatMFChannel * ChooseZ(const G4double A0, const G4double Z0, const G4double MeanT);	
+    // Gives fragments charges
+    G4StatMFChannel * ChooseZ(const G4double A0, const G4double Z0, const G4double MeanT);	
 
-	G4double GetProbability(void)
+    G4double GetProbability(void)
 	{ return _Probability; }
 	
 
 
-	void SetPartitionFragment(const G4int anA)
+    void SetPartitionFragment(const G4int anA)
 	{ 
-		_thePartition.insert(anA);
-		CoulombFreeEnergy(anA);
+	    _thePartition.push_back(anA);
+	    CoulombFreeEnergy(anA);
 	}
 	
-	void Normalize(const G4double Normalization)
+    void Normalize(const G4double Normalization)
 	{ _Probability /= Normalization; }
 
 
-	G4double CalcPartitionProbability(const G4double U,
-								const G4double FreeInternalE0,
-								const G4double SCompound);
+    G4double CalcPartitionProbability(const G4double U,
+				      const G4double FreeInternalE0,
+				      const G4double SCompound);
 								
-	G4double GetTemperature(void)
+    G4double GetTemperature(void)
 	{
-		return _Temperature;
+	    return _Temperature;
 	}
 	
-	G4double GetEntropy(void)
+    G4double GetEntropy(void)
 	{
-		return _Entropy;
+	    return _Entropy;
 	}
 
 private:
-	void CoulombFreeEnergy(const G4double anA);
+    void CoulombFreeEnergy(const G4double anA);
 
-	G4double CalcPartitionTemperature(const G4double U, 
-							  const G4double FreeInternalE0);
+    G4double CalcPartitionTemperature(const G4double U, 
+				      const G4double FreeInternalE0);
 
-	G4double GetPartitionEnergy(const G4double T);
+    G4double GetPartitionEnergy(const G4double T);
 	
-	G4double GetCoulombEnergy(void);
+    G4double GetCoulombEnergy(void);
 
-	G4double GetDegeneracyFactor(const G4int A);
+    G4double GetDegeneracyFactor(const G4int A);
 	
-	G4double InvLevelDensity(const G4double Af) 
+    G4double InvLevelDensity(const G4double Af) 
 	{
-		// Calculate Inverse Density Level
-		// Epsilon0*(1 + 3 /(Af - 1))
-		if (Af < 1.5) return 0.0;
-		else return G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(Af - 1.0));
+	    // Calculate Inverse Density Level
+	    // Epsilon0*(1 + 3 /(Af - 1))
+	    if (Af < 1.5) return 0.0;
+	    else return G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(Af - 1.0));
 	}
 
 private:
 
-	// A and Z of initial nucleus
-	G4double theA;
-	G4double theZ;
+    // A and Z of initial nucleus
+    G4double theA;
+    G4double theZ;
 
-	// Partition probability
-	G4double _Probability;
+    // Partition probability
+    G4double _Probability;
 	
-	// Partition temperature
-	G4double _Temperature;
+    // Partition temperature
+    G4double _Temperature;
 	
-	// Partition entropy
-	G4double _Entropy;
+    // Partition entropy
+    G4double _Entropy;
 	
-	// The partition itself
-	G4RWTValOrderedVector<G4int> _thePartition;
+    // The partition itself
+    G4std::vector<G4int> _thePartition;
 	
 	
-	G4RWTValOrderedVector<G4double> _theCoulombFreeEnergy;
+    G4std::vector<G4double> _theCoulombFreeEnergy;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicrocanonical.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicrocanonical.hh
index b503872a30..a445114c2c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicrocanonical.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFMicrocanonical.hh
@@ -1,8 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMicroCanonical.hh,v 1.5.2.1 2001/06/28 19:13:06 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFMicroCanonical_h
 #define G4StatMFMicroCanonical_h 1
 
-//#include <rw/tvvector.h>
-#include "g4rw/tvordvec.h"
+#include <vector>
 
 #include "G4VStatMFEnsemble.hh"
 #include "G4StatMFMicroPartition.hh"
@@ -18,61 +46,61 @@ class G4StatMFMicroCanonical : public G4VStatMFEnsemble {
 
 public:
 
-	// G4StatMFMicroCanonical class must be initialized with a G4Fragment.
-	G4StatMFMicroCanonical(const G4Fragment & theFragment);
+    // G4StatMFMicroCanonical class must be initialized with a G4Fragment.
+    G4StatMFMicroCanonical(const G4Fragment & theFragment);
 
-	// destructor
-	~G4StatMFMicroCanonical();
+    // destructor
+    ~G4StatMFMicroCanonical();
 
 private:
-	// default constructor
-	G4StatMFMicroCanonical() {};
+    // default constructor
+    G4StatMFMicroCanonical() {};
 
 
-	// copy constructor
-	G4StatMFMicroCanonical(const G4StatMFMicroCanonical &right);
+    // copy constructor
+    G4StatMFMicroCanonical(const G4StatMFMicroCanonical &right);
 
 
-	// operators
-	G4StatMFMicroCanonical & operator=(const G4StatMFMicroCanonical & right);
-	G4bool operator==(const G4StatMFMicroCanonical & right) const;
-	G4bool operator!=(const G4StatMFMicroCanonical & right) const;
+    // operators
+    G4StatMFMicroCanonical & operator=(const G4StatMFMicroCanonical & right);
+    G4bool operator==(const G4StatMFMicroCanonical & right) const;
+    G4bool operator!=(const G4StatMFMicroCanonical & right) const;
 
 
 public:
 
-	// Choice of fragment atomic numbers and charges.
-	G4StatMFChannel * ChooseAandZ(const G4Fragment & theFragment);
+    // Choice of fragment atomic numbers and charges.
+    G4StatMFChannel * ChooseAandZ(const G4Fragment & theFragment);
 	
-	enum {MaxAllowedMultiplicity = 4};
+    enum {MaxAllowedMultiplicity = 4};
 
 private:
 
-	// Initailization method
-	void Initialize(const G4Fragment & theFragment);
+    // Initailization method
+    void Initialize(const G4Fragment & theFragment);
 
-	// Calculate Entropy of Compound Nucleus
-	G4double CalcEntropyOfCompoundNucleus(const G4Fragment & theFragment, G4double & TConf);
+    // Calculate Entropy of Compound Nucleus
+    G4double CalcEntropyOfCompoundNucleus(const G4Fragment & theFragment, G4double & TConf);
 
 
-	G4double CalcFreeInternalEnergy(const G4Fragment & theFragment, const G4double T);
+    G4double CalcFreeInternalEnergy(const G4Fragment & theFragment, const G4double T);
 
 
-	G4double CalcInvLevelDensity(const G4int anA);
+    G4double CalcInvLevelDensity(const G4int anA);
 	
 	
 // Data members
 private:
 	
-	// This is a vector of partitions managers for partitions of different 
-	// multiplicities:
-	
-	G4RWTPtrOrderedVector<G4StatMFMicroManager> _ThePartitionManagerVector;
+    // This is a vector of partitions managers for partitions of different 
+    // multiplicities:
+    
+    G4std::vector<G4StatMFMicroManager*> _ThePartitionManagerVector;
 	
 
 
-	// Statistical weight of compound nucleus
-	G4double _WCompoundNucleus;
+    // Statistical weight of compound nucleus
+    G4double _WCompoundNucleus;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFParameters.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFParameters.hh
index 719a74134c..278e7b2c83 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFParameters.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4StatMFParameters.hh
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFParameters.hh,v 1.3.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #ifndef G4StatMFParameters_h
 #define G4StatMFParameters_h 1
 
@@ -6,29 +35,29 @@
 class G4StatMFParameters
 {
 private:
-  static G4StatMFParameters  theStatMFParameters;
+    static G4StatMFParameters  theStatMFParameters;
 
-  // +----------------------+
-  // | Constant Parameters: |
-  // +----------------------+
-  // Kappa is used for calculate volume V_f for translational motion of fragments
-  static const G4double _Kappa;
-  // KappaCoulomb is used for calculate Coulomb term energy
-  static const G4double _KappaCoulomb;
-  // Inverse level density
-  static const G4double _Epsilon0;
-  // Bethe-Weizsacker coefficients
-  static const G4double _E0;
-  static const G4double _Beta0;
-  static const G4double _Gamma0;
-  // Critical temperature (for liquid-gas phase transitions)
-  static const G4double _CriticalTemp;
-  // Nuclear radius
-  static const G4double _r0;
+    // +----------------------+
+    // | Constant Parameters: |
+    // +----------------------+
+    // Kappa is used for calculate volume V_f for translational motion of fragments
+    static const G4double _Kappa;
+    // KappaCoulomb is used for calculate Coulomb term energy
+    static const G4double _KappaCoulomb;
+    // Inverse level density
+    static const G4double _Epsilon0;
+    // Bethe-Weizsacker coefficients
+    static const G4double _E0;
+    static const G4double _Beta0;
+    static const G4double _Gamma0;
+    // Critical temperature (for liquid-gas phase transitions)
+    static const G4double _CriticalTemp;
+    // Nuclear radius
+    static const G4double _r0;
 
 
-  // default constructor
-  G4StatMFParameters() 
+    // default constructor
+    G4StatMFParameters() 
 //    : 
 //     _Kappa(1.0),
 //     _KappaCoulomb(2.0),
@@ -38,34 +67,34 @@ private:
 //     _Gamma0(25.0), // MeV
 //     _CriticalTemp(18.0), // MeV
 //     _r0(1.17) // fm
-    {}
+	{}
 
 
 public:
 
-  ~G4StatMFParameters() {};
+    ~G4StatMFParameters() {};
 
-  static G4StatMFParameters * GetAddress();
+    static G4StatMFParameters * GetAddress();
 
-  static G4double GetKappa() { return _Kappa; }
+    static G4double GetKappa() { return _Kappa; }
 
-  static G4double GetKappaCoulomb() { return _KappaCoulomb; } 
+    static G4double GetKappaCoulomb() { return _KappaCoulomb; } 
 
-  static G4double GetEpsilon0() { return _Epsilon0; }
+    static G4double GetEpsilon0() { return _Epsilon0; }
 
-  static G4double GetE0() { return _E0; }
+    static G4double GetE0() { return _E0; }
 
-  static G4double GetBeta0() { return _Beta0; } 
+    static G4double GetBeta0() { return _Beta0; } 
 
-  static G4double GetGamma0() { return _Gamma0; }
+    static G4double GetGamma0() { return _Gamma0; }
 
-  static G4double GetCriticalTemp() { return _CriticalTemp; }
+    static G4double GetCriticalTemp() { return _CriticalTemp; }
 
-  static G4double Getr0() { return _r0; }
+    static G4double Getr0() { return _r0; }
   
-  static G4double Beta(const G4double T);
+    static G4double Beta(const G4double T);
   
-  static G4double DBetaDT(const G4double T);
+    static G4double DBetaDT(const G4double T);
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
index 7246ed6ac8..84a22981d3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TritonCoulombBarrier.hh,v 1.1 2000/06/09 11:36:53 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TritonCoulombBarrier.hh,v 1.2.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -20,19 +36,19 @@
 class G4TritonCoulombBarrier : public G4CoulombBarrier
 {
 public:
-	G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {};
-	~G4TritonCoulombBarrier() {};
+    G4TritonCoulombBarrier() : G4CoulombBarrier(3,1) {};
+    ~G4TritonCoulombBarrier() {};
 
 private:
-	G4TritonCoulombBarrier(const G4TritonCoulombBarrier & right);
+    G4TritonCoulombBarrier(const G4TritonCoulombBarrier & right);
 
-	const G4TritonCoulombBarrier & operator=(const G4TritonCoulombBarrier & right);
-	G4bool operator==(const G4TritonCoulombBarrier & right) const;
-	G4bool operator!=(const G4TritonCoulombBarrier & right) const;
+    const G4TritonCoulombBarrier & operator=(const G4TritonCoulombBarrier & right);
+    G4bool operator==(const G4TritonCoulombBarrier & right) const;
+    G4bool operator!=(const G4TritonCoulombBarrier & right) const;
   
 private:
 
-	virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
+    virtual G4double BarrierPenetrationFactor(const G4double aZ) const;
 
 
 };
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationChannel.hh
index c32f19a0a0..45579204b2 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TritonEvaporationChannel.hh,v 1.2.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -20,27 +39,27 @@
 class G4TritonEvaporationChannel : public G4EvaporationChannel
 {
 public:
-	// only available constructor
-	G4TritonEvaporationChannel() : G4EvaporationChannel(3,1,
-		&theEvaporationProbability,&theCoulombBarrier) {};
+  // only available constructor
+  G4TritonEvaporationChannel() : G4EvaporationChannel(3,1,"triton",
+						      &theEvaporationProbability,&theCoulombBarrier) {};
 
-	// destructor
-	~G4TritonEvaporationChannel() {};
+  // destructor
+  ~G4TritonEvaporationChannel() {};
 
 private:
-	const G4TritonEvaporationChannel & operator=(const G4TritonEvaporationChannel & right);  
+  const G4TritonEvaporationChannel & operator=(const G4TritonEvaporationChannel & right);  
 
-	G4TritonEvaporationChannel(const G4TritonEvaporationChannel & right);
+  G4TritonEvaporationChannel(const G4TritonEvaporationChannel & right);
 
 public:
-	G4bool operator==(const G4TritonEvaporationChannel & right) const;
-	G4bool operator!=(const G4TritonEvaporationChannel & right) const;
+  G4bool operator==(const G4TritonEvaporationChannel & right) const;
+  G4bool operator!=(const G4TritonEvaporationChannel & right) const;
 
 private:
 
-	G4TritonCoulombBarrier theCoulombBarrier;
+  G4TritonCoulombBarrier theCoulombBarrier;
 	
-	G4TritonEvaporationProbability theEvaporationProbability;
+  G4TritonEvaporationProbability theEvaporationProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationProbability.hh
index e015429416..48ebed9699 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4TritonEvaporationProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4TritonEvaporationProbability.hh,v 1.2.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999) 
 //
@@ -22,33 +40,33 @@
 class G4TritonEvaporationProbability : public G4EvaporationProbability
 {
 public:
-	// Only available constructor
-	G4TritonEvaporationProbability();
+  // Only available constructor
+  G4TritonEvaporationProbability();
 
-	~G4TritonEvaporationProbability() {}
+  ~G4TritonEvaporationProbability() {}
 private:  
-	// Copy constructor
-	G4TritonEvaporationProbability(const G4TritonEvaporationProbability &right);
+  // Copy constructor
+  G4TritonEvaporationProbability(const G4TritonEvaporationProbability &right);
 
-	const G4TritonEvaporationProbability & operator=(const G4TritonEvaporationProbability &right);
-	G4bool operator==(const G4TritonEvaporationProbability &right) const;
-	G4bool operator!=(const G4TritonEvaporationProbability &right) const;
+  const G4TritonEvaporationProbability & operator=(const G4TritonEvaporationProbability &right);
+  G4bool operator==(const G4TritonEvaporationProbability &right) const;
+  G4bool operator!=(const G4TritonEvaporationProbability &right) const;
   
 
 private:
 
-	virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
-	{ return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
+  virtual G4double CalcAlphaParam(const G4Fragment & fragment) const 
+  { return 1.0 + CCoeficient(G4double(fragment.GetZ()-GetZ()));}
 	
-	virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
-	{ return 0.0; }
+  virtual G4double CalcBetaParam(const G4Fragment & fragment) const 
+  { return 0.0; }
 
-	G4double CCoeficient(const G4double aZ) const;
+  G4double CCoeficient(const G4double aZ) const;
 
-	// Excitation energy levels 
-	G4RWTValVector<G4double> ExcitEnergies;
-	// Spin of excitation energy levels 
-	G4RWTValVector<G4int> ExcitSpins;
+  // Excitation energy levels 
+  G4std::vector<G4double> ExcitEnergies;
+  // Spin of excitation energy levels 
+  G4std::vector<G4int> ExcitSpins;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4UnstableFermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4UnstableFermiFragment.hh
index 246fe28e4b..38521d870e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4UnstableFermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4UnstableFermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4UnstableFermiFragment.hh,v 1.4.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -11,6 +30,8 @@
 #ifndef G4UnstableFermiFragment_h
 #define G4UnstableFermiFragment_h 1
 
+#include <deque>
+
 #include "G4VFermiFragment.hh"
 #include "Randomize.hh"
 
@@ -34,7 +55,7 @@ private:
   
 public:
 
-  G4RWTPtrOrderedVector<G4LorentzVector> *
+  G4std::deque<G4LorentzVector*> *
   FragmentsMomentum(G4double KinE, const G4int K, const G4double * Masses);
 
 private:
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
index 0c40e4ed90..24024531f4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VCoulombBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VCoulombBarrier.hh,v 1.1 2000/06/09 11:36:54 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VCoulombBarrier.hh,v 1.2.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -20,30 +36,30 @@
 class G4VCoulombBarrier
 {
 public:
-	G4VCoulombBarrier(const G4int anA, const G4int aZ);
-	virtual ~G4VCoulombBarrier() {};
+  G4VCoulombBarrier(const G4int anA, const G4int aZ);
+  virtual ~G4VCoulombBarrier() {};
 
 protected:
-	G4VCoulombBarrier() : theA(1),theZ(0) {};
+  G4VCoulombBarrier() : theA(1),theZ(0) {};
 
 private:
-	G4VCoulombBarrier(const G4VCoulombBarrier & right);
+  G4VCoulombBarrier(const G4VCoulombBarrier & right);
 
-	const G4VCoulombBarrier & operator=(const G4VCoulombBarrier & right);
-	G4bool operator==(const G4VCoulombBarrier & right) const;
-	G4bool operator!=(const G4VCoulombBarrier & right) const;
+  const G4VCoulombBarrier & operator=(const G4VCoulombBarrier & right);
+  G4bool operator==(const G4VCoulombBarrier & right) const;
+  G4bool operator!=(const G4VCoulombBarrier & right) const;
   
 public:
-	virtual G4double GetCoulombBarrier(const G4int ARes, const G4int ZRes, 
-												const G4double U) const = 0;
+  virtual G4double GetCoulombBarrier(const G4int ARes, const G4int ZRes, 
+				     const G4double U) const = 0;
 					
-	G4int GetA(void) const {return theA;}
-	G4int GetZ(void) const {return theZ;}
+  G4int GetA(void) const {return theA;}
+  G4int GetZ(void) const {return theZ;}
 					
 private: 
 	
-		G4int theA;
-		G4int theZ;
+  G4int theA;
+  G4int theZ;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VEmissionProbability.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VEmissionProbability.hh
index c51e4c9d9a..aade7ca421 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VEmissionProbability.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VEmissionProbability.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VEmissionProbability.hh,v 1.4.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporation.hh
index 8f20bf042b..a4896c93c0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporation.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VEvaporation.hh,v 1.3.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) written from G4Evaporation.hh (May 1998)
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporationChannel.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporationChannel.hh
index d7bf8062e8..e53c7e3a3c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporationChannel.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VEvaporationChannel.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VEvaporationChannel.hh,v 1.4.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -19,7 +38,9 @@
 class G4VEvaporationChannel
 {
 public:
-  G4VEvaporationChannel() {};
+  G4VEvaporationChannel() : Name("Anonymous") {};
+  G4VEvaporationChannel(const G4String & aName) : Name(aName) {};
+  G4VEvaporationChannel(const G4String * aName) : Name(*aName) {};
   virtual ~G4VEvaporationChannel() {};
 
 private:
@@ -38,6 +59,12 @@ public:
   virtual G4double GetEmissionProbability(void) const = 0;
 
 
+  G4String GetName() const {return Name;}
+  void SetName(const G4String & aName) { Name = aName;}
+
+private:
+  G4String Name;
+
 };
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiBreakUp.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiBreakUp.hh
index fca17cdad3..7a28454d9f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiBreakUp.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiBreakUp.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VFermiBreakUp.hh,v 1.3.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiFragment.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiFragment.hh
index 1e15a714bd..56e8f4837b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiFragment.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VFermiFragment.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VFermiFragment.hh,v 1.3.2.1 2001/06/28 19:13:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
index 7508dd0fd6..6b691703b3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VFissionBarrier.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFissionBarrier.hh,v 1.3 2000/06/09 11:36:54 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFissionBarrier.hh,v 1.3.8.1 2001/06/28 19:13:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaDeexcitation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaDeexcitation.hh
index 02c880f5cb..312f886a7e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaDeexcitation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaDeexcitation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4VGammaDeexcitation
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaTransition.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaTransition.hh
index ffb3f8288f..349ad2c75c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaTransition.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VGammaTransition.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4VGammaTransition
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VLevelDensityParameter.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VLevelDensityParameter.hh
index 7959befd47..facd22135c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VLevelDensityParameter.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VLevelDensityParameter.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VLevelDensityParameter.hh,v 1.3.2.1 2001/06/28 19:13:08 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) 
 //
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VMultiFragmentation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VMultiFragmentation.hh
index 70bef80c98..5932e49d1d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VMultiFragmentation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VMultiFragmentation.hh
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VMultiFragmentation.hh,v 1.4.2.1 2001/06/28 19:13:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara 
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VPhotonEvaporation.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VPhotonEvaporation.hh
index cedf750c8c..f5bf692724 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VPhotonEvaporation.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VPhotonEvaporation.hh
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4VPhotonEvaporation
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFEnsemble.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFEnsemble.hh
index dd08a6053b..ccc8a6f5aa 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFEnsemble.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFEnsemble.hh
@@ -1,3 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VStatMFEnsemble.hh,v 1.3.2.1 2001/06/28 19:13:08 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
 #ifndef G4VStatMFEnsemble_h
 #define G4VStatMFEnsemble_h 1
 
@@ -7,8 +37,8 @@
 class G4VStatMFEnsemble {
 
 public:
-	// Default Constructor
-	G4VStatMFEnsemble() :
+    // Default Constructor
+    G4VStatMFEnsemble() :
 	__FreeInternalE0(0.0),
 	__MeanTemperature(0.0),
 	__MeanEntropy(0.0),
@@ -16,41 +46,41 @@ public:
 	{};
 
 
-	// Destructor
-	virtual ~G4VStatMFEnsemble() {};
+    // Destructor
+    virtual ~G4VStatMFEnsemble() {};
 
 
 private:
 
-	// Copy constructor
-	G4VStatMFEnsemble(const G4VStatMFEnsemble & right);
+    // Copy constructor
+    G4VStatMFEnsemble(const G4VStatMFEnsemble & right);
 
-	// operators
-	G4VStatMFEnsemble & operator=(const G4VStatMFEnsemble & right);
-	G4bool operator==(const G4VStatMFEnsemble & right) const;
-	G4bool operator!=(const G4VStatMFEnsemble & right) const;
+    // operators
+    G4VStatMFEnsemble & operator=(const G4VStatMFEnsemble & right);
+    G4bool operator==(const G4VStatMFEnsemble & right) const;
+    G4bool operator!=(const G4VStatMFEnsemble & right) const;
 	
 public:
 
-	virtual G4StatMFChannel * ChooseAandZ(const G4Fragment & aFragment) = 0;
+    virtual G4StatMFChannel * ChooseAandZ(const G4Fragment & aFragment) = 0;
 		
-	G4double GetMeanMultiplicity(void) const {return __MeanMultiplicity;}
+    G4double GetMeanMultiplicity(void) const {return __MeanMultiplicity;}
 	
-	G4double GetMeanTemperature(void) const {return __MeanTemperature;}
+    G4double GetMeanTemperature(void) const {return __MeanTemperature;}
 
 protected:
 
-	// Free internal energy at temperature T = 0
-	G4double __FreeInternalE0;
+    // Free internal energy at temperature T = 0
+    G4double __FreeInternalE0;
 	
-	// Mean temperature 
-	G4double __MeanTemperature;
+    // Mean temperature 
+    G4double __MeanTemperature;
 	
-	// Mean Entropy 
-	G4double __MeanEntropy;
+    // Mean Entropy 
+    G4double __MeanEntropy;
 	
-	// Mean Multiplicity
-	G4double __MeanMultiplicity;
+    // Mean Multiplicity
+    G4double __MeanMultiplicity;
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFMacroCluster.hh b/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFMacroCluster.hh
index 04438bf69a..c6db4a1198 100644
--- a/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFMacroCluster.hh
+++ b/source/processes/hadronic/models/generator/de_excitation/include/G4VStatMFMacroCluster.hh
@@ -1,3 +1,33 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VStatMFMacroCluster.hh,v 1.5.2.1 2001/06/28 19:13:08 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
 #ifndef G4VStatMFMacroCluster_h
 #define G4VStatMFMacroCluster_h 1
 
@@ -6,98 +36,98 @@
 class G4VStatMFMacroCluster {
 
 public:
-	// Constructor
-	G4VStatMFMacroCluster(const G4int Size) : 
-		theA(Size),
+    // Constructor
+    G4VStatMFMacroCluster(const G4int Size) : 
+	theA(Size),
 	_InvLevelDensity(0.0),
 	_Entropy(0.0),
 	theZARatio(0.0),
 	_MeanMultiplicity(0.0),
 	_Energy(0.0)
 	{
-		if (theA <= 0) G4Exception(
+	    if (theA <= 0) G4Exception(
 		"G4VStatMFMacroCluster::Constructor: Cluster's size must be >= 1");
-	 	_InvLevelDensity = CalcInvLevelDensity();
-	 }
+	    _InvLevelDensity = CalcInvLevelDensity();
+	}
 
 
-	// Destructor
-	virtual ~G4VStatMFMacroCluster() {};
+    // Destructor
+    virtual ~G4VStatMFMacroCluster() {};
 
 
 private:
 
-	// Default constructor
-	G4VStatMFMacroCluster() {};
+    // Default constructor
+    G4VStatMFMacroCluster() {};
 
-	// Copy constructor
-	G4VStatMFMacroCluster(const G4VStatMFMacroCluster & right);
+    // Copy constructor
+    G4VStatMFMacroCluster(const G4VStatMFMacroCluster & right);
 
-	// operators
-	G4VStatMFMacroCluster & operator=(const G4VStatMFMacroCluster & right);
+    // operators
+    G4VStatMFMacroCluster & operator=(const G4VStatMFMacroCluster & right);
 
 public:
-	G4bool operator==(const G4VStatMFMacroCluster & right) const;
-	G4bool operator!=(const G4VStatMFMacroCluster & right) const;
+    G4bool operator==(const G4VStatMFMacroCluster & right) const;
+    G4bool operator!=(const G4VStatMFMacroCluster & right) const;
 
 private:
-	G4double CalcInvLevelDensity(void);
+    G4double CalcInvLevelDensity(void);
 	
 public:
 
-	virtual G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-													const G4double nu, const G4double T) = 0;
+    virtual G4double CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
+					  const G4double nu, const G4double T) = 0;
 						
-	virtual G4double CalcZARatio(const G4double nu) = 0;
+    virtual G4double CalcZARatio(const G4double nu) = 0;
 	
-	G4double GetMeanMultiplicity(void) const { return _MeanMultiplicity; }
+    G4double GetMeanMultiplicity(void) const { return _MeanMultiplicity; }
 
-	virtual G4double CalcEnergy(const G4double T) = 0;
+    virtual G4double CalcEnergy(const G4double T) = 0;
 
-	virtual G4double CalcEntropy(const G4double T, const G4double FreeVol) = 0;
+    virtual G4double CalcEntropy(const G4double T, const G4double FreeVol) = 0;
 
 protected:
-	// Number of nucleons in the cluster
-	G4int theA;
+    // Number of nucleons in the cluster
+    G4int theA;
 	
-	// Inverse level density
-	G4double _InvLevelDensity;
+    // Inverse level density
+    G4double _InvLevelDensity;
 	
-	// Entropy
-	G4double _Entropy;
+    // Entropy
+    G4double _Entropy;
 	
-	// Z/A ratio
-	G4double theZARatio;
+    // Z/A ratio
+    G4double theZARatio;
 	
-	// Mean Multiplicity
-	G4double _MeanMultiplicity;
+    // Mean Multiplicity
+    G4double _MeanMultiplicity;
 	
-	// Energy
-	G4double _Energy;
+    // Energy
+    G4double _Energy;
 
 // *************************************************************************
 public:
 	
-	const G4double GetInvLevelDensity(void) const
+    const G4double GetInvLevelDensity(void) const
 	{ return _InvLevelDensity; }
 	
 
 	 
-	void SetZARatio(const G4double value)
+    void SetZARatio(const G4double value)
 	{ theZARatio = value; }
 	
-	const G4double GetZARatio(void) const
+    const G4double GetZARatio(void) const
 	{ return theZARatio; }
 	
 	
-	void SetSize(const G4double value)
+    void SetSize(const G4double value)
 	{ 
-		if (value <= 0.0) G4Exception("G4VStatMFMacroCluster::SetSize: Cluster's size must be >= 1");
-		theA = G4int(value); 
-		_InvLevelDensity = CalcInvLevelDensity();
+	    if (value <= 0.0) G4Exception("G4VStatMFMacroCluster::SetSize: Cluster's size must be >= 1");
+	    theA = G4int(value); 
+	    _InvLevelDensity = CalcInvLevelDensity();
 	}
 	
-	const G4double GetSize(void) const
+    const G4double GetSize(void) const
 	{ return theA; }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
index bc9f4e7195..739ef5c305 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AlphaCoulombBarrier.cc,v 1.1 2000/06/09 11:43:34 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AlphaCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,41 +32,41 @@
 
 G4AlphaCoulombBarrier::G4AlphaCoulombBarrier(const G4AlphaCoulombBarrier & right)
 {
-  G4Exception("G4AlphaCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4AlphaCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4AlphaCoulombBarrier & G4AlphaCoulombBarrier::operator=(const G4AlphaCoulombBarrier & right)
 {
- G4Exception("G4AlphaCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4AlphaCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4AlphaCoulombBarrier::operator==(const G4AlphaCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4AlphaCoulombBarrier::operator!=(const G4AlphaCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 G4double G4AlphaCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// const G4double Zlist[size]  = {10.0, 20.0, 30.0, 50.0, 70.0};
-	// const G4double Kalpha[size] = {0.68, 0.82, 0.91, 0.97, 0.98};
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.98;
-	} else {
-		K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
-	}
-	return K;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // const G4double Zlist[size]  = {10.0, 20.0, 30.0, 50.0, 70.0};
+    // const G4double Kalpha[size] = {0.68, 0.82, 0.91, 0.97, 0.98};
+    G4double K = 1.0;
+    if (aZ>=70.0) {
+	K = 0.98;
+    } else {
+	K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
+    }
+    return K;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationChannel.cc
index 6203149cd8..811975eaca 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AlphaEvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -14,24 +33,24 @@
 
 const G4AlphaEvaporationChannel & G4AlphaEvaporationChannel::operator=(const G4AlphaEvaporationChannel & right)
 {
-	G4Exception("G4AlphaEvaporationChannel::operator= meant to not be accessable");
-	return *this;
+  G4Exception("G4AlphaEvaporationChannel::operator= meant to not be accessable");
+  return *this;
 }
 
 G4AlphaEvaporationChannel::G4AlphaEvaporationChannel(const G4AlphaEvaporationChannel & right)
 {
-	G4Exception("G4AlphaEvaporationChannel::CopyConstructor meant to not be accessable");
+  G4Exception("G4AlphaEvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4AlphaEvaporationChannel::operator==(const G4AlphaEvaporationChannel & right) const 
 {
-	return (this == (G4AlphaEvaporationChannel *) &right);
-	//  return false;
+  return (this == (G4AlphaEvaporationChannel *) &right);
+  //  return false;
 }
 
 G4bool G4AlphaEvaporationChannel::operator!=(const G4AlphaEvaporationChannel & right) const 
 {
-	return (this != (G4AlphaEvaporationChannel *) &right);
-	//  return true;
+  return (this != (G4AlphaEvaporationChannel *) &right);
+  //  return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationProbability.cc
index 5194494291..7a0b6102f0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4AlphaEvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AlphaEvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,36 +32,40 @@
 #include "G4AlphaEvaporationProbability.hh"
 
 G4AlphaEvaporationProbability::G4AlphaEvaporationProbability() :
-		G4EvaporationProbability(4,2,4) // A,Z,Gamma
+    G4EvaporationProbability(4,2,4) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
+    //  const G4int NumExcitedStates = 31+1;
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
+//    for (G4int i = 0; i < NumExcitedStates; i++) {
+//      ExcitEnergies(i) = 0.0;
+//      ExcitSpins(i) = 0;
+//    }
 
-	ExcitEnergies(18) = 7.98*MeV;
-	ExcitEnergies(20) = 6.90*MeV;
-	ExcitEnergies(25) = 5.83*MeV;
-	ExcitEnergies(26) = 8.57*MeV;
-	ExcitEnergies(31) = 5.33*MeV;
+    ExcitEnergies[18] = 7.98*MeV;
+    ExcitEnergies[20] = 6.90*MeV;
+    ExcitEnergies[25] = 5.83*MeV;
+    ExcitEnergies[26] = 8.57*MeV;
+    ExcitEnergies[31] = 5.33*MeV;
 
-	ExcitSpins(18) = 4;
-	ExcitSpins(20) = 6;
-	ExcitSpins(25) = 7;
-	ExcitSpins(26) = 4;
-	ExcitSpins(31) = 13;
+    ExcitSpins[18] = 4;
+    ExcitSpins[20] = 6;
+    ExcitSpins[25] = 7;
+    ExcitSpins[26] = 4;
+    ExcitSpins[31] = 13;
 	
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);		
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);		
 }
 
 
 G4AlphaEvaporationProbability::G4AlphaEvaporationProbability(const G4AlphaEvaporationProbability &right)
 {
- G4Exception("G4AlphaEvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4AlphaEvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -51,41 +74,41 @@ G4AlphaEvaporationProbability::G4AlphaEvaporationProbability(const G4AlphaEvapor
 const G4AlphaEvaporationProbability & G4AlphaEvaporationProbability::
 operator=(const G4AlphaEvaporationProbability &right)
 {
-  G4Exception("G4AlphaEvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4AlphaEvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4AlphaEvaporationProbability::operator==(const G4AlphaEvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4AlphaEvaporationProbability::operator!=(const G4AlphaEvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4AlphaEvaporationProbability::CCoeficient(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
-	//	G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
-	G4double C = 0.0;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
+    //	G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
+    G4double C = 0.0;
 	
 	
-	if (aZ <= 30) {
-		C = 0.10;
-	} else if (aZ <= 50) {
-		C = 0.1 + -((aZ-50.)/20.)*0.02;
-	} else if (aZ < 70) {
-		C = 0.08 + -((aZ-70.)/20.)*0.02;
-	} else {
-		C = 0.06;
-	}
-	return C;
+    if (aZ <= 30) {
+	C = 0.10;
+    } else if (aZ <= 50) {
+	C = 0.1 + -((aZ-50.)/20.)*0.02;
+    } else if (aZ < 70) {
+	C = 0.08 + -((aZ-70.)/20.)*0.02;
+    } else {
+	C = 0.06;
+    }
+    return C;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4B9FermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4B9FermiFragment.cc
index 2a20d850a0..40594e1a82 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4B9FermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4B9FermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4B9FermiFragment.cc,v 1.4.2.1 2001/06/28 19:13:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4B9FermiFragment::G4B9FermiFragment()
 
 G4B9FermiFragment::G4B9FermiFragment(const G4B9FermiFragment &right)
 {
-  G4Exception("G4B9FermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4B9FermiFragment::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,69 +47,72 @@ G4B9FermiFragment::~G4B9FermiFragment()
 
 const G4B9FermiFragment & G4B9FermiFragment::operator=(const G4B9FermiFragment &right)
 {
-  G4Exception("G4B9FermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4B9FermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4B9FermiFragment::operator==(const G4B9FermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4B9FermiFragment::operator!=(const G4B9FermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 G4FragmentVector * G4B9FermiFragment::GetFragment(const G4LorentzVector & aMomentum)
-  // B9 ----> alpha + alpha + proton
+    // B9 ----> alpha + alpha + proton
 {
-  const G4int NumSubFrag = 3;
-  G4double Masses[NumSubFrag];
-  G4double Charges[NumSubFrag];
-  G4double AtomNum[NumSubFrag];
+    const G4int NumSubFrag = 3;
+    G4double Masses[NumSubFrag];
+    G4double Charges[NumSubFrag];
+    G4double AtomNum[NumSubFrag];
 
 
-  Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
-  Masses[1] = Masses[0]; // alpha
-  Masses[2] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(1,1); // proton
+    Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
+    Masses[1] = Masses[0]; // alpha
+    Masses[2] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(1,1); // proton
   
-  AtomNum[0] = 4;
-  AtomNum[1] = 4;
-  AtomNum[2] = 1;
+    AtomNum[0] = 4;
+    AtomNum[1] = 4;
+    AtomNum[2] = 1;
 
-  Charges[0] = 2;
-  Charges[1] = 2;
-  Charges[2] = 1;
+    Charges[0] = 2;
+    Charges[1] = 2;
+    Charges[2] = 1;
 
-//   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // B9
-//     G4NucleiPropertiesTable::GetMassExcess(1,1) - // proton
-//     2.0*G4NucleiPropertiesTable::GetMassExcess(2,4);
-  G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
-				aMomentum.vect().mag2())  - // B9
-     Masses[2] - // proton
-    2.0*Masses[0];
+    //   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // B9
+    //     G4NucleiPropertiesTable::GetMassExcess(1,1) - // proton
+    //     2.0*G4NucleiPropertiesTable::GetMassExcess(2,4);
+    G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
+				  aMomentum.vect().mag2())  - // B9
+	Masses[2] - // proton
+	2.0*Masses[0];
 
 
-  G4RWTPtrOrderedVector<G4LorentzVector> * SubFragsMomentum =
-    FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
+    G4std::deque<G4LorentzVector*> * SubFragsMomentum =
+	FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
 
-  G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-  for (G4int i = 0; i < NumSubFrag; i++) {
+    for (G4int i = 0; i < NumSubFrag; i++) {
     
-    // Lorentz boost
-    SubFragsMomentum->at(i)->boost(aMomentum.boostVector());
-
+	// Lorentz boost
+	SubFragsMomentum->operator[](i)->boost(aMomentum.boostVector());
     
-    theResult->insert(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->at(i))));
-  }
+	theResult->push_back(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->operator[](i))));
+    }
 
-  SubFragsMomentum->clearAndDestroy();
-  delete SubFragsMomentum;
+    //  SubFragsMomentum->clearAndDestroy();
+    while (!SubFragsMomentum->empty()) {
+	delete SubFragsMomentum->back();
+	SubFragsMomentum->pop_back();
+    }
+    delete SubFragsMomentum;
 
-  return theResult;
+    return theResult;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4Be8FermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4Be8FermiFragment.cc
index 2c1234e34a..ce7e8ee79c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4Be8FermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4Be8FermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Be8FermiFragment.cc,v 1.5.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4Be8FermiFragment::G4Be8FermiFragment()
 
 G4Be8FermiFragment::G4Be8FermiFragment(const G4Be8FermiFragment &right)
 {
-  G4Exception("G4Be8FermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4Be8FermiFragment::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,65 +47,68 @@ G4Be8FermiFragment::~G4Be8FermiFragment()
 
 const G4Be8FermiFragment & G4Be8FermiFragment::operator=(const G4Be8FermiFragment &right)
 {
-  G4Exception("G4Be8FermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4Be8FermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4Be8FermiFragment::operator==(const G4Be8FermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4Be8FermiFragment::operator!=(const G4Be8FermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 G4FragmentVector * G4Be8FermiFragment::GetFragment(const G4LorentzVector & aMomentum)
-  // Be8 ----> alpha + alpha 
+    // Be8 ----> alpha + alpha 
 {
-  const G4int NumSubFrag = 2;
-  G4double Masses[NumSubFrag];
-  G4double Charges[NumSubFrag];
-  G4double AtomNum[NumSubFrag];
+    const G4int NumSubFrag = 2;
+    G4double Masses[NumSubFrag];
+    G4double Charges[NumSubFrag];
+    G4double AtomNum[NumSubFrag];
 
 
-  Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
-  Masses[1] = Masses[0]; // alpha
+    Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
+    Masses[1] = Masses[0]; // alpha
   
-  AtomNum[0] = 4;
-  AtomNum[1] = 4;
+    AtomNum[0] = 4;
+    AtomNum[1] = 4;
 
-  Charges[0] = 2;
-  Charges[1] = 2;
+    Charges[0] = 2;
+    Charges[1] = 2;
 
 //   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // Be8
 //     2.0*G4NucleiPropertiesTable::GetMassExcess(2,4); // alphas
-  G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
-				aMomentum.vect().mag2())  -// Be8
-    2.0*Masses[0]; // alphas
+    G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
+				  aMomentum.vect().mag2())  -// Be8
+	2.0*Masses[0]; // alphas
 
 
-  G4RWTPtrOrderedVector<G4LorentzVector> * SubFragsMomentum =
-    FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
+    G4std::deque<G4LorentzVector*> * SubFragsMomentum =
+	FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
 
 
-  G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-  for (G4int i = 0; i < NumSubFrag; i++) {
+    for (G4int i = 0; i < NumSubFrag; i++) {
 
+	// Lorentz boost
+	SubFragsMomentum->operator[](i)->boost(aMomentum.boostVector());
 
-    // Lorentz boost
-    SubFragsMomentum->at(i)->boost(aMomentum.boostVector());
+	theResult->push_back(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->operator[](i))));
+    }
 
-    theResult->insert(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->at(i))));
-  }
+    //  SubFragsMomentum->clearAndDestroy();
+    while (!SubFragsMomentum->empty()) {
+	delete SubFragsMomentum->back();
+	SubFragsMomentum->pop_back();
+    }
+    delete SubFragsMomentum;
 
-  SubFragsMomentum->clearAndDestroy();
-  delete SubFragsMomentum;
-
-  return theResult;
+    return theResult;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertPairingCorrections.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertPairingCorrections.cc
index 6c14ee3471..4dcb2a3ba8 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertPairingCorrections.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertPairingCorrections.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronGilbertPairingCorrections.cc,v 1.2.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4CameronGilbertPairingCorrections.hh"
 
@@ -8,40 +36,40 @@
 // P(Z)
 G4double G4CameronGilbertPairingCorrections::PairingZTable
 [G4CameronGilbertPairingCorrections::ZTableSize] = { 
-0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
-0.00,  2.46,  0.00,  2.09,  0.00,  1.62,  0.00,  1.62,  0.00,  1.83,
-0.00,  1.73,  0.00,  1.35,  0.00,  1.54,  0.00,  1.20,  0.00,  1.06,
-0.00,  1.36,  0.00,  1.43,  0.00,  1.17,  0.00,  1.24,  0.00,  1.20,  
-0.00,  1.28,  0.00,  1.28,  0.00,  1.35,  0.00,  1.36,  0.00,  1.19,
-0.00,  1.14,  0.00,  1.12,  0.00,  1.58,  0.00,  1.17,  0.00,  1.18,
-0.00,  1.22,  0.00,  0.97,  0.00,  0.92,  0.00,  0.62,  0.00,  0.68,
-0.00,  0.64,  0.00,  0.72,  0.00,  0.75,  0.00,  0.71,  0.00,  0.87,
-0.00,  0.83,  0.00,  0.89,  0.00,  0.79,  0.00,  0.89,  0.00,  0.78,
-0.00,  0.69,  0.00,  0.61,  0.00,  0.72,  0.00,  0.77
+    0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+    0.00,  2.46,  0.00,  2.09,  0.00,  1.62,  0.00,  1.62,  0.00,  1.83,
+    0.00,  1.73,  0.00,  1.35,  0.00,  1.54,  0.00,  1.20,  0.00,  1.06,
+    0.00,  1.36,  0.00,  1.43,  0.00,  1.17,  0.00,  1.24,  0.00,  1.20,  
+    0.00,  1.28,  0.00,  1.28,  0.00,  1.35,  0.00,  1.36,  0.00,  1.19,
+    0.00,  1.14,  0.00,  1.12,  0.00,  1.58,  0.00,  1.17,  0.00,  1.18,
+    0.00,  1.22,  0.00,  0.97,  0.00,  0.92,  0.00,  0.62,  0.00,  0.68,
+    0.00,  0.64,  0.00,  0.72,  0.00,  0.75,  0.00,  0.71,  0.00,  0.87,
+    0.00,  0.83,  0.00,  0.89,  0.00,  0.79,  0.00,  0.89,  0.00,  0.78,
+    0.00,  0.69,  0.00,  0.61,  0.00,  0.72,  0.00,  0.77
 };
 // P(N)
 G4double G4CameronGilbertPairingCorrections::PairingNTable
 [G4CameronGilbertPairingCorrections::NTableSize] = { 
-0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
-0.00,  2.67,  0.00,  1.80,  0.00,  1.67,  0.00,  1.86,  0.00,  2.04,
-0.00,  1.64,  0.00,  1.44,  0.00,  1.54,  0.00,  1.30,  0.00,  1.27,
-0.00,  1.29,  0.00,  1.41,  0.00,  1.50,  0.00,  1.50,  0.00,  1.43,
-0.00,  1.88,  0.00,  1.47,  0.00,  1.57,  0.00,  1.46,  0.00,  0.93,
-0.00,  0.72,  0.00,  1.12,  0.00,  1.29,  0.00,  0.94,  0.00,  1.24,
-0.00,  1.25,  0.00,  1.14,  0.00,  1.32,  0.00,  1.15,  0.00,  1.24,
-0.00,  1.43,  0.00,  1.09,  0.00,  1.20,  0.00,  1.04,  0.00,  0.70,
-0.00,  0.85,  0.00,  0.76,  0.00,  0.92,  0.00,  0.99,  0.00,  1.10,
-0.00,  0.92,  0.00,  0.73,  0.00,  0.70,  0.00,  0.87,  0.00,  0.61,
-0.00,  0.69,  0.00,  0.55,  0.00,  0.40,  0.00,  0.73,  0.00,  0.58,
-0.00,  0.86,  0.00,  1.13,  0.00,  0.84,  0.00,  0.79,  0.00,  0.82,
-0.00,  0.71,  0.00,  0.41,  0.00,  0.38,  0.00,  0.67,  0.00,  0.61,
-0.00,  0.78,  0.00,  0.67,  0.00,  0.67,  0.00,  0.79,  0.00,  0.60,
-0.00,  0.57,  0.00,  0.49,  0.00,  0.43,  0.00,  0.50,  0.00,  0.39
+    0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+    0.00,  2.67,  0.00,  1.80,  0.00,  1.67,  0.00,  1.86,  0.00,  2.04,
+    0.00,  1.64,  0.00,  1.44,  0.00,  1.54,  0.00,  1.30,  0.00,  1.27,
+    0.00,  1.29,  0.00,  1.41,  0.00,  1.50,  0.00,  1.50,  0.00,  1.43,
+    0.00,  1.88,  0.00,  1.47,  0.00,  1.57,  0.00,  1.46,  0.00,  0.93,
+    0.00,  0.72,  0.00,  1.12,  0.00,  1.29,  0.00,  0.94,  0.00,  1.24,
+    0.00,  1.25,  0.00,  1.14,  0.00,  1.32,  0.00,  1.15,  0.00,  1.24,
+    0.00,  1.43,  0.00,  1.09,  0.00,  1.20,  0.00,  1.04,  0.00,  0.70,
+    0.00,  0.85,  0.00,  0.76,  0.00,  0.92,  0.00,  0.99,  0.00,  1.10,
+    0.00,  0.92,  0.00,  0.73,  0.00,  0.70,  0.00,  0.87,  0.00,  0.61,
+    0.00,  0.69,  0.00,  0.55,  0.00,  0.40,  0.00,  0.73,  0.00,  0.58,
+    0.00,  0.86,  0.00,  1.13,  0.00,  0.84,  0.00,  0.79,  0.00,  0.82,
+    0.00,  0.71,  0.00,  0.41,  0.00,  0.38,  0.00,  0.67,  0.00,  0.61,
+    0.00,  0.78,  0.00,  0.67,  0.00,  0.67,  0.00,  0.79,  0.00,  0.60,
+    0.00,  0.57,  0.00,  0.49,  0.00,  0.43,  0.00,  0.50,  0.00,  0.39
 };
 
 G4CameronGilbertPairingCorrections G4CameronGilbertPairingCorrections::theInstance(10.0);
 
 G4CameronGilbertPairingCorrections::G4CameronGilbertPairingCorrections(G4double dummy)
 {
-	G4double even_more_dummy = dummy;
+    G4double even_more_dummy = dummy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertShellCorrections.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertShellCorrections.cc
index 20993f218d..6e5c3b2e75 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertShellCorrections.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronGilbertShellCorrections.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronGilbertShellCorrections.cc,v 1.2.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4CameronGilbertShellCorrections.hh"
 
@@ -8,40 +36,40 @@
 // S(Z)
 const G4double G4CameronGilbertShellCorrections::ShellZTable
 [G4CameronGilbertShellCorrections::ZTableSize] = { 
-  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
- -2.91, -4.17, -5.72, -7.80, -8.97, -9.70,-10.10,-10.70,-11.38,-12.07,
--12.55,-13.24,-13.93,-14.71,-15.53,-16.37,-17.36,-18.52,-18.44,-18.19,
--17.68,-17.09,-16.65,-16.66,-16.59,-16.35,-16.18,-16.41,-16.60,-16.54,
--16.42,-16.84,-17.22,-17.42,-17.52,-17.82,-18.19,-18.58,-19.11,-19.83,
--19.14,-18.35,-17.40,-16.54,-15.68,-14.75,-13.71,-12.87,-12.18,-11.61,
--11.09,-10.78,-10.53,-10.41,-10.21, -9.85, -9.36, -8.97, -8.56, -8.13,
- -7.68, -7.33, -7.11, -7.16, -7.05, -6.81, -6.56, -6.95, -7.52, -8.03,
- -8.41, -8.86, -7.71, -6.38, -5.47, -4.78, -4.37, -4.17, -4.12, -4.29,
- -4.61, -5.04, -5.48, -5.96, -6.40, -6.87, -7.20, -7.74
+     0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+    -2.91, -4.17, -5.72, -7.80, -8.97, -9.70,-10.10,-10.70,-11.38,-12.07,
+    -12.55,-13.24,-13.93,-14.71,-15.53,-16.37,-17.36,-18.52,-18.44,-18.19,
+    -17.68,-17.09,-16.65,-16.66,-16.59,-16.35,-16.18,-16.41,-16.60,-16.54,
+    -16.42,-16.84,-17.22,-17.42,-17.52,-17.82,-18.19,-18.58,-19.11,-19.83,
+    -19.14,-18.35,-17.40,-16.54,-15.68,-14.75,-13.71,-12.87,-12.18,-11.61,
+    -11.09,-10.78,-10.53,-10.41,-10.21, -9.85, -9.36, -8.97, -8.56, -8.13,
+    -7.68, -7.33, -7.11, -7.16, -7.05, -6.81, -6.56, -6.95, -7.52, -8.03,
+    -8.41, -8.86, -7.71, -6.38, -5.47, -4.78, -4.37, -4.17, -4.12, -4.29,
+    -4.61, -5.04, -5.48, -5.96, -6.40, -6.87, -7.20, -7.74
 };
 // S(N)
 const G4double G4CameronGilbertShellCorrections::ShellNTable
 [G4CameronGilbertShellCorrections::NTableSize] = { // 155
- 0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
- 6.80,  7.53,  7.55,  7.21,  7.44,  8.07,  8.94,  9.81, 10.60, 11.39,
-12.54, 13.68, 14.34, 14.19, 13.83, 13.50, 13.00, 12.13, 12.60, 13.26,
-14.13, 14.92, 15.60, 16.38, 17.08, 17.55, 17.98, 18.33, 18.56, 18.71,
-18.65, 18.55, 18.52, 18.34, 18.01, 17.38, 16.56, 15.62, 14.38, 12.88, 
-13.24, 13.71, 14.40, 15.16, 15.89, 16.43, 16.97, 17.59, 18.08, 18.72,
-19.22, 19.51, 19.73, 19.91, 20.06, 20.16, 20.09, 19.83, 19.41, 19.06,
-18.66, 17.73, 17.03, 16.44, 16.00, 15.33, 14.49, 13.42, 12.28, 11.14,
-10.10,  9.09, 10.00, 10.64, 11.18, 11.70, 12.22, 12.71, 13.05, 12.99,
-12.62, 12.11, 11.66, 11.21, 10.81, 10.38, 10.03,  9.65,  9.38,  8.99,
- 8.62,  8.33,  8.10,  7.82,  7.56,  7.33,  7.15,  6.83,  6.69,  6.55,
- 6.53,  6.49,  6.39,  5.82,  5.26,  4.53,  3.83,  3.08,  2.37,  1.72,
- 1.05,  0.27, -0.69, -1.69, -2.58, -3.16, -1.72, -0.41,  0.71,  1.66,
- 2.62,  3.22,  3.76,  4.10,  4.46,  4.83,  5.09,  5.18,  5.17,  5.10,
- 5.05,  5.04,  5.03,  4.99,  4.98,  5.11,  5.27,  5.39,  5.37,  5.30
+    0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,  0.00,
+    6.80,  7.53,  7.55,  7.21,  7.44,  8.07,  8.94,  9.81, 10.60, 11.39,
+    12.54, 13.68, 14.34, 14.19, 13.83, 13.50, 13.00, 12.13, 12.60, 13.26,
+    14.13, 14.92, 15.60, 16.38, 17.08, 17.55, 17.98, 18.33, 18.56, 18.71,
+    18.65, 18.55, 18.52, 18.34, 18.01, 17.38, 16.56, 15.62, 14.38, 12.88, 
+    13.24, 13.71, 14.40, 15.16, 15.89, 16.43, 16.97, 17.59, 18.08, 18.72,
+    19.22, 19.51, 19.73, 19.91, 20.06, 20.16, 20.09, 19.83, 19.41, 19.06,
+    18.66, 17.73, 17.03, 16.44, 16.00, 15.33, 14.49, 13.42, 12.28, 11.14,
+    10.10,  9.09, 10.00, 10.64, 11.18, 11.70, 12.22, 12.71, 13.05, 12.99,
+    12.62, 12.11, 11.66, 11.21, 10.81, 10.38, 10.03,  9.65,  9.38,  8.99,
+    8.62,  8.33,  8.10,  7.82,  7.56,  7.33,  7.15,  6.83,  6.69,  6.55,
+    6.53,  6.49,  6.39,  5.82,  5.26,  4.53,  3.83,  3.08,  2.37,  1.72,
+    1.05,  0.27, -0.69, -1.69, -2.58, -3.16, -1.72, -0.41,  0.71,  1.66,
+    2.62,  3.22,  3.76,  4.10,  4.46,  4.83,  5.09,  5.18,  5.17,  5.10,
+    5.05,  5.04,  5.03,  4.99,  4.98,  5.11,  5.27,  5.39,  5.37,  5.30
 };
 
 G4CameronGilbertShellCorrections G4CameronGilbertShellCorrections::theInstance(10.0);
 
 G4CameronGilbertShellCorrections::G4CameronGilbertShellCorrections(G4double dummy)
 { 
-	G4double even_more_dumy = dummy;
+    G4double even_more_dumy = dummy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronShellPlusPairingCorrections.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronShellPlusPairingCorrections.cc
index 750544c083..9fa12728ad 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronShellPlusPairingCorrections.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronShellPlusPairingCorrections.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronShellPlusPairingCorrections.cc,v 1.2.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4CameronShellPlusPairingCorrections.hh"
 
@@ -61,5 +89,5 @@ G4CameronShellPlusPairingCorrections G4CameronShellPlusPairingCorrections::theIn
 
 G4CameronShellPlusPairingCorrections::G4CameronShellPlusPairingCorrections(G4double dummy)
 {
-	G4double even_more_dummy = dummy;
+    G4double even_more_dummy = dummy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfPairingCorrections.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfPairingCorrections.cc
index 93306586ef..e9bef6a7e9 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfPairingCorrections.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfPairingCorrections.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronTruranHilfPairingCorrections.cc,v 1.2.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4CameronTruranHilfPairingCorrections.hh"
 
@@ -48,5 +76,5 @@ G4CameronTruranHilfPairingCorrections  G4CameronTruranHilfPairingCorrections::th
 
 G4CameronTruranHilfPairingCorrections::G4CameronTruranHilfPairingCorrections(G4double dummy)
 {
-	G4double even_more_dummy = dummy;
+    G4double even_more_dummy = dummy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfShellCorrections.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfShellCorrections.cc
index de835cef06..f3652c7aca 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfShellCorrections.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CameronTruranHilfShellCorrections.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CameronTruranHilfShellCorrections.cc,v 1.2.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4CameronTruranHilfShellCorrections.hh"
 
@@ -50,5 +78,5 @@ G4CameronTruranHilfShellCorrections G4CameronTruranHilfShellCorrections::theInst
 
 G4CameronTruranHilfShellCorrections::G4CameronTruranHilfShellCorrections(G4double dummy)
 {
-	G4double even_more_dummy = dummy;
+    G4double even_more_dummy = dummy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
index e17c7771ef..f104ba9825 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CompetitiveFission.cc
@@ -1,33 +1,50 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4CompetitiveFission.cc,v 1.6.2.1 2001/06/28 19:13:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
-// some corrections by V. Krylov (Oct. 1988)
-// some corrections to V. Krylov by V. Lara (Dec. 1988)
 
 #include "G4CompetitiveFission.hh"
+#include "G4PairingCorrection.hh"
 
-
-G4CompetitiveFission::G4CompetitiveFission()
+G4CompetitiveFission::G4CompetitiveFission() : G4VEvaporationChannel("fission")
 {
-  theFissionBarrierPtr = new G4FissionBarrier;
-  MyOwnFissionBarrier = true;
+    theFissionBarrierPtr = new G4FissionBarrier;
+    MyOwnFissionBarrier = true;
 
-  theFissionProbabilityPtr = new G4FissionProbability;
-  MyOwnFissionProbability = true;
+    theFissionProbabilityPtr = new G4FissionProbability;
+    MyOwnFissionProbability = true;
   
-  theLevelDensityPtr = new G4FissionLevelDensityParameter;
-  MyOwnLevelDensity = true;
+    theLevelDensityPtr = new G4FissionLevelDensityParameter;
+    MyOwnLevelDensity = true;
 
-  MaximalKineticEnergy = -1000.0*MeV;
-  FissionBarrier = 0.0;
-  FissionProbability = 0.0;
-  LevelDensityParameter = 0.0;
+    MaximalKineticEnergy = -1000.0*MeV;
+    FissionBarrier = 0.0;
+    FissionProbability = 0.0;
+    LevelDensityParameter = 0.0;
 }
 
 G4CompetitiveFission::G4CompetitiveFission(const G4CompetitiveFission &right)
@@ -36,27 +53,27 @@ G4CompetitiveFission::G4CompetitiveFission(const G4CompetitiveFission &right)
 
 G4CompetitiveFission::~G4CompetitiveFission()
 {
-  if (MyOwnFissionBarrier) delete theFissionBarrierPtr;
+    if (MyOwnFissionBarrier) delete theFissionBarrierPtr;
 
-  if (MyOwnFissionProbability) delete theFissionProbabilityPtr;
+    if (MyOwnFissionProbability) delete theFissionProbabilityPtr;
 
-  if (MyOwnLevelDensity) delete theLevelDensityPtr;
+    if (MyOwnLevelDensity) delete theLevelDensityPtr;
 }
 
 const G4CompetitiveFission & G4CompetitiveFission::operator=(const G4CompetitiveFission &right)
 {
-  G4Exception("G4CompetitiveFission::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4CompetitiveFission::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4CompetitiveFission::operator==(const G4CompetitiveFission &right) const
 {
-  return (this == (G4CompetitiveFission *) &right);
+    return (this == (G4CompetitiveFission *) &right);
 }
 
 G4bool G4CompetitiveFission::operator!=(const G4CompetitiveFission &right) const
 {
-  return (this != (G4CompetitiveFission *) &right);
+    return (this != (G4CompetitiveFission *) &right);
 }
 
 
@@ -64,213 +81,218 @@ G4bool G4CompetitiveFission::operator!=(const G4CompetitiveFission &right) const
 
 void G4CompetitiveFission::Initialize(const G4Fragment & fragment)
 {
-	G4int anA = G4int(fragment.GetA());
-	G4int aZ = G4int(fragment.GetZ());
-	G4double ExEnergy = fragment.GetExcitationEnergy() - FissionPairingCorrection(anA,aZ);
+    G4int anA = G4int(fragment.GetA());
+    G4int aZ = G4int(fragment.GetZ());
+    G4double ExEnergy = fragment.GetExcitationEnergy() - 
+	G4PairingCorrection::GetFissionPairingCorrection(anA,aZ);
   
 
-	// Saddle point excitation energy ---> A = 65
-	// Fission is excluded for A < 65
-	if (anA >= 65 && ExEnergy > 0.0) {
-		FissionBarrier = theFissionBarrierPtr->FissionBarrier(anA,aZ,ExEnergy);
-		MaximalKineticEnergy = ExEnergy - FissionBarrier;
-		LevelDensityParameter = theLevelDensityPtr->LevelDensityParameter(anA,aZ,ExEnergy);
-		FissionProbability = theFissionProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
-	}
-	else {
-		MaximalKineticEnergy = -1000.0*MeV;
-		LevelDensityParameter = 0.0;
-		FissionProbability = 0.0;
-	}
+    // Saddle point excitation energy ---> A = 65
+    // Fission is excluded for A < 65
+    if (anA >= 65 && ExEnergy > 0.0) {
+	FissionBarrier = theFissionBarrierPtr->FissionBarrier(anA,aZ,ExEnergy);
+	MaximalKineticEnergy = ExEnergy - FissionBarrier;
+	LevelDensityParameter = theLevelDensityPtr->LevelDensityParameter(anA,aZ,ExEnergy);
+	FissionProbability = theFissionProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
+    }
+    else {
+	MaximalKineticEnergy = -1000.0*MeV;
+	LevelDensityParameter = 0.0;
+	FissionProbability = 0.0;
+    }
 
-	return;
+    return;
 }
 
 
 
 G4FragmentVector * G4CompetitiveFission::BreakUp(const G4Fragment & theNucleus)
 {
-	// Nucleus data
-	// Atomic number of nucleus
-	G4int A = G4int(theNucleus.GetA());
-	// Charge of nucleus
-	G4int Z = G4int(theNucleus.GetZ());
-	//   Excitation energy (in MeV)
-	G4double U = theNucleus.GetExcitationEnergy() - FissionPairingCorrection(A,Z);
-	// Check that U > 0
-	if (U <= 0.0) {
-		G4FragmentVector * theResult = new  G4FragmentVector;
-		theResult->insert(new G4Fragment(theNucleus));
-		return theResult;
-	}
-
-	// Atomic Mass of Nucleus (in MeV)
-	G4double M = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A)/MeV;
-	// Nucleus Momentum
-	  G4LorentzVector theNucleusMomentum = theNucleus.GetMomentum();
-
-	// Calculate fission parameters
-	G4FissionParameters theParameters(A,Z,U,FissionBarrier);
-  
-	// First fragment
-	G4int A1 = 0;
-	G4int Z1 = 0;
-	G4double M1 = 0.0;
-
-	// Second fragment
-	G4int A2 = 0;
-	G4int Z2 = 0;
-	G4double M2 = 0.0;
-
-	G4double FragmentsExcitationEnergy = 0.0;
-	G4double FragmentsKineticEnergy = 0.0;
-
-	G4int Trials = 0;
-	do {
-
-		// First fragment 
-		A1 = FissionAtomicNumber(A,theParameters);
-		Z1 = FissionCharge(A,Z,A1);
-		M1 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z1,A1);
-
-
-		// Second Fragment
-		A2 = A - A1;
-		Z2 = Z - Z1;
-		if (A2 < 1 || Z2 < 0) 
-			G4Exception("G4CompetitiveFission::BreakUp: Can't define second fragment! ");
-		M2 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z2,A2)/MeV;
-
-		// Check that fragment masses are less or equal than total energy
-		//  if (M1 + M2 > theNucleusMomentum.mag()/MeV)
-		if (M1 + M2 > theNucleusMomentum.e()/MeV)
-			G4Exception("G4CompetitiveFission::BreakUp: Fragments Mass > Total Energy");
-
-		// Maximal Kinetic Energy (available energy for fragments)
-		//  G4double Tmax = theNucleusMomentum.mag()/MeV - M1 - M2;
-		G4double Tmax = M + U - M1 - M2;
-
-		FragmentsKineticEnergy = FissionKineticEnergy( A , Z,
-																	  A1, Z1,
-																	  A2, Z2,
-																	  U , Tmax,
-																	  theParameters);
-    
-		// Excitation Energy
-		FragmentsExcitationEnergy = Tmax - FragmentsKineticEnergy;
-    
-	} while (FragmentsExcitationEnergy < 0.0 && Trials++ < 100);
-  
-  
-
-	if (FragmentsExcitationEnergy <= 0.0) 
-		G4Exception("G4CompetitiveFission::BreakItUp: Excitation energy for fragments < 0.0!");
-  
-
-	// while (FragmentsExcitationEnergy < 0 && Trials < 100);
-
-	// Fragment 1
-	G4double U1 = FragmentsExcitationEnergy * (G4double(A1)/G4double(A));
-	// Fragment 2
-	G4double U2 = FragmentsExcitationEnergy * (G4double(A2)/G4double(A));
-
-
-	G4double Pmax = sqrt( 2 * ( ( (M1+U1)*(M2+U2) ) /
-								( (M1+U1)+(M2+U2) ) ) * FragmentsKineticEnergy);
-
-	G4ParticleMomentum momentum1 = IsotropicVector( Pmax );
-	G4ParticleMomentum momentum2( -momentum1 );
-
-	// Perform a Galileo boost for fragments
-	momentum1 += (theNucleusMomentum.boostVector() * (M1+U1));
-	momentum2 += (theNucleusMomentum.boostVector() * (M2+U2));
-
-
-	// Create 4-momentum for first fragment
-	// Warning!! Energy conservation is broken
-	G4LorentzVector FourMomentum1( momentum1 , sqrt(momentum1.mag2() + (M1+U1)*(M1+U1)));
-
-	// Create 4-momentum for second fragment
-	// Warning!! Energy conservation is broken
-	G4LorentzVector FourMomentum2( momentum2 , sqrt(momentum2.mag2() + (M2+U2)*(M2+U2)));
-
-	// Create Fragments
-	G4Fragment * Fragment1 = new G4Fragment( A1, Z1, FourMomentum1);
-	if (!Fragment1) G4Exception("G4CompetitiveFission::BreakItUp: Can't create Fragment1! ");
-	G4Fragment * Fragment2 = new G4Fragment( A2, Z2, FourMomentum2);
-	if (!Fragment2) G4Exception("G4CompetitiveFission::BreakItUp: Can't create Fragment2! ");
-
-	// Create Fragment Vector
-	G4FragmentVector * theResult = new G4FragmentVector;
-
-	theResult->insert(Fragment1);
-	theResult->insert(Fragment2);
-
+    // Nucleus data
+    // Atomic number of nucleus
+    G4int A = G4int(theNucleus.GetA());
+    // Charge of nucleus
+    G4int Z = G4int(theNucleus.GetZ());
+    //   Excitation energy (in MeV)
+    G4double U = theNucleus.GetExcitationEnergy() - 
+	G4PairingCorrection::GetFissionPairingCorrection(A,Z);
+    // Check that U > 0
+    if (U <= 0.0) {
+	G4FragmentVector * theResult = new  G4FragmentVector;
+	theResult->push_back(new G4Fragment(theNucleus));
 	return theResult;
+    }
 
+    // Atomic Mass of Nucleus (in MeV)
+    G4double M = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A)/MeV;
+    // Nucleus Momentum
+    G4LorentzVector theNucleusMomentum = theNucleus.GetMomentum();
+
+    // Calculate fission parameters
+    G4FissionParameters theParameters(A,Z,U,FissionBarrier);
+  
+    // First fragment
+    G4int A1 = 0;
+    G4int Z1 = 0;
+    G4double M1 = 0.0;
+
+    // Second fragment
+    G4int A2 = 0;
+    G4int Z2 = 0;
+    G4double M2 = 0.0;
+
+    G4double FragmentsExcitationEnergy = 0.0;
+    G4double FragmentsKineticEnergy = 0.0;
+
+    G4int Trials = 0;
+    do {
+
+	// First fragment 
+	A1 = FissionAtomicNumber(A,theParameters);
+	Z1 = FissionCharge(A,Z,A1);
+	M1 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z1,A1);
+
+
+	// Second Fragment
+	A2 = A - A1;
+	Z2 = Z - Z1;
+	if (A2 < 1 || Z2 < 0) 
+	    G4Exception("G4CompetitiveFission::BreakUp: Can't define second fragment! ");
+	M2 = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z2,A2)/MeV;
+
+	// Check that fragment masses are less or equal than total energy
+	//  if (M1 + M2 > theNucleusMomentum.mag()/MeV)
+	if (M1 + M2 > theNucleusMomentum.e()/MeV)
+	    G4Exception("G4CompetitiveFission::BreakUp: Fragments Mass > Total Energy");
+
+	// Maximal Kinetic Energy (available energy for fragments)
+	//  G4double Tmax = theNucleusMomentum.mag()/MeV - M1 - M2;
+	G4double Tmax = M + U - M1 - M2;
+
+	FragmentsKineticEnergy = FissionKineticEnergy( A , Z,
+						       A1, Z1,
+						       A2, Z2,
+						       U , Tmax,
+						       theParameters);
+    
+	// Excitation Energy
+	FragmentsExcitationEnergy = Tmax - FragmentsKineticEnergy;
+    
+    } while (FragmentsExcitationEnergy < 0.0 && Trials++ < 100);
+  
+  
+
+    if (FragmentsExcitationEnergy <= 0.0) 
+	G4Exception("G4CompetitiveFission::BreakItUp: Excitation energy for fragments < 0.0!");
+  
+
+  // while (FragmentsExcitationEnergy < 0 && Trials < 100);
+  
+  // Fragment 1
+    G4double U1 = FragmentsExcitationEnergy * (G4double(A1)/G4double(A));
+    // Fragment 2
+    G4double U2 = FragmentsExcitationEnergy * (G4double(A2)/G4double(A));
+
+
+    G4double Pmax = sqrt( 2 * ( ( (M1+U1)*(M2+U2) ) /
+				( (M1+U1)+(M2+U2) ) ) * FragmentsKineticEnergy);
+
+    G4ParticleMomentum momentum1 = IsotropicVector( Pmax );
+    G4ParticleMomentum momentum2( -momentum1 );
+
+    // Perform a Galileo boost for fragments
+    momentum1 += (theNucleusMomentum.boostVector() * (M1+U1));
+    momentum2 += (theNucleusMomentum.boostVector() * (M2+U2));
+
+
+  // Create 4-momentum for first fragment
+  // Warning!! Energy conservation is broken
+    G4LorentzVector FourMomentum1( momentum1 , sqrt(momentum1.mag2() + (M1+U1)*(M1+U1)));
+
+    // Create 4-momentum for second fragment
+    // Warning!! Energy conservation is broken
+    G4LorentzVector FourMomentum2( momentum2 , sqrt(momentum2.mag2() + (M2+U2)*(M2+U2)));
+
+  // Create Fragments
+    G4Fragment * Fragment1 = new G4Fragment( A1, Z1, FourMomentum1);
+    if (!Fragment1) G4Exception("G4CompetitiveFission::BreakItUp: Can't create Fragment1! ");
+    G4Fragment * Fragment2 = new G4Fragment( A2, Z2, FourMomentum2);
+    if (!Fragment2) G4Exception("G4CompetitiveFission::BreakItUp: Can't create Fragment2! ");
+
+  // Create Fragment Vector
+    G4FragmentVector * theResult = new G4FragmentVector;
+
+    theResult->push_back(Fragment1);
+    theResult->push_back(Fragment2);
+
+#ifdef debug
+    CheckConservation(theNucleus,theResult);
+#endif
+
+    return theResult;
 }
 
 
 
 G4int G4CompetitiveFission::FissionAtomicNumber(const G4int A, const G4FissionParameters & theParam)
-  // Calculates the atomic number of a fission product
+    // Calculates the atomic number of a fission product
 {
 
-	// For Simplicity reading code
-	const G4double A1 = theParam.GetA1();
-	const G4double A2 = theParam.GetA2();
-	const G4double As = theParam.GetAs();
-	const G4double Sigma1 = theParam.GetSigma1();
-	const G4double Sigma2 = theParam.GetSigma2();
-	const G4double SigmaS = theParam.GetSigmaS();
-	const G4double w = theParam.GetW();
+    // For Simplicity reading code
+    const G4double A1 = theParam.GetA1();
+    const G4double A2 = theParam.GetA2();
+    const G4double As = theParam.GetAs();
+    const G4double Sigma1 = theParam.GetSigma1();
+    const G4double Sigma2 = theParam.GetSigma2();
+    const G4double SigmaS = theParam.GetSigmaS();
+    const G4double w = theParam.GetW();
 
   
-	G4double FasymAsym = 2.0*exp(-((A2-As)*(A2-As))/(2.0*Sigma2*Sigma2)) + 
-								exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
+    G4double FasymAsym = 2.0*exp(-((A2-As)*(A2-As))/(2.0*Sigma2*Sigma2)) + 
+	exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
 
-	G4double FsymA1A2 = exp(-((As-(A1+A2))*(As-(A1+A2)))/(2.0*SigmaS*SigmaS));
+    G4double FsymA1A2 = exp(-((As-(A1+A2))*(As-(A1+A2)))/(2.0*SigmaS*SigmaS));
 
 
-	G4double C2A = A2 + 3.72*Sigma2;
-	G4double C2S = As + 3.72*SigmaS;
+    G4double C2A = A2 + 3.72*Sigma2;
+    G4double C2S = As + 3.72*SigmaS;
   
-	G4double C2 = 0.0;
-	if (w > 1000.0 ) C2 = C2S;
-	else if (w < 0.001) C2 = C2A;
-	else C2 =  G4std::max(C2A,C2S);
+    G4double C2 = 0.0;
+    if (w > 1000.0 ) C2 = C2S;
+    else if (w < 0.001) C2 = C2A;
+    else C2 =  G4std::max(C2A,C2S);
 
-	G4double C1 = A-C2;
-	if (C1 < 30.0) {
-		C2 = A-30.0;
-		C1 = 30.0;
-	}
+    G4double C1 = A-C2;
+    if (C1 < 30.0) {
+	C2 = A-30.0;
+	C1 = 30.0;
+    }
 
-	G4double Am1 = (As + A1)/2.0;
-	G4double Am2 = (A1 + A2)/2.0;
+    G4double Am1 = (As + A1)/2.0;
+    G4double Am2 = (A1 + A2)/2.0;
 
-	// Get Mass distributions as sum of symmetric and asymmetric Gasussians
-	G4double Mass1 = MassDistribution(As,A,theParam); 
-	G4double Mass2 = MassDistribution(Am1,A,theParam); 
-	G4double Mass3 = MassDistribution(A1,A,theParam); 
-	G4double Mass4 = MassDistribution(Am2,A,theParam); 
-	G4double Mass5 = MassDistribution(A2,A,theParam); 
-	// get maximal value among Mass1,...,Mass5
-	G4double MassMax = Mass1;
-	if (Mass2 > MassMax) MassMax = Mass2;
-	if (Mass3 > MassMax) MassMax = Mass3;
-	if (Mass4 > MassMax) MassMax = Mass4;
-	if (Mass5 > MassMax) MassMax = Mass5;
+    // Get Mass distributions as sum of symmetric and asymmetric Gasussians
+    G4double Mass1 = MassDistribution(As,A,theParam); 
+    G4double Mass2 = MassDistribution(Am1,A,theParam); 
+    G4double Mass3 = MassDistribution(A1,A,theParam); 
+    G4double Mass4 = MassDistribution(Am2,A,theParam); 
+    G4double Mass5 = MassDistribution(A2,A,theParam); 
+    // get maximal value among Mass1,...,Mass5
+    G4double MassMax = Mass1;
+    if (Mass2 > MassMax) MassMax = Mass2;
+    if (Mass3 > MassMax) MassMax = Mass3;
+    if (Mass4 > MassMax) MassMax = Mass4;
+    if (Mass5 > MassMax) MassMax = Mass5;
 
-	// Sample a fragment mass number, which lies between C1 and C2
-	G4double m;
-	G4double Pm;
-	do {
-		m = C1+G4UniformRand()*(C2-C1);
-		Pm = MassDistribution(m,A,theParam); 
-	} while (G4UniformRand() > Pm/MassMax);
+    // Sample a fragment mass number, which lies between C1 and C2
+    G4double m;
+    G4double Pm;
+    do {
+	m = C1+G4UniformRand()*(C2-C1);
+	Pm = MassDistribution(m,A,theParam); 
+    } while (G4UniformRand() > Pm/MassMax);
 
-	return G4int(m+0.5);
+    return G4int(m+0.5);
 }
 
 
@@ -279,138 +301,138 @@ G4int G4CompetitiveFission::FissionAtomicNumber(const G4int A, const G4FissionPa
 
 
 G4double G4CompetitiveFission::MassDistribution(const G4double x, const G4double A, 
-																const G4FissionParameters & theParam)
-	// This method gives mass distribution F(x) = F_{asym}(x)+w*F_{sym}(x)
-	// which consist of symmetric and asymmetric sum of gaussians components.
+						const G4FissionParameters & theParam)
+    // This method gives mass distribution F(x) = F_{asym}(x)+w*F_{sym}(x)
+    // which consist of symmetric and asymmetric sum of gaussians components.
 {
-	G4double Xsym = exp(-0.5*(x-theParam.GetAs())*(x-theParam.GetAs())/
-							(theParam.GetSigmaS()*theParam.GetSigmaS()));
+    G4double Xsym = exp(-0.5*(x-theParam.GetAs())*(x-theParam.GetAs())/
+			(theParam.GetSigmaS()*theParam.GetSigmaS()));
 
-	G4double Xasym = exp(-0.5*(x-theParam.GetA2())*(x-theParam.GetA2())/
-		       (theParam.GetSigma2()*theParam.GetSigma2())) + 
-    exp(-0.5*(x-(A-theParam.GetA2()))*(x-(A-theParam.GetA2()))/
-	(theParam.GetSigma2()*theParam.GetSigma2())) +
-    0.5*exp(-0.5*(x-theParam.GetA1())*(x-theParam.GetA1())/
-	    (theParam.GetSigma1()*theParam.GetSigma1())) +
-    0.5*exp(-0.5*(x-(A-theParam.GetA1()))*(x-(A-theParam.GetA1()))/
-	    (theParam.GetSigma1()*theParam.GetSigma1()));
+    G4double Xasym = exp(-0.5*(x-theParam.GetA2())*(x-theParam.GetA2())/
+			 (theParam.GetSigma2()*theParam.GetSigma2())) + 
+	exp(-0.5*(x-(A-theParam.GetA2()))*(x-(A-theParam.GetA2()))/
+	    (theParam.GetSigma2()*theParam.GetSigma2())) +
+	0.5*exp(-0.5*(x-theParam.GetA1())*(x-theParam.GetA1())/
+		(theParam.GetSigma1()*theParam.GetSigma1())) +
+	0.5*exp(-0.5*(x-(A-theParam.GetA1()))*(x-(A-theParam.GetA1()))/
+		(theParam.GetSigma1()*theParam.GetSigma1()));
 
-	if (theParam.GetW() > 1000) return Xsym;
-	else if (theParam.GetW() < 0.001) return Xasym;
-	else return theParam.GetW()*Xsym+Xasym;
+    if (theParam.GetW() > 1000) return Xsym;
+    else if (theParam.GetW() < 0.001) return Xasym;
+    else return theParam.GetW()*Xsym+Xasym;
 }
 
 
 
 
 G4int G4CompetitiveFission::FissionCharge(const G4double A,
-														const G4double Z,
-					 									const G4double Af)
-  // Calculates the charge of a fission product for a given atomic number Af
+					  const G4double Z,
+					  const G4double Af)
+    // Calculates the charge of a fission product for a given atomic number Af
 {
-	const G4double sigma = 0.6;
-	G4double DeltaZ = 0.0;
-	if (Af >= 134.0) DeltaZ = -0.45;                    //                      134 <= Af
-	else if (A <= (A-134.0)) DeltaZ = 0.45;             // Af <= (A-134) 
-	else DeltaZ = -0.45*(Af-(A/2.0))/(134.0-(A/2.0));   //       (A-134) < Af < 134
+    const G4double sigma = 0.6;
+    G4double DeltaZ = 0.0;
+    if (Af >= 134.0) DeltaZ = -0.45;                    //                      134 <= Af
+    else if (A <= (A-134.0)) DeltaZ = 0.45;             // Af <= (A-134) 
+    else DeltaZ = -0.45*(Af-(A/2.0))/(134.0-(A/2.0));   //       (A-134) < Af < 134
 
-	G4double Zmean = (Af/A)*Z + DeltaZ;
+    G4double Zmean = (Af/A)*Z + DeltaZ;
  
-	G4double theZ;
-	do {
-		theZ = G4RandGauss::shoot(Zmean,sigma);
-	} while (theZ  < 1.0 || theZ > (Z-1.0) || theZ > Af);
-	//  return static_cast<G4int>(theZ+0.5);
-	return G4int(theZ+0.5);
+    G4double theZ;
+    do {
+	theZ = G4RandGauss::shoot(Zmean,sigma);
+    } while (theZ  < 1.0 || theZ > (Z-1.0) || theZ > Af);
+    //  return static_cast<G4int>(theZ+0.5);
+    return G4int(theZ+0.5);
 }
 
 
 
 
 G4double G4CompetitiveFission::FissionKineticEnergy(const G4double A, const G4double Z,
-						    										 const G4double Af1, const G4double Zf1,
-						    										 const G4double Af2, const G4double Zf2,
-						   										 const G4double U, const G4double Tmax,
-						    										 const G4FissionParameters & theParam)
-  // Gives the kinetic energy of fission products
+						    const G4double Af1, const G4double Zf1,
+						    const G4double Af2, const G4double Zf2,
+						    const G4double U, const G4double Tmax,
+						    const G4FissionParameters & theParam)
+    // Gives the kinetic energy of fission products
 {
-	// Find maximal value of A for fragments
-	G4double AfMax = G4std::max(Af1,Af2);
-	if (AfMax < (A/2.0)) AfMax = A - AfMax;
+    // Find maximal value of A for fragments
+    G4double AfMax = G4std::max(Af1,Af2);
+    if (AfMax < (A/2.0)) AfMax = A - AfMax;
 
-	// Weights for symmetric and asymmetric components
-	G4double Pas;
-	if (theParam.GetW() > 1000) Pas = 0.0;
-	else {
-		G4double P1 = 0.5*exp(-0.5*(AfMax-theParam.GetA1())*(AfMax-theParam.GetA1())/
-							(theParam.GetSigma1()*theParam.GetSigma1()));
+    // Weights for symmetric and asymmetric components
+    G4double Pas;
+    if (theParam.GetW() > 1000) Pas = 0.0;
+    else {
+	G4double P1 = 0.5*exp(-0.5*(AfMax-theParam.GetA1())*(AfMax-theParam.GetA1())/
+			      (theParam.GetSigma1()*theParam.GetSigma1()));
 
-		G4double P2 = exp(-0.5*(AfMax-theParam.GetA2())*(AfMax-theParam.GetA2())/
-							(theParam.GetSigma2()*theParam.GetSigma2()));
+	G4double P2 = exp(-0.5*(AfMax-theParam.GetA2())*(AfMax-theParam.GetA2())/
+			  (theParam.GetSigma2()*theParam.GetSigma2()));
 
-		Pas = P1+P2;
-	}
+	Pas = P1+P2;
+    }
 
 
-	G4double Ps;
-	if (theParam.GetW() < 0.001) Ps = 0.0;
-	else 
-		Ps = theParam.GetW()*exp(-0.5*(AfMax-theParam.GetAs())*(AfMax-theParam.GetAs())/
-				(theParam.GetSigmaS()*theParam.GetSigmaS()));
+    G4double Ps;
+    if (theParam.GetW() < 0.001) Ps = 0.0;
+    else 
+	Ps = theParam.GetW()*exp(-0.5*(AfMax-theParam.GetAs())*(AfMax-theParam.GetAs())/
+				 (theParam.GetSigmaS()*theParam.GetSigmaS()));
  
 
 
-	G4double Psy = Ps/(Pas+Ps);
+    G4double Psy = Ps/(Pas+Ps);
 
 
-	// Fission fractions Xsy and Xas formed in symmetric and asymmetric modes
-	G4double PPas = theParam.GetSigma1() + 2.0 * theParam.GetSigma2();
-	G4double PPsy = theParam.GetW() * theParam.GetSigmaS();
-	G4double Xas = PPas / (PPas+PPsy);
-	G4double Xsy = PPsy / (PPas+PPsy);
+    // Fission fractions Xsy and Xas formed in symmetric and asymmetric modes
+    G4double PPas = theParam.GetSigma1() + 2.0 * theParam.GetSigma2();
+    G4double PPsy = theParam.GetW() * theParam.GetSigmaS();
+    G4double Xas = PPas / (PPas+PPsy);
+    G4double Xsy = PPsy / (PPas+PPsy);
 
 
-	// Average kinetic energy for symmetric and asymmetric components
-	G4double Eaverage = 0.1071*MeV*(Z*Z)/pow(A,1.0/3.0) + 22.2*MeV;
+    // Average kinetic energy for symmetric and asymmetric components
+    G4double Eaverage = 0.1071*MeV*(Z*Z)/pow(A,1.0/3.0) + 22.2*MeV;
 
 
-	// Compute maximal average kinetic energy of fragments and Energy Dispersion (sqrt)
-	G4double TaverageAfMax;
-	G4double ESigma;
-	// Select randomly fission mode (symmetric or asymmetric)
-	if (G4UniformRand() > Psy) { // Asymmetric Mode
-		G4double A11 = theParam.GetA1()-0.7979*theParam.GetSigma1();
-		G4double A12 = theParam.GetA1()+0.7979*theParam.GetSigma1();
-		G4double A21 = theParam.GetA2()-0.7979*theParam.GetSigma2();
-		G4double A22 = theParam.GetA2()+0.7979*theParam.GetSigma2();
-		// scale factor
-		G4double ScaleFactor = 0.5*theParam.GetSigma1()*(AsymmetricRatio(A,A11)+AsymmetricRatio(A,A12))+
-										theParam.GetSigma2()*(AsymmetricRatio(A,A21)+AsymmetricRatio(A,A22));
-		// Compute average kinetic energy for fragment with AfMax
-		TaverageAfMax = (Eaverage + 12.5 * Xsy) * (PPas/ScaleFactor) * AsymmetricRatio(A,AfMax);
-		ESigma = 10.0*MeV; // MeV
+    // Compute maximal average kinetic energy of fragments and Energy Dispersion (sqrt)
+    G4double TaverageAfMax;
+    G4double ESigma;
+    // Select randomly fission mode (symmetric or asymmetric)
+    if (G4UniformRand() > Psy) { // Asymmetric Mode
+	G4double A11 = theParam.GetA1()-0.7979*theParam.GetSigma1();
+	G4double A12 = theParam.GetA1()+0.7979*theParam.GetSigma1();
+	G4double A21 = theParam.GetA2()-0.7979*theParam.GetSigma2();
+	G4double A22 = theParam.GetA2()+0.7979*theParam.GetSigma2();
+	// scale factor
+	G4double ScaleFactor = 0.5*theParam.GetSigma1()*(AsymmetricRatio(A,A11)+AsymmetricRatio(A,A12))+
+	    theParam.GetSigma2()*(AsymmetricRatio(A,A21)+AsymmetricRatio(A,A22));
+	// Compute average kinetic energy for fragment with AfMax
+	TaverageAfMax = (Eaverage + 12.5 * Xsy) * (PPas/ScaleFactor) * AsymmetricRatio(A,AfMax);
+	ESigma = 10.0*MeV; // MeV
 
-	} else { // Symmetric Mode
-		G4double As0 = theParam.GetAs() + 0.7979*theParam.GetSigmaS();
-		// scale factor
-		G4double ScaleFactor = theParam.GetW()*theParam.GetSigmaS()*SymmetricRatio(A,As0);
-		// Compute average kinetic energy for fragment with AfMax
-		TaverageAfMax = (Eaverage - 12.5*MeV*Xas) * (PPsy/ScaleFactor) * SymmetricRatio(A,AfMax);
-		ESigma = 8.0*MeV;
-  }
+    } else { // Symmetric Mode
+	G4double As0 = theParam.GetAs() + 0.7979*theParam.GetSigmaS();
+	// scale factor
+	G4double ScaleFactor = theParam.GetW()*theParam.GetSigmaS()*SymmetricRatio(A,As0);
+	// Compute average kinetic energy for fragment with AfMax
+	TaverageAfMax = (Eaverage - 12.5*MeV*Xas) * (PPsy/ScaleFactor) * SymmetricRatio(A,AfMax);
+	ESigma = 8.0*MeV;
+    }
 
 
-	// Select randomly, in accordance with Gaussian distribution, fragment kinetic energy
-	G4double KineticEnergy;
-	G4int i = 0;
-	do {
-		KineticEnergy = G4RandGauss::shoot(TaverageAfMax,ESigma);
-		if (i++ > 100) return Eaverage;
-	} while (KineticEnergy < Eaverage-3.72*ESigma || 
-				KineticEnergy > Eaverage+3.72*ESigma ||
-				KineticEnergy > Tmax);
+    // Select randomly, in accordance with Gaussian distribution, fragment kinetic energy
+    G4double KineticEnergy;
+    G4int i = 0;
+    do {
+	KineticEnergy = G4RandGauss::shoot(TaverageAfMax,ESigma);
+	if (i++ > 100) return Eaverage;
+    } while (KineticEnergy < Eaverage-3.72*ESigma || 
+	     KineticEnergy > Eaverage+3.72*ESigma ||
+	     KineticEnergy > Tmax);
 
-	return KineticEnergy;
+    return KineticEnergy;
 }
 
 
@@ -419,24 +441,24 @@ G4double G4CompetitiveFission::FissionKineticEnergy(const G4double A, const G4do
 
 G4double G4CompetitiveFission::AsymmetricRatio(const G4double A,const G4double A11)
 {
-	const G4double B1 = 23.5;
-	const G4double A00 = 134.0;
-	return Ratio(A,A11,B1,A00);
+    const G4double B1 = 23.5;
+    const G4double A00 = 134.0;
+    return Ratio(A,A11,B1,A00);
 }
 
 G4double G4CompetitiveFission::SymmetricRatio(const G4double A,const G4double A11)
 {
-	const G4double B1 = 5.32;
-	const G4double A00 = A/2.0;
-	return Ratio(A,A11,B1,A00);
+    const G4double B1 = 5.32;
+    const G4double A00 = A/2.0;
+    return Ratio(A,A11,B1,A00);
 }
 
 G4double G4CompetitiveFission::Ratio(const G4double A,const G4double A11,
 				     const G4double B1,const G4double A00) 
 {
-	if (A == 0) G4Exception("G4CompetitiveFission::Ratio: A == 0!");
-	if (A11 >= A/2.0 && A11 <= (A00+10.0)) return 1.0-B1*((A11-A00)/A)*((A11-A00)/A);
-	else return 1.0-B1*(10.0/A)*(10.0/A)-2.0*(10.0/A)*B1*((A11-A00-10.0)/A);
+    if (A == 0) G4Exception("G4CompetitiveFission::Ratio: A == 0!");
+    if (A11 >= A/2.0 && A11 <= (A00+10.0)) return 1.0-B1*((A11-A00)/A)*((A11-A00)/A);
+    else return 1.0-B1*(10.0/A)*(10.0/A)-2.0*(10.0/A)*B1*((A11-A00-10.0)/A);
 }
 
 
@@ -444,23 +466,74 @@ G4double G4CompetitiveFission::Ratio(const G4double A,const G4double A11,
 
 
 G4ThreeVector G4CompetitiveFission::IsotropicVector(const G4double Magnitude)
-  // Samples a isotropic random vectorwith a magnitud given by Magnitude.
-  // By default Magnitude = 1.0
+    // Samples a isotropic random vectorwith a magnitud given by Magnitude.
+    // By default Magnitude = 1.0
 {
-  G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-  G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-  G4double Phi = twopi*G4UniformRand();
-  G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
-                       Magnitude*sin(Phi)*SinTheta,
-                       Magnitude*CosTheta);
-  return Vector;
+    G4double CosTheta = 1.0 - 2.0*G4UniformRand();
+    G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
+    G4double Phi = twopi*G4UniformRand();
+    G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
+			 Magnitude*sin(Phi)*SinTheta,
+			 Magnitude*CosTheta);
+    return Vector;
 }
 
-G4double G4CompetitiveFission::FissionPairingCorrection(const G4int A, const G4int Z) const
+
+#ifdef debug
+void G4CompetitiveFission::CheckConservation(const G4Fragment & theInitialState,
+					     G4FragmentVector * Result) const
 {
-	const G4double PairingConstant = 14.0*MeV;
-	const G4int N = A - Z;
-	G4double Pair = (1.0 - G4double(Z) + 2.0*(Z/2)) + (1.0 - G4double(N) + 2.0*(N/2));
-	G4double PCorrection = Pair*PairingConstant/sqrt(G4double(A));
-	return PCorrection;
+    G4double ProductsEnergy =0;
+    G4ThreeVector ProductsMomentum;
+    G4int ProductsA = 0;
+    G4int ProductsZ = 0;
+    G4FragmentVector::iterator h;
+    for (h = Result->begin(); h != Result->end(); h++) {
+	G4LorentzVector tmp = (*h)->GetMomentum();
+	ProductsEnergy += tmp.e();
+	ProductsMomentum += tmp.vect();
+	ProductsA += G4int((*h)->GetA());
+	ProductsZ += G4int((*h)->GetZ());
+    }
+
+    if (ProductsA != theInitialState.GetA()) {
+	G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4CompetitiveFission.cc: Barionic Number Conservation test for fission fragments" 
+	       << G4endl; 
+	G4cout << "Initial A = " << theInitialState.GetA() 
+	       << "   Fragments A = " << ProductsA << "   Diference --> " 
+	       << theInitialState.GetA() - ProductsA << G4endl;
+    }
+    if (ProductsZ != theInitialState.GetZ()) {
+	G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4CompetitiveFission.cc: Charge Conservation test for fission fragments" 
+	       << G4endl; 
+	G4cout << "Initial Z = " << theInitialState.GetZ() 
+	       << "   Fragments Z = " << ProductsZ << "   Diference --> " 
+	       << theInitialState.GetZ() - ProductsZ << G4endl;
+    }
+    if (abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV) {
+	G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4CompetitiveFission.cc: Energy Conservation test for fission fragments" 
+	       << G4endl; 
+	G4cout << "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
+	       << "   Fragments E = " << ProductsEnergy/MeV  << " MeV   Diference --> " 
+	       << (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV" << G4endl;
+    } 
+    if (abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV || 
+	abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
+	abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV) {
+	G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4CompetitiveFission.cc: Momentum Conservation test for fission fragments" 
+	       << G4endl; 
+	G4cout << "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
+	       << "   Fragments P = " << ProductsMomentum  << " MeV   Diference --> " 
+	       << theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV" << G4endl;
+    }
+    return;
 }
+#endif
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ConstantLevelDensityParameter.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ConstantLevelDensityParameter.cc
index c7e1bda7e0..5127b984df 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ConstantLevelDensityParameter.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ConstantLevelDensityParameter.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // Hadronic Process: Nuclear De-excitations
 //    Constant level density parameter (for photon evaporation)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
index ba1f717ebc..970036caad 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaDeexcitation.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ContinuumGammaDeexcitation
@@ -51,8 +65,8 @@ G4ContinuumGammaDeexcitation::~G4ContinuumGammaDeexcitation()
 G4VGammaTransition* G4ContinuumGammaDeexcitation::CreateTransition()
 {
   G4Fragment nucleus = GetNucleus();
-  G4int Z = nucleus.GetZ();
-  G4int A = nucleus.GetA();
+  G4int Z = static_cast<G4int>(nucleus.GetZ());
+  G4int A = static_cast<G4int>(nucleus.GetA());
   G4double excitation = nucleus.GetExcitationEnergy();
 
   if (_nucleusA != A || _nucleusZ != Z)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
index 2acd484c9f..0285dfe0b5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ContinuumGammaTransition.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ContinuumGammaTransition
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
index 29d980d442..8ad21e1ac3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4CoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4CoulombBarrier.cc,v 1.1 2000/06/09 11:43:35 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4CoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -23,18 +39,18 @@ G4CoulombBarrier::G4CoulombBarrier(const G4CoulombBarrier & right)
 
 const G4CoulombBarrier & G4CoulombBarrier::operator=(const G4CoulombBarrier & right)
 {
- G4Exception("G4CoulombBarrier::operator= meant to not be accessable.");
- return *this;
+  G4Exception("G4CoulombBarrier::operator= meant to not be accessable.");
+  return *this;
 }
 
 G4bool G4CoulombBarrier::operator==(const G4CoulombBarrier & right) const 
 {
- return false;
+  return false;
 }
 
 G4bool G4CoulombBarrier::operator!=(const G4CoulombBarrier & right) const 
 {
- return true;
+  return true;
 }
 
 
@@ -42,32 +58,32 @@ G4bool G4CoulombBarrier::operator!=(const G4CoulombBarrier & right) const
 G4double G4CoulombBarrier::GetCoulombBarrier(const G4int ARes, const G4int ZRes, const G4double U) const 
   // Calculation of Coulomb potential energy (barrier) for outgoing fragment
 {
-	G4double Barrier = 0.0;
-	if (ZRes > ARes || ARes < 1) {
-		char errMessage[1024];
-		G4std::ostrstream errOs(errMessage,1024);
-		errOs << "G4CoulombBarrier::GetCoulombBarrier: ";
-		errOs << "Wrong values for ";
-		errOs << "residual nucleus A = " << ARes << " ";
-		errOs << "and residual nucleus Z = " << ZRes << G4endl;
-		G4Exception(errMessage);
-	}
-	if (GetA() == 1 && GetZ() == 0) {
-		Barrier = 0.0;   // Neutron Coulomb Barrier is 0
-	} else {
-		G4double CompoundRadius = 2.173*fermi*(1.0+0.006103*G4double(GetZ())*G4double(ZRes))/
-										(1.0+0.009443*G4double(GetZ())*G4double(ZRes));
-		Barrier = elm_coupling/CompoundRadius * G4double(GetZ())*G4double(ZRes)/
-							(pow(G4double(GetA()),1./3.) + pow(G4double(ARes),1./3.));
+  G4double Barrier = 0.0;
+  if (ZRes > ARes || ARes < 1) {
+    char errMessage[1024];
+    G4std::ostrstream errOs(errMessage,1024);
+    errOs << "G4CoulombBarrier::GetCoulombBarrier: ";
+    errOs << "Wrong values for ";
+    errOs << "residual nucleus A = " << ARes << " ";
+    errOs << "and residual nucleus Z = " << ZRes << G4endl;
+    G4Exception(errMessage);
+  }
+  if (GetA() == 1 && GetZ() == 0) {
+    Barrier = 0.0;   // Neutron Coulomb Barrier is 0
+  } else {
+    G4double CompoundRadius = 2.173*fermi*(1.0+0.006103*G4double(GetZ())*G4double(ZRes))/
+      (1.0+0.009443*G4double(GetZ())*G4double(ZRes));
+    Barrier = elm_coupling/CompoundRadius * G4double(GetZ())*G4double(ZRes)/
+      (pow(G4double(GetA()),1./3.) + pow(G4double(ARes),1./3.));
 
-		// Barrier penetration coeficient
-		G4double K = BarrierPenetrationFactor(ZRes);
+    // Barrier penetration coeficient
+    G4double K = BarrierPenetrationFactor(ZRes);
 		
-		Barrier *= K;
+    Barrier *= K;
 		
-		Barrier /= (1.0 + sqrt(U/(2.0*G4double(ARes))));
-	}
-	return Barrier;
+    Barrier /= (1.0 + sqrt(U/(2.0*G4double(ARes))));
+  }
+  return Barrier;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
index 652e47a6b1..85f29dc4fa 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DeuteronCoulombBarrier.cc,v 1.1 2000/06/09 11:43:35 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DeuteronCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,43 +32,43 @@
 
 G4DeuteronCoulombBarrier::G4DeuteronCoulombBarrier(const G4DeuteronCoulombBarrier & right)
 {
-  G4Exception("G4DeuteronCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4DeuteronCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4DeuteronCoulombBarrier & G4DeuteronCoulombBarrier::operator=(const G4DeuteronCoulombBarrier & right)
 {
- G4Exception("G4DeuteronCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4DeuteronCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4DeuteronCoulombBarrier::operator==(const G4DeuteronCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4DeuteronCoulombBarrier::operator!=(const G4DeuteronCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 G4double G4DeuteronCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
-	// const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
-	// 
-	// K for deuteron is K for protons + 0.06
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}
-	return K+0.06;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
+    // const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
+    // 
+    // K for deuteron is K for protons + 0.06
+    G4double K = 1.0;
+    if (aZ>=70.0) {
+	K = 0.80;
+    } else {
+	K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
+    }
+    return K+0.06;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationChannel.cc
index cbf3d1b35f..15dac85e4d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4DeuteronEvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -14,23 +33,23 @@
 
 const G4DeuteronEvaporationChannel & G4DeuteronEvaporationChannel::operator=(const G4DeuteronEvaporationChannel & right)
 {
-	G4Exception("G4DeuteronEvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4DeuteronEvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4DeuteronEvaporationChannel::G4DeuteronEvaporationChannel(const G4DeuteronEvaporationChannel & right)
 {
-	G4Exception("G4DeuteronEvaporationChannel::CopyConstructor meant to not be accessable");
+    G4Exception("G4DeuteronEvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4DeuteronEvaporationChannel::operator==(const G4DeuteronEvaporationChannel & right) const 
 {
-	return (this == (G4DeuteronEvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4DeuteronEvaporationChannel *) &right);
+    //  return false;
 }
 
 G4bool G4DeuteronEvaporationChannel::operator!=(const G4DeuteronEvaporationChannel & right) const 
 {
-	return (this != (G4DeuteronEvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4DeuteronEvaporationChannel *) &right);
+    //  return true;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationProbability.cc
index 7d3f401525..a9c49ba56f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DeuteronEvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4DeuteronEvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,53 +32,53 @@
 #include "G4DeuteronEvaporationProbability.hh"
 
 G4DeuteronEvaporationProbability::G4DeuteronEvaporationProbability() :
-		G4EvaporationProbability(2,1,6) // A,Z,Gamma
+    G4EvaporationProbability(2,1,6) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
 
-	ExcitEnergies(15) = 6.18*MeV;
-	ExcitEnergies(17) = 2.15*MeV;
-	ExcitEnergies(18) = 5.02*MeV;
-	ExcitEnergies(19) = 2.65*MeV;
-	ExcitEnergies(20) = 4.80*MeV;
-	ExcitEnergies(22) = 3.85*MeV;
-	ExcitEnergies(23) = 6.96*MeV;
-	ExcitEnergies(25) = 4.92*MeV;
-	ExcitEnergies(26) = 7.22*MeV;
-	ExcitEnergies(27) = 0.40*MeV;
-	ExcitEnergies(28) = 6.83*MeV;
-	ExcitEnergies(29) = 7.12*MeV;
-	ExcitEnergies(30) = 3.84*MeV;
-	ExcitEnergies(31) = 3.92*MeV;
 
-	ExcitSpins(15) = 1;
-	ExcitSpins(17) = 3;
-	ExcitSpins(18) = 4;
-	ExcitSpins(19) = 4;
-	ExcitSpins(20) = 4;
-	ExcitSpins(22) = 6;
-	ExcitSpins(23) = 6;
-	ExcitSpins(25) = 1;
-	ExcitSpins(26) = 10;
-	ExcitSpins(27) = 3;
-	ExcitSpins(28) = 10;
-	ExcitSpins(29) = 3;
-	ExcitSpins(30) = 6;
-	ExcitSpins(31) = 5;
+    ExcitEnergies[15] = 6.18*MeV;
+    ExcitEnergies[17] = 2.15*MeV;
+    ExcitEnergies[18] = 5.02*MeV;
+    ExcitEnergies[19] = 2.65*MeV;
+    ExcitEnergies[20] = 4.80*MeV;
+    ExcitEnergies[22] = 3.85*MeV;
+    ExcitEnergies[23] = 6.96*MeV;
+    ExcitEnergies[25] = 4.92*MeV;
+    ExcitEnergies[26] = 7.22*MeV;
+    ExcitEnergies[27] = 0.40*MeV;
+    ExcitEnergies[28] = 6.83*MeV;
+    ExcitEnergies[29] = 7.12*MeV;
+    ExcitEnergies[30] = 3.84*MeV;
+    ExcitEnergies[31] = 3.92*MeV;
+
+    ExcitSpins[15] = 1;
+    ExcitSpins[17] = 3;
+    ExcitSpins[18] = 4;
+    ExcitSpins[19] = 4;
+    ExcitSpins[20] = 4;
+    ExcitSpins[22] = 6;
+    ExcitSpins[23] = 6;
+    ExcitSpins[25] = 1;
+    ExcitSpins[26] = 10;
+    ExcitSpins[27] = 3;
+    ExcitSpins[28] = 10;
+    ExcitSpins[29] = 3;
+    ExcitSpins[30] = 6;
+    ExcitSpins[31] = 5;
 	
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);	
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);	
 	
 }
 G4DeuteronEvaporationProbability::G4DeuteronEvaporationProbability(const G4DeuteronEvaporationProbability &right)
 {
- G4Exception("G4DeuteronEvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4DeuteronEvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -68,39 +87,39 @@ G4DeuteronEvaporationProbability::G4DeuteronEvaporationProbability(const G4Deute
 const G4DeuteronEvaporationProbability & G4DeuteronEvaporationProbability::
 operator=(const G4DeuteronEvaporationProbability &right)
 {
-  G4Exception("G4DeuteronEvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4DeuteronEvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4DeuteronEvaporationProbability::operator==(const G4DeuteronEvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4DeuteronEvaporationProbability::operator!=(const G4DeuteronEvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4DeuteronEvaporationProbability::CCoeficient(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
-	// G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
-	// C for deuteron is equal to C for protons divided by 2
-	G4double C = 0.0;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
+    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
+    // C for deuteron is equal to C for protons divided by 2
+    G4double C = 0.0;
 	
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}
+    if (aZ >= 70) {
+	C = 0.10;
+    } else {
+	C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+    }
 	
-	return C/2.0;
+    return C/2.0;
 	
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
index 06a5f568fd..edf10c0e3b 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaDeexcitation.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4DiscreteGammaDeexcitation
@@ -39,8 +53,8 @@ G4DiscreteGammaDeexcitation::~G4DiscreteGammaDeexcitation() {}
 G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
 {
   G4Fragment nucleus = GetNucleus();
-  G4int A = nucleus.GetA();
-  G4int Z = nucleus.GetZ();
+  G4int A = static_cast<G4int>(nucleus.GetA());
+  G4int Z = static_cast<G4int>(nucleus.GetZ());
 
   if (_levelManager.IsValid(Z,A)) 
     { 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
index ea15e87efa..f2d9d3b5f5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DiscreteGammaTransition.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4ContDiscrGammaTransition
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4DummyProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4DummyProbability.cc
index 0171f9c412..60da19bf16 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4DummyProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4DummyProbability.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4DummyProbability.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
index 4b839d22ff..cfae6ae771 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1Probability.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
index bb78d30905..c4467897f4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability001.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1Probability001.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
index 8a6e238b1a..90ede2cce2 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability01.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1Probability01.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
index b06622cea5..442fdf2fc4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability10.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1Probability10.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
index f57cba9f35..2bef233664 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1Probability100.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1Probability100.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
index 867dcb0528..a4e6ee5738 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability001.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1SingleProbability001.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
index 8ea11f3e9d..7ca50db992 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability01.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1SingleProbability01.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
index 9db65b97cf..7b5ee126ae 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability1.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1SingleProbability1.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
index fed1497aa1..30f1c958b0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability10.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1SingleProbability10.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
index 3f05ff0283..f447742651 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4E1SingleProbability100.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 //  Class G4E1SingleProbability100.cc
 //
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
index a14a23ae9e..827415d171 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4Evaporation.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Evaporation.cc,v 1.5.2.1 2001/06/28 19:13:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -21,140 +40,226 @@
 
 G4Evaporation::G4Evaporation() : myOwnChannelsVector(true)
 {
-	theChannels = new G4RWTPtrOrderedVector<G4VEvaporationChannel>;
+    theChannels = new G4std::vector<G4VEvaporationChannel*>;
+    theChannels->reserve(8);
 
-	theChannels->insert( new G4NeutronEvaporationChannel() );  // n
-	theChannels->insert( new G4ProtonEvaporationChannel() );   // p
-	theChannels->insert( new G4DeuteronEvaporationChannel() ); // Deuteron
-	theChannels->insert( new G4TritonEvaporationChannel() );   // Triton
-	theChannels->insert( new G4He3EvaporationChannel() );      // He3
-	theChannels->insert( new G4AlphaEvaporationChannel() );    // Alpha
+    theChannels->push_back( new G4NeutronEvaporationChannel() );  // n
+    theChannels->push_back( new G4ProtonEvaporationChannel() );   // p
+    theChannels->push_back( new G4DeuteronEvaporationChannel() ); // Deuteron
+    theChannels->push_back( new G4TritonEvaporationChannel() );   // Triton
+    theChannels->push_back( new G4He3EvaporationChannel() );      // He3
+    theChannels->push_back( new G4AlphaEvaporationChannel() );    // Alpha
 
-	theChannels->insert( new G4CompetitiveFission() ); // Fission Channel
-	theChannels->insert( new G4PhotonEvaporation() );  // Photon Channel
+    theChannels->push_back( new G4CompetitiveFission() ); // Fission Channel
+    theChannels->push_back( new G4PhotonEvaporation() );  // Photon Channel
 }
 
 G4Evaporation::G4Evaporation(const G4Evaporation &right)
 {
-	G4Exception("G4Evaporation::copy_constructor meant to not be accessable.");
+    G4Exception("G4Evaporation::copy_constructor meant to not be accessable.");
 }
 
 
 G4Evaporation::~G4Evaporation()
 {
-	if (myOwnChannelsVector) {
-		theChannels->clearAndDestroy();
-		delete theChannels;
+    if (myOwnChannelsVector) {
+	//    theChannels->clearAndDestroy();
+	while (!theChannels->empty()) {
+	    delete (theChannels->back());
+	    theChannels->pop_back();
 	}
+	delete theChannels;
+    }
 }
 
 const G4Evaporation & G4Evaporation::operator=(const G4Evaporation &right)
 {
-  G4Exception("G4Evaporation::operator= meant to not be accessable.");
-  return *this;
+    G4Exception("G4Evaporation::operator= meant to not be accessable.");
+    return *this;
 }
 
 
 G4bool G4Evaporation::operator==(const G4Evaporation &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4Evaporation::operator!=(const G4Evaporation &right) const
 {
-  return true;
+    return true;
 }
 
 
 G4FragmentVector * G4Evaporation::BreakItUp(const G4Fragment &theNucleus)
 {
-	G4FragmentVector * theResult = new G4FragmentVector;
-
-	// CHECK that Excitation Energy != 0
-	if (theNucleus.GetExcitationEnergy() <= 0.0) {
-		theResult->insert(new G4Fragment(theNucleus));
-		return theResult;
-	}
-
-	// The residual nucleus (after evaporation of each fragment)
-	G4Fragment theResidualNucleus = theNucleus;
-
-	// Number of channels
-	G4int TotNumberOfChannels = theChannels->entries();  
-	
-
-	// Starts loop over evaporated particles
-	for (;;) {
-		// loop over evaporation channels
-		G4int i;
-		for (i=0; i < TotNumberOfChannels; i++) {
-			theChannels->at(i)->Initialize(theResidualNucleus);
-    	}
-		// Work out total decay probability by summing over channels 
-		G4double TotalProbability = 0;
-		for (i=0; i < TotNumberOfChannels; i++) {
-			TotalProbability += theChannels->at(i)->GetEmissionProbability();
-		}
-		if (TotalProbability <= 0.0) {
-			// Will be no evaporation more
-			// write information about residual nucleus
-			theResult->insert(new G4Fragment(theResidualNucleus));
-			break; 
-		} else {
-			// Selection of evaporation channel, fission or gamma
-// 			G4double * EmissionProbChannel = new G4double(TotNumberOfChannels);
-			G4RWTValOrderedVector<G4double> EmissionProbChannel;
-	
-// 			EmissionProbChannel[0] = theChannels->at(0)->GetEmissionProbability();
-			EmissionProbChannel.insert(theChannels->at(0)->GetEmissionProbability()); // index 0
-			
-			for (i=1; i < TotNumberOfChannels; i++) {
-// 				EmissionProbChannel[i] = EmissionProbChannel[i-1] + 
-// 												 theChannels->at(i)->GetEmissionProbability();
-				EmissionProbChannel.insert(EmissionProbChannel(i-1) + 
-												 theChannels->at(i)->GetEmissionProbability());
-			}
-
-			G4double shoot = G4UniformRand() * TotalProbability;
-
-			for (i=0; i < TotNumberOfChannels; i++) {
-// 				if (shoot < EmissionProbChannel[i]) 
-				if (shoot < EmissionProbChannel(i)) 
-				break;
-			}
-			
-// 			delete [] EmissionProbChannel;
-			EmissionProbChannel.clear();
-			
-			if( i >= TotNumberOfChannels ) {
-				G4Exception( "G4Evaporation::BreakItUp: Can't define emission probability of the channels!" );
-			} else {
-				// Perform break-up
-				G4FragmentVector * theEvaporationResult = theChannels->at(i)->BreakUp(theResidualNucleus);
-
-				// Check if chosen channel is fission (there are only two EXCITED fragments)
-				// or the channel could not evaporate anything
-				if ( theEvaporationResult->entries() == 1 || 
-						(theEvaporationResult->first()->GetExcitationEnergy() > 0.0 && 
-						theEvaporationResult->last()->GetExcitationEnergy() > 0.0) ) {
-					// FISSION 
-					while (theEvaporationResult->entries() > 0) theResult->insert(theEvaporationResult->removeFirst());
-					theEvaporationResult->clearAndDestroy();
-					delete theEvaporationResult;
-					break;
-				} else {
-					// EVAPORATION
-					while (theEvaporationResult->entries() > 1) theResult->insert(theEvaporationResult->removeFirst());
-					theResidualNucleus = *(theEvaporationResult->at(0));
-					theEvaporationResult->clearAndDestroy();
-					delete theEvaporationResult;
-				}
-			}
-		}
-	}
+    G4FragmentVector * theResult = new G4FragmentVector;
 
+    // CHECK that Excitation Energy != 0
+    if (theNucleus.GetExcitationEnergy() <= 0.0) {
+	theResult->push_back(new G4Fragment(theNucleus));
 	return theResult;
+    }
+
+    // The residual nucleus (after evaporation of each fragment)
+    G4Fragment theResidualNucleus = theNucleus;
+
+    // Number of channels
+    G4int TotNumberOfChannels = theChannels->size();  
+	
+
+    // Starts loop over evaporated particles
+    for (;;) {
+	// loop over evaporation channels
+	G4std::vector<G4VEvaporationChannel*>::iterator i;
+	for (i=theChannels->begin(); i != theChannels->end(); i++) {
+	    (*i)->Initialize(theResidualNucleus);
+	}
+	// Work out total decay probability by summing over channels 
+	G4double TotalProbability = 0;
+	for (i=theChannels->begin(); i != theChannels->end(); i++) {
+	    TotalProbability += (*i)->GetEmissionProbability();
+	}
+	if (TotalProbability <= 0.0) {
+	    // Will be no evaporation more
+	    // write information about residual nucleus
+	    theResult->push_back(new G4Fragment(theResidualNucleus));
+	    break; 
+	} else {
+	    // Selection of evaporation channel, fission or gamma
+	    // G4double * EmissionProbChannel = new G4double(TotNumberOfChannels);
+	    G4std::vector<G4double> EmissionProbChannel;
+	
+	    // EmissionProbChannel[0] = theChannels->at(0)->GetEmissionProbability();
+	    EmissionProbChannel.push_back(theChannels->front()->GetEmissionProbability()); // index 0
+			
+	    for (i= (theChannels->begin()+1); i != theChannels->end(); i++) {
+		// EmissionProbChannel[i] = EmissionProbChannel[i-1] + 
+		// theChannels->at(i)->GetEmissionProbability();
+		EmissionProbChannel.push_back(EmissionProbChannel.back() + (*i)->GetEmissionProbability());
+	    }
+
+	    G4double shoot = G4UniformRand() * TotalProbability;
+	    G4int j;
+	    for (j=0; j < TotNumberOfChannels; j++) {
+		// if (shoot < EmissionProbChannel[i]) 
+		if (shoot < EmissionProbChannel[j]) 
+		    break;
+	    }
+			
+	    // delete [] EmissionProbChannel;
+	    EmissionProbChannel.clear();
+			
+	    if( j >= TotNumberOfChannels ) {
+		G4Exception( "G4Evaporation::BreakItUp: Can't define emission probability of the channels!" );
+	    } else {
+		// Perform break-up
+		G4FragmentVector * theEvaporationResult = (*theChannels)[j]->BreakUp(theResidualNucleus);
+
+#ifdef debug
+		G4cout <<           "---------------------------------------------" 
+		       << G4endl;
+		G4cout << G4endl << " After evaporate a particle test conservation " 
+		       << G4endl;
+		CheckConservation(theResidualNucleus,theEvaporationResult);
+		G4cout << G4endl 
+		       <<           "---------------------------------------------" 
+		       << G4endl;
+#endif  
+
+		// Check if chosen channel is fission (there are only two EXCITED fragments)
+		// or the channel could not evaporate anything
+		if ( theEvaporationResult->size() == 1 || 
+		     ((*(theEvaporationResult->begin()))->GetExcitationEnergy() > 0.0 && 
+		      (*(theEvaporationResult->end()-1))->GetExcitationEnergy() > 0.0) ) {
+		    // FISSION 
+		    while (theEvaporationResult->size() > 0) {
+			theResult->push_back(*(theEvaporationResult->end()-1));
+			theEvaporationResult->pop_back();
+		    }
+		    if (theEvaporationResult->empty()) delete theEvaporationResult;
+		    else G4Exception("G4Evaporation.cc: deleting theEvaporationResult but is not empty after fission");
+		    break;
+		} else {
+		    // EVAPORATION
+		    while (theEvaporationResult->size() > 1) {
+			theResult->push_back(*(theEvaporationResult->begin()));
+			theEvaporationResult->erase(theEvaporationResult->begin());
+		    }
+		    theResidualNucleus = **(theEvaporationResult->begin());
+		    delete *(theEvaporationResult->begin());
+		    theEvaporationResult->pop_back();
+		    if (theEvaporationResult->empty()) delete theEvaporationResult;
+		    else G4Exception("G4Evaporation.cc: deleting theEvaporationResult but is not empty after evaporation");
+		}
+	    }
+	}
+    }
+
+#ifdef debug
+    G4cout << "======== Evaporation Conservation Test ===========" << G4endl 
+	   << "==================================================" << G4endl;
+    CheckConservation(theNucleus,theResult);
+    G4cout << "==================================================" << G4endl;
+#endif
+    return theResult;
 }
 
 
 
+#ifdef debug
+void G4Evaporation::CheckConservation(const G4Fragment & theInitialState,
+				      G4FragmentVector * Result) const
+{
+    G4double ProductsEnergy =0;
+    G4ThreeVector ProductsMomentum;
+    G4int ProductsA = 0;
+    G4int ProductsZ = 0;
+    for (G4FragmentVector::iterator h = Result->begin(); h != Result->end(); h++) {
+	G4LorentzVector tmp = (*h)->GetMomentum();
+	ProductsEnergy += tmp.e();
+	ProductsMomentum += tmp.vect();
+	ProductsA += G4int((*h)->GetA());
+	ProductsZ += G4int((*h)->GetZ());
+    }
+
+    if (ProductsA != theInitialState.GetA()) {
+	G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4Evaporation.cc: Barionic Number Conservation test for evaporation fragments" 
+	       << G4endl; 
+	G4cout << "Initial A = " << theInitialState.GetA() 
+	       << "   Fragments A = " << ProductsA << "   Diference --> " 
+	       << theInitialState.GetA() - ProductsA << G4endl;
+    }
+    if (ProductsZ != theInitialState.GetZ()) {
+	G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4Evaporation.cc: Charge Conservation test for evaporation fragments" 
+	       << G4endl; 
+	G4cout << "Initial Z = " << theInitialState.GetZ() 
+	       << "   Fragments Z = " << ProductsZ << "   Diference --> " 
+	       << theInitialState.GetZ() - ProductsZ << G4endl;
+    }
+    if (abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV) {
+	G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4Evaporation.cc: Energy Conservation test for evaporation fragments" 
+	       << G4endl; 
+	G4cout << "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
+	       << "   Fragments E = " << ProductsEnergy/MeV  << " MeV   Diference --> " 
+	       << (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV" << G4endl;
+    } 
+    if (abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV || 
+	abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
+	abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV) {
+	G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!" << G4endl;
+	G4cout << "G4Evaporation.cc: Momentum Conservation test for evaporation fragments" 
+	       << G4endl; 
+	G4cout << "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
+	       << "   Fragments P = " << ProductsMomentum  << " MeV   Diference --> " 
+	       << theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV" << G4endl;
+    }
+    return;
+}
+#endif
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationChannel.cc
index f91b732622..71c44c795f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationChannel.cc
@@ -1,34 +1,85 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4EvaporationChannel.cc,v 1.6.2.1 2001/06/28 19:13:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
 //
 
 #include "G4EvaporationChannel.hh"
+#include "G4PairingCorrection.hh"
+
 
 G4EvaporationChannel::G4EvaporationChannel(const G4int theA, const G4int theZ,
-  								G4VEmissionProbability * aEmissionStrategy,
-								G4VCoulombBarrier * aCoulombBarrier):
-	A(theA),
-	Z(theZ),
-	theEvaporationProbabilityPtr(aEmissionStrategy),
-	theCoulombBarrierPtr(aCoulombBarrier),
-	MaximalKineticEnergy(-1000.0),
-	EmissionProbability(0.0)
+					   G4VEmissionProbability * aEmissionStrategy,
+					   G4VCoulombBarrier * aCoulombBarrier):
+    A(theA),
+    Z(theZ),
+    theEvaporationProbabilityPtr(aEmissionStrategy),
+    theCoulombBarrierPtr(aCoulombBarrier),
+    MaximalKineticEnergy(-1000.0),
+    EmissionProbability(0.0)
 { 
-	theLevelDensityPtr = new G4EvaporationLevelDensityParameter;
-	MyOwnLevelDensity = true;
+    theLevelDensityPtr = new G4EvaporationLevelDensityParameter;
+    MyOwnLevelDensity = true;
+}
+
+G4EvaporationChannel::G4EvaporationChannel(const G4int theA, const G4int theZ, const G4String & aName,
+					   G4VEmissionProbability * aEmissionStrategy,
+					   G4VCoulombBarrier * aCoulombBarrier):
+    A(theA),
+    Z(theZ),
+    theEvaporationProbabilityPtr(aEmissionStrategy),
+    theCoulombBarrierPtr(aCoulombBarrier),
+    MaximalKineticEnergy(-1000.0),
+    EmissionProbability(0.0),
+    G4VEvaporationChannel(aName)
+{ 
+    theLevelDensityPtr = new G4EvaporationLevelDensityParameter;
+    MyOwnLevelDensity = true;
+}
+
+G4EvaporationChannel::G4EvaporationChannel(const G4int theA, const G4int theZ, const G4String * aName,
+					   G4VEmissionProbability * aEmissionStrategy,
+					   G4VCoulombBarrier * aCoulombBarrier):
+    A(theA),
+    Z(theZ),
+    theEvaporationProbabilityPtr(aEmissionStrategy),
+    theCoulombBarrierPtr(aCoulombBarrier),
+    MaximalKineticEnergy(-1000.0),
+    EmissionProbability(0.0),
+    G4VEvaporationChannel(aName)
+{ 
+    theLevelDensityPtr = new G4EvaporationLevelDensityParameter;
+    MyOwnLevelDensity = true;
 }
 
 
 G4EvaporationChannel::~G4EvaporationChannel()
 {
-	if (MyOwnLevelDensity) delete theLevelDensityPtr;
+    if (MyOwnLevelDensity) delete theLevelDensityPtr;
 }
 
 
@@ -36,25 +87,25 @@ G4EvaporationChannel::~G4EvaporationChannel()
 
 G4EvaporationChannel::G4EvaporationChannel(const G4EvaporationChannel & right)
 {
-	G4Exception("G4EvaporationChannel::copy_costructor meant to not be accessable");
+    G4Exception("G4EvaporationChannel::copy_costructor meant to not be accessable");
 }
 
 const G4EvaporationChannel & G4EvaporationChannel::operator=(const G4EvaporationChannel & right)
 {
-	G4Exception("G4EvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4EvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4EvaporationChannel::operator==(const G4EvaporationChannel & right) const 
 {
-	return (this == (G4EvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4EvaporationChannel *) &right);
+    //  return false;
 }
 
 G4bool G4EvaporationChannel::operator!=(const G4EvaporationChannel & right) const 
 {
-	return (this != (G4EvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4EvaporationChannel *) &right);
+    //  return true;
 }
 
 
@@ -62,80 +113,100 @@ G4bool G4EvaporationChannel::operator!=(const G4EvaporationChannel & right) cons
 void G4EvaporationChannel::Initialize(const G4Fragment & fragment)
 {
 
-	G4int anA = G4int(fragment.GetA());
-	G4int aZ = G4int(fragment.GetZ());
-	AResidual = anA - A;
-	ZResidual = aZ - Z;
+    G4int anA = G4int(fragment.GetA());
+    G4int aZ = G4int(fragment.GetZ());
+    AResidual = anA - A;
+    ZResidual = aZ - Z;
 
-	// Effective excitation energy
-	G4double ExEnergy = fragment.GetExcitationEnergy() - PairingCorrection(anA,aZ);
+    // Effective excitation energy
+    G4double ExEnergy = fragment.GetExcitationEnergy() - G4PairingCorrection::GetPairingCorrection(anA,aZ);
 
-	// We only take into account channels which are physically allowed
-	if (AResidual <= 0 || ZResidual <= 0 || AResidual < ZResidual ||
-      (AResidual == ZResidual && AResidual > 1) || ExEnergy <= 0.0) {
-// 		LevelDensityParameter = 0.0;
-		CoulombBarrier = 0.0;
-// 		BindingEnergy = 0.0;
-		MaximalKineticEnergy = -1000.0*MeV;
-		EmissionProbability = 0.0;
-	} else {
-// 		// Get Level Density
-// 		LevelDensityParameter = theLevelDensityPtr->LevelDensityParameter(anA,aZ,ExEnergy);
+    // We only take into account channels which are physically allowed
+    if (AResidual <= 0 || ZResidual <= 0 || AResidual < ZResidual ||
+	(AResidual == ZResidual && AResidual > 1) || ExEnergy <= 0.0) {
+	// 		LevelDensityParameter = 0.0;
+	CoulombBarrier = 0.0;
+	// 		BindingEnergy = 0.0;
+	MaximalKineticEnergy = -1000.0*MeV;
+	EmissionProbability = 0.0;
+    } else {
+	// // Get Level Density
+	// LevelDensityParameter = theLevelDensityPtr->LevelDensityParameter(anA,aZ,ExEnergy);
 
-		// Coulomb Barrier calculation
-		CoulombBarrier = theCoulombBarrierPtr->GetCoulombBarrier(AResidual,ZResidual,ExEnergy);
+	// Coulomb Barrier calculation
+	CoulombBarrier = theCoulombBarrierPtr->GetCoulombBarrier(AResidual,ZResidual,ExEnergy);
 	
-// 		// Binding Enegy (for separate fragment from nucleus)
-// 		BindingEnergy = CalcBindingEnergy(anA,aZ);
+	// // Binding Enegy (for separate fragment from nucleus)
+	// BindingEnergy = CalcBindingEnergy(anA,aZ);
 
-		// Maximal Kinetic Energy
- 		MaximalKineticEnergy = CalcMaximalKineticEnergy(G4ParticleTable::GetParticleTable()->
- 																GetIonTable()->GetNucleusMass(aZ,anA)+ExEnergy);
+	// Maximal Kinetic Energy
+	MaximalKineticEnergy = CalcMaximalKineticEnergy(G4ParticleTable::GetParticleTable()->
+							GetIonTable()->GetNucleusMass(aZ,anA)+ExEnergy);
 		
-		// Emission probability
-		if (MaximalKineticEnergy <= 0.0) EmissionProbability = 0.0;
-		else { 
-			// Total emission probability for this channel
-			EmissionProbability = theEvaporationProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
+	// Emission probability
+	if (MaximalKineticEnergy <= 0.0) EmissionProbability = 0.0;
+	else { 
+	    // Total emission probability for this channel
+	    EmissionProbability = theEvaporationProbabilityPtr->EmissionProbability(fragment,MaximalKineticEnergy);
 
-		}
 	}
+    }
 	
-	return;
+    return;
 }
 
 
 G4FragmentVector * G4EvaporationChannel::BreakUp(const G4Fragment & theNucleus)
 {
 
-	G4double EvaporatedKineticEnergy = CalcKineticEnergy();
-	G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A);
-	G4double EvaporatedEnergy = EvaporatedKineticEnergy + EvaporatedMass;
+    G4double EvaporatedKineticEnergy = CalcKineticEnergy();
+    G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(Z,A);
+    G4double EvaporatedEnergy = EvaporatedKineticEnergy + EvaporatedMass;
 
-	G4ThreeVector momentum(IsotropicVector(sqrt(EvaporatedKineticEnergy*
-															(EvaporatedKineticEnergy+2.0*EvaporatedMass))));
+    G4ThreeVector momentum(IsotropicVector(sqrt(EvaporatedKineticEnergy*
+						(EvaporatedKineticEnergy+2.0*EvaporatedMass))));
   
-	G4LorentzVector EvaporatedMomentum(momentum,EvaporatedEnergy);
-	EvaporatedMomentum.boost(theNucleus.GetMomentum().boostVector());
+    G4LorentzVector EvaporatedMomentum(momentum,EvaporatedEnergy);
+    EvaporatedMomentum.boost(theNucleus.GetMomentum().boostVector());
 
-	G4Fragment * EvaporatedFragment = new G4Fragment(A,Z,EvaporatedMomentum);
+    G4Fragment * EvaporatedFragment = new G4Fragment(A,Z,EvaporatedMomentum);
 
-	// ** And now the residual nucleus ** 
-	G4double theExEnergy = theNucleus.GetExcitationEnergy();
-	G4double theMass = G4ParticleTable::GetParticleTable()->GetIonTable()->
-							GetNucleusMass(theNucleus.GetZ(),theNucleus.GetA());
-	G4double ResidualEnergy = theMass + (theExEnergy - EvaporatedKineticEnergy) - EvaporatedMass;
+    // ** And now the residual nucleus ** 
+    G4double theExEnergy = theNucleus.GetExcitationEnergy();
+    G4double theMass = G4ParticleTable::GetParticleTable()->GetIonTable()->
+	GetNucleusMass(theNucleus.GetZ(),theNucleus.GetA());
+    G4double ResidualEnergy = theMass + (theExEnergy - EvaporatedKineticEnergy) - EvaporatedMass;
 	
-	G4LorentzVector ResidualMomentum(-momentum,ResidualEnergy);
-	ResidualMomentum.boost(theNucleus.GetMomentum().boostVector());
+    G4LorentzVector ResidualMomentum(-momentum,ResidualEnergy);
+    ResidualMomentum.boost(theNucleus.GetMomentum().boostVector());
 	
-	G4Fragment * ResidualFragment = new G4Fragment( AResidual, ZResidual, ResidualMomentum );
+    G4Fragment * ResidualFragment = new G4Fragment( AResidual, ZResidual, ResidualMomentum );
 
 
-	G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-	theResult->insert(EvaporatedFragment);
-	theResult->insert(ResidualFragment);	return theResult; 
+#ifdef debug
+    G4double Efinal = ResidualMomentum.e() + EvaporatedMomentum.e();
+    G4ThreeVector Pfinal = ResidualMomentum.vect() + EvaporatedMomentum.vect();
+    if (abs(Efinal-theNucleus.GetMomentum().e()) > 1.0*keV) {
+	G4cout << "@@@@@@@@@@@@@@@@@@@@@ G4Evaporation Chanel: ENERGY @@@@@@@@@@@@@@@@" << G4endl;
+	G4cout << "Initial : " << theNucleus.GetMomentum().e()/MeV << " MeV    Final :" 
+	       <<Efinal/MeV << " MeV    Delta: " <<  (Efinal-theNucleus.GetMomentum().e())/MeV 
+	       << " MeV" << G4endl;
+    }
+    if (abs(Pfinal.x()-theNucleus.GetMomentum().x()) > 1.0*keV ||
+	abs(Pfinal.y()-theNucleus.GetMomentum().y()) > 1.0*keV ||
+	abs(Pfinal.z()-theNucleus.GetMomentum().z()) > 1.0*keV ) {
+	G4cout << "@@@@@@@@@@@@@@@@@@@@@ G4Evaporation Chanel: MOMENTUM @@@@@@@@@@@@@@@@" << G4endl;
+	G4cout << "Initial : " << theNucleus.GetMomentum().vect() << " MeV    Final :" 
+	       <<Pfinal/MeV << " MeV    Delta: " <<  Pfinal-theNucleus.GetMomentum().vect()
+	       << " MeV" << G4endl;   
+
+    }
+#endif
+    theResult->push_back(EvaporatedFragment);
+    theResult->push_back(ResidualFragment);
+    return theResult; 
 } 
 
 
@@ -155,77 +226,70 @@ G4FragmentVector * G4EvaporationChannel::BreakUp(const G4Fragment & theNucleus)
 
 
 G4double G4EvaporationChannel::CalcMaximalKineticEnergy(const G4double NucleusTotalE)
-// Calculate maximal kinetic energy that can be carried by fragment.
+    // Calculate maximal kinetic energy that can be carried by fragment.
 {
-	G4double ResidualMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass( ZResidual, AResidual );
-	G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass( Z, A );
+    G4double ResidualMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass( ZResidual, AResidual );
+    G4double EvaporatedMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass( Z, A );
 	
-	G4double T = (NucleusTotalE*NucleusTotalE + EvaporatedMass*EvaporatedMass - ResidualMass*ResidualMass)/
-					(2.0*NucleusTotalE) -
-					EvaporatedMass - CoulombBarrier;
+    G4double T = (NucleusTotalE*NucleusTotalE + EvaporatedMass*EvaporatedMass - ResidualMass*ResidualMass)/
+	(2.0*NucleusTotalE) -
+	EvaporatedMass - CoulombBarrier;
 	
-	return T;
+    return T;
 }
 
 
 
 
 G4double G4EvaporationChannel::CalcKineticEnergy(void)
-// Samples fragment kinetic energy.
-// It uses Dostrovsky's approximation for the inverse reaction cross
-// in the probability for fragment emisson
+    // Samples fragment kinetic energy.
+    // It uses Dostrovsky's approximation for the inverse reaction cross
+    // in the probability for fragment emisson
 {
-	if (MaximalKineticEnergy < 0.0) 
-		G4Exception("G4EvaporationChannel::CalcKineticEnergy: maximal kinetic energy is less than 0");
+    if (MaximalKineticEnergy < 0.0) 
+	G4Exception("G4EvaporationChannel::CalcKineticEnergy: maximal kinetic energy is less than 0");
 
-	G4double Rb = 4.0*theLevelDensityPtr->LevelDensityParameter(AResidual+A,ZResidual+Z,MaximalKineticEnergy)*
-						MaximalKineticEnergy;
-	G4double RbSqrt = sqrt(Rb);
-	G4double PEX1 = 0.0;
-	if (RbSqrt < 160.0) PEX1 = exp(-RbSqrt);
-	G4double Rk = 0.0;
-	G4double FRk = 0.0;
-	do {
-		G4double RandNumber = G4UniformRand();
-		Rk = 1.0 + (1./RbSqrt)*log(RandNumber + (1.0-RandNumber)*PEX1);
-		G4double Q1 = 1.0;
-		G4double Q2 = 1.0;
-		if (Z == 0) { // for emitted neutron
-			G4double Beta = (2.12/pow(AResidual,2./3.) - 0.05)*MeV/
-								(0.76 + 2.2/pow(AResidual,1./3.));
-			Q1 = 1.0 + Beta/(MaximalKineticEnergy);
-			Q2 = Q1*sqrt(Q1);
-		} 
+    G4double Rb = 4.0*theLevelDensityPtr->LevelDensityParameter(AResidual+A,ZResidual+Z,MaximalKineticEnergy)*
+	MaximalKineticEnergy;
+    G4double RbSqrt = sqrt(Rb);
+    G4double PEX1 = 0.0;
+    if (RbSqrt < 160.0) PEX1 = exp(-RbSqrt);
+    G4double Rk = 0.0;
+    G4double FRk = 0.0;
+    do {
+	G4double RandNumber = G4UniformRand();
+	Rk = 1.0 + (1./RbSqrt)*log(RandNumber + (1.0-RandNumber)*PEX1);
+	G4double Q1 = 1.0;
+	G4double Q2 = 1.0;
+	if (Z == 0) { // for emitted neutron
+	    G4double Beta = (2.12/pow(AResidual,2./3.) - 0.05)*MeV/
+		(0.76 + 2.2/pow(AResidual,1./3.));
+	    Q1 = 1.0 + Beta/(MaximalKineticEnergy);
+	    Q2 = Q1*sqrt(Q1);
+	} 
     
-		FRk = (3.0*sqrt(3.0)/2.0)/Q2 * Rk * (Q1 - Rk*Rk);
+	FRk = (3.0*sqrt(3.0)/2.0)/Q2 * Rk * (Q1 - Rk*Rk);
     
-	} while (FRk < G4UniformRand());
+    } while (FRk < G4UniformRand());
 
-  G4double result =  MaximalKineticEnergy * (1.0-Rk*Rk) + CoulombBarrier;
+    G4double result =  MaximalKineticEnergy * (1.0-Rk*Rk) + CoulombBarrier;
 
-  return result;
+    return result;
 } 
  
 
 G4ThreeVector G4EvaporationChannel::IsotropicVector(const G4double Magnitude)
-  // Samples a isotropic random vectorwith a magnitud given by Magnitude.
-  // By default Magnitude = 1.0
+    // Samples a isotropic random vectorwith a magnitud given by Magnitude.
+    // By default Magnitude = 1.0
 {
-	G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-	G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-	G4double Phi = twopi*G4UniformRand();
-	G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
-								Magnitude*sin(Phi)*SinTheta,
-								Magnitude*CosTheta);
-	return Vector;
+    G4double CosTheta = 1.0 - 2.0*G4UniformRand();
+    G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
+    G4double Phi = twopi*G4UniformRand();
+    G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
+			 Magnitude*sin(Phi)*SinTheta,
+			 Magnitude*CosTheta);
+    return Vector;
 }
 
 
-G4double G4EvaporationChannel::PairingCorrection(const G4int anA, const G4int aZ) const
-{
-	const G4double PairingConstant = 12.0*MeV;
-	const G4int N = anA - aZ;
-	G4double Pair = (1.0 - G4double(aZ) + 2.0*(aZ/2)) + (1.0 - G4double(N) + 2.0*(N/2));
-	G4double PCorrection = Pair*PairingConstant/sqrt(G4double(anA));
-	return PCorrection;
-}
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationLevelDensityParameter.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationLevelDensityParameter.cc
index 96937a2452..aa813580f8 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationLevelDensityParameter.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationLevelDensityParameter.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4EvaporationLevelDensityParameter.cc,v 1.4.2.1 2001/06/28 19:13:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -23,44 +42,44 @@ const G4double G4EvaporationLevelDensityParameter::Bs = 1.0;
 G4EvaporationLevelDensityParameter::
 G4EvaporationLevelDensityParameter(const G4EvaporationLevelDensityParameter &right)
 {
-  G4Exception("G4EvaporationLevelDensityParameter::copy_constructor meant to not be accessable");
+    G4Exception("G4EvaporationLevelDensityParameter::copy_constructor meant to not be accessable");
 }
 
 
 const G4EvaporationLevelDensityParameter & G4EvaporationLevelDensityParameter::
 operator=(const G4EvaporationLevelDensityParameter &right)
 {
-  G4Exception("G4EvaporationLevelDensityParameter::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4EvaporationLevelDensityParameter::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4EvaporationLevelDensityParameter::operator==(const G4EvaporationLevelDensityParameter &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4EvaporationLevelDensityParameter::operator!=(const G4EvaporationLevelDensityParameter &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4EvaporationLevelDensityParameter::LevelDensityParameter(const G4int A,const G4int Z,
-																						const G4double U) const 
+								   const G4double U) const 
 {
-	G4int N = A - Z;
+    G4int N = A - Z;
 
-	// Asymptotic Level Density Parameter
-	G4double AsymptoticLDP = (alpha*G4double(A) + beta*pow(G4double(A),2./3.)*Bs)/MeV;
+    // Asymptotic Level Density Parameter
+    G4double AsymptoticLDP = (alpha*G4double(A) + beta*pow(G4double(A),2./3.)*Bs)/MeV;
 	
-	// Shape of the LDP U dependence
-	G4double exponent = -gamma*U;
-	G4double f = 1.;
-	if (exponent > -300.) f -= exp(exponent);
+    // Shape of the LDP U dependence
+    G4double exponent = -gamma*U;
+    G4double f = 1.;
+    if (exponent > -300.) f -= exp(exponent);
 	
-	// Level Density Parameter
-	G4double a = AsymptoticLDP*(1. + ShellCorrection(Z,N)*f/U);
+    // Level Density Parameter
+    G4double a = AsymptoticLDP*(1. + ShellCorrection(Z,N)*f/U);
 	
-	return a;
+    return a;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationProbability.cc
index 83a90b8a4e..cabff23a7c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4EvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4EvaporationProbability.cc,v 1.4.2.1 2001/06/28 19:13:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -11,13 +30,13 @@
 
 
 #include "G4EvaporationProbability.hh"
-
+#include "G4PairingCorrection.hh"
 
 
 
 G4EvaporationProbability::G4EvaporationProbability(const G4EvaporationProbability &right)
 {
- G4Exception("G4EvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4EvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -26,95 +45,89 @@ G4EvaporationProbability::G4EvaporationProbability(const G4EvaporationProbabilit
 const G4EvaporationProbability & G4EvaporationProbability::
 operator=(const G4EvaporationProbability &right)
 {
-  G4Exception("G4EvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4EvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4EvaporationProbability::operator==(const G4EvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4EvaporationProbability::operator!=(const G4EvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4EvaporationProbability::EmissionProbability(const G4Fragment & fragment, const G4double anEnergy)
 {
-	G4double EmissionProbability = 0.0;
-	G4double MaximalKineticEnergy = anEnergy;
-	if (MaximalKineticEnergy > 0.0 && fragment.GetExcitationEnergy() > 0.0) {
-		EmissionProbability = CalcProbability(fragment,MaximalKineticEnergy);
-// 		// Next there is a loop over excited states for this channel summing probabilities
-// 		G4double SavedGamma = Gamma;
-// 		for (G4int i = 0; i < ExcitationEnergies->length(); i++) {
-// 			if (ExcitationSpins->operator()(i) < 0.1) continue;
-// 			Gamma = ExcitationSpins->operator()(i)*A; // A is the channel mass number
-// 			// substract excitation energies
-// 			MaximalKineticEnergy -= ExcitationEnergies->operator()(i);
-// 			// update probability
-// 			EmissionProbability += CalcProbability(fragment,MaximalKineticEnergy);
-// 				EmissionProbability += tmp;
-// 			}
-// 		// restore Gamma and MaximalKineticEnergy
-// 		MaximalKineticEnergy = SavedMaximalKineticEnergy;
-// 		Gamma = SavedGamma;
-// 		}
-	}
-	return EmissionProbability;
+    G4double EmissionProbability = 0.0;
+    G4double MaximalKineticEnergy = anEnergy;
+    if (MaximalKineticEnergy > 0.0 && fragment.GetExcitationEnergy() > 0.0) {
+	EmissionProbability = CalcProbability(fragment,MaximalKineticEnergy);
+	// 		// Next there is a loop over excited states for this channel summing probabilities
+	// 		G4double SavedGamma = Gamma;
+	// 		for (G4int i = 0; i < ExcitationEnergies->length(); i++) {
+	// 			if (ExcitationSpins->operator()(i) < 0.1) continue;
+	// 			Gamma = ExcitationSpins->operator()(i)*A; // A is the channel mass number
+	// 			// substract excitation energies
+	// 			MaximalKineticEnergy -= ExcitationEnergies->operator()(i);
+	// 			// update probability
+	// 			EmissionProbability += CalcProbability(fragment,MaximalKineticEnergy);
+	// 				EmissionProbability += tmp;
+	// 			}
+	// 		// restore Gamma and MaximalKineticEnergy
+	// 		MaximalKineticEnergy = SavedMaximalKineticEnergy;
+	// 		Gamma = SavedGamma;
+	// 		}
+    }
+    return EmissionProbability;
 }
 
-G4double G4EvaporationProbability::CalcProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy)
-  // Calculate integrated probability (width) for rvaporation channel
+G4double G4EvaporationProbability::CalcProbability(const G4Fragment & fragment, 
+						   const G4double MaximalKineticEnergy)
+    // Calculate integrated probability (width) for rvaporation channel
 {	
-	G4double ResidualA = G4double(fragment.GetA() - theA);
-	G4double ResidualZ = G4double(fragment.GetZ() - theZ);
-	G4double U = fragment.GetExcitationEnergy();
+    G4double ResidualA = G4double(fragment.GetA() - theA);
+    G4double ResidualZ = G4double(fragment.GetZ() - theZ);
+    G4double U = fragment.GetExcitationEnergy();
 	
-	G4double NuclearMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass(theZ,theA);
+    G4double NuclearMass = G4ParticleTable::GetParticleTable()->GetIonTable()->GetNucleusMass(theZ,theA);
 
 
-	G4double delta0 = PairingCorrection(fragment.GetA(),fragment.GetZ());
+    G4double delta0 = G4PairingCorrection::GetPairingCorrection(fragment.GetA(),fragment.GetZ());
 
-	G4double SystemEntropy = 2.0*sqrt(theEvapLDPptr->LevelDensityParameter(fragment.GetA(),fragment.GetZ(),U)*(U-delta0));
+    G4double SystemEntropy = 2.0*sqrt(theEvapLDPptr->LevelDensityParameter(fragment.GetA(),
+									   fragment.GetZ(),U)*
+				      (U-delta0));
 								  
-	// compute the integrated probability of evaporation channel
-	G4double RN = 1.5*fermi;
+    // compute the integrated probability of evaporation channel
+    G4double RN = 1.5*fermi;
 
-	G4double Alpha = CalcAlphaParam(fragment);
-	G4double Beta = CalcBetaParam(fragment);
+    G4double Alpha = CalcAlphaParam(fragment);
+    G4double Beta = CalcBetaParam(fragment);
 	
-	G4double Rmax = MaximalKineticEnergy;
-	G4double a = theEvapLDPptr->LevelDensityParameter(ResidualA,ResidualZ,Rmax);
-	G4double GlobalFactor = G4double(Gamma) * (Alpha/(a*a)) *
-									(NuclearMass*RN*RN*pow(ResidualA,2./3.))/
-									(2.*pi* hbar_Planck*hbar_Planck);
-	G4double Term1 = (2.0*Beta*a-3.0)/2.0 + Rmax*a;
-	G4double Term2 = (2.0*Beta*a-3.0)*sqrt(Rmax*a) + 2.0*a*Rmax;
+    G4double Rmax = MaximalKineticEnergy;
+    G4double a = theEvapLDPptr->LevelDensityParameter(ResidualA,ResidualZ,Rmax);
+    G4double GlobalFactor = G4double(Gamma) * (Alpha/(a*a)) *
+	(NuclearMass*RN*RN*pow(ResidualA,2./3.))/
+	(2.*pi* hbar_Planck*hbar_Planck);
+    G4double Term1 = (2.0*Beta*a-3.0)/2.0 + Rmax*a;
+    G4double Term2 = (2.0*Beta*a-3.0)*sqrt(Rmax*a) + 2.0*a*Rmax;
 	
-	G4double ExpTerm1 = 0.0;
-	if (SystemEntropy <= 600.0) ExpTerm1 = exp(-SystemEntropy);
+    G4double ExpTerm1 = 0.0;
+    if (SystemEntropy <= 600.0) ExpTerm1 = exp(-SystemEntropy);
 	
-	G4double ExpTerm2 = 2.*sqrt(a*Rmax) - SystemEntropy;
-	if (ExpTerm2 > 700.0) ExpTerm2 = 700.0;
-	ExpTerm2 = exp(ExpTerm2);
+    G4double ExpTerm2 = 2.*sqrt(a*Rmax) - SystemEntropy;
+    if (ExpTerm2 > 700.0) ExpTerm2 = 700.0;
+    ExpTerm2 = exp(ExpTerm2);
 	
-	G4double Width = GlobalFactor*(Term1*ExpTerm1 + Term2*ExpTerm2);
+    G4double Width = GlobalFactor*(Term1*ExpTerm1 + Term2*ExpTerm2);
 	
-	return Width;
+    return Width;
 }
 
 
 
-G4double G4EvaporationProbability::PairingCorrection(const G4int A, const G4int Z) const
-{
-	const G4double PairingConstant = 12.0*MeV;
-	const G4int N = A - Z;
-	G4double Pair = (1.0 - G4double(Z) + 2.0*(Z/2)) + (1.0 - G4double(N) + 2.0*(N/2));
-	G4double PCorrection = Pair*PairingConstant/sqrt(G4double(A));
-	return PCorrection;
-}
-
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
index cea7a268c9..8cd7e88610 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ExcitationHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitationHandler.cc,v 1.6 2000/06/21 14:26:24 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitationHandler.cc,v 1.8.2.1 2001/06/28 19:13:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -75,117 +91,238 @@ G4bool G4ExcitationHandler::operator!=(const G4ExcitationHandler &right) const
 G4ReactionProductVector * G4ExcitationHandler::BreakItUp(const G4Fragment &theInitialState) const
 {
 
-  G4FragmentVector* theResult = 0; 
+  G4FragmentVector * theResult = 0; 
   G4double exEnergy = theInitialState.GetExcitationEnergy();
   G4double A = theInitialState.GetA();
   G4int Z = G4int(theInitialState.GetZ());
   G4int Zmax = GetMaxZ();
   G4double Amax = GetMaxA();
   
-  // Initial State De-Excitation 
-
-  if(A<GetMaxA()&&Z<GetMaxZ()&&
-     exEnergy>G4NucleiPropertiesTable::GetBindingEnergy(Z,A)) {
-
-    theResult = theFermiModel->BreakItUp(theInitialState);
-
-  } else   if (exEnergy>GetMinE()*A) {
-
-    theResult = theMultiFragmentation->BreakItUp(theInitialState);
-
-  } else {
-
-    theResult = theEvaporation->BreakItUp(theInitialState);
+  // Test applicability
+  if (A <= 4) {
+    G4cerr << "Does not make sense to deexcite" << G4endl;
+    G4cerr << theInitialState << G4endl;
+    G4Exception("G4ExcitationHandler.cc: I can't deexcite your compound nucleus");
   }
 
+  // Initial State De-Excitation 
+  if(A<GetMaxA()&&Z<GetMaxZ()&&
+     exEnergy>G4NucleiPropertiesTable::GetBindingEnergy(Z,A)) {
+    
+    theResult = theFermiModel->BreakItUp(theInitialState);
+    
+  } else   if (exEnergy>GetMinE()*A) {
+    
+    theResult = theMultiFragmentation->BreakItUp(theInitialState);
+    
+  } else {
+    
+    theResult = theEvaporation->BreakItUp(theInitialState);
+  }
+  
 
 
 
   // De-Excitation loop
 
-
+  
   G4Fragment theExcitedNucleus;
   G4FragmentVector* theTempResult = 0; 
 
+
   // Check if there are excited fragments
-  G4int i;
-  for (i = 0; i < theResult->entries(); i++) {
-    exEnergy = theResult->at(i)->GetExcitationEnergy();
+  for (G4int i = 0; i < theResult->size(); i++) {
+    exEnergy = (*theResult)[i]->GetExcitationEnergy();
     if (exEnergy > 0.0) {
-      A = theResult->at(i)->GetA();
-      Z = G4int(theResult->at(i)->GetZ());
-      theExcitedNucleus = *(theResult->at(i));
+      A = (*theResult)[i]->GetA();
+      Z = G4int((*theResult)[i]->GetZ());
+      theExcitedNucleus = *((*theResult)[i]);
       // try to de-excite this fragment
       if(A<GetMaxA()&&Z<GetMaxZ()&&
          exEnergy>G4NucleiPropertiesTable::GetBindingEnergy(Z,A)) {
-
+	// Fermi Breakup
 	theTempResult = theFermiModel->BreakItUp(theExcitedNucleus);
-
       } else   if(exEnergy>GetMinE()*A) {
-
-
+	// Multifragmentation
 	theTempResult = theMultiFragmentation->BreakItUp(theExcitedNucleus);
-
       } else {
-
+	// Evaporation
 	theTempResult = theEvaporation->BreakItUp(theExcitedNucleus);
-
       }
       // The Nucleus has been fragmented?
-      if (theTempResult->entries() > 1) {
+      if (theTempResult->size() > 1) {
 	// If so :
 
 	// Remove excited fragment from the result 
-	delete theResult->removeAt(i--);
-
+	//	delete theResult->removeAt(i--);
+	delete (*theResult)[i];
+	theResult->erase(&(*theResult)[i--]);
 	// and add theTempResult elements to theResult
-	while (theTempResult->entries() > 0) 
-	  theResult->insert(theTempResult->removeFirst());
-	  
+	while (!theTempResult->empty()) {
+	    theResult->push_back(*(theTempResult->end()-1));
+	    theTempResult->pop_back();
+	}
 	delete theTempResult;
       } else { // If not :
 	// it doesn't matter, we Follow with the next fragment but
 	// I have to make 
-	theTempResult->clearAndDestroy();
+	while ( !theTempResult->empty() ) {
+	  delete *(theTempResult->end()-1);
+	  theTempResult->pop_back();
+	}
 	delete theTempResult;
       }
     }
   }
 
-  //  if (theTempResult != 0 ) 
-  //    {
-  //      theTempResult->clearAndDestroy();
-  //      delete theTempResult;
-  //    }
 
+//    // Check if there are excited fragments
+//    G4FragmentVector::iterator i;
+//    for (i = theResult->begin(); i != theResult->end(); i++) {
+//      exEnergy = (*i)->GetExcitationEnergy();
+//      if (exEnergy > 0.0) {
+//        A = (*i)->GetA();
+//        Z = G4int((*i)->GetZ());
+//        theExcitedNucleus = *(*i);
+//        // try to de-excite this fragment
+//        if(A<GetMaxA()&&Z<GetMaxZ()&&
+//           exEnergy>G4NucleiPropertiesTable::GetBindingEnergy(Z,A)) {
+//  	// Fermi Breakup
+//  	theTempResult = theFermiModel->BreakItUp(theExcitedNucleus);
+//        } else   if(exEnergy>GetMinE()*A) {
+//  	// Multifragmentation
+//  	theTempResult = theMultiFragmentation->BreakItUp(theExcitedNucleus);
+//        } else {
+//  	// Evaporation
+//  	theTempResult = theEvaporation->BreakItUp(theExcitedNucleus);
+//        }
+//        // The Nucleus has been fragmented?
+//        if (theTempResult->size() > 1) {
+//  	// If so :
+
+//  	// Remove excited fragment from the result 
+//  	//	delete theResult->removeAt(i--);
+//  	delete *i;
+//  	theResult->erase(i--);
+//  	G4FragmentVector::iterator tmpIterator = i;
+//  	i = theResult->begin();
+//  	while ( i != tmpIterator) i++;
+//  	// and add theTempResult elements to theResult
+//  	while (theTempResult->size() > 0) {
+//  	  theResult->insert(theTempResult->begin());
+//  	  theTempResult->erase(theTempResult->begin());
+//  	}
+//  	delete theTempResult;
+//        } else { // If not :
+//  	// it doesn't matter, we Follow with the next fragment but
+//  	// I have to make 
+//  	while ( !theTempResult->empty() ) {
+//  	  delete *(theTempResult->end()-1);
+//  	  theTempResult->pop_back();
+//  	}
+//  	delete theTempResult;
+//        }
+//      }
+//    }
 
   // Now we try to deexcite by means of PhotonEvaporation those fragments
   // which are excited.
-  // In next version the Photon Evaporation has to be integrated in the main loop
 
-  theTempResult = 0; 
-  for (i = 0; i < theResult->entries(); i++) {
-    if (theResult->at(i)->GetExcitationEnergy() > 0.0 && theResult->at(i)->GetA() > 1) {
-      theExcitedNucleus = *(theResult->at(i));
-      
-      theTempResult = thePhotonEvaporation->BreakItUp(theExcitedNucleus);
-      
-      // Remove excited fragment from the result 
-      delete theResult->removeAt(i);
+  theTempResult = 0;
+  
+  for (G4int j = 0; j < theResult->size(); j++) {
+  	if (theResult->operator[](j)->GetExcitationEnergy() > 0.0 && 
+	     theResult->operator[](j)->GetA() > 1) {
+		theExcitedNucleus = *(theResult->operator[](j));
+		theTempResult = thePhotonEvaporation->BreakItUp(theExcitedNucleus);
+		// If Gamma Evaporation has succeed then
+		if (theTempResult->size() > 1) {
+			// Remove excited fragment from the result 
+			delete theResult->operator[](j);
+			theResult->erase(&theResult->operator[](j--));
+			// and add theTempResult elements to theResult
+			while (!theTempResult->empty()) {
+	  			theResult->push_back(*(theTempResult->end()-1));
+	  			theTempResult->pop_back();
+	 		}
+			delete theTempResult;
+		} 
+		// In other case, just clean theTempResult and continue
+		else {
+			while (!theTempResult->empty()) {
+	  			delete *(theTempResult->end()-1);
+	  			theTempResult->pop_back();
+			}
+			delete theTempResult;
+#ifdef debug
+			G4cout << "G4ExcitationHandler: Gamma Evaporation could not deexcite the nucleus: "
+			       << G4endl
+			       << "-----------------------------------------------------------------------"  
+	       		       << G4endl;
+			G4cout << theExcitedNucleus
+			       << G4endl
+			       << "-----------------------------------------------------------------------"  
+			       << G4endl;
+#endif
+			G4double GammaEnergy = (theResult->operator[](j))->GetExcitationEnergy();
+			G4double cosTheta = 1. - 2. * G4UniformRand();
+			G4double sinTheta = sqrt(1. - cosTheta * cosTheta);
+			G4double phi = twopi * G4UniformRand();
+			G4ThreeVector GammaP(GammaEnergy * sinTheta * cos(phi),
+					     GammaEnergy * sinTheta * sin(phi),
+					     GammaEnergy * cosTheta );
 
-      // and add theTempResult elements to theResult
-      while (theTempResult->entries() > 0) 
-	theResult->insert(theTempResult->removeFirst());
 
-      theTempResult->clearAndDestroy();
-      delete theTempResult;
-    }
+			G4LorentzVector Gamma4P(GammaP,GammaEnergy);
+			G4double Mass = (theResult->operator[](j))->GetGroundStateMass();
+			G4ThreeVector ResidualP = (theResult->operator[](j))->GetMomentum().vect();
+			G4LorentzVector Residual4P(ResidualP,sqrt(Mass*Mass+ResidualP.mag2()));
+			(theResult->operator[](j))->SetMomentum(Residual4P);
+
+		}	
+  	}
   }
   
-  for (i = 0; i < theResult->entries(); i++) 
-	G4LorentzVector mom(theResult->at(i)->GetMomentum());
- 
-    
+//  for (i = theResult->begin(); i != theResult->end(); i++) {
+//    if ((*i)->GetExcitationEnergy() > 0.0 && (*i)->GetA() > 1) {
+//      theExcitedNucleus = **i;
+//      
+//      theTempResult = thePhotonEvaporation->BreakItUp(theExcitedNucleus);
+//      
+//      // If Gamma Evaporation has succeed then
+//      if (theTempResult->size() > 1) {
+//	// Remove excited fragment from the result 
+//         delete *i;
+//         theResult->erase(i--);
+//         G4FragmentVector::iterator tmpIterator = i;
+//	 i = theResult->begin();
+//	 while (i != tmpIterator) i++;
+//	 // and add theTempResult elements to theResult
+//	 while (!theTempResult->empty()) {
+//	  theResult->push_back(*(theTempResult->end()-1));
+//	  theTempResult->pop_back();
+//	 }
+//      }
+//      // In other case, just clean theTempResult and continue
+//      else {
+//	while (!theTempResult->empty()) {
+//	  delete *(theTempResult->end()-1);
+//	  theTempResult->pop_back();
+//	}
+//#ifdef debug
+//	G4cout << "G4ExcitationHandler: Gamma Evaporation could not deexcite the nucleus: " 
+//	       << G4endl;
+//	G4cout << theExcitedNucleus << G4endl;
+//#endif
+//      }
+//      //      theTempResult->clearAndDestroy();
+//      delete theTempResult;
+//    }
+//  }
+  
+#ifdef debug
+  CheckConservation(theInitialState,theResult);
+#endif
   // Change G4FragmentVector by G4DynamicParticle
   return Transform(theResult);
 }
@@ -209,11 +346,12 @@ G4ExcitationHandler::Transform(G4FragmentVector * theFragmentVector) const
   G4int theFragmentA, theFragmentZ;
   G4LorentzVector theFragmentMomentum;
 
-  for (G4int i = 0; i < theFragmentVector->entries(); i++) {
+  G4FragmentVector::iterator i;
+  for (i = theFragmentVector->begin(); i != theFragmentVector->end(); i++) {
 //     theFragmentVector->at(i)->DumpInfo();
-    theFragmentA = G4int(theFragmentVector->at(i)->GetA());
-    theFragmentZ = G4int(theFragmentVector->at(i)->GetZ());
-    theFragmentMomentum = theFragmentVector->at(i)->GetMomentum();
+    theFragmentA = G4int((*i)->GetA());
+    theFragmentZ = G4int((*i)->GetZ());
+    theFragmentMomentum = (*i)->GetMomentum();
     theKindOfFragment = 0;
     if (theFragmentA == 0 && theFragmentZ == 0) {       // photon
       theKindOfFragment = theGamma;      
@@ -237,13 +375,16 @@ G4ExcitationHandler::Transform(G4FragmentVector * theFragmentVector) const
       G4ReactionProduct * theNew = new G4ReactionProduct(theKindOfFragment);
       theNew->SetMomentum(theFragmentMomentum.vect());
       theNew->SetTotalEnergy(theFragmentMomentum.e());
-      theNew->SetFormationTime(theFragmentVector->at(i)->GetCreationTime());
+      theNew->SetFormationTime((*i)->GetCreationTime());
       theReactionProductVector->insert(theNew);
     }
   }
   if (theFragmentVector != 0)
     { 
-      theFragmentVector->clearAndDestroy();
+      while (!theFragmentVector->empty()) {
+	delete *(theFragmentVector->end()-1);
+	theFragmentVector->pop_back();
+      }
       delete theFragmentVector;
     }
   G4int debugit;
@@ -262,7 +403,60 @@ G4ExcitationHandler::Transform(G4FragmentVector * theFragmentVector) const
 }
 
 
-
+#ifdef debug
+void G4ExcitationHandler::CheckConservation(const G4Fragment & theInitialState,
+					    G4FragmentVector * Result) const
+{
+  G4double ProductsEnergy =0;
+  G4ThreeVector ProductsMomentum;
+  G4int ProductsA = 0;
+  G4int ProductsZ = 0;
+  G4FragmentVector::iterator h;
+  for (h = Result->begin(); h != Result->end(); h++) {
+    G4LorentzVector tmp = (*h)->GetMomentum();
+    ProductsEnergy += tmp.e();
+    ProductsMomentum += tmp.vect();
+    ProductsA += G4int((*h)->GetA());
+    ProductsZ += G4int((*h)->GetZ());
+  }
+
+  if (ProductsA != theInitialState.GetA()) {
+    G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4ExcitationHandler.cc: Barionic Number Conservation test for deexcitation fragments" 
+	   << G4endl; 
+    G4cout << "Initial A = " << theInitialState.GetA() 
+	   << "   Fragments A = " << ProductsA << "   Diference --> " 
+	   << theInitialState.GetA() - ProductsA << G4endl;
+  }
+  if (ProductsZ != theInitialState.GetZ()) {
+    G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4ExcitationHandler.cc: Charge Conservation test for deexcitation fragments" 
+	   << G4endl; 
+    G4cout << "Initial Z = " << theInitialState.GetZ() 
+	   << "   Fragments Z = " << ProductsZ << "   Diference --> " 
+	   << theInitialState.GetZ() - ProductsZ << G4endl;
+  }
+  if (abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4ExcitationHandler.cc: Energy Conservation test for deexcitation fragments" 
+	   << G4endl; 
+    G4cout << "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
+	   << "   Fragments E = " << ProductsEnergy/MeV  << " MeV   Diference --> " 
+	   << (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV" << G4endl;
+  } 
+  if (abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV || 
+      abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
+      abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4ExcitationHandler.cc: Momentum Conservation test for deexcitation fragments" 
+	   << G4endl; 
+    G4cout << "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
+	   << "   Fragments P = " << ProductsMomentum  << " MeV   Diference --> " 
+	   << theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV" << G4endl;
+  }
+  return;
+}
+#endif
 
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiBreakUp.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiBreakUp.cc
index 807963778e..468087922c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiBreakUp.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiBreakUp.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiBreakUp.cc,v 1.4.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4FermiBreakUp::G4FermiBreakUp()
 
 G4FermiBreakUp::G4FermiBreakUp(const G4FermiBreakUp &right)
 {
-  G4Exception("G4FermiBreakUp::copy_constructor meant to not be accessable");
+    G4Exception("G4FermiBreakUp::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,59 +47,59 @@ G4FermiBreakUp::~G4FermiBreakUp()
 
 const G4FermiBreakUp & G4FermiBreakUp::operator=(const G4FermiBreakUp &right)
 {
-  G4Exception("G4FermiBreakUp::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4FermiBreakUp::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4FermiBreakUp::operator==(const G4FermiBreakUp &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4FermiBreakUp::operator!=(const G4FermiBreakUp &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 G4FragmentVector * G4FermiBreakUp::BreakItUp(const G4Fragment &theNucleus)
 {
-	// CHECK that Excitation Energy > 0
-	if (theNucleus.GetExcitationEnergy() <= theNucleus.GetBindingEnergy()) {
-		G4FragmentVector * theResult = new G4FragmentVector;
-		theResult->insert(new G4Fragment(theNucleus));
-		return theResult;
-	}
+    // CHECK that Excitation Energy > 0
+    if (theNucleus.GetExcitationEnergy() <= theNucleus.GetBindingEnergy()) {
+	G4FragmentVector * theResult = new G4FragmentVector;
+	theResult->push_back(new G4Fragment(theNucleus));
+	return theResult;
+    }
 
-	// Total energy of nucleus in nucleus rest frame 
-	G4double TotalEnergyRF = theNucleus.GetExcitationEnergy() +
-		G4ParticleTable::GetParticleTable()->GetIonTable()->
-		GetIonMass(theNucleus.GetZ(),theNucleus.GetA());
+    // Total energy of nucleus in nucleus rest frame 
+    G4double TotalEnergyRF = theNucleus.GetExcitationEnergy() +
+	G4ParticleTable::GetParticleTable()->GetIonTable()->
+	GetIonMass(theNucleus.GetZ(),theNucleus.GetA());
 
-	G4FermiConfigurationList theConfigurationList;
+    G4FermiConfigurationList theConfigurationList;
 
 
 	// Split the nucleus
-	G4bool Split = theConfigurationList.Initialize(theNucleus.GetA(), 
-																  theNucleus.GetZ(),
-																  TotalEnergyRF);
-	if ( !Split ) {
-		G4FragmentVector * theResult = new G4FragmentVector;
-		theResult->insert(new G4Fragment(theNucleus));
-
-		return theResult;
-	}
-
-	// Chose a configuration
-	G4FermiConfiguration theConfiguration(theConfigurationList.ChooseConfiguration());
-  
-
-	// Get the fragments corresponding to chosen configuration.
-	G4FragmentVector * theResult = theConfiguration.GetFragments(theNucleus);
+    G4bool Split = theConfigurationList.Initialize(theNucleus.GetA(), 
+						   theNucleus.GetZ(),
+						   TotalEnergyRF);
+    if ( !Split ) {
+	G4FragmentVector * theResult = new G4FragmentVector;
+	theResult->push_back(new G4Fragment(theNucleus));
 
 	return theResult;
+    }
+
+    // Chose a configuration
+    G4FermiConfiguration theConfiguration(theConfigurationList.ChooseConfiguration());
+  
+
+    // Get the fragments corresponding to chosen configuration.
+    G4FragmentVector * theResult = theConfiguration.GetFragments(theNucleus);
+
+    return theResult;
 	
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfiguration.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfiguration.cc
index 6ff87c32d0..75b12abba4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfiguration.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfiguration.cc
@@ -1,15 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiConfiguration.cc,v 1.5.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
-
-// V. Lara (Apr 1999)
-// Corrected a bug in calculation of probabilities found by N. Ameline
+//
 // 
 
 
@@ -136,115 +153,115 @@ G4StableFermiFragment G4FermiConfiguration::Fragment99( 16, 8,  3,  7.12*keV );
 
                    
 G4VFermiFragment * G4FermiConfiguration::theListOfFragments[NumberOfFragments] = {
-  &G4FermiConfiguration::Fragment00, 
-  &G4FermiConfiguration::Fragment01, 
-  &G4FermiConfiguration::Fragment02, 
-  &G4FermiConfiguration::Fragment03, 
-  &G4FermiConfiguration::Fragment04, 
-  &G4FermiConfiguration::Fragment05, 
-  &G4FermiConfiguration::Fragment06, 
-  &G4FermiConfiguration::Fragment07, 
-  &G4FermiConfiguration::Fragment08, 
-  &G4FermiConfiguration::Fragment09, 
+    &G4FermiConfiguration::Fragment00, 
+    &G4FermiConfiguration::Fragment01, 
+    &G4FermiConfiguration::Fragment02, 
+    &G4FermiConfiguration::Fragment03, 
+    &G4FermiConfiguration::Fragment04, 
+    &G4FermiConfiguration::Fragment05, 
+    &G4FermiConfiguration::Fragment06, 
+    &G4FermiConfiguration::Fragment07, 
+    &G4FermiConfiguration::Fragment08, 
+    &G4FermiConfiguration::Fragment09, 
 
-  &G4FermiConfiguration::Fragment10, 
-  &G4FermiConfiguration::Fragment11, 
-  &G4FermiConfiguration::Fragment12, 
-  &G4FermiConfiguration::Fragment13, 
-  &G4FermiConfiguration::Fragment14, 
-  &G4FermiConfiguration::Fragment15, 
-  &G4FermiConfiguration::Fragment16, 
-  &G4FermiConfiguration::Fragment17, 
-  &G4FermiConfiguration::Fragment18, 
-  &G4FermiConfiguration::Fragment19, 
+    &G4FermiConfiguration::Fragment10, 
+    &G4FermiConfiguration::Fragment11, 
+    &G4FermiConfiguration::Fragment12, 
+    &G4FermiConfiguration::Fragment13, 
+    &G4FermiConfiguration::Fragment14, 
+    &G4FermiConfiguration::Fragment15, 
+    &G4FermiConfiguration::Fragment16, 
+    &G4FermiConfiguration::Fragment17, 
+    &G4FermiConfiguration::Fragment18, 
+    &G4FermiConfiguration::Fragment19, 
 
-  &G4FermiConfiguration::Fragment20, 
-  &G4FermiConfiguration::Fragment21, 
-  &G4FermiConfiguration::Fragment22, 
-  &G4FermiConfiguration::Fragment23, 
-  &G4FermiConfiguration::Fragment24, 
-  &G4FermiConfiguration::Fragment25, 
-  &G4FermiConfiguration::Fragment26, 
-  &G4FermiConfiguration::Fragment27, 
-  &G4FermiConfiguration::Fragment28, 
-  &G4FermiConfiguration::Fragment29,
+    &G4FermiConfiguration::Fragment20, 
+    &G4FermiConfiguration::Fragment21, 
+    &G4FermiConfiguration::Fragment22, 
+    &G4FermiConfiguration::Fragment23, 
+    &G4FermiConfiguration::Fragment24, 
+    &G4FermiConfiguration::Fragment25, 
+    &G4FermiConfiguration::Fragment26, 
+    &G4FermiConfiguration::Fragment27, 
+    &G4FermiConfiguration::Fragment28, 
+    &G4FermiConfiguration::Fragment29,
 
-  &G4FermiConfiguration::Fragment30, 
-  &G4FermiConfiguration::Fragment31, 
-  &G4FermiConfiguration::Fragment32, 
-  &G4FermiConfiguration::Fragment33, 
-  &G4FermiConfiguration::Fragment34,
-  &G4FermiConfiguration::Fragment35, 
-  &G4FermiConfiguration::Fragment36, 
-  &G4FermiConfiguration::Fragment37, 
-  &G4FermiConfiguration::Fragment38, 
-  &G4FermiConfiguration::Fragment39,
+    &G4FermiConfiguration::Fragment30, 
+    &G4FermiConfiguration::Fragment31, 
+    &G4FermiConfiguration::Fragment32, 
+    &G4FermiConfiguration::Fragment33, 
+    &G4FermiConfiguration::Fragment34,
+    &G4FermiConfiguration::Fragment35, 
+    &G4FermiConfiguration::Fragment36, 
+    &G4FermiConfiguration::Fragment37, 
+    &G4FermiConfiguration::Fragment38, 
+    &G4FermiConfiguration::Fragment39,
 
-  &G4FermiConfiguration::Fragment40, 
-  &G4FermiConfiguration::Fragment41, 
-  &G4FermiConfiguration::Fragment42, 
-  &G4FermiConfiguration::Fragment43, 
-  &G4FermiConfiguration::Fragment44,
-  &G4FermiConfiguration::Fragment45, 
-  &G4FermiConfiguration::Fragment46, 
-  &G4FermiConfiguration::Fragment47, 
-  &G4FermiConfiguration::Fragment48, 
-  &G4FermiConfiguration::Fragment49,
+    &G4FermiConfiguration::Fragment40, 
+    &G4FermiConfiguration::Fragment41, 
+    &G4FermiConfiguration::Fragment42, 
+    &G4FermiConfiguration::Fragment43, 
+    &G4FermiConfiguration::Fragment44,
+    &G4FermiConfiguration::Fragment45, 
+    &G4FermiConfiguration::Fragment46, 
+    &G4FermiConfiguration::Fragment47, 
+    &G4FermiConfiguration::Fragment48, 
+    &G4FermiConfiguration::Fragment49,
 
-  &G4FermiConfiguration::Fragment50, 
-  &G4FermiConfiguration::Fragment51, 
-  &G4FermiConfiguration::Fragment52, 
-  &G4FermiConfiguration::Fragment53, 
-  &G4FermiConfiguration::Fragment54,
-  &G4FermiConfiguration::Fragment55, 
-  &G4FermiConfiguration::Fragment56, 
-  &G4FermiConfiguration::Fragment57, 
-  &G4FermiConfiguration::Fragment58, 
-  &G4FermiConfiguration::Fragment59,
+    &G4FermiConfiguration::Fragment50, 
+    &G4FermiConfiguration::Fragment51, 
+    &G4FermiConfiguration::Fragment52, 
+    &G4FermiConfiguration::Fragment53, 
+    &G4FermiConfiguration::Fragment54,
+    &G4FermiConfiguration::Fragment55, 
+    &G4FermiConfiguration::Fragment56, 
+    &G4FermiConfiguration::Fragment57, 
+    &G4FermiConfiguration::Fragment58, 
+    &G4FermiConfiguration::Fragment59,
 
-  &G4FermiConfiguration::Fragment60, 
-  &G4FermiConfiguration::Fragment61, 
-  &G4FermiConfiguration::Fragment62, 
-  &G4FermiConfiguration::Fragment63, 
-  &G4FermiConfiguration::Fragment64,
-  &G4FermiConfiguration::Fragment65, 
-  &G4FermiConfiguration::Fragment66, 
-  &G4FermiConfiguration::Fragment67, 
-  &G4FermiConfiguration::Fragment68, 
-  &G4FermiConfiguration::Fragment69,
+    &G4FermiConfiguration::Fragment60, 
+    &G4FermiConfiguration::Fragment61, 
+    &G4FermiConfiguration::Fragment62, 
+    &G4FermiConfiguration::Fragment63, 
+    &G4FermiConfiguration::Fragment64,
+    &G4FermiConfiguration::Fragment65, 
+    &G4FermiConfiguration::Fragment66, 
+    &G4FermiConfiguration::Fragment67, 
+    &G4FermiConfiguration::Fragment68, 
+    &G4FermiConfiguration::Fragment69,
 
-  &G4FermiConfiguration::Fragment70, 
-  &G4FermiConfiguration::Fragment71, 
-  &G4FermiConfiguration::Fragment72, 
-  &G4FermiConfiguration::Fragment73, 
-  &G4FermiConfiguration::Fragment74,
-  &G4FermiConfiguration::Fragment75, 
-  &G4FermiConfiguration::Fragment76, 
-  &G4FermiConfiguration::Fragment77, 
-  &G4FermiConfiguration::Fragment78, 
-  &G4FermiConfiguration::Fragment79,
+    &G4FermiConfiguration::Fragment70, 
+    &G4FermiConfiguration::Fragment71, 
+    &G4FermiConfiguration::Fragment72, 
+    &G4FermiConfiguration::Fragment73, 
+    &G4FermiConfiguration::Fragment74,
+    &G4FermiConfiguration::Fragment75, 
+    &G4FermiConfiguration::Fragment76, 
+    &G4FermiConfiguration::Fragment77, 
+    &G4FermiConfiguration::Fragment78, 
+    &G4FermiConfiguration::Fragment79,
 
-  &G4FermiConfiguration::Fragment80, 
-  &G4FermiConfiguration::Fragment81, 
-  &G4FermiConfiguration::Fragment82, 
-  &G4FermiConfiguration::Fragment83, 
-  &G4FermiConfiguration::Fragment84,
-  &G4FermiConfiguration::Fragment85, 
-  &G4FermiConfiguration::Fragment86, 
-  &G4FermiConfiguration::Fragment87, 
-  &G4FermiConfiguration::Fragment88, 
-  &G4FermiConfiguration::Fragment89,
+    &G4FermiConfiguration::Fragment80, 
+    &G4FermiConfiguration::Fragment81, 
+    &G4FermiConfiguration::Fragment82, 
+    &G4FermiConfiguration::Fragment83, 
+    &G4FermiConfiguration::Fragment84,
+    &G4FermiConfiguration::Fragment85, 
+    &G4FermiConfiguration::Fragment86, 
+    &G4FermiConfiguration::Fragment87, 
+    &G4FermiConfiguration::Fragment88, 
+    &G4FermiConfiguration::Fragment89,
 
-  &G4FermiConfiguration::Fragment90, 
-  &G4FermiConfiguration::Fragment91, 
-  &G4FermiConfiguration::Fragment92, 
-  &G4FermiConfiguration::Fragment93, 
-  &G4FermiConfiguration::Fragment94,
-  &G4FermiConfiguration::Fragment95, 
-  &G4FermiConfiguration::Fragment96, 
-  &G4FermiConfiguration::Fragment97, 
-  &G4FermiConfiguration::Fragment98, 
-  &G4FermiConfiguration::Fragment99
+    &G4FermiConfiguration::Fragment90, 
+    &G4FermiConfiguration::Fragment91, 
+    &G4FermiConfiguration::Fragment92, 
+    &G4FermiConfiguration::Fragment93, 
+    &G4FermiConfiguration::Fragment94,
+    &G4FermiConfiguration::Fragment95, 
+    &G4FermiConfiguration::Fragment96, 
+    &G4FermiConfiguration::Fragment97, 
+    &G4FermiConfiguration::Fragment98, 
+    &G4FermiConfiguration::Fragment99
 };
 
 
@@ -257,7 +274,7 @@ G4FermiConfiguration::G4FermiConfiguration()
 
 G4FermiConfiguration::G4FermiConfiguration(const G4FermiConfiguration &right)
 {
-  Index = right.Index;
+    Index = right.Index;
 }
 
 
@@ -268,328 +285,338 @@ G4FermiConfiguration::~G4FermiConfiguration()
 
 const G4FermiConfiguration & G4FermiConfiguration::operator=(const G4FermiConfiguration &right)
 {
-  Index = right.Index;
-  return *this;
+    Index = right.Index;
+    return *this;
 }
 
 
 G4bool G4FermiConfiguration::operator==(const G4FermiConfiguration &right) const
 {
-  if (Index.entries() == right.Index.entries()) {
-    for (G4int i = 0; i < Index.entries(); i++) {
-      if (Index(i) != right.Index(i)) return false;
+    if (Index.size() == right.Index.size()) {
+	for (G4int i = 0; i < Index.size(); i++) {
+	    if (Index[i] != right.Index[i]) return false;
+	}
+	return true;
     }
-    return true;
-  }
-  else return false;
+    else return false;
 }
 
 G4bool G4FermiConfiguration::operator!=(const G4FermiConfiguration &right) const
 {
-  return !(*this == right);
+    return !(*this == right);
 }
 
 
 void G4FermiConfiguration::Initialize(const G4int max)
 {
-  Index.clear();
-  for (G4int i = 0;  i < max; i++) Index.insert(1);
+    Index.clear();
+    for (G4int i = 0;  i < max; i++) Index.push_back(1);
 }
 
 
 G4bool G4FermiConfiguration::SplitNucleus(const G4int A, const G4int Z)
 {
-  // Splits nucleus (A,Z) into K fragments
-  // Returns TRUE if splitting is succesful and FALSE in other case
+    // Splits nucleus (A,Z) into K fragments
+    // Returns TRUE if splitting is succesful and FALSE in other case
   
-  G4int K = Index.entries();
+    G4int K = Index.size();
 
 
-  G4int L = 0;
-  G4int SumA = 0, SumZ = 0;
-  for (;;) {
-    L++;
-    if (L < K) {
-      Index[L-1]++;
-      if (Index[L-1] > Index[L]) {
-	Index[L-1] = 1;
-	continue;
-      } else {
-	SumA = 0;
-	for (G4int i = 1; i <= K; i++) SumA += theListOfFragments[Index[i-1]-1]->GetA();
-	if (SumA > A) {
-	  Index[L-1] = 1;
-	  continue;
-	} else if (SumA < A) {
-	  L = 0;
-	  continue;
+    G4int L = 0;
+    G4int SumA = 0, SumZ = 0;
+    for (;;) {
+	L++;
+	if (L < K) {
+	    //      Index[L-1]++;
+	    Index[L-1] = Index[L-1]+1;
+	    if (Index[L-1] > Index[L]) {
+		Index[L-1] = 1;
+		continue;
+	    } else {
+		SumA = 0;
+		for (G4int i = 1; i <= K; i++) SumA += theListOfFragments[Index[i-1]-1]->GetA();
+		if (SumA > A) {
+		    Index[L-1] = 1;
+		    continue;
+		} else if (SumA < A) {
+		    L = 0;
+		    continue;
+		} else {
+		    SumZ = 0;
+		    for (G4int i = 1; i <= K; i++) SumZ += theListOfFragments[Index[i-1]-1]->GetZ();
+		    if (SumZ != Z) {
+			L = 0;
+			continue;
+		    } else {
+			return true;
+		    }
+		}
+	    }
 	} else {
-	  SumZ = 0;
-	  for (G4int i = 1; i <= K; i++) SumZ += theListOfFragments[Index[i-1]-1]->GetZ();
-	  if (SumZ != Z) {
-	    L = 0;
-	    continue;
-	  } else {
-	    return true;
-	  }
+	    //      Index[L-1]++;
+	    Index[L-1] = Index[L-1]+1;
+	    if (Index[L-1] > 100) {
+		return false;
+	    } else {
+		SumA = 0;
+		for (G4int i = 1; i <= K; i++) SumA += theListOfFragments[Index[i-1]-1]->GetA();
+		if (SumA < A) {
+		    L = 0;
+		    continue;
+		} else if (SumA == A) {
+		    SumZ = 0;
+		    for (G4int i = 1; i <= K; i++) SumZ += theListOfFragments[Index[i-1]-1]->GetZ();
+		    if (SumZ != Z) {
+			L = 0;
+			continue;
+		    } else {
+			return true;
+		    }
+		} else {
+		    return false;
+		}
+	    }
 	}
-      }
-    } else {
-      Index[L-1]++;
-      if (Index[L-1] > 100) {
-	return false;
-      } else {
-	SumA = 0;
-	for (G4int i = 1; i <= K; i++) SumA += theListOfFragments[Index[i-1]-1]->GetA();
-	if (SumA < A) {
-	  L = 0;
-	  continue;
-	} else if (SumA == A) {
-	  SumZ = 0;
-	  for (G4int i = 1; i <= K; i++) SumZ += theListOfFragments[Index[i-1]-1]->GetZ();
-	  if (SumZ != Z) {
-	    L = 0;
-	    continue;
-	  } else {
-	    return true;
-	  }
-	} else {
-	  return false;
-	}
-      }
     }
-  }
 }
 
 
 G4double G4FermiConfiguration::CoulombBarrier(void)
 {
-	//  Calculates Coulomb Barrier (MeV) for given channel with K fragments.
-	const G4double Coef = (3./5.)*1.44*MeV*fermi* pow(1./(1.+Kappa), 1./3.)/r0;
+    //  Calculates Coulomb Barrier (MeV) for given channel with K fragments.
+    const G4double Coef = (3./5.)*1.44*MeV*fermi* pow(1./(1.+Kappa), 1./3.)/r0;
 
-	G4double SumA = 0, SumZ = 0;
-	G4double CoulombEnergy = 0.;
-	for (G4int i = 0; i < Index.entries(); i++) {
-		G4double z = theListOfFragments[Index[i]-1]->GetZ();
-		G4double a = theListOfFragments[Index[i]-1]->GetA();
-		CoulombEnergy += (z*z) / pow(a, 1./3.);
-		SumA += a;
-		SumZ += z;
-	}
-	CoulombEnergy -= SumZ*SumZ/pow(SumA, 1./3.);
-	return -Coef * CoulombEnergy;
+    G4double SumA = 0, SumZ = 0;
+    G4double CoulombEnergy = 0.;
+    for (G4int i = 0; i < Index.size(); i++) {
+	G4double z = theListOfFragments[Index[i]-1]->GetZ();
+	G4double a = theListOfFragments[Index[i]-1]->GetA();
+	CoulombEnergy += (z*z) / pow(a, 1./3.);
+	SumA += a;
+	SumZ += z;
+    }
+    CoulombEnergy -= SumZ*SumZ/pow(SumA, 1./3.);
+    return -Coef * CoulombEnergy;
 }
 
 
 
 
 G4double G4FermiConfiguration::DecayProbability(const G4int A, const G4double TotalE)
-  // Decay probability  for a given channel with K fragments
+    // Decay probability  for a given channel with K fragments
 {
-  // A: Atomic Weight
-	// TotalE: Total energy of nucleus (MeV)
+    // A: Atomic Weight
+    // TotalE: Total energy of nucleus (MeV)
   
-	G4int K = Index.entries();
-	G4int i;
+    G4int K = Index.size();
+    G4int i;
   
-	const G4double NucleonMass = 938.0*MeV;
-	const G4double DimCoeff = pow(r0*sqrt(NucleonMass)/hbarc,3.0)*Kappa*sqrt(2.0/pi)/3.0;
+    const G4double NucleonMass = 938.0*MeV;
+    const G4double DimCoeff = pow(r0*sqrt(NucleonMass)/hbarc,3.0)*Kappa*sqrt(2.0/pi)/3.0;
   
-	// Calculation of 1/Gamma(3(n-1)/2)
-	G4double InvGammaFunc = 1.0;
-	if (K <= 1) InvGammaFunc = 0.0;
-	else {
-		G4double arg = 3.0*(K-1)/2.0 - 1.0;
-		while (arg > 1.1) {
-			InvGammaFunc *= arg; 
-			arg--;
-		}
-		
-		if ((K-1)%2 == 1) InvGammaFunc *= sqrt(pi)/2.0;
-		
-		InvGammaFunc = 1.0/InvGammaFunc;
+    // Calculation of 1/Gamma(3(n-1)/2)
+    G4double InvGammaFunc = 1.0;
+    if (K <= 1) InvGammaFunc = 0.0;
+    else {
+	G4double arg = 3.0*(K-1)/2.0 - 1.0;
+	while (arg > 1.1) {
+	    InvGammaFunc *= arg; 
+	    arg--;
 	}
+		
+	if ((K-1)%2 == 1) InvGammaFunc *= sqrt(pi)/2.0;
+		
+	InvGammaFunc = 1.0/InvGammaFunc;
+    }
   
   
-	G4double DeltaEnergy = TotalE; // MeV
-	G4double Weight = 0.;
-	G4double ProdAMass = 1.;  
-	G4double ProdSpin = 1.;
+    G4double DeltaEnergy = TotalE; // MeV
+    G4double Weight = 0.;
+    G4double ProdAMass = 1.;  
+    G4double ProdSpin = 1.;
 
-	for (i = 0; i<K; i++) {
-		ProdAMass *= theListOfFragments[Index[i]-1]->GetA();
-		// Spin factor S_n
-		ProdSpin *= theListOfFragments[Index[i]-1]->GetPolarization();
-		DeltaEnergy -= theListOfFragments[Index[i]-1]->GetFragmentMass() + 
-							theListOfFragments[Index[i]-1]->GetExcitationEnergy();
+    for (i = 0; i<K; i++) {
+	ProdAMass *= theListOfFragments[Index[i]-1]->GetA();
+	// Spin factor S_n
+	ProdSpin *= theListOfFragments[Index[i]-1]->GetPolarization();
+	DeltaEnergy -= theListOfFragments[Index[i]-1]->GetFragmentMass() + 
+	    theListOfFragments[Index[i]-1]->GetExcitationEnergy();
+    };
+  
+    // Check that there is enough energy to produce K fragments
+    if ((DeltaEnergy -= CoulombBarrier()) <= 0.0) return Weight; // return 0.0
+  
+    ProdAMass /= A;
+    ProdAMass *= sqrt(ProdAMass);
+  
+    if (K <= 2) {
+	Weight = InvGammaFunc*A*DimCoeff*ProdAMass*ProdSpin*sqrt(DeltaEnergy);
+	if (Index[0] == Index[1]) Weight *= 0.5; //Permutation factor G_n
+    } else {
+	G4double Base = A*DimCoeff*DeltaEnergy*sqrt(DeltaEnergy);
+	G4double Powered = 1.0;
+	G4double PermutationFactor = 1.0;
+	for (G4int i = 0; i < K-1; i++) {
+	    Powered *= Base;
+	    G4int N = 1;
+	    for (G4int j = i+1; j<K; j++) if(Index[i] == Index[j]) N++;
+	    PermutationFactor *= N;
 	};
+	Weight = Powered*ProdAMass*ProdSpin*InvGammaFunc/(DeltaEnergy*PermutationFactor);
+    }
   
-	// Check that there is enough energy to produce K fragments
-	if ((DeltaEnergy -= CoulombBarrier()) <= 0.0) return Weight; // return 0.0
-  
-	ProdAMass /= A;
-	ProdAMass *= sqrt(ProdAMass);
-  
-	if (K <= 2) {
-		Weight = InvGammaFunc*A*DimCoeff*ProdAMass*ProdSpin*sqrt(DeltaEnergy);
-		if (Index[0] == Index[1]) Weight *= 0.5; //Permutation factor G_n
-	} else {
-		G4double Base = A*DimCoeff*DeltaEnergy*sqrt(DeltaEnergy);
-		G4double Powered = 1.0;
-		G4double PermutationFactor = 1.0;
-		for (G4int i = 0; i < K-1; i++) {
-			Powered *= Base;
-			G4int N = 1;
-			for (G4int j = i+1; j<K; j++) if(Index[i] == Index[j]) N++;
-			PermutationFactor *= N;
-		};
-		Weight = Powered*ProdAMass*ProdSpin*InvGammaFunc/(DeltaEnergy*PermutationFactor);
-	}
-  
-	return Weight; 
+    return Weight; 
 }
 
 
 G4FragmentVector * G4FermiConfiguration::GetFragments(const G4Fragment & theNucleus)
 {
  
-  G4int K = Index.entries();
+    G4int K = Index.size();
   
-  // Avalaible kinetic energy of system.
-  G4double AvalKineticEnergy = theNucleus.GetExcitationEnergy() +
-    G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theNucleus.GetZ(),theNucleus.GetA());
+    // Avalaible kinetic energy of system.
+    G4double AvalKineticEnergy = theNucleus.GetExcitationEnergy() +
+	G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theNucleus.GetZ(),theNucleus.GetA());
   
-  G4int i;
-  for (i = 0; i < K; i++) 
-    AvalKineticEnergy -= theListOfFragments[Index[i]-1]->GetFragmentMass();
+    G4int i;
+    for (i = 0; i < K; i++) 
+	AvalKineticEnergy -= theListOfFragments[Index[i]-1]->GetFragmentMass();
   
   
-  // Calculate Momenta of K fragments
-  G4RWTPtrOrderedVector<G4LorentzVector>* MomentumComponents = 
-    FragmentsMomentum(AvalKineticEnergy);
+    // Calculate Momenta of K fragments
+    G4std::deque<G4LorentzVector*>* MomentumComponents = 
+	FragmentsMomentum(AvalKineticEnergy);
+
   
-  G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
   
-  // Go back to the Lab Frame
-  for (i = 0; i < K; i++) {
+    // Go back to the Lab Frame
+    for (i = 0; i < K; i++) {
     
-    G4LorentzVector FourMomentum(*(MomentumComponents->at(i)));
+	G4LorentzVector FourMomentum(*(MomentumComponents->operator[](i)));
 
     
-    // Lorentz boost
-    FourMomentum.boost(theNucleus.GetMomentum().boostVector());
+	// Lorentz boost
+	FourMomentum.boost(theNucleus.GetMomentum().boostVector());
     
-    G4FragmentVector * fragment = theListOfFragments[Index[i]-1]->GetFragment(FourMomentum);
+	G4FragmentVector * fragment = theListOfFragments[Index[i]-1]->GetFragment(FourMomentum);
     
-    do {
-      theResult->insert(fragment->removeFirst());
-    } while (fragment->entries() > 0);
+	do {
+	    theResult->push_back(*(fragment->end()-1));
+	    fragment->pop_back();
+	} while (!fragment->empty());
     
-    delete fragment;
-  }
+	delete fragment;
+    }
   
-  MomentumComponents->clearAndDestroy();
-  delete MomentumComponents;
+    //  MomentumComponents->clearAndDestroy();
+    while (!MomentumComponents->empty()) {
+	delete MomentumComponents->back();
+	MomentumComponents->pop_back();
+    }
+    delete MomentumComponents;
   
-  return theResult;
+    return theResult;
 }
 
 
 
-G4RWTPtrOrderedVector<G4LorentzVector>* 
+G4std::deque<G4LorentzVector*>* 
 G4FermiConfiguration::FragmentsMomentum(G4double KineticEnergy)
 {
-  // Calculates momentum for K fragments (Kopylov's method of sampling is used)
-  // KinetEnergy is the available kinetic energy
+    // Calculates momentum for K fragments (Kopylov's method of sampling is used)
+    // KinetEnergy is the available kinetic energy
   
 
-  G4int K = Index.entries();
+    G4int K = Index.size();
 
   
-  G4RWTPtrOrderedVector<G4LorentzVector>* MomentumList = 
-    new G4RWTPtrOrderedVector<G4LorentzVector>(K);
+    G4std::deque<G4LorentzVector*>* MomentumList = 
+	new G4std::deque<G4LorentzVector*>(K);
   
-  G4double AvalaibleMass = 0; 
-  for (G4int i=0; i<K; i++) AvalaibleMass += theListOfFragments[Index[i]-1]->GetFragmentMass();
+    G4double AvalaibleMass = 0; 
+    for (G4int i=0; i<K; i++) AvalaibleMass += theListOfFragments[Index[i]-1]->GetFragmentMass();
   
-  G4double PFragMagCM = 0.0;
-  G4double Mass = AvalaibleMass+KineticEnergy;
-  G4LorentzVector PFragCM(0.0,0.0,0.0,0.0);
-  G4LorentzVector PFragLab(0.0,0.0,0.0,0.0);
-  G4LorentzVector PRestCM(0.0,0.0,0.0,0.0);
-  G4LorentzVector PRestLab(0.0,0.0,0.0,Mass);
+    G4double PFragMagCM = 0.0;
+    G4double Mass = AvalaibleMass+KineticEnergy;
+    G4LorentzVector PFragCM(0.0,0.0,0.0,0.0);
+    G4LorentzVector PFragLab(0.0,0.0,0.0,0.0);
+    G4LorentzVector PRestCM(0.0,0.0,0.0,0.0);
+    G4LorentzVector PRestLab(0.0,0.0,0.0,Mass);
 
-  for (G4int l = 0; l < K-1; l++) {
-    G4int LK = K - l;
-    G4double FragMass = theListOfFragments[Index[LK-1]-1]->GetFragmentMass();
-    AvalaibleMass -= FragMass;
+    for (G4int l = 0; l < K-1; l++) {
+	G4int LK = K - l;
+	G4double FragMass = theListOfFragments[Index[LK-1]-1]->GetFragmentMass();
+	AvalaibleMass -= FragMass;
 
-    if (LK > 2) KineticEnergy *= RNKSI(LK-1); 
-    else KineticEnergy = 0.0;
+	if (LK > 2) KineticEnergy *= RNKSI(LK-1); 
+	else KineticEnergy = 0.0;
 
-    G4double RestMass = AvalaibleMass + KineticEnergy;
+	G4double RestMass = AvalaibleMass + KineticEnergy;
 
-    PFragMagCM = sqrt(
-		      abs((Mass*Mass - (FragMass + RestMass)*(FragMass + RestMass))*
-			  (Mass*Mass - (FragMass - RestMass)*(FragMass - RestMass)))
-		      )/ (2.0*Mass);
+	PFragMagCM = sqrt(
+	    abs((Mass*Mass - (FragMass + RestMass)*(FragMass + RestMass))*
+		(Mass*Mass - (FragMass - RestMass)*(FragMass - RestMass)))
+	    )/ (2.0*Mass);
     
 
-    // Create a unit vector with a random direction isotropically distributed
-    G4ParticleMomentum RandVector(IsotropicVector(PFragMagCM)); 
+	// Create a unit vector with a random direction isotropically distributed
+	G4ParticleMomentum RandVector(IsotropicVector(PFragMagCM)); 
     
-    PFragCM.setVect(RandVector);
-    //    PFragCM.setE((Mass*Mass + FragMass*FragMass - RestMass*RestMass)/(2.0*Mass));
-    PFragCM.setE(sqrt(RandVector.mag2()+FragMass*FragMass));
+	PFragCM.setVect(RandVector);
+	//    PFragCM.setE((Mass*Mass + FragMass*FragMass - RestMass*RestMass)/(2.0*Mass));
+	PFragCM.setE(sqrt(RandVector.mag2()+FragMass*FragMass));
 
-    PRestCM.setVect(-RandVector);
-    //    PRestCM.setE((Mass*Mass + RestMass*RestMass - FragMass*FragMass)/(2.0*Mass));
-    PRestCM.setE(sqrt(RandVector.mag2()+RestMass*RestMass));
+	PRestCM.setVect(-RandVector);
+	//    PRestCM.setE((Mass*Mass + RestMass*RestMass - FragMass*FragMass)/(2.0*Mass));
+	PRestCM.setE(sqrt(RandVector.mag2()+RestMass*RestMass));
 
 
-    G4ThreeVector BoostV = PRestLab.boostVector();
+	G4ThreeVector BoostV = PRestLab.boostVector();
 
-    PFragLab = PFragCM;
-    PFragLab.boost(BoostV);
-    PRestLab = PRestCM;
-    PRestLab.boost(BoostV);
+	PFragLab = PFragCM;
+	PFragLab.boost(BoostV);
+	PRestLab = PRestCM;
+	PRestLab.boost(BoostV);
     
-    MomentumList->prepend(new G4LorentzVector(PFragLab));
+	//    MomentumList->prepend(new G4LorentzVector(PFragLab));
+	MomentumList->push_front(new G4LorentzVector(PFragLab));
 
-    Mass = RestMass;
-  }
+	Mass = RestMass;
+    }
   
-  MomentumList->prepend(new G4LorentzVector(PRestLab));
-  return MomentumList;
+    //  MomentumList->prepend(new G4LorentzVector(PRestLab));
+    MomentumList->push_front(new G4LorentzVector(PRestLab));
+    return MomentumList;
 }
 
 
 G4double G4FermiConfiguration::RNKSI(const G4int K)
 {
-	G4double csim = (3.0*K-5.0)/(3.0*K-4.0);
-	G4double pex = (3.0*K-5.0)/2.0;
-	G4double fcsim = sqrt(1.0-csim)*pow(csim,pex);
+    G4double csim = (3.0*K-5.0)/(3.0*K-4.0);
+    G4double pex = (3.0*K-5.0)/2.0;
+    G4double fcsim = sqrt(1.0-csim)*pow(csim,pex);
 
-	G4double csi = 0.0;
-	G4double fcsi= 0.0;
-	G4double rf = 0.0;
-	do {
-		csi = G4UniformRand();
-		fcsi = sqrt(1.0-csi)*pow(csi,pex);
-		rf = fcsim*G4UniformRand();
-	} while (rf > fcsi);
-	return csi;
+    G4double csi = 0.0;
+    G4double fcsi= 0.0;
+    G4double rf = 0.0;
+    do {
+	csi = G4UniformRand();
+	fcsi = sqrt(1.0-csi)*pow(csi,pex);
+	rf = fcsim*G4UniformRand();
+    } while (rf > fcsi);
+    return csi;
 }
     
 G4ParticleMomentum G4FermiConfiguration::IsotropicVector(const G4double Magnitude)
-  // Samples a isotropic random vectorwith a magnitud given by Magnitude.
-  // By default Magnitude = 1.0
+    // Samples a isotropic random vectorwith a magnitud given by Magnitude.
+    // By default Magnitude = 1.0
 {
-  G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-  G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-  G4double Phi = twopi*G4UniformRand();
-  G4ParticleMomentum Vector(Magnitude*cos(Phi)*SinTheta,
-			    Magnitude*sin(Phi)*SinTheta,
-			    Magnitude*CosTheta);
-  return Vector;
+    G4double CosTheta = 1.0 - 2.0*G4UniformRand();
+    G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
+    G4double Phi = twopi*G4UniformRand();
+    G4ParticleMomentum Vector(Magnitude*cos(Phi)*SinTheta,
+			      Magnitude*sin(Phi)*SinTheta,
+			      Magnitude*CosTheta);
+    return Vector;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfigurationList.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfigurationList.cc
index 3c00657717..f1ae6fdcea 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfigurationList.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FermiConfigurationList.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FermiConfigurationList.cc,v 1.5.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -14,78 +33,78 @@
 
 
 G4FermiConfigurationList::G4FermiConfigurationList():
-  TotNumOfConfigurations(0)
+    TotNumOfConfigurations(0)
 {
-  for (G4int i = 0; i < MaxNumOfFragments; i++) NumOfConfigurations[i] = 0;
+    for (G4int i = 0; i < MaxNumOfFragments; i++) NumOfConfigurations[i] = 0;
 }
 
 G4FermiConfigurationList::G4FermiConfigurationList(const G4FermiConfigurationList &right)
 {
-  G4Exception("G4FermiConfigurationList::copy_constructor meant to not be accessable");
+    G4Exception("G4FermiConfigurationList::copy_constructor meant to not be accessable");
 }
 
 
 const G4FermiConfigurationList & G4FermiConfigurationList::operator=(const G4FermiConfigurationList &right)
 {
-  G4Exception("G4FermiConfigurationList::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4FermiConfigurationList::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4FermiConfigurationList::operator==(const G4FermiConfigurationList &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4FermiConfigurationList::operator!=(const G4FermiConfigurationList &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 G4bool G4FermiConfigurationList::Initialize(const G4int A, const G4int Z, const G4double TotalEnergyRF)
 {
-  //
-  // let's split nucleus into k = 2,...,6 fragments
-  //
-	Configurations.clear();
-	NormalizedWeights.clear();
-	G4FermiConfiguration aConfiguration;
-	G4RWTValOrderedVector<G4double> NOTNormalizedWeights;
-	G4double NormStatWeight = 0.0;
-	for (G4int k = 2; k <= 6; k++) {
-		// Initialize Configuration for k fragments
-		aConfiguration.Initialize(k);
-		G4bool SplitSuccesed;
-		do {
-			// Splits the nucleus into k fragments
-			SplitSuccesed = aConfiguration.SplitNucleus(A,Z);
-			if (SplitSuccesed) {
-				TotNumOfConfigurations++;
-				NumOfConfigurations[k-1]++;
+    //
+    // let's split nucleus into k = 2,...,6 fragments
+    //
+    Configurations.clear();
+    NormalizedWeights.clear();
+    G4FermiConfiguration aConfiguration;
+    G4std::vector<G4double> NOTNormalizedWeights;
+    G4double NormStatWeight = 0.0;
+    for (G4int k = 2; k <= 6; k++) {
+	// Initialize Configuration for k fragments
+	aConfiguration.Initialize(k);
+	G4bool SplitSuccesed;
+	do {
+	    // Splits the nucleus into k fragments
+	    SplitSuccesed = aConfiguration.SplitNucleus(A,Z);
+	    if (SplitSuccesed) {
+		TotNumOfConfigurations++;
+		NumOfConfigurations[k-1]++;
 
-				// Non-Normalized statistical weight for given channel with k fragments
-				G4double StatWeight = aConfiguration.DecayProbability(A,TotalEnergyRF);
-				NormStatWeight += StatWeight;
-				// Statistical weights (it will be normalized...)
-				NOTNormalizedWeights.insert(StatWeight);	
+		// Non-Normalized statistical weight for given channel with k fragments
+		G4double StatWeight = aConfiguration.DecayProbability(A,TotalEnergyRF);
+		NormStatWeight += StatWeight;
+		// Statistical weights (it will be normalized...)
+		NOTNormalizedWeights.push_back(StatWeight);	
 
-				// Store configuration
-				Configurations.insert(aConfiguration);
-			}
-			// Repeat splitting into k fragments (it may be several posibilities for a choosen K)
-		} while (SplitSuccesed);
-	}
+		// Store configuration
+		Configurations.push_back(aConfiguration);
+	    }
+	    // Repeat splitting into k fragments (it may be several posibilities for a choosen K)
+	} while (SplitSuccesed);
+    }
 
-	if (NormStatWeight > 0.0) {
-		// Let's normalize statistical weights of channels
-		for (G4int i = 0; i < TotNumOfConfigurations; i++) 
-			NormalizedWeights.insert(NOTNormalizedWeights(i)/NormStatWeight);
+    if (NormStatWeight > 0.0) {
+	// Let's normalize statistical weights of channels
+	for (G4int i = 0; i < TotNumOfConfigurations; i++) 
+	    NormalizedWeights.push_back(NOTNormalizedWeights[i]/NormStatWeight);
     
-		return true;
-	}
-	else return false;
+	return true;
+    }
+    else return false;
 
 }
 
@@ -93,14 +112,14 @@ G4bool G4FermiConfigurationList::Initialize(const G4int A, const G4int Z, const
 
 G4FermiConfiguration G4FermiConfigurationList::ChooseConfiguration(void)
 {
-	G4double RandomWeight =  G4UniformRand();
-	G4double AcumWeight = 0.0;
-	G4int thisConfig = 0;
-	do {
-		AcumWeight += NormalizedWeights(thisConfig);  // We are adding the prob. of each configuration
-		thisConfig++;
-	} while ((thisConfig <= TotNumOfConfigurations) && (AcumWeight < RandomWeight));
+    G4double RandomWeight =  G4UniformRand();
+    G4double AcumWeight = 0.0;
+    G4int thisConfig = 0;
+    do {
+	AcumWeight += NormalizedWeights[thisConfig];  // We are adding the prob. of each configuration
+	thisConfig++;
+    } while ((thisConfig <= TotNumOfConfigurations) && (AcumWeight < RandomWeight));
 
-	return Configurations(thisConfig - 1);
+    return Configurations[thisConfig - 1];
 
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
index adc1d0cbd8..3435b29c06 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FissionBarrier.cc,v 1.3 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FissionBarrier.cc,v 1.4.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -16,61 +32,61 @@
 
 G4FissionBarrier::G4FissionBarrier(const G4FissionBarrier & right)
 {
-  G4Exception("G4FissionBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4FissionBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4FissionBarrier & G4FissionBarrier::operator=(const G4FissionBarrier & right)
 {
- G4Exception("G4FissionBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4FissionBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4FissionBarrier::operator==(const G4FissionBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4FissionBarrier::operator!=(const G4FissionBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 
 G4double G4FissionBarrier::FissionBarrier(const G4int A, const G4int Z, const G4double U)
-  // Compute fission barrier according with Barashenkov's prescription for A >= 65
+    // Compute fission barrier according with Barashenkov's prescription for A >= 65
 {
-  if (A >= 65) return BarashenkovFissionBarrier(A,Z)/(1.0 + sqrt(U/(2.0*G4double(A))));
-  else return 100.0*GeV;
+    if (A >= 65) return BarashenkovFissionBarrier(A,Z)/(1.0 + sqrt(U/(2.0*G4double(A))));
+    else return 100.0*GeV;
 }
 
 
 G4double G4FissionBarrier::BarashenkovFissionBarrier(const G4int A, const G4int Z)
-  // Calculates Fission Barrier heights 
+    // Calculates Fission Barrier heights 
 {
-	// Liquid drop model parameters for
-	// surface energy of a spherical nucleus
-	const G4double aSurf = 17.9439*MeV;
-	// and coulomb energy
-	const G4double aCoul = 0.7053*MeV;
-	const G4int N = A - Z;
-	const G4double k = 1.7826;
+    // Liquid drop model parameters for
+    // surface energy of a spherical nucleus
+    const G4double aSurf = 17.9439*MeV;
+    // and coulomb energy
+    const G4double aCoul = 0.7053*MeV;
+    const G4int N = A - Z;
+    const G4double k = 1.7826;
 
-	// fissibility parameter
-	G4double x = (aCoul/(2.0*aSurf))*(G4double(Z)*G4double(Z))/G4double(A);
-	x /= (1.0 - k*(G4double(N-Z)/G4double(A))*(G4double(N-Z)/G4double(A)));
+    // fissibility parameter
+    G4double x = (aCoul/(2.0*aSurf))*(G4double(Z)*G4double(Z))/G4double(A);
+    x /= (1.0 - k*(G4double(N-Z)/G4double(A))*(G4double(N-Z)/G4double(A)));
   
-	// Liquid drop model part of Fission Barrier
-	G4double BF0 = aSurf*pow(G4double(A),2./3.);
-	if (x <= 2./3.) BF0 *= 0.38*(3./4.-x);
-	else BF0 *= 0.83*(1. - x)*(1. - x)*(1. - x);
+    // Liquid drop model part of Fission Barrier
+    G4double BF0 = aSurf*pow(G4double(A),2./3.);
+    if (x <= 2./3.) BF0 *= 0.38*(3./4.-x);
+    else BF0 *= 0.83*(1. - x)*(1. - x)*(1. - x);
 
 
-	// 
-	G4double D = 1.248*MeV;
-	D *= (G4double(N)-2.0*(N/2)) + (G4double(Z)-2.0*(Z/2));
+    // 
+    G4double D = 1.248*MeV;
+    D *= (G4double(N)-2.0*(N/2)) + (G4double(Z)-2.0*(Z/2));
 
-  return BF0 + D - SellPlusPairingCorrection(Z,N);
+    return BF0 + D - SellPlusPairingCorrection(Z,N);
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionLevelDensityParameter.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionLevelDensityParameter.cc
index 48a463591e..308afa76d2 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionLevelDensityParameter.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionLevelDensityParameter.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FissionLevelDensityParameter.cc,v 1.4.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -16,37 +35,37 @@
 G4FissionLevelDensityParameter::
 G4FissionLevelDensityParameter(const G4FissionLevelDensityParameter &right)
 {
- G4Exception("G4FissionLevelDensityParameter::copy_constructor meant to not be accessable");
+    G4Exception("G4FissionLevelDensityParameter::copy_constructor meant to not be accessable");
 }
 
 
 const G4FissionLevelDensityParameter & G4FissionLevelDensityParameter::
 operator=(const G4FissionLevelDensityParameter &right)
 {
-  G4Exception("G4FissionLevelDensityParameter::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4FissionLevelDensityParameter::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4FissionLevelDensityParameter::
 operator==(const G4FissionLevelDensityParameter &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4FissionLevelDensityParameter::
 operator!=(const G4FissionLevelDensityParameter &right) const
 {
-  return true;
+    return true;
 }
 
 
 G4double G4FissionLevelDensityParameter::
 LevelDensityParameter(const G4int A,const G4int Z,const G4double U) const 
 {
-  G4double EvapLDP = theEvaporationLevelDensityParameter.LevelDensityParameter(A,Z,U);
+    G4double EvapLDP = theEvaporationLevelDensityParameter.LevelDensityParameter(A,Z,U);
 
-  if (Z >= 89) return 1.04*EvapLDP;
-  else if (Z >= 85) return (1.04*(1./MeV) + 0.01*(89-Z))*EvapLDP;
-  else return 1.08*EvapLDP;
+    if (Z >= 89) return 1.04*EvapLDP;
+    else if (Z >= 85) return (1.04*(1./MeV) + 0.01*(89-Z))*EvapLDP;
+    else return 1.08*EvapLDP;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
index 4744f3a58a..186a582472 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionParameters.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FissionParameters.cc,v 1.5.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -20,73 +39,73 @@ const G4double G4FissionParameters::A2 = 141.0;
 G4FissionParameters::G4FissionParameters(const G4int A, const G4int Z, const G4double ExEnergy,
 					 const G4double FissionBarrier)
 {
-  G4double U = ExEnergy; 
+    G4double U = ExEnergy; 
   
-  As = A/2.0;
+    As = A/2.0;
 
-  if (A <= 235) Sigma2 = 5.6;  // MeV
-  else Sigma2 = 5.6 + 0.096*(A-235); // MeV
+    if (A <= 235) Sigma2 = 5.6;  // MeV
+    else Sigma2 = 5.6 + 0.096*(A-235); // MeV
 
-  Sigma1 = 0.5*Sigma2; // MeV
+    Sigma1 = 0.5*Sigma2; // MeV
 
-  SigmaS = exp(0.00553*U/MeV + 2.1386); // MeV
-	if (SigmaS > 20.0) SigmaS = 20.0;
+    SigmaS = exp(0.00553*U/MeV + 2.1386); // MeV
+    if (SigmaS > 20.0) SigmaS = 20.0;
 
-  G4double FasymAsym = 2.0*exp(-((A2-As)*(A2-As))/(2.0*Sigma2*Sigma2)) + 
-    exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
+    G4double FasymAsym = 2.0*exp(-((A2-As)*(A2-As))/(2.0*Sigma2*Sigma2)) + 
+	exp(-((A1-As)*(A1-As))/(2.0*Sigma1*Sigma1));
   
-  G4double FsymA1A2 = exp(-((As-(A1+A2)/2.0)*(As-(A1+A2)/2.0))/(2.0*SigmaS*SigmaS));
+    G4double FsymA1A2 = exp(-((As-(A1+A2)/2.0)*(As-(A1+A2)/2.0))/(2.0*SigmaS*SigmaS));
   
 
-  G4double wa;
-  G4double w1,w2;
-  w = 0.0;
-  if (Z >= 90) {         // Z >= 90
-    if (U <= 16.25) wa = exp(0.5385*U/MeV-9.9564);  // U <= 16.25 MeV
-    else wa = exp(0.09197*U/MeV-2.7003);            // U  > 16.25 MeV
-  } else if (Z == 89) {  // Z == 89
-    wa = exp(0.09197*U-1.0808);
-  } else if (Z >= 82) {  //  82 <= Z <= 88
-    G4double X = FissionBarrier - 7.5*MeV;
-    if (X < 0.0) X = 0.0;
-    wa = exp(0.09197*(U-X)/MeV-1.0808);
-  } else {               // Z < 82
-    w = 1001.0;
-  }
+    G4double wa;
+    G4double w1,w2;
+    w = 0.0;
+    if (Z >= 90) {         // Z >= 90
+	if (U <= 16.25) wa = exp(0.5385*U/MeV-9.9564);  // U <= 16.25 MeV
+	else wa = exp(0.09197*U/MeV-2.7003);            // U  > 16.25 MeV
+    } else if (Z == 89) {  // Z == 89
+	wa = exp(0.09197*U-1.0808);
+    } else if (Z >= 82) {  //  82 <= Z <= 88
+	G4double X = FissionBarrier - 7.5*MeV;
+	if (X < 0.0) X = 0.0;
+	wa = exp(0.09197*(U-X)/MeV-1.0808);
+    } else {               // Z < 82
+	w = 1001.0;
+    }
   
-  if (w == 0.0) {
-    w1 = G4std::max(1.03*wa - FasymAsym, 0.0001);
-    w2 = G4std::max(1.0 - FsymA1A2*wa,   0.0001);
+    if (w == 0.0) {
+	w1 = G4std::max(1.03*wa - FasymAsym, 0.0001);
+	w2 = G4std::max(1.0 - FsymA1A2*wa,   0.0001);
     
-    w = w1/w2;
+	w = w1/w2;
 
-    if (82 <= Z && Z < 89 && A < 227)  w *= exp(0.3*(227-A));
-  }
+	if (82 <= Z && Z < 89 && A < 227)  w *= exp(0.3*(227-A));
+    }
   
 }
 
 
 G4FissionParameters::G4FissionParameters(const G4FissionParameters &right)
 {
- G4Exception("G4FissionParameters::copy_constructor meant to not be accessable");
+    G4Exception("G4FissionParameters::copy_constructor meant to not be accessable");
 }
 
 
 const G4FissionParameters & G4FissionParameters::operator=(const G4FissionParameters &right)
 {
-  G4Exception("G4FissionParameters::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4FissionParameters::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4FissionParameters::operator==(const G4FissionParameters &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4FissionParameters::operator!=(const G4FissionParameters &right) const
 {
-  return true;
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionProbability.cc
index 1974350b89..d385754f00 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4FissionProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4FissionProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4FissionProbability.cc,v 1.4.2.1 2001/06/28 19:13:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -11,13 +30,13 @@
 
 
 #include "G4FissionProbability.hh"
-
+#include "G4PairingCorrection.hh"
 
 
 
 G4FissionProbability::G4FissionProbability(const G4FissionProbability &right)
 {
- G4Exception("G4FissionProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4FissionProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -25,61 +44,44 @@ G4FissionProbability::G4FissionProbability(const G4FissionProbability &right)
 
 const G4FissionProbability & G4FissionProbability::operator=(const G4FissionProbability &right)
 {
-  G4Exception("G4FissionProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4FissionProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4FissionProbability::operator==(const G4FissionProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4FissionProbability::operator!=(const G4FissionProbability &right) const
 {
-  return true;
+    return true;
 }
 
 
 G4double G4FissionProbability::EmissionProbability(const G4Fragment & fragment, const G4double MaximalKineticEnergy)
-	// Compute integrated probability of fission channel
+    // Compute integrated probability of fission channel
 {
-	if (MaximalKineticEnergy <= 0.0) return 0.0;
-	G4double A = fragment.GetA();
-	G4double Z = fragment.GetZ();
-	G4double U = fragment.GetExcitationEnergy();
+    if (MaximalKineticEnergy <= 0.0) return 0.0;
+    G4double A = fragment.GetA();
+    G4double Z = fragment.GetZ();
+    G4double U = fragment.GetExcitationEnergy();
   
-	G4double Ucompound = U - EvaporationPairingCorrection(G4int(A),G4int(Z));
-	G4double Ufission = U - FissionPairingCorrection(G4int(A),G4int(Z));
+    G4double Ucompound = U - G4PairingCorrection::GetPairingCorrection(G4int(A),G4int(Z));
+    G4double Ufission = U - G4PairingCorrection::GetFissionPairingCorrection(G4int(A),G4int(Z));
   
-	G4double SystemEntropy = 2.0*sqrt(theEvapLDP.LevelDensityParameter(A,Z,Ucompound)*Ucompound);
+    G4double SystemEntropy = 2.0*sqrt(theEvapLDP.LevelDensityParameter(A,Z,Ucompound)*Ucompound);
 	
-	G4double afission = theFissLDP.LevelDensityParameter(A,Z,Ufission);
+    G4double afission = theFissLDP.LevelDensityParameter(A,Z,Ufission);
 
-	G4double Cf = 2.0*sqrt(afission*MaximalKineticEnergy);
+    G4double Cf = 2.0*sqrt(afission*MaximalKineticEnergy);
 
-	G4double Q1 = 1.0 + (Cf - 1.0)*exp(Cf);
-	G4double Q2 = 4.0*pi*afission*exp(SystemEntropy);
+    G4double Q1 = 1.0 + (Cf - 1.0)*exp(Cf);
+    G4double Q2 = 4.0*pi*afission*exp(SystemEntropy);
 	
-	G4double probability = Q1/Q2;
+    G4double probability = Q1/Q2;
  
-	return probability;
+    return probability;
 }
 
-G4double G4FissionProbability::EvaporationPairingCorrection(const G4int A, const G4int Z) const
-{
-	const G4double PairingConstant = 12.0*MeV;
-	const G4int N = A - Z;
-	G4double Pair = (1.0 - G4double(Z) + 2.0*(Z/2)) + (1.0 - G4double(N) + 2.0*(N/2));
-	G4double PCorrection = Pair*PairingConstant/sqrt(G4double(A));
-	return PCorrection;
-}
-
-G4double G4FissionProbability::FissionPairingCorrection(const G4int A, const G4int Z) const
-{
-	const G4double PairingConstant = 14.0*MeV;
-	const G4int N = A - Z;
-	G4double Pair = (1.0 - G4double(Z) + 2.0*(Z/2)) + (1.0 - G4double(N) + 2.0*(N/2));
-	G4double PCorrection = Pair*PairingConstant/sqrt(G4double(A));
-	return PCorrection;
-}
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
index b1352e05ae..2353d78fc4 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4He3CoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4He3CoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4He3CoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,43 +32,43 @@
 
 G4He3CoulombBarrier::G4He3CoulombBarrier(const G4He3CoulombBarrier & right)
 {
-  G4Exception("G4He3CoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4He3CoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4He3CoulombBarrier & G4He3CoulombBarrier::operator=(const G4He3CoulombBarrier & right)
 {
- G4Exception("G4He3CoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4He3CoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4He3CoulombBarrier::operator==(const G4He3CoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4He3CoulombBarrier::operator!=(const G4He3CoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 G4double G4He3CoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// const G4double Zlist[size]  = {10.0, 20.0, 30.0, 50.0, 70.0};
-	// const G4double KHe3[size] = {0.68, 0.82, 0.91, 0.97, 0.98};
-	//
-	// K for He3 is K for alphas + 0.12
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.98;
-	} else {
-		K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
-	}
-	return K+0.12;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // const G4double Zlist[size]  = {10.0, 20.0, 30.0, 50.0, 70.0};
+    // const G4double KHe3[size] = {0.68, 0.82, 0.91, 0.97, 0.98};
+    //
+    // K for He3 is K for alphas + 0.12
+    G4double K = 1.0;
+    if (aZ>=70.0) {
+	K = 0.98;
+    } else {
+	K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
+    }
+    return K+0.12;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationChannel.cc
index 658389a229..7a3b48c32f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4He3EvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -14,24 +33,24 @@
 
 const G4He3EvaporationChannel & G4He3EvaporationChannel::operator=(const G4He3EvaporationChannel & right)
 {
-	G4Exception("G4He3EvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4He3EvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4He3EvaporationChannel::G4He3EvaporationChannel(const G4He3EvaporationChannel & right)
 {
-	G4Exception("G4He3EvaporationChannel::CopyConstructor meant to not be accessable");
+    G4Exception("G4He3EvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4He3EvaporationChannel::operator==(const G4He3EvaporationChannel & right) const 
 {
-	return (this == (G4He3EvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4He3EvaporationChannel *) &right);
+    //  return false;
 }
 
 G4bool G4He3EvaporationChannel::operator!=(const G4He3EvaporationChannel & right) const 
 {
-	return (this != (G4He3EvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4He3EvaporationChannel *) &right);
+    //  return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationProbability.cc
index 6c7da98629..1fcc8b9fee 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4He3EvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4He3EvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,35 +32,36 @@
 #include "G4He3EvaporationProbability.hh"
 
 G4He3EvaporationProbability::G4He3EvaporationProbability() :
-		G4EvaporationProbability(3,2,6) // A,Z,Gamma
+    G4EvaporationProbability(3,2,6) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
-	
-	ExcitEnergies(18) = 7.29*MeV;
-	ExcitEnergies(20) = 6.48*MeV;
-	ExcitEnergies(25) = 5.69*MeV;
-	ExcitEnergies(26) = 8.31*MeV;
-	ExcitEnergies(31) = 5.10*MeV;
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
+
 
-	ExcitSpins(18) = 6;
-	ExcitSpins(20) = 8;
-	ExcitSpins(25) = 3;
-	ExcitSpins(26) = 2;
-	ExcitSpins(31) = 7;	
 	
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);	
+    ExcitEnergies[18] = 7.29*MeV;
+    ExcitEnergies[20] = 6.48*MeV;
+    ExcitEnergies[25] = 5.69*MeV;
+    ExcitEnergies[26] = 8.31*MeV;
+    ExcitEnergies[31] = 5.10*MeV;
+
+    ExcitSpins[18] = 6;
+    ExcitSpins[20] = 8;
+    ExcitSpins[25] = 3;
+    ExcitSpins[26] = 2;
+    ExcitSpins[31] = 7;	
+	
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);	
 }
 
 G4He3EvaporationProbability::G4He3EvaporationProbability(const G4He3EvaporationProbability &right)
 {
- G4Exception("G4He3EvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4He3EvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -50,42 +70,42 @@ G4He3EvaporationProbability::G4He3EvaporationProbability(const G4He3EvaporationP
 const G4He3EvaporationProbability & G4He3EvaporationProbability::
 operator=(const G4He3EvaporationProbability &right)
 {
-  G4Exception("G4He3EvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4He3EvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4He3EvaporationProbability::operator==(const G4He3EvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4He3EvaporationProbability::operator!=(const G4He3EvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4He3EvaporationProbability::CCoeficient(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
-	//	G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
-	// C for He3 is equal to C for alpha times 4/3
-	G4double C = 0.0;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
+    //	G4double Calpha[5] = { 0.10, 0.10, 0.10, 0.08, 0.06};
+    // C for He3 is equal to C for alpha times 4/3
+    G4double C = 0.0;
 	
 	
-	if (aZ <= 30) {
-		C = 0.10;
-	} else if (aZ <= 50) {
-		C = 0.1 + -((aZ-50.)/20.)*0.02;
-	} else if (aZ < 70) {
-		C = 0.08 + -((aZ-70.)/20.)*0.02;
-	} else {
-		C = 0.06;
-	}
-	return C*(4.0/3.0);
+    if (aZ <= 30) {
+	C = 0.10;
+    } else if (aZ <= 50) {
+	C = 0.1 + -((aZ-50.)/20.)*0.02;
+    } else if (aZ < 70) {
+	C = 0.08 + -((aZ-70.)/20.)*0.02;
+    } else {
+	C = 0.06;
+    }
+    return C*(4.0/3.0);
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4He5FermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4He5FermiFragment.cc
index 77379a01b0..afe928ea39 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4He5FermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4He5FermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4He5FermiFragment.cc,v 1.4.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4He5FermiFragment::G4He5FermiFragment()
 
 G4He5FermiFragment::G4He5FermiFragment(const G4He5FermiFragment &right)
 {
-  G4Exception("G4He5FermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4He5FermiFragment::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,67 +47,71 @@ G4He5FermiFragment::~G4He5FermiFragment()
 
 const G4He5FermiFragment & G4He5FermiFragment::operator=(const G4He5FermiFragment &right)
 {
-  G4Exception("G4He5FermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4He5FermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4He5FermiFragment::operator==(const G4He5FermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4He5FermiFragment::operator!=(const G4He5FermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 
 G4FragmentVector * G4He5FermiFragment::GetFragment(const G4LorentzVector & aMomentum)
-  // He5 ----> alpha + neutron
+    // He5 ----> alpha + neutron
 {
-  const G4int NumSubFrag = 2;
-  G4double Masses[NumSubFrag];
-  G4double Charges[NumSubFrag];
-  G4double AtomNum[NumSubFrag];
+    const G4int NumSubFrag = 2;
+    G4double Masses[NumSubFrag];
+    G4double Charges[NumSubFrag];
+    G4double AtomNum[NumSubFrag];
 
 
-  Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
-  Masses[1] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(0,1); // neutron
+    Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
+    Masses[1] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(0,1); // neutron
   
-  AtomNum[0] = 4;
-  AtomNum[1] = 1;
+    AtomNum[0] = 4;
+    AtomNum[1] = 1;
 
-  Charges[0] = 2;
-  Charges[1] = 0;
+    Charges[0] = 2;
+    Charges[1] = 0;
 
-//   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // He5
-//     G4NucleiPropertiesTable::GetMassExcess(0,1) - // neutron
-//     G4NucleiPropertiesTable::GetMassExcess(2,4); // alpha
-  G4double AvalKineticE = sqrt(aMomentum.e()*aMomentum.e() - 
-			       aMomentum.vect().mag2())  - // He5
-                               Masses[1] - // neutron
-                               Masses[0]; // alpha
+    //   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // He5
+    //     G4NucleiPropertiesTable::GetMassExcess(0,1) - // neutron
+    //     G4NucleiPropertiesTable::GetMassExcess(2,4); // alpha
+    G4double AvalKineticE = sqrt(aMomentum.e()*aMomentum.e() - 
+				 aMomentum.vect().mag2())  - // He5
+	Masses[1] - // neutron
+	Masses[0]; // alpha
 
-  G4RWTPtrOrderedVector<G4LorentzVector> * SubFragsMomentum =
-    FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
+    G4std::deque<G4LorentzVector*> * SubFragsMomentum =
+	FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
+  
 
 
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-  G4FragmentVector * theResult = new G4FragmentVector;
+    for (G4int i = 0; i < NumSubFrag; i++) {
 
-  for (G4int i = 0; i < NumSubFrag; i++) {
-
-    // Lorentz boost
-    SubFragsMomentum->at(i)->boost(aMomentum.boostVector());
+	// Lorentz boost
+	SubFragsMomentum->operator[](i)->boost(aMomentum.boostVector());
     
-    theResult->insert(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->at(i))));
-  }
+	theResult->push_back(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->operator[](i))));
+    }
   
-  SubFragsMomentum->clearAndDestroy();
-  delete SubFragsMomentum;
+    //  SubFragsMomentum->clearAndDestroy();
+    while (!SubFragsMomentum->empty()) {
+	delete SubFragsMomentum->back();
+	SubFragsMomentum->pop_back();
+    }
+    delete SubFragsMomentum;
 
-  return theResult;
+    return theResult;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4Li5FermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4Li5FermiFragment.cc
index 09a66e222c..db933da065 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4Li5FermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4Li5FermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Li5FermiFragment.cc,v 1.4.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4Li5FermiFragment::G4Li5FermiFragment()
 
 G4Li5FermiFragment::G4Li5FermiFragment(const G4Li5FermiFragment &right)
 {
-  G4Exception("G4Li5FermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4Li5FermiFragment::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,65 +47,69 @@ G4Li5FermiFragment::~G4Li5FermiFragment()
 
 const G4Li5FermiFragment & G4Li5FermiFragment::operator=(const G4Li5FermiFragment &right)
 {
-  G4Exception("G4Li5FermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4Li5FermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4Li5FermiFragment::operator==(const G4Li5FermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4Li5FermiFragment::operator!=(const G4Li5FermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
 G4FragmentVector * G4Li5FermiFragment::GetFragment(const G4LorentzVector & aMomentum)
-  // Li5 ----> alpha + proton
+    // Li5 ----> alpha + proton
 {
-  const G4int NumSubFrag = 2;
-  G4double Masses[NumSubFrag];
-  G4double Charges[NumSubFrag];
-  G4double AtomNum[NumSubFrag];
+    const G4int NumSubFrag = 2;
+    G4double Masses[NumSubFrag];
+    G4double Charges[NumSubFrag];
+    G4double AtomNum[NumSubFrag];
 
 
-  Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
-  Masses[1] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(1,1); // proton
+    Masses[0] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(2,4); // alpha
+    Masses[1] = G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(1,1); // proton
   
-  AtomNum[0] = 4;
-  AtomNum[1] = 1;
+    AtomNum[0] = 4;
+    AtomNum[1] = 1;
 
-  Charges[0] = 2;
-  Charges[1] = 1;
+    Charges[0] = 2;
+    Charges[1] = 1;
 
-//   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // Li5
-//     G4NucleiPropertiesTable::GetMassExcess(1,1) - // proton
-//     G4NucleiPropertiesTable::GetMassExcess(2,4); // alpha
-  G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
-				aMomentum.vect().mag2())  - // Li5
-		   Masses[0] - // proton
-		  Masses[1]; // alpha
+    //   G4double AvalKineticE = G4NucleiPropertiesTable::GetMassExcess(Z,A) + ExcitEnergy - // Li5
+    //     G4NucleiPropertiesTable::GetMassExcess(1,1) - // proton
+    //     G4NucleiPropertiesTable::GetMassExcess(2,4); // alpha
+    G4double AvalKineticE =  sqrt(aMomentum.e()*aMomentum.e() - 
+				  aMomentum.vect().mag2())  - // Li5
+	Masses[0] - // proton
+	Masses[1]; // alpha
 
-  G4RWTPtrOrderedVector<G4LorentzVector> * SubFragsMomentum =
-    FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
+    G4std::deque<G4LorentzVector*> * SubFragsMomentum =
+	FragmentsMomentum(AvalKineticE, NumSubFrag,Masses);
 
 
 
-  G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-  for (G4int i = 0; i < NumSubFrag; i++) {
+    for (G4int i = 0; i < NumSubFrag; i++) {
     
-    // Lorentz boost
-    SubFragsMomentum->at(i)->boost(aMomentum.boostVector());
+	// Lorentz boost
+	SubFragsMomentum->operator[](i)->boost(aMomentum.boostVector());
 
-    theResult->insert(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->at(i))));
-  }
+	theResult->push_back(new G4Fragment(AtomNum[i],Charges[i],*(SubFragsMomentum->operator[](i))));
+    }
 
-  SubFragsMomentum->clearAndDestroy();
-  delete SubFragsMomentum;
+    //  SubFragsMomentum->clearAndDestroy();
+    while (!SubFragsMomentum->empty()) {
+	delete SubFragsMomentum->back();
+	SubFragsMomentum->pop_back();
+    }
+    delete SubFragsMomentum;
 
-  return theResult;
+    return theResult;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
index 185ed86f83..8d5d0728b1 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,23 +32,23 @@
 
 G4NeutronCoulombBarrier::G4NeutronCoulombBarrier(const G4NeutronCoulombBarrier & right)
 {
-  G4Exception("G4NeutronCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4NeutronCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4NeutronCoulombBarrier & G4NeutronCoulombBarrier::operator=(const G4NeutronCoulombBarrier & right)
 {
- G4Exception("G4NeutronCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4NeutronCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4NeutronCoulombBarrier::operator==(const G4NeutronCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4NeutronCoulombBarrier::operator!=(const G4NeutronCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationChannel.cc
index efa7a66b5b..a0aa452dca 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4NeutronEvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -14,24 +33,24 @@
 
 const G4NeutronEvaporationChannel & G4NeutronEvaporationChannel::operator=(const G4NeutronEvaporationChannel & right)
 {
-	G4Exception("G4NeutronEvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4NeutronEvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4NeutronEvaporationChannel::G4NeutronEvaporationChannel(const G4NeutronEvaporationChannel & right)
 {
-	G4Exception("G4NeutronEvaporationChannel::CopyConstructor meant to not be accessable");
+    G4Exception("G4NeutronEvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4NeutronEvaporationChannel::operator==(const G4NeutronEvaporationChannel & right) const 
 {
-	return (this == (G4NeutronEvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4NeutronEvaporationChannel *) &right);
+    //  return false;
 }
 
 G4bool G4NeutronEvaporationChannel::operator!=(const G4NeutronEvaporationChannel & right) const 
 {
-	return (this != (G4NeutronEvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4NeutronEvaporationChannel *) &right);
+    //  return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationProbability.cc
index ab2393a9ac..ca22d695aa 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NeutronEvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4NeutronEvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,65 +32,65 @@
 #include "G4NeutronEvaporationProbability.hh"
 
 G4NeutronEvaporationProbability::G4NeutronEvaporationProbability() :
-		G4EvaporationProbability(1,0,2) // A,Z,Gamma
+    G4EvaporationProbability(1,0,2) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
+
 	
-	ExcitEnergies( 9) = 3.56*MeV;
-	ExcitEnergies(10) = 0.48*MeV;
-	ExcitEnergies(11) = 0.98*MeV;
-	ExcitEnergies(12) = 0.43*MeV;
-	ExcitEnergies(15) = 3.37*MeV;
-	ExcitEnergies(17) = 0.72*MeV;
-	ExcitEnergies(18) = 2.13*MeV;
-	ExcitEnergies(19) = 0.95*MeV;
-	ExcitEnergies(20) = 2.00*MeV;
-	ExcitEnergies(21) = 4.44*MeV;
-	ExcitEnergies(22) = 3.09*MeV;
-	ExcitEnergies(23) = 6.09*MeV;
-	ExcitEnergies(25) = 2.31*MeV;
-	ExcitEnergies(26) = 5.28*MeV;
-	ExcitEnergies(27) = 0.12*MeV;
-	ExcitEnergies(28) = 5.22*MeV;
-	ExcitEnergies(29) = 6.10*MeV;
-	ExcitEnergies(30) = 0.87*MeV;
-	ExcitEnergies(31) = 1.98*MeV;
+    ExcitEnergies[ 9] = 3.56*MeV;
+    ExcitEnergies[10] = 0.48*MeV;
+    ExcitEnergies[11] = 0.98*MeV;
+    ExcitEnergies[12] = 0.43*MeV;
+    ExcitEnergies[15] = 3.37*MeV;
+    ExcitEnergies[17] = 0.72*MeV;
+    ExcitEnergies[18] = 2.13*MeV;
+    ExcitEnergies[19] = 0.95*MeV;
+    ExcitEnergies[20] = 2.00*MeV;
+    ExcitEnergies[21] = 4.44*MeV;
+    ExcitEnergies[22] = 3.09*MeV;
+    ExcitEnergies[23] = 6.09*MeV;
+    ExcitEnergies[25] = 2.31*MeV;
+    ExcitEnergies[26] = 5.28*MeV;
+    ExcitEnergies[27] = 0.12*MeV;
+    ExcitEnergies[28] = 5.22*MeV;
+    ExcitEnergies[29] = 6.10*MeV;
+    ExcitEnergies[30] = 0.87*MeV;
+    ExcitEnergies[31] = 1.98*MeV;
 
 
-	ExcitSpins( 9) = 1;
-	ExcitSpins(10) = 2;
-	ExcitSpins(11) = 3;
-	ExcitSpins(12) = 2;
-	ExcitSpins(15) = 5;
-	ExcitSpins(17) = 3;
-	ExcitSpins(18) = 2;
-	ExcitSpins(19) = 5;
-	ExcitSpins(20) = 2;
-	ExcitSpins(21) = 5;
-	ExcitSpins(22) = 2;
-	ExcitSpins(23) = 3;
-	ExcitSpins(25) = 1;
-	ExcitSpins(26) = 8;
-	ExcitSpins(27) = 1;
-	ExcitSpins(28) = 8;
-	ExcitSpins(29) = 8;
-	ExcitSpins(30) = 2;
-	ExcitSpins(31) = 5;
+    ExcitSpins[ 9] = 1;
+    ExcitSpins[10] = 2;
+    ExcitSpins[11] = 3;
+    ExcitSpins[12] = 2;
+    ExcitSpins[15] = 5;
+    ExcitSpins[17] = 3;
+    ExcitSpins[18] = 2;
+    ExcitSpins[19] = 5;
+    ExcitSpins[20] = 2;
+    ExcitSpins[21] = 5;
+    ExcitSpins[22] = 2;
+    ExcitSpins[23] = 3;
+    ExcitSpins[25] = 1;
+    ExcitSpins[26] = 8;
+    ExcitSpins[27] = 1;
+    ExcitSpins[28] = 8;
+    ExcitSpins[29] = 8;
+    ExcitSpins[30] = 2;
+    ExcitSpins[31] = 5;
 
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);
 }
 
 
 G4NeutronEvaporationProbability::G4NeutronEvaporationProbability(const G4NeutronEvaporationProbability &right)
 {
- G4Exception("G4NeutronEvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4NeutronEvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -80,17 +99,17 @@ G4NeutronEvaporationProbability::G4NeutronEvaporationProbability(const G4Neutron
 const G4NeutronEvaporationProbability & G4NeutronEvaporationProbability::
 operator=(const G4NeutronEvaporationProbability &right)
 {
-  G4Exception("G4NeutronEvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4NeutronEvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4NeutronEvaporationProbability::operator==(const G4NeutronEvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4NeutronEvaporationProbability::operator!=(const G4NeutronEvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
index 6cdd0f188d..2b0bfbffbc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevel.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4NuclearLevel
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
index d876178ed8..4e98fd1dc0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4NuclearLevelManager.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4NuclearLevelManager
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4PairingCorrection.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4PairingCorrection.cc
new file mode 100644
index 0000000000..01e7d474f9
--- /dev/null
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4PairingCorrection.cc
@@ -0,0 +1,51 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PairingCorrection.cc,v 1.1.2.1 2001/06/28 19:13:18 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
+
+#include "G4PairingCorrection.hh"
+
+
+// G4double G4PairingCorrection::
+// GetPairingCorrection(const G4int anA, const G4int aZ)
+// {
+//   const G4double PairingConstant = 12.0*MeV;
+//   const G4int N = anA - aZ;
+//   G4double Pair = (1.0 - G4double(aZ) + 2.0*(aZ/2)) + (1.0 - G4double(N) + 2.0*(N/2));
+//   G4double PCorrection = Pair*PairingConstant/sqrt(G4double(anA));
+//   return PCorrection;
+// }
+
+
+
+G4PairingCorrection G4PairingCorrection::theInstance(10.0);
+
+G4PairingCorrection::G4PairingCorrection(G4double dummy)
+{
+    G4double even_more_dummy = dummy;
+}
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
index 5cfb7b45e4..f1074b8ed3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4PhotonEvaporation.cc
@@ -1,16 +1,30 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//      
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4PhotonEvaporation
@@ -79,16 +93,16 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
   G4FragmentVector* contProducts = _contDeexcitation->DoTransition();  
 
   G4int nCont = 0;
-  if (contProducts != 0) nCont = contProducts->entries();
+  if (contProducts != 0) nCont = contProducts->size();
 
-  G4int i;
+  G4FragmentVector::iterator i;
   if (nCont > 0)
     {
       G4Fragment modifiedNucleus = _contDeexcitation->GetNucleus();
       _discrDeexcitation->SetNucleus(modifiedNucleus);
-      for (i=0; i<nCont; i++)
+      for (i = contProducts->begin(); i != contProducts->end(); i++)
 	{
-	  products->insert(contProducts->at(i));
+	  products->push_back(*i);
 	}
     }
   else
@@ -97,36 +111,38 @@ G4FragmentVector* G4PhotonEvaporation::BreakUp(const G4Fragment& nucleus)
       G4FragmentVector* discrProducts = _discrDeexcitation->DoTransition();
       
       G4int nDiscr = 0;
-      if (discrProducts != 0) nDiscr = discrProducts->entries();
+      if (discrProducts != 0) nDiscr = discrProducts->size();
       
       if (_verbose > 0)
 	G4cout << " = BreakUp = " << nDiscr 
 	       << " gammas from DiscreteDeexcitation " 
 	       << G4endl;
       
-      for (i=0; i<nDiscr; i++)
+      for (i = discrProducts->begin(); i != discrProducts->end(); i++)
 	{
-	  products->insert(discrProducts->at(i));
+	  products->push_back(*i);
 	}
+      discrProducts->clear();
       delete discrProducts;
     }
 
 
   _gammaE = 0.;
-  if (products->entries() > 0)
+  if (products->size() > 0)
     {
-      _gammaE = products->at(0)->GetMomentum().e();
+      _gammaE = (*(products->begin()))->GetMomentum().e();
     }
 
+  contProducts->clear();
   delete contProducts;  // delete vector, not fragments 
 
   // Add deexcited nucleus to products
   G4Fragment* finalNucleus = new G4Fragment(_discrDeexcitation->GetNucleus());
-  products->insert(finalNucleus);
+  products->push_back(finalNucleus);
 
 
   if (_verbose > 0)
-    G4cout << "*-*-*-* Photon evaporation: " << products->entries() << G4endl;
+    G4cout << "*-*-*-* Photon evaporation: " << products->size() << G4endl;
 
   return products;
 }
@@ -147,20 +163,20 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
 
   // Products from continuum gamma transitions
   G4int nCont = 0;
-  if (contProducts != 0) nCont = contProducts->entries();
+  if (contProducts != 0) nCont = contProducts->size();
 
   if (_verbose > 0)
     G4cout << " = BreakItUp = " << nCont 
 	   << " gammas from ContinuumDeexcitation " << G4endl;
 
-  G4int i;
+  G4FragmentVector::iterator i;
   if (nCont > 0)
     {
       G4Fragment modifiedNucleus = _contDeexcitation->GetNucleus();
       _discrDeexcitation->SetNucleus(modifiedNucleus);
-      for (i=0; i<nCont; i++)
+      for (i = contProducts->begin(); i != contProducts->end(); i++)
 	{
-	  products->insert(contProducts->at(i));
+	  products->push_back(*i);
 	}
     }
 
@@ -168,29 +184,35 @@ G4FragmentVector* G4PhotonEvaporation::BreakItUp(const G4Fragment& nucleus)
   G4FragmentVector* discrProducts = _discrDeexcitation->DoChain();
 
   G4int nDiscr = 0;
-  if (discrProducts != 0) nDiscr = discrProducts->entries();
+  if (discrProducts != 0) nDiscr = discrProducts->size();
 
   if (_verbose > 0)
     G4cout << " = BreakItUp = " << nDiscr 
 	   << " gammas from DiscreteDeexcitation " << G4endl;
 
-  for (i=0; i<nDiscr; i++)
+  for (i = discrProducts->begin(); i != discrProducts->end(); i++)
     {
-      products->insert(discrProducts->at(i));
+      products->push_back(*i);
     }
 
   // Add deexcited nucleus to products
   G4Fragment* finalNucleus = new G4Fragment(_discrDeexcitation->GetNucleus());
-  products->insert(finalNucleus);
+  products->push_back(finalNucleus);
 
   if (_verbose > 0)
     G4cout << " = BreakItUp = Nucleus added to products" << G4endl;
 
-  delete contProducts;  // delete vector, not fragments 
-  delete discrProducts;
+   contProducts->clear();
+   discrProducts->clear();
+   delete contProducts;  // delete vector, not fragments 
+   delete discrProducts;
 
   if (_verbose > 0)
-    G4cout << "*-*-* Photon evaporation: " << products->entries() << G4endl;
+    G4cout << "*-*-* Photon evaporation: " << products->size() << G4endl;
+
+#ifdef debug
+  CheckConservation(nucleus,products);
+#endif
 
   return products;
 }
@@ -227,3 +249,63 @@ void G4PhotonEvaporation::SetVerboseLevel(G4int verbose)
 
   return;
 }
+
+
+#ifdef debug
+void G4PhotonEvaporation::CheckConservation(const G4Fragment & theInitialState,
+					    G4FragmentVector * Result) const
+{
+  G4double ProductsEnergy =0;
+  G4ThreeVector ProductsMomentum;
+  G4int ProductsA = 0;
+  G4int ProductsZ = 0;
+  G4FragmentVector::iterator h;
+  for (h = Result->begin(); h != Result->end(); h++) {
+    G4LorentzVector tmp = (*h)->GetMomentum();
+    ProductsEnergy += tmp.e();
+    ProductsMomentum += tmp.vect();
+    ProductsA += G4int((*h)->GetA());
+    ProductsZ += G4int((*h)->GetZ());
+  }
+
+  if (ProductsA != theInitialState.GetA()) {
+    G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PhotonEvaporation.cc: Barionic Number Conservation test for evaporation fragments" 
+	   << G4endl; 
+    G4cout << "Initial A = " << theInitialState.GetA() 
+	   << "   Fragments A = " << ProductsA << "   Diference --> " 
+	   << theInitialState.GetA() - ProductsA << G4endl;
+  }
+  if (ProductsZ != theInitialState.GetZ()) {
+    G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PhotonEvaporation.cc: Charge Conservation test for evaporation fragments" 
+	   << G4endl; 
+    G4cout << "Initial Z = " << theInitialState.GetZ() 
+	   << "   Fragments Z = " << ProductsZ << "   Diference --> " 
+	   << theInitialState.GetZ() - ProductsZ << G4endl;
+  }
+  if (abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PhotonEvaporation.cc: Energy Conservation test for evaporation fragments" 
+	   << G4endl; 
+    G4cout << "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
+	   << "   Fragments E = " << ProductsEnergy/MeV  << " MeV   Diference --> " 
+	   << (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV" << G4endl;
+  } 
+  if (abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV || 
+      abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
+      abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PhotonEvaporation.cc: Momentum Conservation test for evaporation fragments" 
+	   << G4endl; 
+    G4cout << "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
+	   << "   Fragments P = " << ProductsMomentum  << " MeV   Diference --> " 
+	   << theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV" << G4endl;
+  }
+  return;
+}
+#endif
+
+
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
index 39354fb5ac..c6e8b0e21c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProtonCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProtonCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,41 +32,41 @@
 
 G4ProtonCoulombBarrier::G4ProtonCoulombBarrier(const G4ProtonCoulombBarrier & right)
 {
-  G4Exception("G4ProtonCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4ProtonCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4ProtonCoulombBarrier & G4ProtonCoulombBarrier::operator=(const G4ProtonCoulombBarrier & right)
 {
- G4Exception("G4ProtonCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4ProtonCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4ProtonCoulombBarrier::operator==(const G4ProtonCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4ProtonCoulombBarrier::operator!=(const G4ProtonCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 G4double G4ProtonCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
-	// const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}
-	return K;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
+    // const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
+    G4double K = 1.0;
+    if (aZ>=70.0) {
+	K = 0.80;
+    } else {
+	K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
+    }
+    return K;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationChannel.cc
index a4e3a7d1fd..88ea77fe6c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ProtonEvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -14,25 +33,25 @@
 
 const G4ProtonEvaporationChannel & G4ProtonEvaporationChannel::operator=(const G4ProtonEvaporationChannel & right)
 {
-	G4Exception("G4ProtonEvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4ProtonEvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4ProtonEvaporationChannel::G4ProtonEvaporationChannel(const G4ProtonEvaporationChannel & right)
 {
-	G4Exception("G4ProtonEvaporationChannel::CopyConstructor meant to not be accessable");
+    G4Exception("G4ProtonEvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4ProtonEvaporationChannel::operator==(const G4ProtonEvaporationChannel & right) const 
 {
-	return (this == (G4ProtonEvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4ProtonEvaporationChannel *) &right);
+    //  return false;
 }
 
 G4bool G4ProtonEvaporationChannel::operator!=(const G4ProtonEvaporationChannel & right) const 
 {
-	return (this != (G4ProtonEvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4ProtonEvaporationChannel *) &right);
+    //  return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationProbability.cc
index a4e73a0674..705ec099fc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4ProtonEvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ProtonEvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,91 +32,93 @@
 #include "G4ProtonEvaporationProbability.hh"
 
 G4ProtonEvaporationProbability::G4ProtonEvaporationProbability() :
-		G4EvaporationProbability(1,1,2) // A,Z,Gamma
+    G4EvaporationProbability(1,1,2) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
-	ExcitEnergies(15) = 5.96*MeV;
-	ExcitEnergies(17) = 1.74*MeV;
-	ExcitEnergies(18) = 4.44*MeV;
-	ExcitEnergies(19) = 1.67*MeV;
-	ExcitEnergies(20) = 4.32*MeV;
-	ExcitEnergies(22) = 3.68*MeV;
-	ExcitEnergies(23) = 6.69*MeV;
-	ExcitEnergies(25) = 3.95*MeV;
-	ExcitEnergies(26) = 6.32*MeV;
-	ExcitEnergies(27) = 0.30*MeV;
-	ExcitEnergies(28) = 6.18*MeV;
-	ExcitEnergies(29) = 6.92*MeV;
-	ExcitEnergies(30) = 3.06*MeV;
-	ExcitEnergies(31) = 3.57*MeV;
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
 
 
-	ExcitSpins(15) = 8;
-	ExcitSpins(17) = 1;
-	ExcitSpins(18) = 6;
-	ExcitSpins(19) = 5;
-	ExcitSpins(20) = 6;
-	ExcitSpins(22) = 4;
-	ExcitSpins(23) = 8;
-	ExcitSpins(25) = 3;
-	ExcitSpins(26) = 4;
-	ExcitSpins(27) = 7;
-	ExcitSpins(28) = 4;
-	ExcitSpins(29) = 5;
-	ExcitSpins(30) = 2;
-	ExcitSpins(31) = 10;
+
+    ExcitEnergies[15] = 5.96*MeV;
+    ExcitEnergies[17] = 1.74*MeV;
+    ExcitEnergies[18] = 4.44*MeV;
+    ExcitEnergies[19] = 1.67*MeV;
+    ExcitEnergies[20] = 4.32*MeV;
+    ExcitEnergies[22] = 3.68*MeV;
+    ExcitEnergies[23] = 6.69*MeV;
+    ExcitEnergies[25] = 3.95*MeV;
+    ExcitEnergies[26] = 6.32*MeV;
+    ExcitEnergies[27] = 0.30*MeV;
+    ExcitEnergies[28] = 6.18*MeV;
+    ExcitEnergies[29] = 6.92*MeV;
+    ExcitEnergies[30] = 3.06*MeV;
+    ExcitEnergies[31] = 3.57*MeV;
+
+
+    ExcitSpins[15] = 8;
+    ExcitSpins[17] = 1;
+    ExcitSpins[18] = 6;
+    ExcitSpins[19] = 5;
+    ExcitSpins[20] = 6;
+    ExcitSpins[22] = 4;
+    ExcitSpins[23] = 8;
+    ExcitSpins[25] = 3;
+    ExcitSpins[26] = 4;
+    ExcitSpins[27] = 7;
+    ExcitSpins[28] = 4;
+    ExcitSpins[29] = 5;
+    ExcitSpins[30] = 2;
+    ExcitSpins[31] = 10;
 	
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);	
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);	
 	
 }
 
 G4ProtonEvaporationProbability::G4ProtonEvaporationProbability(const G4ProtonEvaporationProbability &right)
 {
- G4Exception("G4ProtonEvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4ProtonEvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 const G4ProtonEvaporationProbability & G4ProtonEvaporationProbability::
 operator=(const G4ProtonEvaporationProbability &right)
 {
-  G4Exception("G4ProtonEvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4ProtonEvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4ProtonEvaporationProbability::operator==(const G4ProtonEvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4ProtonEvaporationProbability::operator!=(const G4ProtonEvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4ProtonEvaporationProbability::CCoeficient(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
-	// G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
-	G4double C = 0.0;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
+    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
+    G4double C = 0.0;
 	
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}
+    if (aZ >= 70) {
+	C = 0.10;
+    } else {
+	C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+    }
 	
-	return C;
+    return C;
 	
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4RandGeneralTmp.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4RandGeneralTmp.cc
index 384e686879..f45ecec63e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4RandGeneralTmp.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4RandGeneralTmp.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 // -----------------------------------------------------------------------
 //                             HEP Random
 //                          --- RandGeneralTmp ---
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4Solver.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4Solver.cc
index a78c37045f..9833fb55da 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4Solver.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4Solver.cc
@@ -1,39 +1,68 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4Solver.cc,v 1.2.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4Solver.hh"
 
 template <class Function> 
 G4Solver<Function>::G4Solver(const G4Solver & right)
 {
-	MaxIter = right.MaxIter;
-	tolerance = right.tolerance;
-	a = right.a;
-	b = right.b;
-	root = right.root;
+    MaxIter = right.MaxIter;
+    tolerance = right.tolerance;
+    a = right.a;
+    b = right.b;
+    root = right.root;
 }
 
 // operators
 template <class Function> 
 G4Solver<Function> & G4Solver<Function>::operator=(const G4Solver & right)
 {
-	MaxIter = right.MaxIter;
-	tolerance = right.tolerance;
-	a = right.a;
-	b = right.b;
-	root = right.root;	
-	return *this;
+    MaxIter = right.MaxIter;
+    tolerance = right.tolerance;
+    a = right.a;
+    b = right.b;
+    root = right.root;	
+    return *this;
 }
 
 template <class Function> 
 G4bool G4Solver<Function>::operator==(const G4Solver & right) const
 {
-	if (this == &right) return true;
-	else return false;
+    if (this == &right) return true;
+    else return false;
 }
 
 template <class Function> 
 G4bool G4Solver<Function>::operator!=(const G4Solver & right) const
 {
-	return !operator==(right);
+    return !operator==(right);
 }
 	
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StableFermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StableFermiFragment.cc
index 3af43756bf..2d75bf0080 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StableFermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StableFermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StableFermiFragment.cc,v 1.3.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4StableFermiFragment::G4StableFermiFragment()
 
 G4StableFermiFragment::G4StableFermiFragment(const G4StableFermiFragment &right)
 {
-  G4Exception("G4StableFermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4StableFermiFragment::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,28 +47,28 @@ G4StableFermiFragment::~G4StableFermiFragment()
 
 const G4StableFermiFragment & G4StableFermiFragment::operator=(const G4StableFermiFragment &right)
 {
-  G4Exception("G4StableFermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4StableFermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StableFermiFragment::operator==(const G4StableFermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4StableFermiFragment::operator!=(const G4StableFermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
 
 G4FragmentVector * G4StableFermiFragment::GetFragment(const G4LorentzVector & aMomentum)
 {
-  G4FragmentVector * theResult = new G4FragmentVector;
+    G4FragmentVector * theResult = new G4FragmentVector;
 
-  theResult->insert(new G4Fragment(A,Z,aMomentum));
+    theResult->push_back(new G4Fragment(A,Z,aMomentum));
   
-  return theResult;
+    return theResult;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
index 1f65366dcd..9f8ff173f0 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMF.cc
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMF.cc,v 1.6.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
 #include "G4StatMF.hh"
 
@@ -14,7 +42,7 @@ G4StatMF::~G4StatMF() {}; //{if (_theEnsemble != 0) delete _theEnsemble;}
 // Copy constructor
 G4StatMF::G4StatMF(const G4StatMF & right)
 {
-	G4Exception("G4StatMF::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMF::copy_constructor meant to not be accessable");
 }
 
 
@@ -22,22 +50,22 @@ G4StatMF::G4StatMF(const G4StatMF & right)
 
 G4StatMF & G4StatMF::operator=(const G4StatMF & right)
 {
-	G4Exception("G4StatMF::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMF::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMF::operator==(const G4StatMF & right)
 {
-	G4Exception("G4StatMF::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMF::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMF::operator!=(const G4StatMF & right)
 {
-	G4Exception("G4StatMF::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMF::operator!= meant to not be accessable");
+    return true;
 }
 
 
@@ -46,23 +74,23 @@ G4bool G4StatMF::operator!=(const G4StatMF & right)
 
 G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
 {
-// 	G4FragmentVector * theResult = new G4FragmentVector;
+    // 	G4FragmentVector * theResult = new G4FragmentVector;
 
-	if (theFragment.GetExcitationEnergy() <= 0.0) {
-		G4FragmentVector * theResult = new G4FragmentVector;
-		theResult->insert(new G4Fragment(theFragment));
-		return 0;
-	}
+    if (theFragment.GetExcitationEnergy() <= 0.0) {
+	G4FragmentVector * theResult = new G4FragmentVector;
+	theResult->push_back(new G4Fragment(theFragment));
+	return 0;
+    }
 
 
-	// Maximun average multiplicity: M_0 = 2.6 for A ~ 200 
-	// and M_0 = 3.3 for A <= 110
-	G4double MaxAverageMultiplicity = 2.6;
-	if (theFragment.GetA() <= 110) MaxAverageMultiplicity = 3.3;
+    // Maximun average multiplicity: M_0 = 2.6 for A ~ 200 
+    // and M_0 = 3.3 for A <= 110
+    G4double MaxAverageMultiplicity = 2.6;
+    if (theFragment.GetA() <= 110) MaxAverageMultiplicity = 3.3;
 	
-	// We'll use two kinds of ensembles
-	G4StatMFMicroCanonical * theMicrocanonicalEnsemble = 0;
-  	G4StatMFMacroCanonical * theMacrocanonicalEnsemble = 0;
+    // We'll use two kinds of ensembles
+    G4StatMFMicroCanonical * theMicrocanonicalEnsemble = 0;
+    G4StatMFMacroCanonical * theMacrocanonicalEnsemble = 0;
 
 	
 	//-------------------------------------------------------
@@ -70,251 +98,255 @@ G4FragmentVector * G4StatMF::BreakItUp(const G4Fragment &theFragment)
 	//-------------------------------------------------------
   
 	// Microcanonical ensemble initialization 
-	theMicrocanonicalEnsemble = new G4StatMFMicroCanonical(theFragment);
+    theMicrocanonicalEnsemble = new G4StatMFMicroCanonical(theFragment);
 
-	G4int Iterations = 0;
-	G4double Temperature = 0.0;
-	G4double EnergyCoulomb = 0.0;
+    G4int Iterations = 0;
+    G4double Temperature = 0.0;
+    G4double EnergyCoulomb = 0.0;
   
-	G4bool FirstTime = true;
-	G4StatMFChannel * theChannel = 0;
+    G4bool FirstTime = true;
+    G4StatMFChannel * theChannel = 0;
 
-	G4bool ChannelOk;
-	do {  // Try to de-excite as much as 10 times
-		do {
+    G4bool ChannelOk;
+    do {  // Try to de-excite as much as 10 times
+	do {
 		
-			G4double theMeanMult = theMicrocanonicalEnsemble->GetMeanMultiplicity();
-			if (theMeanMult <= MaxAverageMultiplicity) {
-//				G4cout << "MICROCANONICAL" << G4endl;
+	    G4double theMeanMult = theMicrocanonicalEnsemble->GetMeanMultiplicity();
+	    if (theMeanMult <= MaxAverageMultiplicity) {
+		//				G4cout << "MICROCANONICAL" << G4endl;
 				// choose fragments atomic numbers and charges from direct simulation
-				theChannel = theMicrocanonicalEnsemble->ChooseAandZ(theFragment);
-				_theEnsemble = theMicrocanonicalEnsemble;
-			} else {
+		theChannel = theMicrocanonicalEnsemble->ChooseAandZ(theFragment);
+		_theEnsemble = theMicrocanonicalEnsemble;
+	    } else {
 				//-------------------------------------------------
 				// Non direct simulation part (Macrocanonical Ensemble)
 				//-------------------------------------------------
-				if (FirstTime) {
-					// Macrocanonical ensemble initialization 
-					theMacrocanonicalEnsemble = new G4StatMFMacroCanonical(theFragment);
-					_theEnsemble = theMacrocanonicalEnsemble;
-					FirstTime = false;
-				}
-//				G4cout << "MACROCANONICAL" << G4endl;
+		if (FirstTime) {
+		    // Macrocanonical ensemble initialization 
+		    theMacrocanonicalEnsemble = new G4StatMFMacroCanonical(theFragment);
+		    _theEnsemble = theMacrocanonicalEnsemble;
+		    FirstTime = false;
+		}
+		//				G4cout << "MACROCANONICAL" << G4endl;
 				// Select calculated fragment total multiplicity, 
 				// fragment atomic numbers and fragment charges.
-				theChannel = theMacrocanonicalEnsemble->ChooseAandZ(theFragment);
-			}
+		theChannel = theMacrocanonicalEnsemble->ChooseAandZ(theFragment);
+	    }
       	
-			if (!(ChannelOk = theChannel->CheckFragments())) delete theChannel; 
+	    if (!(ChannelOk = theChannel->CheckFragments())) delete theChannel; 
 			
-		} while (!ChannelOk);
+	} while (!ChannelOk);
 
 
-		if (theChannel->GetMultiplicity() <= 1) {
-			G4FragmentVector * theResult = new G4FragmentVector;
-			theResult->insert(new G4Fragment(theFragment));
-			delete theMicrocanonicalEnsemble;
-			if (theMacrocanonicalEnsemble != 0) delete theMacrocanonicalEnsemble;
-			delete theChannel;
-			return theResult;
-		}
+	if (theChannel->GetMultiplicity() <= 1) {
+	    G4FragmentVector * theResult = new G4FragmentVector;
+	    theResult->push_back(new G4Fragment(theFragment));
+	    delete theMicrocanonicalEnsemble;
+	    if (theMacrocanonicalEnsemble != 0) delete theMacrocanonicalEnsemble;
+	    delete theChannel;
+	    return theResult;
+	}
 
-		//--------------------------------------
-		// Second part of simulation procedure.
-		//--------------------------------------
+	//--------------------------------------
+	// Second part of simulation procedure.
+	//--------------------------------------
 
-		// Find temperature of breaking channel.
-		Temperature = _theEnsemble->GetMeanTemperature(); // Initial value for Temperature 
+	// Find temperature of breaking channel.
+	Temperature = _theEnsemble->GetMeanTemperature(); // Initial value for Temperature 
 
-		if (FindTemperatureOfBreakingChannel(theFragment,theChannel,Temperature)) break;
+	if (FindTemperatureOfBreakingChannel(theFragment,theChannel,Temperature)) break;
 
-	} while (Iterations++ < 10);
+    } while (Iterations++ < 10);
 
 
-	// If Iterations >= 10 means that we couldn't solve for temperature
-	if (Iterations >= 10) G4Exception("G4StatMF::BreakItUp: Was not possible to solve for temperature of breaking channel");
+    // If Iterations >= 10 means that we couldn't solve for temperature
+    if (Iterations >= 10) G4Exception("G4StatMF::BreakItUp: Was not possible to solve for temperature of breaking channel");
 
 
-	G4FragmentVector * theResult = theChannel->GetFragments(theFragment.GetA(),theFragment.GetZ(),Temperature);
+    G4FragmentVector * theResult = theChannel->GetFragments(theFragment.GetA(),theFragment.GetZ(),Temperature);
 
 	
 	
 	// ~~~~~~ Energy conservation Patch !!!!!!!!!!!!!!!!!!!!!!
 	// Original nucleus 4-momentum in CM system
-	G4LorentzVector InitialMomentum(theFragment.GetMomentum());
-	InitialMomentum.boost(-InitialMomentum.boostVector());
-	G4double ScaleFactor;
-	do {
-		G4double FragmentsEnergy = 0.0;
-		G4int j = 0;
-		for (j = 0; j < theResult->entries(); j++) FragmentsEnergy += theResult->at(j)->GetMomentum().e();
-		ScaleFactor = InitialMomentum.e()/FragmentsEnergy;
-		G4ThreeVector ScaledMomentum(0.0,0.0,0.0);
-		for (j = 0; j < theResult->entries(); j++) {
-			ScaledMomentum = ScaleFactor*theResult->at(j)->GetMomentum().vect();
-			G4double Mass = theResult->at(j)->GetMomentum().m();
-			G4LorentzVector NewMomentum;
-			NewMomentum.setVect(ScaledMomentum);
-			NewMomentum.setE(sqrt(ScaledMomentum.mag2()+Mass*Mass));
-			theResult->at(j)->SetMomentum(NewMomentum);		
-		}
-	} while (ScaleFactor > 1.0+1.e-10);
-	// ~~~~~~ End of patch !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    G4LorentzVector InitialMomentum(theFragment.GetMomentum());
+    InitialMomentum.boost(-InitialMomentum.boostVector());
+    G4double ScaleFactor = 0.0;
+    G4double SavedScaleFactor = 0.0;
+    do {
+	G4double FragmentsEnergy = 0.0;
+	G4FragmentVector::iterator j;
+	for (j = theResult->begin(); j != theResult->end(); j++) 
+	    FragmentsEnergy += (*j)->GetMomentum().e();
+	SavedScaleFactor = ScaleFactor;
+	ScaleFactor = InitialMomentum.e()/FragmentsEnergy;
+	G4ThreeVector ScaledMomentum(0.0,0.0,0.0);
+	for (j = theResult->begin(); j != theResult->end(); j++) {
+	    ScaledMomentum = ScaleFactor * (*j)->GetMomentum().vect();
+	    G4double Mass = (*j)->GetMomentum().m();
+	    G4LorentzVector NewMomentum;
+	    NewMomentum.setVect(ScaledMomentum);
+	    NewMomentum.setE(sqrt(ScaledMomentum.mag2()+Mass*Mass));
+	    (*j)->SetMomentum(NewMomentum);		
+	}
+    } while (ScaleFactor > 1.0+1.e-5 && abs(ScaleFactor-SavedScaleFactor)/ScaleFactor > 1.e-10);
+    // ~~~~~~ End of patch !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	
 	// Perform Lorentz boost
-	for (G4int i = 0; i < theResult->entries(); i++) {
-		G4LorentzVector FourMom = theResult->at(i)->GetMomentum();
-		FourMom.boost(theFragment.GetMomentum().boostVector());
-		theResult->at(i)->SetMomentum(FourMom);
-	}
+    G4FragmentVector::iterator i;
+    for (i = theResult->begin(); i != theResult->end(); i++) {
+	G4LorentzVector FourMom = (*i)->GetMomentum();
+	FourMom.boost(theFragment.GetMomentum().boostVector());
+	(*i)->SetMomentum(FourMom);
+    }
 
-	// garbage collection
-	delete theMicrocanonicalEnsemble;
-	if (theMacrocanonicalEnsemble != 0) delete theMacrocanonicalEnsemble;
-	delete theChannel;
+    // garbage collection
+    delete theMicrocanonicalEnsemble;
+    if (theMacrocanonicalEnsemble != 0) delete theMacrocanonicalEnsemble;
+    delete theChannel;
 
-	return theResult;
+    return theResult;
 }
 
 
 G4bool G4StatMF::FindTemperatureOfBreakingChannel(const G4Fragment & theFragment,
 						  const G4StatMFChannel * aChannel,
 						  G4double & Temperature)
-  // This finds temperature of breaking channel.
+    // This finds temperature of breaking channel.
 {
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
-	G4double U = theFragment.GetExcitationEnergy();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
+    G4double U = theFragment.GetExcitationEnergy();
 
-	G4double T = G4std::max(Temperature,0.0012*MeV);
+    G4double T = G4std::max(Temperature,0.0012*MeV);
 
-	G4double Ta = T;
-	G4double Tb = T;
+    G4double Ta = T;
+    G4double Tb = T;
         
    
-	G4double TotalEnergy = CalcEnergy(A,Z,aChannel,T);
+    G4double TotalEnergy = CalcEnergy(A,Z,aChannel,T);
 
-	G4double Da = (U - TotalEnergy)/U;
-	G4double Db = 0.0;
+    G4double Da = (U - TotalEnergy)/U;
+    G4double Db = 0.0;
     
-	// bracketing the solution
-	if (Da == 0.0) {
-		Temperature = T;
-		return true;
-	} else if (Da < 0.0) {
-		do {
-			Tb -= 0.5 * abs(Tb);
-			T = Tb;
-			if (Tb < 0.001*MeV) return false;
+    // bracketing the solution
+    if (Da == 0.0) {
+	Temperature = T;
+	return true;
+    } else if (Da < 0.0) {
+	do {
+	    Tb -= 0.5 * abs(Tb);
+	    T = Tb;
+	    if (Tb < 0.001*MeV) return false;
             
-			TotalEnergy = CalcEnergy(A,Z,aChannel,T);
+	    TotalEnergy = CalcEnergy(A,Z,aChannel,T);
         
-			Db = (U - TotalEnergy)/U;
-		} while (Db < 0.0);
+	    Db = (U - TotalEnergy)/U;
+	} while (Db < 0.0);
 
+    } else {
+	do {
+	    Tb += 0.5 * abs(Tb);
+	    T = Tb;
+        
+	    TotalEnergy = CalcEnergy(A,Z,aChannel,T);
+        
+	    Db = (U - TotalEnergy)/U;
+	} while (Db > 0.0); 
+    }
+    
+    G4double eps = 1.0e-14 * abs(Tb-Ta);
+    //G4double eps = 1.0e-3 ;
+    
+    // Start the bisection method
+    for (G4int j = 0; j < 1000; j++) {
+	G4double Tc =  (Ta+Tb)/2.0;
+	if (abs(Ta-Tc) <= eps) {
+	    Temperature = Tc;
+	    return true;
+	}
+        
+	T = Tc;
+        
+	TotalEnergy = CalcEnergy(A,Z,aChannel,T);
+        
+	G4double Dc = (U - TotalEnergy)/U; 
+        
+	if (Dc == 0.0) {
+	    Temperature  = Tc;
+	    return true;
+	}
+        
+	if (Da*Dc < 0.0) {
+	    Tb = Tc;
+	    Db = Dc;
 	} else {
-		do {
-			Tb += 0.5 * abs(Tb);
-			T = Tb;
-        
-			TotalEnergy = CalcEnergy(A,Z,aChannel,T);
-        
-			Db = (U - TotalEnergy)/U;
-		} while (Db > 0.0); 
+	    Ta = Tc;
+	    Da = Dc;
 	}
+    }
     
-	G4double eps = 1.0e-14 * abs(Tb-Ta);
-	//G4double eps = 1.0e-3 ;
-    
-	// Start the bisection method
-	for (G4int j = 0; j < 1000; j++) {
-		G4double Tc =  (Ta+Tb)/2.0;
-		if (abs(Ta-Tc) <= eps) {
-			Temperature = Tc;
-			return true;
-		}
-        
-		T = Tc;
-        
-		TotalEnergy = CalcEnergy(A,Z,aChannel,T);
-        
-		G4double Dc = (U - TotalEnergy)/U; 
-        
-		if (Dc == 0.0) {
-			Temperature  = Tc;
-			return true;
-		}
-        
-		if (Da*Dc < 0.0) {
-			Tb = Tc;
-			Db = Dc;
-		} else {
-			Ta = Tc;
-			Da = Dc;
-		}
-	}
-    
-	Temperature  = (Ta+Tb)/2.0;
-	return false;
-// ***********************************************************
-//   const G4double HT = 0.5;
-//   G4double H = 0.0;
-//   G4int counter = 0;
-//   G4int id = 0;
-//   G4int K1 = 0, K2 = 0;
+    Temperature  = (Ta+Tb)/2.0;
+    return false;
+    // ***********************************************************
+    //   const G4double HT = 0.5;
+    //   G4double H = 0.0;
+    //   G4int counter = 0;
+    //   G4int id = 0;
+    //   G4int K1 = 0, K2 = 0;
 
-//   do {
+    //   do {
 
-//     G4double TotalEnergy = CalcEnergy(A,Z,aChannel,T);
-// 
-//     G4double D = (U - TotalEnergy)/U;
-//     if (abs(D) < 0.003) {
-//       Temperature = T;
-//       return true;
-//     }
-//     counter++;
-// 
-//     if (D < 0.0) H = -HT;
-//     else H = HT;
-// 
-//     if (D <= 0.0) {
-//       for (;;) {
-// 	    K1 = 1;
-// 	    if (K1 ==1 && K2 == 1) id++;
-// 	    if (id > 30) return false;
-// 	    T += H/pow(2.0,id);
-// 	    if ( T >= 0.001) break;
-// 	    K2 = 1;
-// 	    H = HT;
-//       }
-//     } else {
-//       for (;;) {
-// 	    K2 = 1;
-// 	    if (K1 ==1 && K2 == 1) id++;
-// 	    if (id > 30) return false;
-// 	    T += H/pow(2.0,id);
-// 	    if ( T >= 0.001) break;
-// 	    K1 = 1;
-// 	    H = HT;
-//       }
-//     }
-//   } while (counter <= 120);
-//   return false;
+    //     G4double TotalEnergy = CalcEnergy(A,Z,aChannel,T);
+    // 
+    //     G4double D = (U - TotalEnergy)/U;
+    //     if (abs(D) < 0.003) {
+    //       Temperature = T;
+    //       return true;
+    //     }
+    //     counter++;
+    // 
+    //     if (D < 0.0) H = -HT;
+    //     else H = HT;
+    // 
+    //     if (D <= 0.0) {
+    //       for (;;) {
+    // 	    K1 = 1;
+    // 	    if (K1 ==1 && K2 == 1) id++;
+    // 	    if (id > 30) return false;
+    // 	    T += H/pow(2.0,id);
+    // 	    if ( T >= 0.001) break;
+    // 	    K2 = 1;
+    // 	    H = HT;
+    //       }
+    //     } else {
+    //       for (;;) {
+    // 	    K2 = 1;
+    // 	    if (K1 ==1 && K2 == 1) id++;
+    // 	    if (id > 30) return false;
+    // 	    T += H/pow(2.0,id);
+    // 	    if ( T >= 0.001) break;
+    // 	    K1 = 1;
+    // 	    H = HT;
+    //       }
+    //     }
+    //   } while (counter <= 120);
+    //   return false;
 }
 
 
 
 G4double G4StatMF::CalcEnergy(const G4double A, const G4double Z, const G4StatMFChannel * aChannel,
-										const G4double T)
+			      const G4double T)
 {
-	G4double MassExcess0 = G4NucleiProperties::GetMassExcess(A,Z);
+    G4double MassExcess0 = G4NucleiProperties::GetMassExcess(A,Z);
 	
-	G4double Coulomb = (3./5.)*(elm_coupling*Z*Z)*pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
-	 						(G4StatMFParameters::Getr0()*pow(A,1./3.));
+    G4double Coulomb = (3./5.)*(elm_coupling*Z*Z)*pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
+	(G4StatMFParameters::Getr0()*pow(A,1./3.));
 
-   G4double ChannelEnergy = aChannel->GetFragmentsEnergy(T);
+    G4double ChannelEnergy = aChannel->GetFragmentsEnergy(T);
 	
-	return -MassExcess0 + Coulomb + ChannelEnergy;
+    return -MassExcess0 + Coulomb + ChannelEnergy;
 
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFChannel.cc
index d15970941f..52fa41637f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFChannel.cc
@@ -1,11 +1,39 @@
-#include "G4StatMFChannel.hh"
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFChannel.cc,v 1.5.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
+#include "G4StatMFChannel.hh"
 
 
 // Copy constructor
 G4StatMFChannel::G4StatMFChannel(const G4StatMFChannel & right)
 {
-	G4Exception("G4StatMFChannel::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFChannel::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -13,381 +41,381 @@ G4StatMFChannel::G4StatMFChannel(const G4StatMFChannel & right)
 G4StatMFChannel & G4StatMFChannel::
 operator=(const G4StatMFChannel & right)
 {
-	G4Exception("G4StatMFChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFChannel::operator==(const G4StatMFChannel & right) const
 {
-//	G4Exception("G4StatMFChannel::operator== meant to not be accessable");
-	return false;
+    //	G4Exception("G4StatMFChannel::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFChannel::operator!=(const G4StatMFChannel & right) const 
 {
-//	G4Exception("G4StatMFChannel::operator!= meant to not be accessable");
-	return true;
+    //	G4Exception("G4StatMFChannel::operator!= meant to not be accessable");
+    return true;
 }
 
 
 G4bool G4StatMFChannel::CheckFragments(void)
 {
-	for (G4int i = 0; i < _theFragments.entries(); i++) {
-		G4int A = G4int(_theFragments(i)->GetA());
-		G4int Z = G4int(_theFragments(i)->GetZ());
-		if (A > 1 && (Z >= A || Z <= 0) || (A==1 && Z > A) || A <= 0) return false;
-	}
+    for (G4int i = 0; i < _theFragments.size(); i++) {
+	G4int A = G4int(_theFragments[i]->GetA());
+	G4int Z = G4int(_theFragments[i]->GetZ());
+	if (A > 1 && (Z >= A || Z <= 0) || (A==1 && Z > A) || A <= 0) return false;
+    }
 	
-	return true;
+    return true;
 }
 
 
 
 
 void G4StatMFChannel::CreateFragment(const G4double A, const G4double Z)
-// Create a new fragment.
-// Fragments are automatically sorted: first charged fragments, 
-// then neutral ones.
+    // Create a new fragment.
+    // Fragments are automatically sorted: first charged fragments, 
+    // then neutral ones.
 {
-	if (Z <= 0.5) {
-		_theFragments.insert(new G4StatMFFragment(A,Z));
-		_NumOfNeutralFragments++;
-	} else {
-		_theFragments.prepend(new G4StatMFFragment(A,Z));
-		_NumOfChargedFragments++;
-	}
+    if (Z <= 0.5) {
+	_theFragments.push_back(new G4StatMFFragment(A,Z));
+	_NumOfNeutralFragments++;
+    } else {
+	_theFragments.push_front(new G4StatMFFragment(A,Z));
+	_NumOfChargedFragments++;
+    }
 	
-	return;
+    return;
 }
 
 
 G4double G4StatMFChannel::GetFragmentsCoulombEnergy(void)
 {
-	G4double Coulomb = 0.0;
-	for (G4int i = 0;i < _theFragments.entries(); i++)
-						Coulomb += _theFragments(i)->GetCoulombEnergy();
-	return Coulomb;
+    G4double Coulomb = 0.0;
+    for (G4int i = 0;i < _theFragments.size(); i++)
+	Coulomb += _theFragments[i]->GetCoulombEnergy();
+    return Coulomb;
 }
 
 
 
 G4double G4StatMFChannel::GetFragmentsEnergy(const G4double T) const
 {
-	G4double Energy = 0.0;
+    G4double Energy = 0.0;
 	
-	G4double TranslationalEnergy = (3./2.)*T*_theFragments.entries();
+    G4double TranslationalEnergy = (3./2.)*T*_theFragments.size();
 	
-	for (G4int i = 0;i < _theFragments.entries(); i++)
-						Energy += _theFragments(i)->GetEnergy(T);
-	return Energy + TranslationalEnergy;	
+    for (G4int i = 0;i < _theFragments.size(); i++)
+	Energy += _theFragments[i]->GetEnergy(T);
+    return Energy + TranslationalEnergy;	
 }
 
 G4FragmentVector * G4StatMFChannel::GetFragments(const G4double anA, 
-																const G4double anZ,
-																const G4double T)
-	//
+						 const G4double anZ,
+						 const G4double T)
+    //
 {
 
-	// calculate momenta of charged fragments  
-	CoulombImpulse(anA,anZ,T);
+    // calculate momenta of charged fragments  
+    CoulombImpulse(anA,anZ,T);
 	
-	// calculate momenta of neutral fragments
-	FragmentsMomenta(_NumOfNeutralFragments, _NumOfChargedFragments, T);
+    // calculate momenta of neutral fragments
+    FragmentsMomenta(_NumOfNeutralFragments, _NumOfChargedFragments, T);
 
 
-	G4FragmentVector * theResult = new G4FragmentVector;
-	for (G4int i = 0; i < _theFragments.entries(); i++)
-			theResult->insert(_theFragments(i)->GetFragment(T));
+    G4FragmentVector * theResult = new G4FragmentVector;
+    for (G4int i = 0; i < _theFragments.size(); i++)
+	theResult->push_back(_theFragments[i]->GetFragment(T));
 
-	return theResult;
+    return theResult;
 
 }
 
 
 
 void G4StatMFChannel::CoulombImpulse(const G4double anA, const G4double anZ, const G4double T)
-	// Aafter breakup, fragments fly away under Coulomb field.
-	// This method calculates asymptotic fragments momenta.
+    // Aafter breakup, fragments fly away under Coulomb field.
+    // This method calculates asymptotic fragments momenta.
 {
-	// First, we have to place the fragments inside of the original nucleus volume
-	PlaceFragments(anA);
+    // First, we have to place the fragments inside of the original nucleus volume
+    PlaceFragments(anA);
 	
 	// Second, we sample initial charged fragments momenta. There are
 	// _NumOfChargedFragments charged fragments and they start at the begining
 	// of the vector _theFragments (i.e. 0) 
-	FragmentsMomenta(_NumOfChargedFragments, 0, T);
+    FragmentsMomenta(_NumOfChargedFragments, 0, T);
 
-	// Third, we have to figure out the asymptotic momenta of charged fragments 
-	// For taht we have to solve equations of motion for fragments
-	SolveEqOfMotion(anA,anZ,T);
+    // Third, we have to figure out the asymptotic momenta of charged fragments 
+    // For taht we have to solve equations of motion for fragments
+    SolveEqOfMotion(anA,anZ,T);
 
-	return;
+    return;
 }
 
 
 
 void G4StatMFChannel::PlaceFragments(const G4double anA)
-	// This gives the position of fragments at the breakup instant. 
-	// Fragments positions are sampled inside prolongated ellipsoid.
+    // This gives the position of fragments at the breakup instant. 
+    // Fragments positions are sampled inside prolongated ellipsoid.
 {
-	const G4double R0 = G4StatMFParameters::Getr0();
-	const G4double Rsys = 2.0*R0*pow(anA,1./3.);
+    const G4double R0 = G4StatMFParameters::Getr0();
+    const G4double Rsys = 2.0*R0*pow(anA,1./3.);
 
-	G4bool TooMuchIterations;
-	do {
-		TooMuchIterations = false;
+    G4bool TooMuchIterations;
+    do {
+	TooMuchIterations = false;
 
-		// Sample the position of the first fragment
-		G4double R = (Rsys - R0*pow(_theFragments(0)->GetA(),1./3.))*
-							pow(G4UniformRand(),1./3.);
-		_theFragments(0)->SetPosition(IsotropicVector(R));
+	// Sample the position of the first fragment
+	G4double R = (Rsys - R0*pow(_theFragments[0]->GetA(),1./3.))*
+	    pow(G4UniformRand(),1./3.);
+	_theFragments[0]->SetPosition(IsotropicVector(R));
 		
 
-		// Sample the position of the remaining fragments
-		G4bool ThereAreOverlaps = false;
-		for (G4int i = 1; i < _theFragments.entries(); i++) {
-			G4int counter = 0;
-			do {
-				R = (Rsys - R0*pow(_theFragments(i)->GetA(),1./3.))*
-						pow(G4UniformRand(),1./3.);
-				_theFragments(i)->SetPosition(IsotropicVector(R));
+	// Sample the position of the remaining fragments
+	G4bool ThereAreOverlaps = false;
+	for (G4int i = 1; i < _theFragments.size(); i++) {
+	    G4int counter = 0;
+	    do {
+		R = (Rsys - R0*pow(_theFragments[i]->GetA(),1./3.))*
+		    pow(G4UniformRand(),1./3.);
+		_theFragments[i]->SetPosition(IsotropicVector(R));
 			
 				// Check that there are not overlapping fragments
-				for (G4int j = 0; j < i; j++) {
-					G4ThreeVector FragToFragVector = 
-						_theFragments(i)->GetPosition() - _theFragments(j)->GetPosition();
+		for (G4int j = 0; j < i; j++) {
+		    G4ThreeVector FragToFragVector = 
+			_theFragments[i]->GetPosition() - _theFragments[j]->GetPosition();
 					
-					G4double Rmin = R0*(pow(_theFragments(i)->GetA(),1./3.) +
-										  pow(_theFragments(j)->GetA(),1./3));
-					if (ThereAreOverlaps = (FragToFragVector.mag2() < Rmin*Rmin)) break;
-				}
-				counter++;
-			} while (ThereAreOverlaps && counter < 1000);
-			
-			if (counter >= 1000) {
-				TooMuchIterations = true;
-				break;
-			} 
+		    G4double Rmin = R0*(pow(_theFragments[i]->GetA(),1./3.) +
+					pow(_theFragments[j]->GetA(),1./3));
+		    if (ThereAreOverlaps = (FragToFragVector.mag2() < Rmin*Rmin)) break;
 		}
-	} while (TooMuchIterations);
+		counter++;
+	    } while (ThereAreOverlaps && counter < 1000);
+			
+	    if (counter >= 1000) {
+		TooMuchIterations = true;
+		break;
+	    } 
+	}
+    } while (TooMuchIterations);
 	
-	return;
+    return;
 }
 
 
 void G4StatMFChannel::FragmentsMomenta(const G4int NF, const G4int idx,
-													const G4double T)
-// Calculate fragments momenta at the breakup instant
-// Fragment kinetic energies are calculated according to the 
-// Boltzmann distribution at given temperature.
-// NF is number of fragments
-// idx is index of first fragment
+				       const G4double T)
+    // Calculate fragments momenta at the breakup instant
+    // Fragment kinetic energies are calculated according to the 
+    // Boltzmann distribution at given temperature.
+    // NF is number of fragments
+    // idx is index of first fragment
 {
-	G4double KinE = (3./2.)*T*G4double(NF);
+    G4double KinE = (3./2.)*T*G4double(NF);
 	
-	G4ThreeVector p;
+    G4ThreeVector p;
 	
-	if (NF <= 0) return;
-	else if (NF == 1) {
-		// We have only one fragment to deal with
-		p = IsotropicVector(sqrt(2.0*_theFragments(idx)->GetNuclearMass()*KinE));
-		_theFragments(idx)->SetMomentum(p);
-	} else if (NF == 2) {
-		// We have only two fragment to deal with
-		G4double M1 = _theFragments(idx)->GetNuclearMass();
-		G4double M2 = _theFragments(idx+1)->GetNuclearMass();
-		p = IsotropicVector(sqrt(2.0*KinE*(M1*M2)/(M1+M2)));		
-		_theFragments(idx)->SetMomentum(p);
-		_theFragments(idx+1)->SetMomentum(-p);
-	} else {
-		// We have more than two fragments
-		G4double AvailableE;
-		G4int i1,i2;
-		G4double SummedE;
-		G4ThreeVector SummedP;
+    if (NF <= 0) return;
+    else if (NF == 1) {
+	// We have only one fragment to deal with
+	p = IsotropicVector(sqrt(2.0*_theFragments[idx]->GetNuclearMass()*KinE));
+	_theFragments[idx]->SetMomentum(p);
+    } else if (NF == 2) {
+	// We have only two fragment to deal with
+	G4double M1 = _theFragments[idx]->GetNuclearMass();
+	G4double M2 = _theFragments[idx+1]->GetNuclearMass();
+	p = IsotropicVector(sqrt(2.0*KinE*(M1*M2)/(M1+M2)));		
+	_theFragments[idx]->SetMomentum(p);
+	_theFragments[idx+1]->SetMomentum(-p);
+    } else {
+	// We have more than two fragments
+	G4double AvailableE;
+	G4int i1,i2;
+	G4double SummedE;
+	G4ThreeVector SummedP;
+	do {
+	    // Fisrt sample momenta of NF-2 fragments 
+	    // according to Boltzmann distribution
+	    AvailableE = 0.0;
+	    SummedE = 0.0;
+	    SummedP.setX(0.0);SummedP.setY(0.0);SummedP.setZ(0.0);
+	    for (G4int i = idx; i < idx+NF-2; i++) {
+		G4double E;
+		G4double RandE;
+		G4double Boltzmann;
 		do {
-			// Fisrt sample momenta of NF-2 fragments 
-			// according to Boltzmann distribution
-			AvailableE = 0.0;
-			SummedE = 0.0;
-			SummedP.setX(0.0);SummedP.setY(0.0);SummedP.setZ(0.0);
-			for (G4int i = idx; i < idx+NF-2; i++) {
-				G4double E;
-				G4double RandE;
-				G4double Boltzmann;
-				do {
-					E = 9.0*T*G4UniformRand();
-					Boltzmann = sqrt(E)*exp(-E/T);
-					RandE = sqrt(T/2.)*exp(-0.5)*G4UniformRand();
-				} while (RandE > Boltzmann);
-				p = IsotropicVector(sqrt(2.0*E*_theFragments(i)->GetNuclearMass()));
-				_theFragments(i)->SetMomentum(p);
-				SummedE += E;
-				SummedP += p;
-			}	
-			// Calculate momenta of last two fragments in such a way
-			// that constraints are satisfied
-			i1 = idx+NF-2;  // before last fragment index
-			i2 = idx+NF-1;  // last fragment index
-			p = -SummedP;
-			AvailableE = KinE - SummedE;
-			// Available Kinetic Energy should be shared between two last fragments
-		} while (AvailableE <= p.mag2()/(2.0*(_theFragments(i1)->GetNuclearMass()+
-														  _theFragments(i2)->GetNuclearMass())));		
+		    E = 9.0*T*G4UniformRand();
+		    Boltzmann = sqrt(E)*exp(-E/T);
+		    RandE = sqrt(T/2.)*exp(-0.5)*G4UniformRand();
+		} while (RandE > Boltzmann);
+		p = IsotropicVector(sqrt(2.0*E*_theFragments[i]->GetNuclearMass()));
+		_theFragments[i]->SetMomentum(p);
+		SummedE += E;
+		SummedP += p;
+	    }	
+	    // Calculate momenta of last two fragments in such a way
+	    // that constraints are satisfied
+	    i1 = idx+NF-2;  // before last fragment index
+	    i2 = idx+NF-1;  // last fragment index
+	    p = -SummedP;
+	    AvailableE = KinE - SummedE;
+	    // Available Kinetic Energy should be shared between two last fragments
+	} while (AvailableE <= p.mag2()/(2.0*(_theFragments[i1]->GetNuclearMass()+
+					      _theFragments[i2]->GetNuclearMass())));		
 		
-//		G4double H = 1.0 + _theFragments(i2)->GetA()/_theFragments(i1)->GetA();
-		G4double H = 1.0 + _theFragments(i2)->GetNuclearMass()/_theFragments(i1)->GetNuclearMass();
-		G4double CTM12 = H*(1.0 - 2.0*_theFragments(i2)->GetNuclearMass()*AvailableE/p.mag2());
-		G4double CosTheta1;
-		G4double Sign;
-		do {
-			do {
-				CosTheta1 = 1.0 - 2.0*G4UniformRand();
-			} while (CosTheta1*CosTheta1 < CTM12);
-		} while (CTM12 >= 0.0 && CosTheta1 < 0.0);
+	//		G4double H = 1.0 + _theFragments(i2)->GetA()/_theFragments(i1)->GetA();
+	G4double H = 1.0 + _theFragments[i2]->GetNuclearMass()/_theFragments[i1]->GetNuclearMass();
+	G4double CTM12 = H*(1.0 - 2.0*_theFragments[i2]->GetNuclearMass()*AvailableE/p.mag2());
+	G4double CosTheta1;
+	G4double Sign;
+	do {
+	    do {
+		CosTheta1 = 1.0 - 2.0*G4UniformRand();
+	    } while (CosTheta1*CosTheta1 < CTM12);
+	} while (CTM12 >= 0.0 && CosTheta1 < 0.0);
 
-		if (CTM12 < 0.0) Sign = 1.0;
-		else if (G4UniformRand() <= 0.5) Sign = -1.0;
-		else Sign = 1.0;
+	if (CTM12 < 0.0) Sign = 1.0;
+	else if (G4UniformRand() <= 0.5) Sign = -1.0;
+	else Sign = 1.0;
 		
 		
-		G4double P1 = (p.mag()*CosTheta1+Sign*sqrt(p.mag2()*(CosTheta1*CosTheta1-CTM12)))/H;
-		G4double P2 = sqrt(P1*P1+p.mag2() - 2.0*P1*p.mag()*CosTheta1);
-		G4double Phi = twopi*G4UniformRand();
-		G4double SinTheta1 = sqrt(1.0 - CosTheta1*CosTheta1);
-		G4double CosPhi1 = cos(Phi);
-		G4double SinPhi1 = sin(Phi);
-		G4double CosPhi2 = -CosPhi1;
-		G4double SinPhi2 = -SinPhi1;
-		G4double CosTheta2 = (p.mag2() + P2*P2 - P1*P1)/(2.0*p.mag()*P2);
-		G4double SinTheta2 = 0.0;
-		if (CosTheta2 > -1.0 && CosTheta2 < 1.0) SinTheta2 = sqrt(1.0 - CosTheta2*CosTheta2);
+	G4double P1 = (p.mag()*CosTheta1+Sign*sqrt(p.mag2()*(CosTheta1*CosTheta1-CTM12)))/H;
+	G4double P2 = sqrt(P1*P1+p.mag2() - 2.0*P1*p.mag()*CosTheta1);
+	G4double Phi = twopi*G4UniformRand();
+	G4double SinTheta1 = sqrt(1.0 - CosTheta1*CosTheta1);
+	G4double CosPhi1 = cos(Phi);
+	G4double SinPhi1 = sin(Phi);
+	G4double CosPhi2 = -CosPhi1;
+	G4double SinPhi2 = -SinPhi1;
+	G4double CosTheta2 = (p.mag2() + P2*P2 - P1*P1)/(2.0*p.mag()*P2);
+	G4double SinTheta2 = 0.0;
+	if (CosTheta2 > -1.0 && CosTheta2 < 1.0) SinTheta2 = sqrt(1.0 - CosTheta2*CosTheta2);
 	
-		G4ThreeVector p1(P1*SinTheta1*CosPhi1,P1*SinTheta1*SinPhi1,P1*CosTheta1);
-		G4ThreeVector p2(P2*SinTheta2*CosPhi2,P2*SinTheta2*SinPhi2,P2*CosTheta2);
-		G4ThreeVector b(1.0,0.0,0.0);
+	G4ThreeVector p1(P1*SinTheta1*CosPhi1,P1*SinTheta1*SinPhi1,P1*CosTheta1);
+	G4ThreeVector p2(P2*SinTheta2*CosPhi2,P2*SinTheta2*SinPhi2,P2*CosTheta2);
+	G4ThreeVector b(1.0,0.0,0.0);
 		
-		p1 = RotateMomentum(p,b,p1);
-		p2 = RotateMomentum(p,b,p2);
+	p1 = RotateMomentum(p,b,p1);
+	p2 = RotateMomentum(p,b,p2);
 	
-		SummedP += p1 + p2;
-		SummedE += p1.mag2()/(2.0*_theFragments(i1)->GetNuclearMass()) + 
-					  p2.mag2()/(2.0*_theFragments(i2)->GetNuclearMass());		
+	SummedP += p1 + p2;
+	SummedE += p1.mag2()/(2.0*_theFragments[i1]->GetNuclearMass()) + 
+	    p2.mag2()/(2.0*_theFragments[i2]->GetNuclearMass());		
 		
-		_theFragments(i1)->SetMomentum(p1);
-		_theFragments(i2)->SetMomentum(p2);
+	_theFragments[i1]->SetMomentum(p1);
+	_theFragments[i2]->SetMomentum(p2);
 		
-	}
+    }
 
-	return;
+    return;
 }
 
 
 void G4StatMFChannel::SolveEqOfMotion(const G4double anA, const G4double anZ, const G4double T)
-// This method will find a solution of Newton's equation of motion
-// for fragments in the self-consistent time-dependent Coulomb field
+    // This method will find a solution of Newton's equation of motion
+    // for fragments in the self-consistent time-dependent Coulomb field
 {
-	G4double CoulombEnergy = (3./5.)*(elm_coupling*anZ*anZ)*
-							pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
-	 						(G4StatMFParameters::Getr0()*pow(anA,1./3.))
-							- GetFragmentsCoulombEnergy();
-	if (CoulombEnergy <= 0.0) return;
+    G4double CoulombEnergy = (3./5.)*(elm_coupling*anZ*anZ)*
+	pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
+	(G4StatMFParameters::Getr0()*pow(anA,1./3.))
+	- GetFragmentsCoulombEnergy();
+    if (CoulombEnergy <= 0.0) return;
 
-	G4int Iterations = 0;
-	G4double TimeN = 0.0;
-	G4double TimeS = 0.0;
-	G4double DeltaTime = 10.0;
+    G4int Iterations = 0;
+    G4double TimeN = 0.0;
+    G4double TimeS = 0.0;
+    G4double DeltaTime = 10.0;
 
-	G4ThreeVector * Pos = new G4ThreeVector[_NumOfChargedFragments];
-	G4ThreeVector * Vel = new G4ThreeVector[_NumOfChargedFragments];
-	G4ThreeVector * Accel = new G4ThreeVector[_NumOfChargedFragments];
+    G4ThreeVector * Pos = new G4ThreeVector[_NumOfChargedFragments];
+    G4ThreeVector * Vel = new G4ThreeVector[_NumOfChargedFragments];
+    G4ThreeVector * Accel = new G4ThreeVector[_NumOfChargedFragments];
 
-	G4int i;
-	for (i = 0; i < _NumOfChargedFragments; i++) {
-		Vel[i] = (1.0/(_theFragments(i)->GetNuclearMass()))*
-						_theFragments(i)->GetMomentum();
-		Pos[i] = _theFragments(i)->GetPosition();
-	}
+    G4int i;
+    for (i = 0; i < _NumOfChargedFragments; i++) {
+	Vel[i] = (1.0/(_theFragments[i]->GetNuclearMass()))*
+	    _theFragments[i]->GetMomentum();
+	Pos[i] = _theFragments[i]->GetPosition();
+    }
   
-	do {
+    do {
 
-		G4ThreeVector distance;
-		G4ThreeVector force;
+	G4ThreeVector distance;
+	G4ThreeVector force;
 
-		for (i = 0; i < _NumOfChargedFragments; i++) {
-			force.setX(0.0); force.setY(0.0); force.setZ(0.0);
-			for (G4int j = 0; j < _NumOfChargedFragments; j++) {
-				if (i != j) {
-					distance = Pos[i] - Pos[j];
-					force += (elm_coupling*(_theFragments(i)->GetZ()*_theFragments(j)->GetZ())/
-										(distance.mag2()*distance.mag()))*distance;
-				}
-			}
-			Accel[i] = (1./(_theFragments(i)->GetNuclearMass()))*force;
+	for (i = 0; i < _NumOfChargedFragments; i++) {
+	    force.setX(0.0); force.setY(0.0); force.setZ(0.0);
+	    for (G4int j = 0; j < _NumOfChargedFragments; j++) {
+		if (i != j) {
+		    distance = Pos[i] - Pos[j];
+		    force += (elm_coupling*(_theFragments[i]->GetZ()*_theFragments[j]->GetZ())/
+			      (distance.mag2()*distance.mag()))*distance;
 		}
+	    }
+	    Accel[i] = (1./(_theFragments[i]->GetNuclearMass()))*force;
+	}
 
-		TimeN = TimeS + DeltaTime;
+	TimeN = TimeS + DeltaTime;
 	
-		G4ThreeVector SavedVel;
-		for ( i = 0; i < _NumOfChargedFragments; i++) {
-			SavedVel = Vel[i];
-			Vel[i] += Accel[i]*(TimeN-TimeS);
-			Pos[i] += (SavedVel+Vel[i])*(TimeN-TimeS)*0.5;
-		}
+	G4ThreeVector SavedVel;
+	for ( i = 0; i < _NumOfChargedFragments; i++) {
+	    SavedVel = Vel[i];
+	    Vel[i] += Accel[i]*(TimeN-TimeS);
+	    Pos[i] += (SavedVel+Vel[i])*(TimeN-TimeS)*0.5;
+	}
 
-// 		if (Iterations >= 50 && Iterations < 75) DeltaTime = 4.;
-// 		else if (Iterations >= 75) DeltaTime = 10.;
+	// 		if (Iterations >= 50 && Iterations < 75) DeltaTime = 4.;
+	// 		else if (Iterations >= 75) DeltaTime = 10.;
 
-		TimeS = TimeN;
+	TimeS = TimeN;
 
-	} while (Iterations++ < 100);
+    } while (Iterations++ < 100);
 	
-	// Summed fragment kinetic energy
-	G4double TotalKineticEnergy = 0.0;
-	for (i = 0; i < _NumOfChargedFragments; i++) TotalKineticEnergy += 
-		_theFragments(i)->GetNuclearMass()*0.5*Vel[i].mag2();
+    // Summed fragment kinetic energy
+    G4double TotalKineticEnergy = 0.0;
+    for (i = 0; i < _NumOfChargedFragments; i++) TotalKineticEnergy += 
+						     _theFragments[i]->GetNuclearMass()*0.5*Vel[i].mag2();
 	
-	// Scaling of fragment velocities
-	G4double KineticEnergy = (3./2.)*G4double(_theFragments.entries())*T;
-	G4double Eta = ( CoulombEnergy + KineticEnergy ) / TotalKineticEnergy;
-	for (i = 0; i < _NumOfChargedFragments; i++) Vel[i] *= Eta;
+    // Scaling of fragment velocities
+    G4double KineticEnergy = (3./2.)*G4double(_theFragments.size())*T;
+    G4double Eta = ( CoulombEnergy + KineticEnergy ) / TotalKineticEnergy;
+    for (i = 0; i < _NumOfChargedFragments; i++) Vel[i] *= Eta;
 	
 	
-	// Finally calculate fragments momenta
-	for (i = 0; i < _NumOfChargedFragments; i++) 
-				_theFragments(i)->SetMomentum(_theFragments(i)->GetNuclearMass()*Vel[i]);
+    // Finally calculate fragments momenta
+    for (i = 0; i < _NumOfChargedFragments; i++) 
+	_theFragments[i]->SetMomentum(_theFragments[i]->GetNuclearMass()*Vel[i]);
 
 	
-	// garbage collection
-	delete [] Pos;
-	delete [] Vel;
-	delete [] Accel;
+    // garbage collection
+    delete [] Pos;
+    delete [] Vel;
+    delete [] Accel;
 
-	return;
+    return;
 }
 
 
 
 G4ThreeVector G4StatMFChannel::RotateMomentum(G4ThreeVector Pa,
-						      G4ThreeVector V, G4ThreeVector P)
-// Rotates a 3-vector P to close momentum triangle Pa + V + P = 0
+					      G4ThreeVector V, G4ThreeVector P)
+    // Rotates a 3-vector P to close momentum triangle Pa + V + P = 0
 {
-  G4ThreeVector U = Pa.unit();
+    G4ThreeVector U = Pa.unit();
   
-  G4double Alpha1 = U * V;
+    G4double Alpha1 = U * V;
   
-  G4double Alpha2 = sqrt(V.mag2() - Alpha1*Alpha1);
+    G4double Alpha2 = sqrt(V.mag2() - Alpha1*Alpha1);
 
-  G4ThreeVector N = (1./Alpha2)*U.cross(V);
+    G4ThreeVector N = (1./Alpha2)*U.cross(V);
 
-  G4ThreeVector RotatedMomentum(
-				     ( (V.x() - Alpha1*U.x())/Alpha2 ) * P.x() + N.x() * P.y() + U.x() * P.z(),
-				     ( (V.y() - Alpha1*U.y())/Alpha2 ) * P.x() + N.y() * P.y() + U.y() * P.z(),
-				     ( (V.z() - Alpha1*U.z())/Alpha2 ) * P.x() + N.z() * P.y() + U.z() * P.z()
-				     );
-  return RotatedMomentum;
+    G4ThreeVector RotatedMomentum(
+	( (V.x() - Alpha1*U.x())/Alpha2 ) * P.x() + N.x() * P.y() + U.x() * P.z(),
+	( (V.y() - Alpha1*U.y())/Alpha2 ) * P.x() + N.y() * P.y() + U.y() * P.z(),
+	( (V.z() - Alpha1*U.z())/Alpha2 ) * P.x() + N.z() * P.y() + U.z() * P.z()
+	);
+    return RotatedMomentum;
 }
 
 
@@ -395,14 +423,14 @@ G4ThreeVector G4StatMFChannel::RotateMomentum(G4ThreeVector Pa,
 
 
 G4ThreeVector G4StatMFChannel::IsotropicVector(const G4double Magnitude)
-  // Samples a isotropic random vector with a magnitud given by Magnitude.
-  // By default Magnitude = 1
+    // Samples a isotropic random vector with a magnitud given by Magnitude.
+    // By default Magnitude = 1
 {
-  G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-  G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-  G4double Phi = twopi*G4UniformRand();
-  G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
-		       Magnitude*cos(Phi)*CosTheta,
-		       Magnitude*sin(Phi));
-  return Vector;
+    G4double CosTheta = 1.0 - 2.0*G4UniformRand();
+    G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
+    G4double Phi = twopi*G4UniformRand();
+    G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
+			 Magnitude*cos(Phi)*CosTheta,
+			 Magnitude*sin(Phi));
+    return Vector;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
index a0743aec47..432264e39e 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFFragment.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFFragment.cc,v 1.6.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFFragment.hh"
 
 
@@ -5,7 +34,7 @@
 // Copy constructor
 G4StatMFFragment::G4StatMFFragment(const G4StatMFFragment & right)
 {
-	G4Exception("G4StatMFFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFFragment::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -13,108 +42,108 @@ G4StatMFFragment::G4StatMFFragment(const G4StatMFFragment & right)
 G4StatMFFragment & G4StatMFFragment::
 operator=(const G4StatMFFragment & right)
 {
-	G4Exception("G4StatMFFragment::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFFragment::operator==(const G4StatMFFragment & right) const
 {
 //	G4Exception("G4StatMFFragment::operator== meant to not be accessable");
-	return false;
+    return false;
 }
  
 
 G4bool G4StatMFFragment::operator!=(const G4StatMFFragment & right) const
 {
 //	G4Exception("G4StatMFFragment::operator!= meant to not be accessable");
-	return true;
+    return true;
 }
 
 
 
 G4double G4StatMFFragment::GetCoulombEnergy(void)
 {
-	if (theZ <= 0.1) return 0.0;
-	G4double Coulomb = (3./5.)*(elm_coupling*theZ*theZ)*
-					pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
-					(G4StatMFParameters::Getr0()*pow(theA,1./3.));
+    if (theZ <= 0.1) return 0.0;
+    G4double Coulomb = (3./5.)*(elm_coupling*theZ*theZ)*
+	pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.)/
+	(G4StatMFParameters::Getr0()*pow(theA,1./3.));
 						
-	return Coulomb;
+    return Coulomb;
 }
 
 
 G4double G4StatMFFragment::GetEnergy(const G4double T)
 {
-	if (theA < 1 || theZ < 0 || theZ > theA) {
-		G4cerr << "G4StatMFFragment::GetEnergy: A = " << theA 
-				 << ", Z = " << theZ << G4endl;
-		G4Exception(
-		"G4StatMFFragment::GetEnergy: Wrong values for A and Z!");
-	}
-	G4double BulkEnergy = G4NucleiProperties::GetMassExcess(theA,theZ);
+    if (theA < 1 || theZ < 0 || theZ > theA) {
+	G4cerr << "G4StatMFFragment::GetEnergy: A = " << theA 
+	       << ", Z = " << theZ << G4endl;
+	G4Exception(
+	    "G4StatMFFragment::GetEnergy: Wrong values for A and Z!");
+    }
+    G4double BulkEnergy = G4NucleiProperties::GetMassExcess(theA,theZ);
 	
-	if (theA < 4) return BulkEnergy - GetCoulombEnergy();
+    if (theA < 4) return BulkEnergy - GetCoulombEnergy();
 	
-	G4double SurfaceEnergy;
-	if (G4StatMFParameters::DBetaDT(T) == 0.0) SurfaceEnergy = 0.0;
-	else SurfaceEnergy = (5./2.)*pow(theA,2.0/3.0)*T*T*
-						G4StatMFParameters::GetBeta0()/
-						(G4StatMFParameters::GetCriticalTemp()*
-						 G4StatMFParameters::GetCriticalTemp());
+    G4double SurfaceEnergy;
+    if (G4StatMFParameters::DBetaDT(T) == 0.0) SurfaceEnergy = 0.0;
+    else SurfaceEnergy = (5./2.)*pow(theA,2.0/3.0)*T*T*
+	     G4StatMFParameters::GetBeta0()/
+	     (G4StatMFParameters::GetCriticalTemp()*
+	      G4StatMFParameters::GetCriticalTemp());
 					 
 					 
-	G4double ExchangeEnergy = theA*T*T/GetInvLevelDensity();
-	if (theA != 4) ExchangeEnergy += SurfaceEnergy;		  
+    G4double ExchangeEnergy = theA*T*T/GetInvLevelDensity();
+    if (theA != 4) ExchangeEnergy += SurfaceEnergy;		  
 	
-	return 	BulkEnergy + ExchangeEnergy - GetCoulombEnergy();		
+    return 	BulkEnergy + ExchangeEnergy - GetCoulombEnergy();		
 	
 }
 
 
 G4double G4StatMFFragment::GetInvLevelDensity(void)
 {
-	// Calculate Inverse Density Level
-	// Epsilon0*(1 + 3 /(Af - 1))
-	if (theA == 1) return 0.0;
-	else return
-		G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(theA - 1.0));
+    // Calculate Inverse Density Level
+    // Epsilon0*(1 + 3 /(Af - 1))
+    if (theA == 1) return 0.0;
+    else return
+	     G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(theA - 1.0));
 }
 
 
 
 G4Fragment * G4StatMFFragment::GetFragment(const G4double T)
 {
-	G4double U = CalcExcitationEnergy(T);
+    G4double U = CalcExcitationEnergy(T);
 	
-	G4double M = GetNuclearMass();
+    G4double M = GetNuclearMass();
 
-	G4LorentzVector FourMomentum(_momentum,sqrt(_momentum.mag2()+(M+U)*(M+U)));
+    G4LorentzVector FourMomentum(_momentum,sqrt(_momentum.mag2()+(M+U)*(M+U)));
 
-	G4Fragment * theFragment = new G4Fragment(theA,theZ,FourMomentum);
+    G4Fragment * theFragment = new G4Fragment(theA,theZ,FourMomentum);
 
-	return theFragment;
+    return theFragment;
 }
 
 
 G4double G4StatMFFragment::CalcExcitationEnergy(const G4double T)
 {
-	if (theA <= 3) return 0.0;
+    if (theA <= 3) return 0.0;
 	
-	G4double BulkEnergy = theA*T*T/GetInvLevelDensity();
+    G4double BulkEnergy = theA*T*T/GetInvLevelDensity();
 	
-	// if it is an alpha particle: done
-	if (theA == 4) return BulkEnergy;
+    // if it is an alpha particle: done
+    if (theA == 4) return BulkEnergy;
 	
-	// Term connected with surface energy
-	G4double SurfaceEnergy = 0.0;
-	if (abs(G4StatMFParameters::DBetaDT(T)) > 1.0e-20) 
+    // Term connected with surface energy
+    G4double SurfaceEnergy = 0.0;
+    if (abs(G4StatMFParameters::DBetaDT(T)) > 1.0e-20) 
 // 		SurfaceEnergy = (5./2.)*pow(theA,2.0/3.0)*T*T*G4StatMFParameters::GetBeta0()/
 // 			(G4StatMFParameters::GetCriticalTemp()*G4StatMFParameters::GetCriticalTemp());
-			SurfaceEnergy = (5./2.)*pow(theA,2.0/3.0)*(G4StatMFParameters::Beta(T) - 
-								T*G4StatMFParameters::DBetaDT(T) - G4StatMFParameters::GetBeta0());
+	SurfaceEnergy = (5./2.)*pow(theA,2.0/3.0)*(G4StatMFParameters::Beta(T) - 
+						   T*G4StatMFParameters::DBetaDT(T) - G4StatMFParameters::GetBeta0());
 		
-	return BulkEnergy + SurfaceEnergy;
+    return BulkEnergy + SurfaceEnergy;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroBiNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroBiNucleon.cc
index 0ced50d51f..b45ed45266 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroBiNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroBiNucleon.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroBiNucleon.cc,v 1.6.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFMacroBiNucleon.hh"
 
 // Operators
@@ -5,73 +34,73 @@
 G4StatMFMacroBiNucleon & G4StatMFMacroBiNucleon::
 operator=(const G4StatMFMacroBiNucleon & right)
 {
-	G4Exception("G4StatMFMacroBiNucleon::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroBiNucleon::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMacroBiNucleon::operator==(const G4StatMFMacroBiNucleon & right) const
 {
-	G4Exception("G4StatMFMacroBiNucleon::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroBiNucleon::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMacroBiNucleon::operator!=(const G4StatMFMacroBiNucleon & right) const
 {
-	G4Exception("G4StatMFMacroBiNucleon::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroBiNucleon::operator!= meant to not be accessable");
+    return true;
 }
 
 
 G4double G4StatMFMacroBiNucleon::CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-																	const G4double nu, const G4double T)
+						      const G4double nu, const G4double T)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
 	
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 	
-	const G4double degeneracy = 3.0;
+    const G4double degeneracy = 3.0;
 	
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(1,theA); //old value was 2.796*MeV
+    const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(1,theA); //old value was 2.796*MeV
 	
-	_MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*
-			exp((BindingE+ theA*(mu+nu*theZARatio) - 
-			 Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
+    _MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*
+	exp((BindingE+ theA*(mu+nu*theZARatio) - 
+	     Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
 			 
-	return 	_MeanMultiplicity;
+    return 	_MeanMultiplicity;
 }
 
 
 G4double G4StatMFMacroBiNucleon::CalcEnergy(const G4double T)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 									
-	_Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(1,theA) + 
-							Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
-							(3./2.) * T;
+    _Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(1,theA) + 
+	Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
+	(3./2.) * T;
 							
-	return 	_Energy;				
+    return 	_Energy;				
 }
 
 
 
 G4double G4StatMFMacroBiNucleon::CalcEntropy(const G4double T, const G4double FreeVol)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 
-	G4double Entropy = 0.0;
-	if (_MeanMultiplicity > 0.0)
+    G4double Entropy = 0.0;
+    if (_MeanMultiplicity > 0.0)
 	// Is this formula correct?
-		Entropy = _MeanMultiplicity*(5./2.+
-					log(3.0*G4double(theA)*sqrt(G4double(theA))*FreeVol/
-					(lambda3*_MeanMultiplicity)));
+	Entropy = _MeanMultiplicity*(5./2.+
+				     log(3.0*G4double(theA)*sqrt(G4double(theA))*FreeVol/
+					 (lambda3*_MeanMultiplicity)));
 								
 								
-	return Entropy;
+    return Entropy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroChemicalPotential.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroChemicalPotential.cc
index 0a7a3f492b..b3f3e6e2b2 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroChemicalPotential.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroChemicalPotential.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroChemicalPotential.cc,v 1.4.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFMacroChemicalPotential.hh"
 
@@ -5,101 +34,101 @@
 G4StatMFMacroChemicalPotential & 
 G4StatMFMacroChemicalPotential::operator=(const G4StatMFMacroChemicalPotential & right) 
 {
-	G4Exception("G4StatMFMacroChemicalPotential::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroChemicalPotential::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4StatMFMacroChemicalPotential::operator==(const G4StatMFMacroChemicalPotential & right) const 
 {
-	G4Exception("G4StatMFMacroChemicalPotential::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroChemicalPotential::operator== meant to not be accessable");
+    return false;
 }
 
 
 G4bool G4StatMFMacroChemicalPotential::operator!=(const G4StatMFMacroChemicalPotential & right) const 
 {
-	G4Exception("G4StatMFMacroChemicalPotential::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroChemicalPotential::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 
 G4double G4StatMFMacroChemicalPotential::CalcChemicalPotentialNu(void) 
-	//	Calculate Chemical potential \nu
+    //	Calculate Chemical potential \nu
 {
-	G4double CP = ((3./5.)*elm_coupling/G4StatMFParameters::Getr0())*
-		(1.0-1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0));
+    G4double CP = ((3./5.)*elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0-1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0));
 
-	// Initial value for _ChemPotentialNu	
-	_ChemPotentialNu = (theZ/theA)*(8.0*G4StatMFParameters::GetGamma0()+2.0*CP*pow(theA,2./3.)) -
-								4.0*G4StatMFParameters::GetGamma0();
+    // Initial value for _ChemPotentialNu	
+    _ChemPotentialNu = (theZ/theA)*(8.0*G4StatMFParameters::GetGamma0()+2.0*CP*pow(theA,2./3.)) -
+	4.0*G4StatMFParameters::GetGamma0();
 		
 
-	G4double ChemPa = _ChemPotentialNu;
-	G4double ChemPb = 0.5*_ChemPotentialNu;
+    G4double ChemPa = _ChemPotentialNu;
+    G4double ChemPb = 0.5*_ChemPotentialNu;
     
-	G4double fChemPa = this->operator()(ChemPa); 
-	G4double fChemPb = this->operator()(ChemPb); 
+    G4double fChemPa = this->operator()(ChemPa); 
+    G4double fChemPb = this->operator()(ChemPb); 
 
-	if (fChemPa*fChemPb > 0.0) {    
-		// bracketing the solution
-		if (fChemPa < 0.0) {
-			do {
-				ChemPb -= 1.5*abs(ChemPb-ChemPa);
-            fChemPb = this->operator()(ChemPb);   
-			} while (fChemPb < 0.0);
-		} else {
-			do {
-				ChemPb += 1.5*abs(ChemPb-ChemPa);
-            fChemPb = this->operator()(ChemPb);
-			} while (fChemPb > 0.0);
-		}
+    if (fChemPa*fChemPb > 0.0) {    
+	// bracketing the solution
+	if (fChemPa < 0.0) {
+	    do {
+		ChemPb -= 1.5*abs(ChemPb-ChemPa);
+		fChemPb = this->operator()(ChemPb);   
+	    } while (fChemPb < 0.0);
+	} else {
+	    do {
+		ChemPb += 1.5*abs(ChemPb-ChemPa);
+		fChemPb = this->operator()(ChemPb);
+	    } while (fChemPb > 0.0);
 	}
+    }
 
-	G4Solver<G4StatMFMacroChemicalPotential> * theSolver = new G4Solver<G4StatMFMacroChemicalPotential>(100,1.e-4);
-	theSolver->SetIntervalLimits(ChemPa,ChemPb);
-	if (!theSolver->Brent(*this)) 
-		G4Exception("G4StatMFMacroChemicalPotential::CalcChemicalPotentialNu: I couldn't find the root.");
-	_ChemPotentialNu = theSolver->GetRoot();
-	delete theSolver;
-	return _ChemPotentialNu;
+    G4Solver<G4StatMFMacroChemicalPotential> * theSolver = new G4Solver<G4StatMFMacroChemicalPotential>(100,1.e-4);
+    theSolver->SetIntervalLimits(ChemPa,ChemPb);
+    if (!theSolver->Brent(*this)) 
+	G4Exception("G4StatMFMacroChemicalPotential::CalcChemicalPotentialNu: I couldn't find the root.");
+    _ChemPotentialNu = theSolver->GetRoot();
+    delete theSolver;
+    return _ChemPotentialNu;
 }
 
 
 
 G4double G4StatMFMacroChemicalPotential::CalcMeanZ(const G4double nu)
 {
-	G4int i;
-  	for (i=1; i < theA; i++) { 
-		_theClusters->operator()(i)->CalcZARatio(nu);
-	}
-	CalcChemicalPotentialMu(nu);
-	// This is important, the Z over A ratio for proton and neutron depends on the 
-	// chemical potential Mu, while for the first guess for Chemical potential mu 
-	// some values of Z over A ratio. This is the reason for that.
-	_theClusters->operator()(0)->CalcZARatio(nu);
+    G4int i;
+    for (i=1; i < theA; i++) { 
+	_theClusters->operator[](i)->CalcZARatio(nu);
+    }
+    CalcChemicalPotentialMu(nu);
+    // This is important, the Z over A ratio for proton and neutron depends on the 
+    // chemical potential Mu, while for the first guess for Chemical potential mu 
+    // some values of Z over A ratio. This is the reason for that.
+    _theClusters->operator[](0)->CalcZARatio(nu);
 	
-	G4double MeanZ = 0.0;
-	for (i = 0; i < theA; i++) 
-					MeanZ += G4double(i+1)*_theClusters->operator()(i)->GetZARatio()*
-								_theClusters->operator()(i)->GetMeanMultiplicity();											
-	return MeanZ;
+    G4double MeanZ = 0.0;
+    for (i = 0; i < theA; i++) 
+	MeanZ += G4double(i+1)*_theClusters->operator[](i)->GetZARatio()*
+	    _theClusters->operator[](i)->GetMeanMultiplicity();											
+    return MeanZ;
 }
 
 
 void G4StatMFMacroChemicalPotential::CalcChemicalPotentialMu(const G4double nu)
-	//	Calculate Chemical potential \mu
-	// For that is necesary to calculate mean multiplicities
+    //	Calculate Chemical potential \mu
+    // For that is necesary to calculate mean multiplicities
 {
-	G4StatMFMacroMultiplicity * theMultip = new
-		G4StatMFMacroMultiplicity(theA,_Kappa,_MeanTemperature,nu,_theClusters);
+    G4StatMFMacroMultiplicity * theMultip = new
+	G4StatMFMacroMultiplicity(theA,_Kappa,_MeanTemperature,nu,_theClusters);
 		
-	_ChemPotentialMu = theMultip->CalcChemicalPotentialMu();
-	_MeanMultiplicity = theMultip->GetMeanMultiplicity();
+    _ChemPotentialMu = theMultip->CalcChemicalPotentialMu();
+    _MeanMultiplicity = theMultip->GetMeanMultiplicity();
 	
-	delete theMultip;
+    delete theMultip;
 	
-	return;
+    return;
 
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
index f2523702fb..2c57dd959f 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiNucleon.cc
@@ -1,19 +1,48 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroMultiNucleon.cc,v 1.7.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFMacroMultiNucleon.hh"
 
 // Default constructor
 G4StatMFMacroMultiNucleon::
 G4StatMFMacroMultiNucleon() :
-G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
+    G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
 {
-	G4Exception("G4StatMFMacroMultiNucleon::default_constructor meant to not be accessable");
+    G4Exception("G4StatMFMacroMultiNucleon::default_constructor meant to not be accessable");
 }
 
 // Copy constructor
 G4StatMFMacroMultiNucleon::
 G4StatMFMacroMultiNucleon(const G4StatMFMacroMultiNucleon & right) :
-G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
+    G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
 {
-	G4Exception("G4StatMFMacroMultiNucleon::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFMacroMultiNucleon::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -21,60 +50,60 @@ G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
 G4StatMFMacroMultiNucleon & G4StatMFMacroMultiNucleon::
 operator=(const G4StatMFMacroMultiNucleon & right) 
 {
-	G4Exception("G4StatMFMacroMultiNucleon::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroMultiNucleon::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMacroMultiNucleon::operator==(const G4StatMFMacroMultiNucleon & right) const
 {
-	G4Exception("G4StatMFMacroMultiNucleon::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroMultiNucleon::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMacroMultiNucleon::operator!=(const G4StatMFMacroMultiNucleon & right) const
 {
-	G4Exception("G4StatMFMacroMultiNucleon::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroMultiNucleon::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 G4double G4StatMFMacroMultiNucleon::CalcMeanMultiplicity(const G4double FreeVol, const G4double mu,
-																			const G4double nu, const G4double T)
+							 const G4double nu, const G4double T)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
 	
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 	
-	const G4double A23 = pow(theA,2./3.);
+    const G4double A23 = pow(theA,2./3.);
 	
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 	
-	G4double exponent = (mu + nu*theZARatio+ G4StatMFParameters::GetE0() + T*T/_InvLevelDensity 
-							- G4StatMFParameters::GetGamma0()*(1.0 - 2.0*theZARatio)*(1.0 - 2.0*theZARatio))*theA
-							- G4StatMFParameters::Beta(T)*A23 - Coulomb*theZARatio*theZARatio*A23*theA;
+    G4double exponent = (mu + nu*theZARatio+ G4StatMFParameters::GetE0() + T*T/_InvLevelDensity 
+			 - G4StatMFParameters::GetGamma0()*(1.0 - 2.0*theZARatio)*(1.0 - 2.0*theZARatio))*theA
+	- G4StatMFParameters::Beta(T)*A23 - Coulomb*theZARatio*theZARatio*A23*theA;
 	
-	exponent /= T;
+    exponent /= T;
 	
-	if (exponent > 30.0) exponent = 30.0;
+    if (exponent > 30.0) exponent = 30.0;
 	
-	_MeanMultiplicity = G4std::max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
-	return _MeanMultiplicity;	
+    _MeanMultiplicity = G4std::max((FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*exp(exponent),1.0e-30);
+    return _MeanMultiplicity;	
 }
 
 
 G4double G4StatMFMacroMultiNucleon::CalcZARatio(const G4double nu)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	G4double den = 8.0*G4StatMFParameters::GetGamma0()+2.0*Coulomb*pow(theA,2./3.);
-	G4double num = 4.0*G4StatMFParameters::GetGamma0()+nu;
+    G4double den = 8.0*G4StatMFParameters::GetGamma0()+2.0*Coulomb*pow(theA,2./3.);
+    G4double num = 4.0*G4StatMFParameters::GetGamma0()+nu;
 	
-	return theZARatio = num/den;
+    return theZARatio = num/den;
 	
 
 }
@@ -83,51 +112,51 @@ G4double G4StatMFMacroMultiNucleon::CalcZARatio(const G4double nu)
 
 G4double G4StatMFMacroMultiNucleon::CalcEnergy(const G4double T)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 	
-	const G4double A23 = pow(G4double(theA),2./3.);
+    const G4double A23 = pow(G4double(theA),2./3.);
 
-	// Volume term 
-	G4double EVol = G4double(theA) * (T*T/_InvLevelDensity - G4StatMFParameters::GetE0());
+    // Volume term 
+    G4double EVol = G4double(theA) * (T*T/_InvLevelDensity - G4StatMFParameters::GetE0());
 	
-	// Symmetry term
+    // Symmetry term
 //	G4double ESym = G4double(theA) * G4StatMFParameters::GetGamma0() *(1. - 2.* theZARatio * theZARatio);
 	
-	// Surface term
-	G4double ESurf = A23*(G4StatMFParameters::Beta(T) - T*G4StatMFParameters::DBetaDT(T));
+    // Surface term
+    G4double ESurf = A23*(G4StatMFParameters::Beta(T) - T*G4StatMFParameters::DBetaDT(T));
  
-	// Coulomb term
-	G4double ECoul = Coulomb*A23*G4double(theA)*theZARatio*theZARatio;
+    // Coulomb term
+    G4double ECoul = Coulomb*A23*G4double(theA)*theZARatio*theZARatio;
 	
-	// Translational term
-	G4double ETrans = (3./2.)*T;
+    // Translational term
+    G4double ETrans = (3./2.)*T;
 	
 	
-	return _Energy = EVol + ESurf + ECoul + ETrans; // + ESym; 
+    return _Energy = EVol + ESurf + ECoul + ETrans; // + ESym; 
 }
 
 
 G4double G4StatMFMacroMultiNucleon::CalcEntropy(const G4double T, const G4double FreeVol)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 
-	G4double Entropy = 0.0;
-	if (_MeanMultiplicity > 0.0) {
-		// Volume term
-		G4double SV = 2.0*G4double(theA)*T/_InvLevelDensity;
+    G4double Entropy = 0.0;
+    if (_MeanMultiplicity > 0.0) {
+	// Volume term
+	G4double SV = 2.0*G4double(theA)*T/_InvLevelDensity;
 		
-		// Surface term
-		G4double SS = -G4StatMFParameters::DBetaDT(T)*pow(G4double(theA),2./3.);
+	// Surface term
+	G4double SS = -G4StatMFParameters::DBetaDT(T)*pow(G4double(theA),2./3.);
 		
-		// Translational term
-		G4double ST = (5./2.)+log(FreeVol*sqrt(G4double(theA))*G4double(theA)/(lambda3*_MeanMultiplicity));
+	// Translational term
+	G4double ST = (5./2.)+log(FreeVol*sqrt(G4double(theA))*G4double(theA)/(lambda3*_MeanMultiplicity));
 		
 		
-		Entropy = _MeanMultiplicity*(SV + SS + ST);
-	}
+	Entropy = _MeanMultiplicity*(SV + SS + ST);
+    }
 								
 								
-	return Entropy;
+    return Entropy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiplicity.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiplicity.cc
index 95cb92e494..6dd5dad594 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiplicity.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroMultiplicity.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroMultiplicity.cc,v 1.3.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFMacroMultiplicity.hh"
 
@@ -5,97 +34,98 @@
 G4StatMFMacroMultiplicity & 
 G4StatMFMacroMultiplicity::operator=(const G4StatMFMacroMultiplicity & right) 
 {
-	G4Exception("G4StatMFMacroMultiplicity::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroMultiplicity::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4StatMFMacroMultiplicity::operator==(const G4StatMFMacroMultiplicity & right) const 
 {
-	G4Exception("G4StatMFMacroMultiplicity::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroMultiplicity::operator== meant to not be accessable");
+    return false;
 }
 
 
 G4bool G4StatMFMacroMultiplicity::operator!=(const G4StatMFMacroMultiplicity & right) const 
 {
-	G4Exception("G4StatMFMacroMultiplicity::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroMultiplicity::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 
 G4double G4StatMFMacroMultiplicity::CalcChemicalPotentialMu(void) 
-	//	Calculate Chemical potential \mu
-	// For that is necesary to calculate mean multiplicities
+    //	Calculate Chemical potential \mu
+    // For that is necesary to calculate mean multiplicities
 {
-	G4double CP = ((3./5.)*elm_coupling/G4StatMFParameters::Getr0())*
-		(1.0-1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0));
+    G4double CP = ((3./5.)*elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0-1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0));
 
-	// starting value for chemical potential \mu
-	// it is the derivative of F(T,V)-\nu*Z w.r.t. Af in Af=5
-	G4double ZA5 = _theClusters->operator()(4)->GetZARatio();
-	G4double ILD5 = _theClusters->operator()(4)->GetInvLevelDensity();
-	_ChemPotentialMu = -G4StatMFParameters::GetE0()-
-		_MeanTemperature*_MeanTemperature/ILD5 -
-		_ChemPotentialNu*ZA5 + 
-		G4StatMFParameters::GetGamma0()*(1.0-2.0*ZA5)*(1.0-2.0*ZA5) +
-		(2.0/3.0)*G4StatMFParameters::Beta(_MeanTemperature)/pow(5.,1./3.) +
-		(5.0/3.0)*CP*ZA5*ZA5*pow(5,2./3.) -
-		1.5*_MeanTemperature/5.0;
+    // starting value for chemical potential \mu
+    // it is the derivative of F(T,V)-\nu*Z w.r.t. Af in Af=5
+    G4double ZA5 = _theClusters->operator[](4)->GetZARatio();
+    G4double ILD5 = _theClusters->operator[](4)->GetInvLevelDensity();
+    _ChemPotentialMu = -G4StatMFParameters::GetE0()-
+	_MeanTemperature*_MeanTemperature/ILD5 -
+	_ChemPotentialNu*ZA5 + 
+	G4StatMFParameters::GetGamma0()*(1.0-2.0*ZA5)*(1.0-2.0*ZA5) +
+	(2.0/3.0)*G4StatMFParameters::Beta(_MeanTemperature)/pow(5.,1./3.) +
+	(5.0/3.0)*CP*ZA5*ZA5*pow(5,2./3.) -
+	1.5*_MeanTemperature/5.0;
 		
 
 
-	G4double ChemPa = _ChemPotentialMu;
-	if (ChemPa/_MeanTemperature > 10.0) ChemPa = 10.0*_MeanTemperature;
-	G4double ChemPb = ChemPa - 0.5*abs(ChemPa);
+    G4double ChemPa = _ChemPotentialMu;
+    if (ChemPa/_MeanTemperature > 10.0) ChemPa = 10.0*_MeanTemperature;
+    G4double ChemPb = ChemPa - 0.5*abs(ChemPa);
     
     
-	G4double fChemPa = this->operator()(ChemPa); 
-	G4double fChemPb = this->operator()(ChemPb); 
+    G4double fChemPa = this->operator()(ChemPa); 
+    G4double fChemPb = this->operator()(ChemPb); 
     
     // bracketing the solution
-	G4int iterations = 0;
-	while (fChemPa*fChemPb > 0.0 && iterations < 10) {
-		if (abs(fChemPa) <= abs(fChemPb)) {
-	 		ChemPa += 0.6*(ChemPa-ChemPb);
-	 		fChemPa = this->operator()(ChemPa);
-		} else {
-			ChemPb += 0.6*(ChemPb-ChemPa);
-			fChemPb = this->operator()(ChemPb);
-		}
-	}
-	if (fChemPa*fChemPb > 0.0) {
-		G4Exception("G4StatMFMacroMultiplicity::CalcChemicalPotentialMu: I couldn't bracket the root.");
+    G4int iterations = 0;
+    while (fChemPa*fChemPb > 0.0 && iterations < 10) {
+	if (abs(fChemPa) <= abs(fChemPb)) {
+	    ChemPa += 0.6*(ChemPa-ChemPb);
+	    fChemPa = this->operator()(ChemPa);
+	} else {
+	    ChemPb += 0.6*(ChemPb-ChemPa);
+	    fChemPb = this->operator()(ChemPb);
 	}
+    }
+    if (fChemPa*fChemPb > 0.0) {
+	G4Exception("G4StatMFMacroMultiplicity::CalcChemicalPotentialMu: I couldn't bracket the root.");
+    }
 	
 	
-	G4Solver<G4StatMFMacroMultiplicity> * theSolver = new G4Solver<G4StatMFMacroMultiplicity>(100,1.e-4);
-	theSolver->SetIntervalLimits(ChemPa,ChemPb);
-	if (!theSolver->Brent(*this)) 
-		G4Exception("G4StatMFMacroMultiplicity::CalcChemicalPotentialMu: I couldn't find the root.");
-	_ChemPotentialMu = theSolver->GetRoot();
-	delete theSolver;
-	return _ChemPotentialMu;
+    G4Solver<G4StatMFMacroMultiplicity> * theSolver = new G4Solver<G4StatMFMacroMultiplicity>(100,1.e-4);
+    theSolver->SetIntervalLimits(ChemPa,ChemPb);
+    if (!theSolver->Brent(*this)) 
+	G4Exception("G4StatMFMacroMultiplicity::CalcChemicalPotentialMu: I couldn't find the root.");
+    _ChemPotentialMu = theSolver->GetRoot();
+    delete theSolver;
+    return _ChemPotentialMu;
 }
 
 
 
 G4double G4StatMFMacroMultiplicity::CalcMeanA(const G4double mu)
 {
-	G4double r03 = G4StatMFParameters::Getr0(); r03 *= r03*r03;
-	G4double V0 = (4.0/3.0)*pi*theA*r03;
+    G4double r03 = G4StatMFParameters::Getr0(); r03 *= r03*r03;
+    G4double V0 = (4.0/3.0)*pi*theA*r03;
 
-	G4double MeanA = 0.0;
+    G4double MeanA = 0.0;
 	
-	_MeanMultiplicity = 0.0;
+    _MeanMultiplicity = 0.0;
 	
-	for (G4int i = 0; i < theA; i++) {
-		G4double multip = _theClusters->operator()(i)->CalcMeanMultiplicity(V0*_Kappa,
-									mu,_ChemPotentialNu,_MeanTemperature);
-		MeanA += multip*G4double(i+1);
-		_MeanMultiplicity += multip;
-	}
+    for (G4int i = 0; i < theA; i++) {
+	G4double multip = _theClusters->operator[](i)->CalcMeanMultiplicity(V0*_Kappa,
+									    mu,_ChemPotentialNu,
+									    _MeanTemperature);
+	MeanA += multip*G4double(i+1);
+	_MeanMultiplicity += multip;
+    }
 
-	return MeanA;
+    return MeanA;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroNucleon.cc
index 0cfa2d409b..e9c7295e80 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroNucleon.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroNucleon.cc,v 1.5.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFMacroNucleon.hh"
 
 // Operators
@@ -5,75 +34,75 @@
 G4StatMFMacroNucleon & G4StatMFMacroNucleon::
 operator=(const G4StatMFMacroNucleon & right)
 {
-	G4Exception("G4StatMFMacroNucleon::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroNucleon::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMacroNucleon::operator==(const G4StatMFMacroNucleon & right) const
 {
-	G4Exception("G4StatMFMacroNucleon::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroNucleon::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMacroNucleon::operator!=(const G4StatMFMacroNucleon & right) const
 {
-	G4Exception("G4StatMFMacroNucleon::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroNucleon::operator!= meant to not be accessable");
+    return true;
 }
 
 G4double G4StatMFMacroNucleon::CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-																const G4double nu, const G4double T)
+						    const G4double nu, const G4double T)
 {
-	if (T <= 0.0) G4Exception("G4StatMFMacroNucleon::CalcMeanMultiplicity: Temperature less or equal 0");
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    if (T <= 0.0) G4Exception("G4StatMFMacroNucleon::CalcMeanMultiplicity: Temperature less or equal 0");
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
 	
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 	
-	const G4double degeneracy = 2.0;
+    const G4double degeneracy = 2.0;
 	
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	_NeutronMeanMultiplicity = (degeneracy*FreeVol/lambda3)*exp(mu/T);
+    _NeutronMeanMultiplicity = (degeneracy*FreeVol/lambda3)*exp(mu/T);
 	
-	_ProtonMeanMultiplicity = (degeneracy*FreeVol/lambda3)*
-										exp((mu+nu-Coulomb)/T);
+    _ProtonMeanMultiplicity = (degeneracy*FreeVol/lambda3)*
+	exp((mu+nu-Coulomb)/T);
 
 	
 
-	return _MeanMultiplicity = _NeutronMeanMultiplicity + _ProtonMeanMultiplicity;
+    return _MeanMultiplicity = _NeutronMeanMultiplicity + _ProtonMeanMultiplicity;
 	
 }
 
 
 G4double G4StatMFMacroNucleon::CalcEnergy(const G4double T)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 									
-	return _Energy = Coulomb * theZARatio + (3./2.) * T;
+    return _Energy = Coulomb * theZARatio + (3./2.) * T;
 							
 }
 
 G4double G4StatMFMacroNucleon::CalcEntropy(const G4double T, const G4double FreeVol)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 
-	G4double NeutronEntropy = 0.0;
-	if (_NeutronMeanMultiplicity > 0.0)
-		NeutronEntropy = _NeutronMeanMultiplicity*(5./2.+
-								log(2.0*G4double(theA)*FreeVol/(lambda3*_NeutronMeanMultiplicity)));
+    G4double NeutronEntropy = 0.0;
+    if (_NeutronMeanMultiplicity > 0.0)
+	NeutronEntropy = _NeutronMeanMultiplicity*(5./2.+
+						   log(2.0*G4double(theA)*FreeVol/(lambda3*_NeutronMeanMultiplicity)));
 								
 								
-	G4double ProtonEntropy = 0.0;
-	if (_ProtonMeanMultiplicity > 0.0)
-		ProtonEntropy = _ProtonMeanMultiplicity*(5./2.+
-								log(2.0*G4double(theA)*FreeVol/(lambda3*_ProtonMeanMultiplicity)));
+    G4double ProtonEntropy = 0.0;
+    if (_ProtonMeanMultiplicity > 0.0)
+	ProtonEntropy = _ProtonMeanMultiplicity*(5./2.+
+						 log(2.0*G4double(theA)*FreeVol/(lambda3*_ProtonMeanMultiplicity)));
 								
 								
-	return NeutronEntropy+ProtonEntropy;
+    return NeutronEntropy+ProtonEntropy;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
index e6981bcad5..cf12bc2513 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTemperature.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTemperature.cc,v 1.6.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFMacroTemperature.hh"
 
@@ -5,124 +34,126 @@
 G4StatMFMacroTemperature & 
 G4StatMFMacroTemperature::operator=(const G4StatMFMacroTemperature & right) 
 {
-	G4Exception("G4StatMFMacroTemperature::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroTemperature::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4StatMFMacroTemperature::operator==(const G4StatMFMacroTemperature & right) const 
 {
-	G4Exception("G4StatMFMacroTemperature::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroTemperature::operator== meant to not be accessable");
+    return false;
 }
 
 
 G4bool G4StatMFMacroTemperature::operator!=(const G4StatMFMacroTemperature & right) const 
 {
-	G4Exception("G4StatMFMacroTemperature::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroTemperature::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 
 G4double G4StatMFMacroTemperature::CalcTemperature(void) 
-	//	Calculate Chemical potential \nu
+    //	Calculate Chemical potential \nu
 {
-	// Temperature
-	G4double Ta = 0.00012; 
-	G4double Tb = G4std::max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
+    // Temperature
+    G4double Ta = 0.00012; 
+    G4double Tb = G4std::max(sqrt(_ExEnergy/(theA*0.12)),0.01*MeV);
     
-	G4double fTa = this->operator()(Ta); 
-	G4double fTb = this->operator()(Tb); 
+    G4double fTa = this->operator()(Ta); 
+    G4double fTb = this->operator()(Tb); 
 
-	// Bracketing the solution
-	// T should be greater than 0.
-	// The interval is [Ta,Tb]
-	// We start with a low value for Ta = 0.0012 K
-	// it should be enough to have fTa > 0 If it isn't 
-	// the case, we decrease Ta. But carefully, because 
-	// fTa growes very fast when Ta is near 0 and we could have
-	// an overflow.
+    // Bracketing the solution
+    // T should be greater than 0.
+    // The interval is [Ta,Tb]
+    // We start with a low value for Ta = 0.0012 K
+    // it should be enough to have fTa > 0 If it isn't 
+    // the case, we decrease Ta. But carefully, because 
+    // fTa growes very fast when Ta is near 0 and we could have
+    // an overflow.
 
-	G4int iterations = 0;  
-	while (fTa < 0.0 && iterations++ < 10) {
-		Ta -= 0.5*Ta;
-		fTa = this->operator()(Ta);
-	}
-	// Usually, fTb will be less than 0, but if it is not the case: 
-	iterations = 0;  
-	while (fTa*fTb > 0.0 && iterations++ < 10) {
-		Tb += 1.5*abs(Tb-Ta);
-		fTb = this->operator()(Tb);
-	}
+    G4int iterations = 0;  
+    while (fTa < 0.0 && iterations++ < 10) {
+	Ta -= 0.5*Ta;
+	fTa = this->operator()(Ta);
+    }
+    // Usually, fTb will be less than 0, but if it is not the case: 
+    iterations = 0;  
+    while (fTa*fTb > 0.0 && iterations++ < 10) {
+	Tb += 1.5*abs(Tb-Ta);
+	fTb = this->operator()(Tb);
+    }
 	
-	if (fTa*fTb > 0.0) {
-		G4Exception("G4StatMFMacroTemperature::CalcTemperature: I couldn't bracket	the solution.");
-	}
+    if (fTa*fTb > 0.0) {
+	G4Exception("G4StatMFMacroTemperature::CalcTemperature: I couldn't bracket	the solution.");
+    }
 
-	G4Solver<G4StatMFMacroTemperature> * theSolver = new G4Solver<G4StatMFMacroTemperature>(100,1.e-4);
-	theSolver->SetIntervalLimits(Ta,Tb);
-	if (!theSolver->Brent(*this)) 
-		G4Exception("G4StatMFMacroTemperature::CalcTemperature: I couldn't find the root.");
-	_MeanTemperature = theSolver->GetRoot();
-	delete theSolver;
-	return _MeanTemperature;
+    G4Solver<G4StatMFMacroTemperature> * theSolver = new G4Solver<G4StatMFMacroTemperature>(100,1.e-4);
+    theSolver->SetIntervalLimits(Ta,Tb);
+    if (!theSolver->Brent(*this)) 
+	G4Exception("G4StatMFMacroTemperature::CalcTemperature: I couldn't find the root.");
+    _MeanTemperature = theSolver->GetRoot();
+    delete theSolver;
+    return _MeanTemperature;
 }
 
 
 
 G4double G4StatMFMacroTemperature::FragsExcitEnergy(const G4double T)
-  // Calculates excitation energy per nucleon and summed fragment multiplicity and entropy
+    // Calculates excitation energy per nucleon and summed fragment multiplicity and entropy
 {
 
-	// Model Parameters
-	G4double R0 = G4StatMFParameters::Getr0()*pow(theA,1./3.);
-	G4double R = R0*pow(1.0+G4StatMFParameters::GetKappaCoulomb(), 1./3.);
-	G4double FreeVol = _Kappa*(4.*pi/3.)*R0*R0*R0; 
+    // Model Parameters
+    G4double R0 = G4StatMFParameters::Getr0()*pow(theA,1./3.);
+    G4double R = R0*pow(1.0+G4StatMFParameters::GetKappaCoulomb(), 1./3.);
+    G4double FreeVol = _Kappa*(4.*pi/3.)*R0*R0*R0; 
  
  
-	// Calculate Chemical potentials
-	CalcChemicalPotentialNu(T);
+    // Calculate Chemical potentials
+    CalcChemicalPotentialNu(T);
 
 
-	// Average total fragment energy
-	G4double AverageEnergy = 0.0;
-	G4int i;
-	for (i = 0; i < theA; i++) AverageEnergy += 
-			_theClusters->operator()(i)->GetMeanMultiplicity()*
-			_theClusters->operator()(i)->CalcEnergy(T);
+    // Average total fragment energy
+    G4double AverageEnergy = 0.0;
+    G4int i;
+    for (i = 0; i < theA; i++) AverageEnergy += 
+				   _theClusters->operator[](i)->GetMeanMultiplicity()*
+				   _theClusters->operator[](i)->CalcEnergy(T);
 
 
-	// Add Coulomb energy			
-	AverageEnergy += (3./5.)*elm_coupling*theZ*theZ/R;		
+    // Add Coulomb energy			
+    AverageEnergy += (3./5.)*elm_coupling*theZ*theZ/R;		
 
-  	// Calculate mean entropy
-	_MeanEntropy = 0.0;
-  	for (i = 0; i < theA; i++) _MeanEntropy +=
-			_theClusters->operator()(i)->CalcEntropy(T,FreeVol);	
+    // Calculate mean entropy
+    _MeanEntropy = 0.0;
+    for (i = 0; i < theA; i++) _MeanEntropy +=
+				   _theClusters->operator[](i)->CalcEntropy(T,FreeVol);	
 
-	// Excitation energy per nucleon
-	G4double FragsExcitEnergy = AverageEnergy - _FreeInternalE0;
+    // Excitation energy per nucleon
+    G4double FragsExcitEnergy = AverageEnergy - _FreeInternalE0;
 
-	return FragsExcitEnergy;
+    return FragsExcitEnergy;
 
 }
 
 
 void G4StatMFMacroTemperature::CalcChemicalPotentialNu(const G4double T)
-  // Calculates the chemical potential \nu 
+    // Calculates the chemical potential \nu 
 
 {
-	G4StatMFMacroChemicalPotential * theChemPot = new
-		G4StatMFMacroChemicalPotential(theA,theZ,_Kappa,T,_theClusters);
+    G4StatMFMacroChemicalPotential * theChemPot = new
+	G4StatMFMacroChemicalPotential(theA,theZ,_Kappa,T,_theClusters);
 
 
-	_ChemPotentialNu = theChemPot->CalcChemicalPotentialNu();
-	_ChemPotentialMu = theChemPot->GetChemicalPotentialMu();
-	_MeanMultiplicity = theChemPot->GetMeanMultiplicity();	
+    _ChemPotentialNu = theChemPot->CalcChemicalPotentialNu();
+    _ChemPotentialMu = theChemPot->GetChemicalPotentialMu();
+    _MeanMultiplicity = theChemPot->GetMeanMultiplicity();	
 	
-	delete theChemPot;
+    delete theChemPot;
 		    
-	return;
+    return;
 
 }
+
+
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTetraNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTetraNucleon.cc
index c62b20461b..f93c7a3a94 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTetraNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTetraNucleon.cc
@@ -1,11 +1,40 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTetraNucleon.cc,v 1.6.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFMacroTetraNucleon.hh"
 
 // Copy constructor
 G4StatMFMacroTetraNucleon::
 G4StatMFMacroTetraNucleon(const G4StatMFMacroTetraNucleon & right) :
-G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
+    G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
 {
-	G4Exception("G4StatMFMacroTetraNucleon::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFMacroTetraNucleon::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -13,57 +42,57 @@ G4VStatMFMacroCluster(0)  // Beacuse the def. constr. of base class is private
 G4StatMFMacroTetraNucleon & G4StatMFMacroTetraNucleon::
 operator=(const G4StatMFMacroTetraNucleon & right)
 {
-	G4Exception("G4StatMFMacroTetraNucleon::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroTetraNucleon::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMacroTetraNucleon::operator==(const G4StatMFMacroTetraNucleon & right) const
 {
-	G4Exception("G4StatMFMacroTetraNucleon::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroTetraNucleon::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMacroTetraNucleon::operator!=(const G4StatMFMacroTetraNucleon & right) const
 {
-	G4Exception("G4StatMFMacroTetraNucleon::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroTetraNucleon::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 G4double G4StatMFMacroTetraNucleon::CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-																			const G4double nu, const G4double T)
+							 const G4double nu, const G4double T)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
 	
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 	
-	const G4double degeneracy = 1;  // He4
+    const G4double degeneracy = 1;  // He4
 	
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(2,theA); //old value was 30.11*MeV
+    const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(2,theA); //old value was 30.11*MeV
 	
-	_MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)* 
-			exp((BindingE+ theA*(mu+nu*theZARatio+T*T/_InvLevelDensity) - 
-			 Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
+    _MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)* 
+	exp((BindingE+ theA*(mu+nu*theZARatio+T*T/_InvLevelDensity) - 
+	     Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
 			 
-	return _MeanMultiplicity;	
+    return _MeanMultiplicity;	
 }
 
 
 G4double G4StatMFMacroTetraNucleon::CalcEnergy(const G4double T)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 									
-	return _Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(2,theA) + 
-							Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
-							(3./2.) * T +
-							theA * T*T/_InvLevelDensity;
+    return _Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(2,theA) + 
+	Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
+	(3./2.) * T +
+	theA * T*T/_InvLevelDensity;
 							
 }
 
@@ -71,14 +100,14 @@ G4double G4StatMFMacroTetraNucleon::CalcEnergy(const G4double T)
 
 G4double G4StatMFMacroTetraNucleon::CalcEntropy(const G4double T, const G4double FreeVol)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 
-	G4double Entropy = 0.0;
-	if (_MeanMultiplicity > 0.0)
-		Entropy = _MeanMultiplicity*(5./2.+
-					log(8.0*FreeVol/(lambda3*_MeanMultiplicity)))+ // 8 = theA*sqrt(theA)
-					8.0*T/_InvLevelDensity;			
+    G4double Entropy = 0.0;
+    if (_MeanMultiplicity > 0.0)
+	Entropy = _MeanMultiplicity*(5./2.+
+				     log(8.0*FreeVol/(lambda3*_MeanMultiplicity)))+ // 8 = theA*sqrt(theA)
+	    8.0*T/_InvLevelDensity;			
 								
-	return Entropy;
+    return Entropy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTriNucleon.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTriNucleon.cc
index 904eaa49bd..b47eb2ec5a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTriNucleon.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacroTriNucleon.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMacroTriNucleon.cc,v 1.6.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4StatMFMacroTriNucleon.hh"
 
 // Operators
@@ -5,72 +34,72 @@
 G4StatMFMacroTriNucleon & G4StatMFMacroTriNucleon::
 operator=(const G4StatMFMacroTriNucleon & right)
 {
-	G4Exception("G4StatMFMacroTriNucleon::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroTriNucleon::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMacroTriNucleon::operator==(const G4StatMFMacroTriNucleon & right) const
 {
-	G4Exception("G4StatMFMacroTriNucleon::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMacroTriNucleon::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMacroTriNucleon::operator!=(const G4StatMFMacroTriNucleon & right) const
 {
-	G4Exception("G4StatMFMacroTriNucleon::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMacroTriNucleon::operator!= meant to not be accessable");
+    return true;
 }
 
 
 
 G4double G4StatMFMacroTriNucleon::CalcMeanMultiplicity(const G4double FreeVol, const G4double mu, 
-																		 const G4double nu, const G4double T)
+						       const G4double nu, const G4double T)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
 	
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 	
-	const G4double degeneracy = 2.0+2.0;  // H3 + He3
+    const G4double degeneracy = 2.0+2.0;  // H3 + He3
 	
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(1,theA); // old value was 9.224*MeV
+    const G4double BindingE = G4NucleiPropertiesTable::GetBindingEnergy(1,theA); // old value was 9.224*MeV
 //							+ G4NucleiProperties::GetBindingEnergy(2,theA);
 
 	
-	_MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*
-			exp((BindingE+ theA*(mu+nu*theZARatio) - 
-			 Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
+    _MeanMultiplicity = (degeneracy*FreeVol*G4double(theA)*sqrt(G4double(theA))/lambda3)*
+	exp((BindingE+ theA*(mu+nu*theZARatio) - 
+	     Coulomb*theZARatio*theZARatio*pow(theA,5./3.))/T);
 			 
-	return _MeanMultiplicity;
+    return _MeanMultiplicity;
 }
 
 
 G4double G4StatMFMacroTriNucleon::CalcEnergy(const G4double T)
 {
-	const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-									(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    const G4double Coulomb = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 									
-	return _Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(1,theA) + 
-							Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
-							(3./2.) * T;
+    return _Energy  = -G4NucleiPropertiesTable::GetBindingEnergy(1,theA) + 
+	Coulomb * theZARatio * theZARatio * pow(G4double(theA),5./3.) +
+	(3./2.) * T;
 							
 }
 
 
 G4double G4StatMFMacroTriNucleon::CalcEntropy(const G4double T, const G4double FreeVol)
 {
-	const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
-	const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
+    const G4double ThermalWaveLenght = 16.15*fermi/sqrt(T);
+    const G4double lambda3 = ThermalWaveLenght*ThermalWaveLenght*ThermalWaveLenght;
 
-	G4double Entropy = 0.0;
-	if (_MeanMultiplicity > 0.0)
-		Entropy = _MeanMultiplicity*(5./2.+
-					log(4.0*G4double(theA)*sqrt(G4double(theA))*FreeVol/(lambda3*_MeanMultiplicity)));
+    G4double Entropy = 0.0;
+    if (_MeanMultiplicity > 0.0)
+	Entropy = _MeanMultiplicity*(5./2.+
+				     log(4.0*G4double(theA)*sqrt(G4double(theA))*FreeVol/(lambda3*_MeanMultiplicity)));
 								
 								
-	return Entropy;
+    return Entropy;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
index e20b3e86f4..2e16a29d23 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMacrocanonical.cc
@@ -1,13 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StatMFMacroCanonical.cc,v 1.6 2000/08/03 08:47:47 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
+// $Id: G4StatMFMacroCanonical.cc,v 1.7.2.1 2001/06/28 19:13:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// by V. Lara
 // --------------------------------------------------------------------
 
 #include "G4StatMFMacroCanonical.hh"
@@ -17,16 +34,16 @@
 G4StatMFMacroCanonical::G4StatMFMacroCanonical(const G4Fragment & theFragment) 
 {
 
-	// Get memory for clusters
-	_theClusters.insert(new G4StatMFMacroNucleon);              // Size 1
-	_theClusters.insert(new G4StatMFMacroBiNucleon);            // Size 2
-	_theClusters.insert(new G4StatMFMacroTriNucleon);           // Size 3
-	_theClusters.insert(new G4StatMFMacroTetraNucleon);         // Size 4
-	for (G4int i = 4; i < theFragment.GetA(); i++)   
-		_theClusters.insert(new G4StatMFMacroMultiNucleon(i+1)); // Size 5 ... A
+    // Get memory for clusters
+    _theClusters.push_back(new G4StatMFMacroNucleon);              // Size 1
+    _theClusters.push_back(new G4StatMFMacroBiNucleon);            // Size 2
+    _theClusters.push_back(new G4StatMFMacroTriNucleon);           // Size 3
+    _theClusters.push_back(new G4StatMFMacroTetraNucleon);         // Size 4
+    for (G4int i = 4; i < theFragment.GetA(); i++)   
+	_theClusters.push_back(new G4StatMFMacroMultiNucleon(i+1)); // Size 5 ... A
 		
-	// Perform class initialization
-	Initialize(theFragment);
+    // Perform class initialization
+    Initialize(theFragment);
 
 }
 
@@ -34,27 +51,30 @@ G4StatMFMacroCanonical::G4StatMFMacroCanonical(const G4Fragment & theFragment)
 // destructor
 G4StatMFMacroCanonical::~G4StatMFMacroCanonical() 
 {
-	// garbage collection
-	_theClusters.clearAndDestroy();
+    // garbage collection
+    while (!_theClusters.empty()) {
+	delete _theClusters.back();
+	_theClusters.pop_back();
+    }
 }
 
 // operators definitions
 G4StatMFMacroCanonical & 
 G4StatMFMacroCanonical::operator=(const G4StatMFMacroCanonical & right) 
 {
-	G4Exception("G4StatMFMacroCanonical::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMacroCanonical::operator= meant to not be accessable");
+    return *this;
 }
 
 G4bool G4StatMFMacroCanonical::operator==(const G4StatMFMacroCanonical & right) const 
 {
-	return false;
+    return false;
 }
 
 
 G4bool G4StatMFMacroCanonical::operator!=(const G4StatMFMacroCanonical & right) const 
 {
-	return true;
+    return true;
 }
 
 
@@ -64,26 +84,26 @@ G4bool G4StatMFMacroCanonical::operator!=(const G4StatMFMacroCanonical & right)
 void G4StatMFMacroCanonical::Initialize(const G4Fragment & theFragment) 
 {
   
-	// Excitation Energy
-	G4double U = theFragment.GetExcitationEnergy();
+    // Excitation Energy
+    G4double U = theFragment.GetExcitationEnergy();
   
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
 
   
-	// Free Internal energy at T = 0
-	__FreeInternalE0 = A*( -G4StatMFParameters::GetE0() +              // Volume term (for T = 0)
-									G4StatMFParameters::GetGamma0()*
-									(1.0-2.0*Z/A)*(1.0-2.0*Z/A) ) +            // Symmetry term
-    				G4StatMFParameters::GetBeta0()*pow(A,2.0/3.0) +        // Surface term (for T = 0)
-    				(3.0/5.0)*elm_coupling*Z*Z/(G4StatMFParameters::Getr0()*
-					pow(A,1.0/3.0));                                       // Coulomb term 
+    // Free Internal energy at T = 0
+    __FreeInternalE0 = A*( -G4StatMFParameters::GetE0() +              // Volume term (for T = 0)
+			   G4StatMFParameters::GetGamma0()*
+			   (1.0-2.0*Z/A)*(1.0-2.0*Z/A) ) +            // Symmetry term
+	G4StatMFParameters::GetBeta0()*pow(A,2.0/3.0) +        // Surface term (for T = 0)
+	(3.0/5.0)*elm_coupling*Z*Z/(G4StatMFParameters::Getr0()*
+				    pow(A,1.0/3.0));                                       // Coulomb term 
   
 
 
-  CalculateTemperature(theFragment);
+    CalculateTemperature(theFragment);
 
-  return;
+    return;
 }
 
 
@@ -92,89 +112,89 @@ void G4StatMFMacroCanonical::Initialize(const G4Fragment & theFragment)
 
 void G4StatMFMacroCanonical::CalculateTemperature(const G4Fragment & theFragment)
 {
-	// Excitation Energy
-	G4double U = theFragment.GetExcitationEnergy();
+    // Excitation Energy
+    G4double U = theFragment.GetExcitationEnergy();
   
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
 
 	// Fragment Multiplicity
-	G4double FragMult = G4std::max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
+    G4double FragMult = G4std::max((1.0+(2.31/MeV)*(U/A - 3.5*MeV))*A/100.0, 2.0);
 
 
-	// Parameter Kappa
-	_Kappa = (1.0+elm_coupling*(pow(FragMult,1./3.)-1)/
-				(G4StatMFParameters::Getr0()*pow(A,1./3.)));
-	_Kappa = _Kappa*_Kappa*_Kappa - 1.0;
+    // Parameter Kappa
+    _Kappa = (1.0+elm_coupling*(pow(FragMult,1./3.)-1)/
+	      (G4StatMFParameters::Getr0()*pow(A,1./3.)));
+    _Kappa = _Kappa*_Kappa*_Kappa - 1.0;
 
 	
-	G4StatMFMacroTemperature * theTemp = new	
-		G4StatMFMacroTemperature(A,Z,U,__FreeInternalE0,_Kappa,&_theClusters);
+    G4StatMFMacroTemperature * theTemp = new	
+	G4StatMFMacroTemperature(A,Z,U,__FreeInternalE0,_Kappa,&_theClusters);
 
-	__MeanTemperature = theTemp->CalcTemperature();
-	_ChemPotentialNu = theTemp->GetChemicalPotentialNu();
-	_ChemPotentialMu = theTemp->GetChemicalPotentialMu();
-	__MeanMultiplicity = theTemp->GetMeanMultiplicity();
-	__MeanEntropy = theTemp->GetEntropy();
+    __MeanTemperature = theTemp->CalcTemperature();
+    _ChemPotentialNu = theTemp->GetChemicalPotentialNu();
+    _ChemPotentialMu = theTemp->GetChemicalPotentialMu();
+    __MeanMultiplicity = theTemp->GetMeanMultiplicity();
+    __MeanEntropy = theTemp->GetEntropy();
 	
-	delete theTemp;			
+    delete theTemp;			
 
-	return;
+    return;
 }
 
 
 // --------------------------------------------------------------------------
 
 G4StatMFChannel * G4StatMFMacroCanonical::ChooseAandZ(const G4Fragment &theFragment)
-  // Calculate total fragments multiplicity, fragment atomic numbers and charges
+    // Calculate total fragments multiplicity, fragment atomic numbers and charges
 {
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
   
-	G4RWTValVector<G4double> ANumbers(A);
+    G4std::vector<G4double> ANumbers(A);
 
-	G4double Multiplicity = ChooseA(A,ANumbers);
+    G4double Multiplicity = ChooseA(A,ANumbers);
 
 
-	G4RWTValOrderedVector<G4double> FragmentsA;
+    G4std::vector<G4double> FragmentsA;
   
-	G4int i = 0;  
-	G4int s = 0;
-	for (i = 0; i < A; i++) {
+    G4int i = 0;  
+    G4int s = 0;
+    for (i = 0; i < A; i++) {
 //		if (ANumbers(i) == 0) continue;
-		for (G4int j = 0; j < ANumbers(i); j++) FragmentsA.insert(i+1);
-	}
+	for (G4int j = 0; j < ANumbers[i]; j++) FragmentsA.push_back(i+1);
+    }
 
 
 // Sort fragments in decreasing order
-	G4int im = 0;
-	for (G4int j = 0; j < Multiplicity; j++) {
-		G4double FragmentsAMax = 0.0;
-		im = j;
-		for (i = j; i < Multiplicity; i++) {
-			if (FragmentsA(i) <= FragmentsAMax) continue;
-			else {
-				im = i;
-				FragmentsAMax = FragmentsA(im);
-			}
-		}
-	
-		if (im != j) {
-			FragmentsA(im) = FragmentsA(j);
-			FragmentsA(j) = FragmentsAMax;
-		}
+    G4int im = 0;
+    for (G4int j = 0; j < Multiplicity; j++) {
+	G4double FragmentsAMax = 0.0;
+	im = j;
+	for (i = j; i < Multiplicity; i++) {
+	    if (FragmentsA[i] <= FragmentsAMax) continue;
+	    else {
+		im = i;
+		FragmentsAMax = FragmentsA[im];
+	    }
 	}
+	
+	if (im != j) {
+	    FragmentsA[im] = FragmentsA[j];
+	    FragmentsA[j] = FragmentsAMax;
+	}
+    }
 
-	return ChooseZ(Z,FragmentsA);
+    return ChooseZ(Z,FragmentsA);
 }
 
 
 
-G4double G4StatMFMacroCanonical::ChooseA(const G4double A, G4RWTValVector<G4double> & ANumbers)
-  // Determines fragments multiplicities and compute total fragment multiplicity
+G4double G4StatMFMacroCanonical::ChooseA(const G4double A, G4std::vector<G4double> & ANumbers)
+    // Determines fragments multiplicities and compute total fragment multiplicity
 {
-	G4double multiplicity = 0.0;
-	G4int i;
+    G4double multiplicity = 0.0;
+    G4int i;
   
   
 // G4double GH = 0.0;
@@ -185,87 +205,88 @@ G4double G4StatMFMacroCanonical::ChooseA(const G4double A, G4RWTValVector<G4doub
 //  G4double SqrtGH = sqrt(GH) + 0.5;
   
   
-	G4RWTValVector<G4double> AcumMultiplicity(A);
+    G4std::vector<G4double> AcumMultiplicity(A);
 
-	AcumMultiplicity(0) = _theClusters(0)->GetMeanMultiplicity();
-	for (i = 1; i < A; i++) AcumMultiplicity(i) = AcumMultiplicity(i-1) + 
-													_theClusters(i)->GetMeanMultiplicity();                 
-	G4int CheckA;
+    AcumMultiplicity[0] = _theClusters[0]->GetMeanMultiplicity();
+    for (i = 1; i < A; i++) AcumMultiplicity[i] = AcumMultiplicity[i-1] + 
+				_theClusters[i]->GetMeanMultiplicity();                 
+    G4int CheckA;
+    do {
+	CheckA = -1;
+	G4int SumA = 0;
+	G4int ThisOne = 0;
+	multiplicity = 0.0;
+	for (i = 0; i < A; i++) ANumbers[i] = 0.0;
 	do {
-		CheckA = -1;
-		G4int SumA = 0;
-		G4int ThisOne = 0;
-		multiplicity = 0.0;
-		for (i = 0; i < A; i++) ANumbers(i) = 0.0;
-		do {
-			G4double RandNumber = G4UniformRand()*__MeanMultiplicity;
-			for (i = 0; i < A; i++) {
-				if (RandNumber < AcumMultiplicity(i)) {
-					ThisOne = i;
-					break;
-				}
-			}
-			multiplicity++;
-			ANumbers(ThisOne) = ANumbers(ThisOne)+1;
-			SumA += ThisOne+1;
-			CheckA = G4int(A) - SumA;
+	    G4double RandNumber = G4UniformRand()*__MeanMultiplicity;
+	    for (i = 0; i < A; i++) {
+		if (RandNumber < AcumMultiplicity[i]) {
+		    ThisOne = i;
+		    break;
+		}
+	    }
+	    multiplicity++;
+	    ANumbers[ThisOne] = ANumbers[ThisOne]+1;
+	    SumA += ThisOne+1;
+	    CheckA = G4int(A) - SumA;
 
-		} while (CheckA > 0);
+	} while (CheckA > 0);
 
-	} while (CheckA < 0 || abs(__MeanMultiplicity - multiplicity) > sqrt(__MeanMultiplicity) + 1./2.);
+    } while (CheckA < 0 || abs(__MeanMultiplicity - multiplicity) > sqrt(__MeanMultiplicity) + 1./2.);
   
-	return multiplicity;
+    return multiplicity;
 }
 
 
 G4StatMFChannel * G4StatMFMacroCanonical::ChooseZ(const G4int & Z, 
-								G4RWTValOrderedVector<G4double> & FragmentsA)
-  // 
+						  G4std::vector<G4double> & FragmentsA)
+    // 
 {
-	G4RWTValOrderedVector<G4double> FragmentsZ;
+    G4std::vector<G4double> FragmentsZ;
 	
-	G4double DeltaZ = 0.0;
-	G4double CP = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
-					(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
+    G4double DeltaZ = 0.0;
+    G4double CP = (3./5.)*(elm_coupling/G4StatMFParameters::Getr0())*
+	(1.0 - 1.0/pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1./3.));
 
-	G4int multiplicity = FragmentsA.entries();
+    G4int multiplicity = FragmentsA.size();
 
-	do {
-		G4int SumZ = 0;
-		for (G4int i = 0; i < multiplicity; i++) {
-			G4double A = FragmentsA(i);
-			if (A <= 1.0) {
-				G4double RandNumber = G4UniformRand();
-				if (RandNumber < _theClusters(0)->GetZARatio()) {
-					FragmentsZ.insert(1.0);
-					SumZ += G4int(FragmentsZ(i));
-				} else FragmentsZ.insert(0.0);
-			} else {
-				G4double RandZ;
-				G4double CC = 8.0*G4StatMFParameters::GetGamma0()+2.0*CP*pow(FragmentsA(i),2./3.);
-				G4double ZMean;
-				if (FragmentsA(i) > 1.5 && FragmentsA(i) < 4.5) ZMean = 0.5*FragmentsA(i);
-				else ZMean = FragmentsA(i)*(4.0*G4StatMFParameters::GetGamma0()+_ChemPotentialNu)/CC;
-				G4double ZDispersion = sqrt(FragmentsA(i)*__MeanTemperature/CC);
-				G4int z;
-				do {
-					RandZ = G4RandGauss::shoot(ZMean,ZDispersion);
-					z = G4int(RandZ+0.5);
-				} while (z < 0 || z > A);
-					FragmentsZ(i) = z;
-					SumZ += z;
-			}
-		}
-		DeltaZ = Z - SumZ;
-	} while (abs(DeltaZ) > 1.1);
+    do {
+	G4int SumZ = 0;
+	for (G4int i = 0; i < multiplicity; i++) {
+	    G4double A = FragmentsA[i];
+	    if (A <= 1.0) {
+		G4double RandNumber = G4UniformRand();
+		if (RandNumber < _theClusters[0]->GetZARatio()) {
+		    FragmentsZ.push_back(1.0);
+		    SumZ += G4int(FragmentsZ[i]);
+		} else FragmentsZ.push_back(0.0);
+	    } else {
+		G4double RandZ;
+		G4double CC = 8.0*G4StatMFParameters::GetGamma0()+2.0*CP*pow(FragmentsA[i],2./3.);
+		G4double ZMean;
+		if (FragmentsA[i] > 1.5 && FragmentsA[i] < 4.5) ZMean = 0.5*FragmentsA[i];
+		else ZMean = FragmentsA[i]*(4.0*G4StatMFParameters::GetGamma0()+_ChemPotentialNu)/CC;
+		G4double ZDispersion = sqrt(FragmentsA[i]*__MeanTemperature/CC);
+		G4int z;
+		do {
+		    RandZ = G4RandGauss::shoot(ZMean,ZDispersion);
+		    z = G4int(RandZ+0.5);
+		} while (z < 0 || z > A);
+//		FragmentsZ[i] = z;
+		FragmentsZ.push_back(z);
+		SumZ += z;
+	    }
+	}
+	DeltaZ = Z - SumZ;
+    } while (abs(DeltaZ) > 1.1);
 	
-	// DeltaZ can be 0, 1 or -1
-	FragmentsZ(0) += DeltaZ;
+    // DeltaZ can be 0, 1 or -1
+    FragmentsZ[0] += DeltaZ;
 	
-	G4StatMFChannel * theChannel = new G4StatMFChannel;
-	for (G4int i = multiplicity-1; i >= 0; i--) 
-		theChannel->CreateFragment(FragmentsA(i),FragmentsZ(i));
+    G4StatMFChannel * theChannel = new G4StatMFChannel;
+    for (G4int i = multiplicity-1; i >= 0; i--) 
+	theChannel->CreateFragment(FragmentsA[i],FragmentsZ[i]);
 	
 
-	return theChannel;
+    return theChannel;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroManager.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroManager.cc
index de367ee7a6..580c6ea0b6 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroManager.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroManager.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMicroManager.cc,v 1.2.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFMicroManager.hh"
 
@@ -6,7 +35,7 @@
 // Copy constructor
 G4StatMFMicroManager::G4StatMFMicroManager(const G4StatMFMicroManager & right)
 {
-	G4Exception("G4StatMFMicroManager::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFMicroManager::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -14,38 +43,41 @@ G4StatMFMicroManager::G4StatMFMicroManager(const G4StatMFMicroManager & right)
 G4StatMFMicroManager & G4StatMFMicroManager::
 operator=(const G4StatMFMicroManager & right)
 {
-	G4Exception("G4StatMFMicroManager::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMicroManager::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMicroManager::operator==(const G4StatMFMicroManager & right) const
 {
-	return false;
+    return false;
 }
  
 
 G4bool G4StatMFMicroManager::operator!=(const G4StatMFMicroManager & right) const
 {
-	return true;
+    return true;
 }
 
 
 
 // constructor
 G4StatMFMicroManager::G4StatMFMicroManager(const G4Fragment & theFragment, const G4int multiplicity,
-														 const G4double FreeIntE, const G4double SCompNuc) : 
-	_Normalization(0.0)
+					   const G4double FreeIntE, const G4double SCompNuc) : 
+    _Normalization(0.0)
 {
-	// Perform class initialization
-	Initialize(theFragment,multiplicity,FreeIntE,SCompNuc);
+    // Perform class initialization
+    Initialize(theFragment,multiplicity,FreeIntE,SCompNuc);
 }
 
 
 // destructor
 G4StatMFMicroManager::~G4StatMFMicroManager() 
 {
-	_Partition.clearAndDestroy();
+    while (!_Partition.empty()) {
+	delete _Partition.back();
+	_Partition.pop_back();
+    }
 }
 
 
@@ -53,114 +85,114 @@ G4StatMFMicroManager::~G4StatMFMicroManager()
 // Initialization method
 
 void G4StatMFMicroManager::Initialize(const G4Fragment & theFragment, const G4int m, 
-												  const G4double FreeIntE, const G4double SCompNuc) 
+				      const G4double FreeIntE, const G4double SCompNuc) 
 {
-	G4int i;
+    G4int i;
 
-	G4double U = theFragment.GetExcitationEnergy();
+    G4double U = theFragment.GetExcitationEnergy();
 
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
 	
-	// Statistical weights
-	_WW = 0.0;
+    // Statistical weights
+    _WW = 0.0;
 
-	// Mean breakup multiplicity
-	_MeanMultiplicity = 0.0;
+    // Mean breakup multiplicity
+    _MeanMultiplicity = 0.0;
 
-	// Mean channel temperature
-	_MeanTemperature = 0.0;
+    // Mean channel temperature
+    _MeanTemperature = 0.0;
 
-	// Mean channel entropy
-	_MeanEntropy = 0.0;	
+    // Mean channel entropy
+    _MeanEntropy = 0.0;	
 	
-	// Keep fragment atomic numbers
+    // Keep fragment atomic numbers
 // 	G4int * FragmentAtomicNumbers = new G4int(G4int(A+0.5));
 //	G4int * FragmentAtomicNumbers = new G4int(m);
-	G4int FragmentAtomicNumbers[4];
+    G4int FragmentAtomicNumbers[4];
 	
-	// We distribute A nucleons between m fragments mantaining the order
-	// FragmentAtomicNumbers[m-1]>FragmentAtomicNumbers[m-2]>...>FragmentAtomicNumbers[0]
-	// Our initial distribution is 
-	// FragmentAtomicNumbers[m-1]=A, FragmentAtomicNumbers[m-2]=0, ..., FragmentAtomicNumbers[0]=0
-	FragmentAtomicNumbers[m-1] = G4int(A);
-	for (i = 0; i <  (m - 1); i++) FragmentAtomicNumbers[i] = 0;
+    // We distribute A nucleons between m fragments mantaining the order
+    // FragmentAtomicNumbers[m-1]>FragmentAtomicNumbers[m-2]>...>FragmentAtomicNumbers[0]
+    // Our initial distribution is 
+    // FragmentAtomicNumbers[m-1]=A, FragmentAtomicNumbers[m-2]=0, ..., FragmentAtomicNumbers[0]=0
+    FragmentAtomicNumbers[m-1] = G4int(A);
+    for (i = 0; i <  (m - 1); i++) FragmentAtomicNumbers[i] = 0;
 
-	// We try to distribute A nucleons in partitions of m fragments
-	// MakePartition return true if it is possible 
-	// and false if it is not	
-	while (MakePartition(m,FragmentAtomicNumbers)) {
-		// Allowed partitions are stored and its probability calculated
+    // We try to distribute A nucleons in partitions of m fragments
+    // MakePartition return true if it is possible 
+    // and false if it is not	
+    while (MakePartition(m,FragmentAtomicNumbers)) {
+	// Allowed partitions are stored and its probability calculated
 			
-			G4StatMFMicroPartition * aPartition = new G4StatMFMicroPartition(A,Z);
-			G4double PartitionProbability = 0.0;
+	G4StatMFMicroPartition * aPartition = new G4StatMFMicroPartition(A,Z);
+	G4double PartitionProbability = 0.0;
 			
-			for (i = m-1; i >= 0; i--) aPartition->SetPartitionFragment(FragmentAtomicNumbers[i]);
-			PartitionProbability = aPartition->CalcPartitionProbability(U,FreeIntE,SCompNuc);
-			_Partition.insert(aPartition);
+	for (i = m-1; i >= 0; i--) aPartition->SetPartitionFragment(FragmentAtomicNumbers[i]);
+	PartitionProbability = aPartition->CalcPartitionProbability(U,FreeIntE,SCompNuc);
+	_Partition.push_back(aPartition);
 			
-			_WW += PartitionProbability;
-			_MeanMultiplicity += m*PartitionProbability;
-			_MeanTemperature += aPartition->GetTemperature() * PartitionProbability;
-			if (PartitionProbability > 0.0) 
-							_MeanEntropy += PartitionProbability * aPartition->GetEntropy();
+	_WW += PartitionProbability;
+	_MeanMultiplicity += m*PartitionProbability;
+	_MeanTemperature += aPartition->GetTemperature() * PartitionProbability;
+	if (PartitionProbability > 0.0) 
+	    _MeanEntropy += PartitionProbability * aPartition->GetEntropy();
 			
-	}
+    }
 		
 	
-	// garbage collection
+    // garbage collection
 // 	delete [] FragmentAtomicNumbers;
 	
 }
 
 
 G4bool G4StatMFMicroManager::MakePartition(const G4int k, G4int * ANumbers)
-	// Distributes A nucleons between k fragments
-	// mantaining the order ANumbers[k-1] > ANumbers[k-2] > ... > ANumbers[0]
-	// If it is possible returns true. In other case returns false
+    // Distributes A nucleons between k fragments
+    // mantaining the order ANumbers[k-1] > ANumbers[k-2] > ... > ANumbers[0]
+    // If it is possible returns true. In other case returns false
 {
-	G4int l = 1;
-	while (l < k) {
-		G4int tmp = ANumbers[l-1] + ANumbers[k-1];
-		ANumbers[l-1] += 1;
-		ANumbers[k-1] -= 1;
-		if (ANumbers[l-1] > ANumbers[l] || ANumbers[k-2] > ANumbers[k-1]) {
-			ANumbers[l-1] = 1;
-			ANumbers[k-1] = tmp - 1;
-			l++;
-		} else return true;
-	}
-	return false;
+    G4int l = 1;
+    while (l < k) {
+	G4int tmp = ANumbers[l-1] + ANumbers[k-1];
+	ANumbers[l-1] += 1;
+	ANumbers[k-1] -= 1;
+	if (ANumbers[l-1] > ANumbers[l] || ANumbers[k-2] > ANumbers[k-1]) {
+	    ANumbers[l-1] = 1;
+	    ANumbers[k-1] = tmp - 1;
+	    l++;
+	} else return true;
+    }
+    return false;
 }
 
 
 
 void G4StatMFMicroManager::Normalize(const G4double Norm)
 {
-	_Normalization = Norm;
-	_WW /= Norm;
-	_MeanMultiplicity /= Norm;
-	_MeanTemperature /= Norm;
-	_MeanEntropy /= Norm; 
+    _Normalization = Norm;
+    _WW /= Norm;
+    _MeanMultiplicity /= Norm;
+    _MeanTemperature /= Norm;
+    _MeanEntropy /= Norm; 
 	
 // 	for (G4int i = 0; i < _Partition.entries(); i++) _Partition(i)->Normalize(Norm);
 	
-	return;
+    return;
 }
 
 G4StatMFChannel * G4StatMFMicroManager::ChooseChannel(const G4double A0, const G4double Z0, 
-																		const G4double MeanT)
+						      const G4double MeanT)
 {
-	G4double RandNumber = _Normalization * _WW * G4UniformRand();
-	G4double AccumWeight = 0.0;
+    G4double RandNumber = _Normalization * _WW * G4UniformRand();
+    G4double AccumWeight = 0.0;
 	
-	for (G4int i = 0; i < _Partition.entries(); i++) {
-			AccumWeight += _Partition(i)->GetProbability();
-			if (RandNumber < AccumWeight) 
-				return _Partition(i)->ChooseZ(A0,Z0,MeanT);
-	}
+    for (G4int i = 0; i < _Partition.size(); i++) {
+	AccumWeight += _Partition[i]->GetProbability();
+	if (RandNumber < AccumWeight) 
+	    return _Partition[i]->ChooseZ(A0,Z0,MeanT);
+    }
 
-	G4Exception
-		("G4StatMFMicroCanonical::ChooseChannel: Couldn't find a channel.");
-	return 0;
+    G4Exception
+	("G4StatMFMicroCanonical::ChooseChannel: Couldn't find a channel.");
+    return 0;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
index 28473e5bad..231f2fd2ad 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicroPartition.cc
@@ -1,13 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StatMFMicroPartition.cc,v 1.8 2000/08/03 08:47:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
+// $Id: G4StatMFMicroPartition.cc,v 1.9.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// by V. Lara
 // --------------------------------------------------------------------
 
 #include "G4StatMFMicroPartition.hh"
@@ -17,7 +34,7 @@
 // Copy constructor
 G4StatMFMicroPartition::G4StatMFMicroPartition(const G4StatMFMicroPartition & right)
 {
-	G4Exception("G4StatMFMicroPartition::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFMicroPartition::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -25,287 +42,287 @@ G4StatMFMicroPartition::G4StatMFMicroPartition(const G4StatMFMicroPartition & ri
 G4StatMFMicroPartition & G4StatMFMicroPartition::
 operator=(const G4StatMFMicroPartition & right)
 {
-	G4Exception("G4StatMFMicroPartition::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMicroPartition::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMicroPartition::operator==(const G4StatMFMicroPartition & right) const
 {
 //	G4Exception("G4StatMFMicroPartition::operator== meant to not be accessable");
-	return false;
+    return false;
 }
  
 
 G4bool G4StatMFMicroPartition::operator!=(const G4StatMFMicroPartition & right) const
 {
 //	G4Exception("G4StatMFMicroPartition::operator!= meant to not be accessable");
-	return true;
+    return true;
 }
 
 
 
 void G4StatMFMicroPartition::CoulombFreeEnergy(const G4double anA)
 {
-	// This Z independent factor in the Coulomb free energy 
-	G4double  CoulombConstFactor = 1.0/
-			pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);
+    // This Z independent factor in the Coulomb free energy 
+    G4double  CoulombConstFactor = 1.0/
+	pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);
 	
-	CoulombConstFactor = elm_coupling*(3./5.)*(1. - CoulombConstFactor)/
-										G4StatMFParameters::Getr0();
+    CoulombConstFactor = elm_coupling*(3./5.)*(1. - CoulombConstFactor)/
+	G4StatMFParameters::Getr0();
 
-	// We use the aproximation Z_f ~ Z/A * A_f
+    // We use the aproximation Z_f ~ Z/A * A_f
 										
-	if (anA == 0 || anA == 1) {
-			_theCoulombFreeEnergy.insert(CoulombConstFactor*(theZ/theA)*(theZ/theA));
-	} else if (anA == 2 || anA == 3 || anA == 4) {
-		// Z/A ~ 1/2
-		_theCoulombFreeEnergy.insert(CoulombConstFactor*0.5*
-												pow(anA,5./3.));
-	} else { // anA > 4
-		_theCoulombFreeEnergy.insert(CoulombConstFactor*(theZ/theA)*(theZ/theA)*
-												pow(anA,5./3.));	
+    if (anA == 0 || anA == 1) {
+	_theCoulombFreeEnergy.push_back(CoulombConstFactor*(theZ/theA)*(theZ/theA));
+    } else if (anA == 2 || anA == 3 || anA == 4) {
+	// Z/A ~ 1/2
+	_theCoulombFreeEnergy.push_back(CoulombConstFactor*0.5*
+					pow(anA,5./3.));
+    } else { // anA > 4
+	_theCoulombFreeEnergy.push_back(CoulombConstFactor*(theZ/theA)*(theZ/theA)*
+					pow(anA,5./3.));	
 												
-	}
+    }
 }
 
 
 G4double G4StatMFMicroPartition::GetCoulombEnergy(void)
 {
-	G4double  CoulombFactor = 1.0/
-			pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);	
+    G4double  CoulombFactor = 1.0/
+	pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);	
 			
-	G4double CoulombEnergy = elm_coupling*(3./5.)*theZ*theZ*CoulombFactor/
-							  		(G4StatMFParameters::Getr0()*pow(theA,1./3.));
+    G4double CoulombEnergy = elm_coupling*(3./5.)*theZ*theZ*CoulombFactor/
+	(G4StatMFParameters::Getr0()*pow(theA,1./3.));
 									
 									
-	for (G4int i = 0; i < _thePartition.entries(); i++) 
-			CoulombEnergy += _theCoulombFreeEnergy(i) - elm_coupling*(3./5.)*
-									(theZ/theA)*(theZ/theA)*pow(_thePartition(i),5./3.)/
-									G4StatMFParameters::Getr0();
+    for (G4int i = 0; i < _thePartition.size(); i++) 
+	CoulombEnergy += _theCoulombFreeEnergy[i] - elm_coupling*(3./5.)*
+	    (theZ/theA)*(theZ/theA)*pow(_thePartition[i],5./3.)/
+	    G4StatMFParameters::Getr0();
 									
 			
-	return CoulombEnergy;
+    return CoulombEnergy;
 }
 
 G4double G4StatMFMicroPartition::GetPartitionEnergy(const G4double T)
 {
-	G4double  CoulombFactor = 1.0/
-			pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);	
+    G4double  CoulombFactor = 1.0/
+	pow(1.0+G4StatMFParameters::GetKappaCoulomb(),1.0/3.0);	
 			
-	G4double PartitionEnergy = 0.0;
+    G4double PartitionEnergy = 0.0;
 	
 	
-	// We use the aprox that Z_f ~ Z/A * A_f
-	for (G4int i = 0; i < _thePartition.entries(); i++) {
-		if (_thePartition(i) == 0 || _thePartition(i) == 1) {
+    // We use the aprox that Z_f ~ Z/A * A_f
+    for (G4int i = 0; i < _thePartition.size(); i++) {
+	if (_thePartition[i] == 0 || _thePartition[i] == 1) {
 		
-			PartitionEnergy += _theCoulombFreeEnergy(i);
+	    PartitionEnergy += _theCoulombFreeEnergy[i];
 			
-		} else if (_thePartition(i) == 2) {
+	} else if (_thePartition[i] == 2) {
 			
-			PartitionEnergy +=	
-				-2.796 // Binding Energy of deuteron ??????
-				+ _theCoulombFreeEnergy(i);
+	    PartitionEnergy +=	
+		-2.796 // Binding Energy of deuteron ??????
+		+ _theCoulombFreeEnergy[i];
 				
-		} else if (_thePartition(i) == 3) {
+	} else if (_thePartition[i] == 3) {
 		
-			PartitionEnergy +=	
-				-9.224 // Binding Energy of trtion/He3 ??????
-				+ _theCoulombFreeEnergy(i);
+	    PartitionEnergy +=	
+		-9.224 // Binding Energy of trtion/He3 ??????
+		+ _theCoulombFreeEnergy[i];
 				
-		} else if (_thePartition(i) == 4) {
+	} else if (_thePartition[i] == 4) {
 		
-			PartitionEnergy +=
-				-30.11 // Binding Energy of ALPHA ??????
-				+ _theCoulombFreeEnergy(i) 
-				+ 4.*T*T/InvLevelDensity(4.);
+	    PartitionEnergy +=
+		-30.11 // Binding Energy of ALPHA ??????
+		+ _theCoulombFreeEnergy[i] 
+		+ 4.*T*T/InvLevelDensity(4.);
 																
-		} else {
+	} else {
 												
-			PartitionEnergy +=
-					//Volume term						
-					(- G4StatMFParameters::GetE0() + 
-					T*T/InvLevelDensity(_thePartition(i)))
-					*_thePartition(i) + 
+	    PartitionEnergy +=
+		//Volume term						
+		(- G4StatMFParameters::GetE0() + 
+		 T*T/InvLevelDensity(_thePartition[i]))
+		*_thePartition[i] + 
 					 
-					// Symmetry term
-					G4StatMFParameters::GetGamma0()*
-					(1.0-2.0*theZ/theA)*(1.0-2.0*theZ/theA)*_thePartition(i) +  
+		// Symmetry term
+		G4StatMFParameters::GetGamma0()*
+		(1.0-2.0*theZ/theA)*(1.0-2.0*theZ/theA)*_thePartition[i] +  
 					
-					// Surface term
-					(G4StatMFParameters::Beta(T) - T*G4StatMFParameters::DBetaDT(T))*
-					pow(_thePartition(i),2./3.) +
+		// Surface term
+		(G4StatMFParameters::Beta(T) - T*G4StatMFParameters::DBetaDT(T))*
+		pow(_thePartition[i],2./3.) +
 					
-					// Coulomb term 
-	     			_theCoulombFreeEnergy(i);
+		// Coulomb term 
+		_theCoulombFreeEnergy[i];
 						
-		}
 	}
+    }
 	
-	PartitionEnergy += elm_coupling*(3./5.)*theZ*theZ*CoulombFactor/
-							 (G4StatMFParameters::Getr0()*pow(theA,1./3.))
-							 + (3./2.)*T*(_thePartition.entries()-1);
+    PartitionEnergy += elm_coupling*(3./5.)*theZ*theZ*CoulombFactor/
+	(G4StatMFParameters::Getr0()*pow(theA,1./3.))
+	+ (3./2.)*T*(_thePartition.size()-1);
 							 
-	return PartitionEnergy;
+    return PartitionEnergy;
 }
 
 
 G4double G4StatMFMicroPartition::CalcPartitionTemperature(const G4double U,
-								const G4double FreeInternalE0)
+							  const G4double FreeInternalE0)
 {
-	G4double PartitionEnergy = GetPartitionEnergy(0.0);
+    G4double PartitionEnergy = GetPartitionEnergy(0.0);
 	
-	// If this happens, T = 0 MeV, which means that probability for this
-	// partition will be 0
-	if (abs(U + FreeInternalE0 - PartitionEnergy) < 0.003) return -1.0;
+    // If this happens, T = 0 MeV, which means that probability for this
+    // partition will be 0
+    if (abs(U + FreeInternalE0 - PartitionEnergy) < 0.003) return -1.0;
 	
-	// Calculate temperature by midpoint method
+    // Calculate temperature by midpoint method
 	
-	// Bracketing the solution
-	G4double Ta = 0.001;
-	G4double Tb = G4std::max(sqrt(8.0*U/theA),0.0012*MeV);
-	G4double Tmid = 0.0;
+    // Bracketing the solution
+    G4double Ta = 0.001;
+    G4double Tb = G4std::max(sqrt(8.0*U/theA),0.0012*MeV);
+    G4double Tmid = 0.0;
 	
-	G4double Da = (U + FreeInternalE0 - GetPartitionEnergy(Ta))/U;
-	G4double Db = (U + FreeInternalE0 - GetPartitionEnergy(Tb))/U;
+    G4double Da = (U + FreeInternalE0 - GetPartitionEnergy(Ta))/U;
+    G4double Db = (U + FreeInternalE0 - GetPartitionEnergy(Tb))/U;
 	
-	while (Da*Db > 0.0) {
-		Tb += 0.5*Tb; 	
-		Db = (U + FreeInternalE0 - GetPartitionEnergy(Tb))/U;
-	}
+    while (Da*Db > 0.0) {
+	Tb += 0.5*Tb; 	
+	Db = (U + FreeInternalE0 - GetPartitionEnergy(Tb))/U;
+    }
 	
-	G4double eps = 1.0e-14*abs(Ta-Tb);
+    G4double eps = 1.0e-14*abs(Ta-Tb);
 
-	for (G4int i = 0; i < 1000; i++) {
-		Tmid = (Ta+Tb)/2.0;
-		if (abs(Ta-Tb) <= eps) return Tmid;
-		G4double Dmid = (U + FreeInternalE0 - GetPartitionEnergy(Tmid))/U;
-		if (abs(Dmid) < 0.003) return Tmid;
-		if (Da*Dmid < 0.0) {
-      	Tb = Tmid;
-      	Db = Dmid;
+    for (G4int i = 0; i < 1000; i++) {
+	Tmid = (Ta+Tb)/2.0;
+	if (abs(Ta-Tb) <= eps) return Tmid;
+	G4double Dmid = (U + FreeInternalE0 - GetPartitionEnergy(Tmid))/U;
+	if (abs(Dmid) < 0.003) return Tmid;
+	if (Da*Dmid < 0.0) {
+	    Tb = Tmid;
+	    Db = Dmid;
     	} else {
-      	Ta = Tmid;
-      	Da = Dmid;
+	    Ta = Tmid;
+	    Da = Dmid;
     	} 
-	}
-	// if we arrive here the temperature could not be calculated
-	G4cerr << "G4StatMFMicroPartition::CalcPartitionTemperature: I can't calculate the temperature"  
-			<< G4endl;
-	// and set probability to 0 returning T < 0
-	return -1.0;
+    }
+    // if we arrive here the temperature could not be calculated
+    G4cerr << "G4StatMFMicroPartition::CalcPartitionTemperature: I can't calculate the temperature"  
+	   << G4endl;
+    // and set probability to 0 returning T < 0
+    return -1.0;
 	
 }
 
 
 G4double G4StatMFMicroPartition::CalcPartitionProbability(const G4double U,
-															const G4double FreeInternalE0,
-															const G4double SCompound)
+							  const G4double FreeInternalE0,
+							  const G4double SCompound)
 {	
-	G4double T = CalcPartitionTemperature(U,FreeInternalE0);
-	if ( T <= 0.0) return _Probability = 0.0;
-	_Temperature = T;
+    G4double T = CalcPartitionTemperature(U,FreeInternalE0);
+    if ( T <= 0.0) return _Probability = 0.0;
+    _Temperature = T;
 	
 
-	// Factorial of fragment multiplicity
-	G4double Fact = 1.0;
-	G4int i;
-	for (i = 0; i < _thePartition.entries() - 1; i++) {
-		G4double f = 1.0;
-		for (G4int ii = i+1; i< _thePartition.entries(); i++) 
-								if (_thePartition(i) == _thePartition(ii)) f++;
-		Fact *= f;
-	}
+    // Factorial of fragment multiplicity
+    G4double Fact = 1.0;
+    G4int i;
+    for (i = 0; i < _thePartition.size() - 1; i++) {
+	G4double f = 1.0;
+	for (G4int ii = i+1; i< _thePartition.size(); i++) 
+	    if (_thePartition[i] == _thePartition[ii]) f++;
+	Fact *= f;
+    }
 	
-	G4double ProbDegeneracy = 1.0;
-	G4double ProbA32 = 1.0;	
+    G4double ProbDegeneracy = 1.0;
+    G4double ProbA32 = 1.0;	
 	
-	for (i = 0; i < _thePartition.entries(); i++) {
-		ProbDegeneracy *= GetDegeneracyFactor(G4int(_thePartition(i)));
-   	ProbA32 *= G4double(_thePartition(i))*sqrt(G4double(_thePartition(i)));
-	}
+    for (i = 0; i < _thePartition.size(); i++) {
+	ProbDegeneracy *= GetDegeneracyFactor(G4int(_thePartition[i]));
+   	ProbA32 *= G4double(_thePartition[i])*sqrt(G4double(_thePartition[i]));
+    }
 	
-	// Compute entropy
-	G4double PartitionEntropy = 0.0;
-	for (i = 0; i < _thePartition.entries(); i++) {
-		// interaction entropy for alpha
-		if (_thePartition(i) == 4)  PartitionEntropy += 
-				2.0*T*_thePartition(i)/InvLevelDensity(_thePartition(i));
-		// interaction entropy for Af > 4
-		else if (_thePartition(i) > 4) PartitionEntropy += 
-				2.0*T*_thePartition(i)/InvLevelDensity(_thePartition(i)) -
-				G4StatMFParameters::DBetaDT(T)*pow(_thePartition(i),2.0/3.0);
-	}
+    // Compute entropy
+    G4double PartitionEntropy = 0.0;
+    for (i = 0; i < _thePartition.size(); i++) {
+	// interaction entropy for alpha
+	if (_thePartition[i] == 4)  PartitionEntropy += 
+					2.0*T*_thePartition[i]/InvLevelDensity(_thePartition[i]);
+	// interaction entropy for Af > 4
+	else if (_thePartition[i] > 4) PartitionEntropy += 
+					   2.0*T*_thePartition[i]/InvLevelDensity(_thePartition[i]) -
+					   G4StatMFParameters::DBetaDT(T)*pow(_thePartition[i],2.0/3.0);
+    }
 	
-	// Thermal Wave Lenght = sqrt(2 pi hbar^2 / nucleon_mass T)
-	G4double ThermalWaveLenght3 = 16.15*fermi/sqrt(T);
-	ThermalWaveLenght3 = ThermalWaveLenght3*ThermalWaveLenght3*ThermalWaveLenght3;
+    // Thermal Wave Lenght = sqrt(2 pi hbar^2 / nucleon_mass T)
+    G4double ThermalWaveLenght3 = 16.15*fermi/sqrt(T);
+    ThermalWaveLenght3 = ThermalWaveLenght3*ThermalWaveLenght3*ThermalWaveLenght3;
 	
-	// Translational Entropy
-	G4double kappa = (1. + elm_coupling*(pow(_thePartition.entries(),1./3.)-1.0)/(G4StatMFParameters::Getr0()*pow(theA,1./3.)));
-	kappa = kappa*kappa*kappa;
-	kappa -= 1.;
-	G4double V0 = (4./3.)*pi*theA*G4StatMFParameters::Getr0()*G4StatMFParameters::Getr0()*
-						G4StatMFParameters::Getr0();
-	G4double FreeVolume = kappa*V0;
-	G4double TranslationalS = G4std::max(0.0, log(ProbA32/Fact) +
-			(_thePartition.entries()-1.0)*log(FreeVolume/ThermalWaveLenght3) +
-			1.5*(_thePartition.entries()-1.0) - (3./2.)*log(theA));
+    // Translational Entropy
+    G4double kappa = (1. + elm_coupling*(pow(_thePartition.size(),1./3.)-1.0)/(G4StatMFParameters::Getr0()*pow(theA,1./3.)));
+    kappa = kappa*kappa*kappa;
+    kappa -= 1.;
+    G4double V0 = (4./3.)*pi*theA*G4StatMFParameters::Getr0()*G4StatMFParameters::Getr0()*
+	G4StatMFParameters::Getr0();
+    G4double FreeVolume = kappa*V0;
+    G4double TranslationalS = G4std::max(0.0, log(ProbA32/Fact) +
+					 (_thePartition.size()-1.0)*log(FreeVolume/ThermalWaveLenght3) +
+					 1.5*(_thePartition.size()-1.0) - (3./2.)*log(theA));
 
-	PartitionEntropy += log(ProbDegeneracy) + TranslationalS;
-	_Entropy = PartitionEntropy;
+    PartitionEntropy += log(ProbDegeneracy) + TranslationalS;
+    _Entropy = PartitionEntropy;
 	
-	// And finally compute probability of fragment configuration
-	return _Probability = exp(PartitionEntropy-SCompound);
+    // And finally compute probability of fragment configuration
+    return _Probability = exp(PartitionEntropy-SCompound);
 }
 
 
 
 G4double G4StatMFMicroPartition::GetDegeneracyFactor(const G4int A)
 {
-	// Degeneracy factors are statistical factors
-	// DegeneracyFactor for nucleon is (2S_n + 1)(2I_n + 1) = 4
-	G4double DegFactor = 0;
-	if (A > 4) DegFactor = 1.0;
-	else if (A == 1) DegFactor = 4.0;     // nucleon
-	else if (A == 2) DegFactor = 3.0;     // Deuteron
-	else if (A == 3) DegFactor = 2.0+2.0; // Triton + He3
-	else if (A == 4) DegFactor = 1.0;     // alpha
-	return DegFactor;
+    // Degeneracy factors are statistical factors
+    // DegeneracyFactor for nucleon is (2S_n + 1)(2I_n + 1) = 4
+    G4double DegFactor = 0;
+    if (A > 4) DegFactor = 1.0;
+    else if (A == 1) DegFactor = 4.0;     // nucleon
+    else if (A == 2) DegFactor = 3.0;     // Deuteron
+    else if (A == 3) DegFactor = 2.0+2.0; // Triton + He3
+    else if (A == 4) DegFactor = 1.0;     // alpha
+    return DegFactor;
 }
 
 
 G4StatMFChannel * G4StatMFMicroPartition::ChooseZ(const G4double A0, const G4double Z0, const G4double MeanT)
-	// Gives fragments charges
+    // Gives fragments charges
 {
-	G4RWTValOrderedVector<G4int> FragmentsZ;
+    G4std::vector<G4int> FragmentsZ;
 
-	G4int ZBalance = 0;
-	do {
-		G4double CC = G4StatMFParameters::GetGamma0()*8.0;
-		G4int SumZ = 0;
-		for (G4int i = 0; i < _thePartition.length(); i++) {
-			G4double ZMean;
-			G4double Af = _thePartition(i);
-			if (Af > 1.5 && Af < 4.5) ZMean = 0.5*Af;
-			else ZMean = Af*Z0/A0;
-			G4double ZDispersion = sqrt(Af * MeanT/CC);
-			G4int Zf;
-			do {
-				Zf = G4int(G4RandGauss::shoot(ZMean,ZDispersion));
-			} while (Zf < 0 || Zf > Af);
-			FragmentsZ.insert(Zf);
-			SumZ += Zf;
-		}
-		ZBalance = G4int(Z0) - SumZ;
-	} while (abs(ZBalance) > 1.1);
-	FragmentsZ(0) += ZBalance;
+    G4int ZBalance = 0;
+    do {
+	G4double CC = G4StatMFParameters::GetGamma0()*8.0;
+	G4int SumZ = 0;
+	for (G4int i = 0; i < _thePartition.size(); i++) {
+	    G4double ZMean;
+	    G4double Af = _thePartition[i];
+	    if (Af > 1.5 && Af < 4.5) ZMean = 0.5*Af;
+	    else ZMean = Af*Z0/A0;
+	    G4double ZDispersion = sqrt(Af * MeanT/CC);
+	    G4int Zf;
+	    do {
+		Zf = G4int(G4RandGauss::shoot(ZMean,ZDispersion));
+	    } while (Zf < 0 || Zf > Af);
+	    FragmentsZ.push_back(Zf);
+	    SumZ += Zf;
+	}
+	ZBalance = G4int(Z0) - SumZ;
+    } while (abs(ZBalance) > 1.1);
+    FragmentsZ[0] += ZBalance;
 	
-	G4StatMFChannel * theChannel = new G4StatMFChannel;
-	for (G4int i = 0; i < _thePartition.length(); i++) 
-		theChannel->CreateFragment(_thePartition(i),FragmentsZ(i));
+    G4StatMFChannel * theChannel = new G4StatMFChannel;
+    for (G4int i = 0; i < _thePartition.size(); i++) 
+	theChannel->CreateFragment(_thePartition[i],FragmentsZ[i]);
 	
 	
-	return theChannel;
+    return theChannel;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
index bba22fd156..cfc3516c04 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFMicrocanonical.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFMicroCanonical.cc,v 1.5.2.1 2001/06/28 19:13:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFMicroCanonical.hh"
 
@@ -5,9 +34,9 @@
 
 // Copy constructor
 G4StatMFMicroCanonical::G4StatMFMicroCanonical(const G4StatMFMicroCanonical &
-															right)
+					       right)
 {
-	G4Exception("G4StatMFMicroCanonical::copy_constructor meant to not be accessable");
+    G4Exception("G4StatMFMicroCanonical::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -15,22 +44,22 @@ G4StatMFMicroCanonical::G4StatMFMicroCanonical(const G4StatMFMicroCanonical &
 G4StatMFMicroCanonical & G4StatMFMicroCanonical::
 operator=(const G4StatMFMicroCanonical & right)
 {
-	G4Exception("G4StatMFMicroCanonical::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4StatMFMicroCanonical::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4StatMFMicroCanonical::operator==(const G4StatMFMicroCanonical & right) const
 {
-	G4Exception("G4StatMFMicroCanonical::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4StatMFMicroCanonical::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4StatMFMicroCanonical::operator!=(const G4StatMFMicroCanonical & right) const
 {
-	G4Exception("G4StatMFMicroCanonical::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4StatMFMicroCanonical::operator!= meant to not be accessable");
+    return true;
 }
 
 
@@ -38,8 +67,8 @@ G4bool G4StatMFMicroCanonical::operator!=(const G4StatMFMicroCanonical & right)
 // constructor
 G4StatMFMicroCanonical::G4StatMFMicroCanonical(const G4Fragment & theFragment) 
 {
-	// Perform class initialization
-	Initialize(theFragment);
+    // Perform class initialization
+    Initialize(theFragment);
 
 }
 
@@ -47,8 +76,12 @@ G4StatMFMicroCanonical::G4StatMFMicroCanonical(const G4Fragment & theFragment)
 // destructor
 G4StatMFMicroCanonical::~G4StatMFMicroCanonical() 
 {
-	// garbage collection
-	_ThePartitionManagerVector.clearAndDestroy();
+    // garbage collection
+//    _ThePartitionManagerVector.clearAndDestroy();
+    while (!_ThePartitionManagerVector.empty()) {
+	delete _ThePartitionManagerVector.back();
+	_ThePartitionManagerVector.pop_back();
+    }
 }
 
 
@@ -58,87 +91,87 @@ G4StatMFMicroCanonical::~G4StatMFMicroCanonical()
 void G4StatMFMicroCanonical::Initialize(const G4Fragment & theFragment) 
 {
 
-	G4int i;
+    G4int i;
   
-	// Excitation Energy 
-	G4double U = theFragment.GetExcitationEnergy();
+    // Excitation Energy 
+    G4double U = theFragment.GetExcitationEnergy();
   
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
 
-	// Configuration temperature
-	G4double TConfiguration = sqrt(8.0*U/A);
+    // Configuration temperature
+    G4double TConfiguration = sqrt(8.0*U/A);
 	
-	// Free internal energy at Temperature T = 0
-	__FreeInternalE0 = A*( 
-			// Volume term (for T = 0)
-			-G4StatMFParameters::GetE0() +  
-			// Symmetry term
-			G4StatMFParameters::GetGamma0()*(1.0-2.0*Z/A)*(1.0-2.0*Z/A) 
-			) + 
-			// Surface term (for T = 0)
-    		G4StatMFParameters::GetBeta0()*pow(A,2.0/3.0) + 
-			// Coulomb term 
-    		elm_coupling*(3.0/5.0)*Z*Z/(G4StatMFParameters::Getr0()*pow(A,1.0/3.0));
+    // Free internal energy at Temperature T = 0
+    __FreeInternalE0 = A*( 
+	// Volume term (for T = 0)
+	-G4StatMFParameters::GetE0() +  
+	// Symmetry term
+	G4StatMFParameters::GetGamma0()*(1.0-2.0*Z/A)*(1.0-2.0*Z/A) 
+	) + 
+	// Surface term (for T = 0)
+	G4StatMFParameters::GetBeta0()*pow(A,2.0/3.0) + 
+	// Coulomb term 
+	elm_coupling*(3.0/5.0)*Z*Z/(G4StatMFParameters::Getr0()*pow(A,1.0/3.0));
   
-	// Statistical weight
-	G4double W = 0.0;
+    // Statistical weight
+    G4double W = 0.0;
 
 
-	// Mean breakup multiplicity
-	__MeanMultiplicity = 0.0;
+    // Mean breakup multiplicity
+    __MeanMultiplicity = 0.0;
 
-	// Mean channel temperature
-	__MeanTemperature = 0.0;
+    // Mean channel temperature
+    __MeanTemperature = 0.0;
 
-	// Mean channel entropy
-	__MeanEntropy = 0.0;
+    // Mean channel entropy
+    __MeanEntropy = 0.0;
 
-	// Calculate entropy of compound nucleus
-	G4double SCompoundNucleus = CalcEntropyOfCompoundNucleus(theFragment,TConfiguration);
+    // Calculate entropy of compound nucleus
+    G4double SCompoundNucleus = CalcEntropyOfCompoundNucleus(theFragment,TConfiguration);
   
-	// Statistical weight of compound nucleus
-	_WCompoundNucleus = 1.0; // exp(SCompoundNucleus - SCompoundNucleus);
+    // Statistical weight of compound nucleus
+    _WCompoundNucleus = 1.0; // exp(SCompoundNucleus - SCompoundNucleus);
   
-	W += _WCompoundNucleus;
+    W += _WCompoundNucleus;
 
 
 
-	// Maximal fragment multiplicity allowed in direct simulation
-	G4int MaxMult = G4StatMFMicroCanonical::MaxAllowedMultiplicity;
-	if (A > 110) MaxMult -= 1;
+    // Maximal fragment multiplicity allowed in direct simulation
+    G4int MaxMult = G4StatMFMicroCanonical::MaxAllowedMultiplicity;
+    if (A > 110) MaxMult -= 1;
 
 
 
-	for (G4int m = 2; m <= MaxMult; m++) {
-		G4StatMFMicroManager * aMicroManager = 
-			new G4StatMFMicroManager(theFragment,m,__FreeInternalE0,SCompoundNucleus);
-		_ThePartitionManagerVector.insert(aMicroManager);
-	}
+    for (G4int m = 2; m <= MaxMult; m++) {
+	G4StatMFMicroManager * aMicroManager = 
+	    new G4StatMFMicroManager(theFragment,m,__FreeInternalE0,SCompoundNucleus);
+	_ThePartitionManagerVector.push_back(aMicroManager);
+    }
 
-	// W is the total probability
-	for (i = 0; i < _ThePartitionManagerVector.entries(); i++) {
-		W += _ThePartitionManagerVector(i)->GetProbability();
-	}
+    // W is the total probability
+    for (i = 0; i < _ThePartitionManagerVector.size(); i++) {
+	W += _ThePartitionManagerVector[i]->GetProbability();
+    }
 
-	// Normalization of statistical weights
-	for (i = 0; i < _ThePartitionManagerVector.entries(); i++) {
-		_ThePartitionManagerVector(i)->Normalize(W);
-	}
-	_WCompoundNucleus /= W;
+    // Normalization of statistical weights
+    for (i = 0; i < _ThePartitionManagerVector.size(); i++) {
+	_ThePartitionManagerVector[i]->Normalize(W);
+    }
+    _WCompoundNucleus /= W;
 
-	__MeanMultiplicity += 1.0 * _WCompoundNucleus;
-	__MeanTemperature += TConfiguration * _WCompoundNucleus;
-	__MeanEntropy += SCompoundNucleus * _WCompoundNucleus;
+    __MeanMultiplicity += 1.0 * _WCompoundNucleus;
+    __MeanTemperature += TConfiguration * _WCompoundNucleus;
+    __MeanEntropy += SCompoundNucleus * _WCompoundNucleus;
 
 	
-	for (i = 0; i < _ThePartitionManagerVector.entries(); i++) {
-		__MeanMultiplicity += _ThePartitionManagerVector(i)->GetMeanMultiplicity();
-		__MeanTemperature += _ThePartitionManagerVector(i)->GetMeanTemperature();
-		__MeanEntropy += _ThePartitionManagerVector(i)->GetMeanEntropy();
-	}
+    for (i = 0; i < _ThePartitionManagerVector.size(); i++) {
+	__MeanMultiplicity += _ThePartitionManagerVector[i]->GetMeanMultiplicity();
+	__MeanTemperature += _ThePartitionManagerVector[i]->GetMeanTemperature();
+	__MeanEntropy += _ThePartitionManagerVector[i]->GetMeanEntropy();
+    }
 	
-	return;
+    return;
 }
 
 
@@ -146,124 +179,124 @@ void G4StatMFMicroCanonical::Initialize(const G4Fragment & theFragment)
 
 
 G4double G4StatMFMicroCanonical::CalcFreeInternalEnergy(const G4Fragment & theFragment, 
-																		 const G4double T)
+							const G4double T)
 {
-	G4double A = theFragment.GetA();
-	G4double Z = theFragment.GetZ();
-	G4double A13 = pow(A,1.0/3.0);
+    G4double A = theFragment.GetA();
+    G4double Z = theFragment.GetZ();
+    G4double A13 = pow(A,1.0/3.0);
   	
-  	G4double InvLevelDensityPar = G4StatMFParameters::GetEpsilon0()*(1.0 + 3.0/(A-1.0));
+    G4double InvLevelDensityPar = G4StatMFParameters::GetEpsilon0()*(1.0 + 3.0/(A-1.0));
 	
-	G4double VolumeTerm = (-G4StatMFParameters::GetE0()+T*T/InvLevelDensityPar)*A;
+    G4double VolumeTerm = (-G4StatMFParameters::GetE0()+T*T/InvLevelDensityPar)*A;
 
-	G4double SymmetryTerm = G4StatMFParameters::GetGamma0()*(A - 2.0*Z)*(A - 2.0*Z)/A;
+    G4double SymmetryTerm = G4StatMFParameters::GetGamma0()*(A - 2.0*Z)*(A - 2.0*Z)/A;
 
-	G4double SurfaceTerm = (G4StatMFParameters::Beta(T)-T*G4StatMFParameters::DBetaDT(T))*A13*A13;
+    G4double SurfaceTerm = (G4StatMFParameters::Beta(T)-T*G4StatMFParameters::DBetaDT(T))*A13*A13;
 
-	G4double CoulombTerm = elm_coupling*(3.0/5.0)*Z*Z/(G4StatMFParameters::Getr0()*A13);
+    G4double CoulombTerm = elm_coupling*(3.0/5.0)*Z*Z/(G4StatMFParameters::Getr0()*A13);
 
-	return VolumeTerm + SymmetryTerm + SurfaceTerm + CoulombTerm;
+    return VolumeTerm + SymmetryTerm + SurfaceTerm + CoulombTerm;
 }
 
 
 
 G4double G4StatMFMicroCanonical::CalcEntropyOfCompoundNucleus(const G4Fragment & theFragment,G4double & TConf)
-  // Calculates Temperature and Entropy of compound nucleus
+    // Calculates Temperature and Entropy of compound nucleus
 {
-	const G4double A = theFragment.GetA();
-	const G4double Z = theFragment.GetZ();
-	const G4double U = theFragment.GetExcitationEnergy();
-	const G4double A13 = pow(A,1.0/3.0);
+    const G4double A = theFragment.GetA();
+    const G4double Z = theFragment.GetZ();
+    const G4double U = theFragment.GetExcitationEnergy();
+    const G4double A13 = pow(A,1.0/3.0);
 
-	G4double Ta = G4std::max(sqrt(U/(0.125*A)),0.0012*MeV); 
-	G4double Tb = Ta;
+    G4double Ta = G4std::max(sqrt(U/(0.125*A)),0.0012*MeV); 
+    G4double Tb = Ta;
   
-	G4double ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Ta);
-	G4double Da = (U+__FreeInternalE0-ECompoundNucleus)/U;
-	G4double Db = 0.0;
+    G4double ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Ta);
+    G4double Da = (U+__FreeInternalE0-ECompoundNucleus)/U;
+    G4double Db = 0.0;
 
 
-	G4double InvLevelDensity = CalcInvLevelDensity(A);
+    G4double InvLevelDensity = CalcInvLevelDensity(A);
 
 
-	// bracketing the solution
-	if (Da == 0.0) {
-		TConf = Ta;
-		return 2*Ta*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Ta)*A13*A13;
-	} else if (Da < 0.0) {
-		do {
-			Tb -= 0.5*Tb;
-			ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tb);
-			Db = (U+__FreeInternalE0-ECompoundNucleus)/U;
-		} while (Db < 0.0);
+    // bracketing the solution
+    if (Da == 0.0) {
+	TConf = Ta;
+	return 2*Ta*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Ta)*A13*A13;
+    } else if (Da < 0.0) {
+	do {
+	    Tb -= 0.5*Tb;
+	    ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tb);
+	    Db = (U+__FreeInternalE0-ECompoundNucleus)/U;
+	} while (Db < 0.0);
+    } else {
+	do {
+	    Tb += 0.5*Tb;
+	    ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tb);
+	    Db = (U+__FreeInternalE0-ECompoundNucleus)/U;
+	} while (Db > 0.0);
+    }
+    
+
+    G4double eps = 1.0e-14 * abs(Tb-Ta);
+
+    for (G4int i = 0; i < 1000; i++) {
+	G4double Tc = (Ta+Tb)/2.0;
+	if (abs(Ta-Tb) <= eps) {
+	    TConf = Tc;
+	    return 2*Tc*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Tc)*A13*A13;
+	}
+	ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tc);
+	G4double Dc = (U+__FreeInternalE0-ECompoundNucleus)/U;
+
+	if (Dc == 0.0) {
+	    TConf = Tc;
+	    return 2*Tc*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Tc)*A13*A13;
+	}
+    
+	if (Da*Dc < 0.0) {
+	    Tb = Tc;
+	    Db = Dc;
 	} else {
-		do {
-			Tb += 0.5*Tb;
-			ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tb);
-			Db = (U+__FreeInternalE0-ECompoundNucleus)/U;
-		} while (Db > 0.0);
-	}
-    
+	    Ta = Tc;
+	    Da = Dc;
+	} 
+    }
 
-	G4double eps = 1.0e-14 * abs(Tb-Ta);
+    G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << G4endl;
 
-	for (G4int i = 0; i < 1000; i++) {
-		G4double Tc = (Ta+Tb)/2.0;
-		if (abs(Ta-Tb) <= eps) {
-			TConf = Tc;
-			return 2*Tc*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Tc)*A13*A13;
-		}
-		ECompoundNucleus = CalcFreeInternalEnergy(theFragment,Tc);
-		G4double Dc = (U+__FreeInternalE0-ECompoundNucleus)/U;
-
-		if (Dc == 0.0) {
-			TConf = Tc;
-			return 2*Tc*A/InvLevelDensity - G4StatMFParameters::DBetaDT(Tc)*A13*A13;
-		}
-    
-		if (Da*Dc < 0.0) {
-			Tb = Tc;
-			Db = Dc;
-		} else {
-			Ta = Tc;
-			Da = Dc;
-		} 
-	}
-
-	G4cerr << "G4StatMFMicrocanoncal::CalcEntropyOfCompoundNucleus: I can't calculate the temperature" << G4endl;
-
-	return 0.0;
+    return 0.0;
 }
 
 
 
 
 G4StatMFChannel *  G4StatMFMicroCanonical::ChooseAandZ(const G4Fragment & theFragment)
-	// Choice of fragment atomic numbers and charges 
+    // Choice of fragment atomic numbers and charges 
 {
-	// We choose a multiplicity (1,2,3,...) and then a channel
-	G4double RandNumber = G4UniformRand();
+    // We choose a multiplicity (1,2,3,...) and then a channel
+    G4double RandNumber = G4UniformRand();
 
-	if (RandNumber < _WCompoundNucleus) { 
+    if (RandNumber < _WCompoundNucleus) { 
 	
-		G4StatMFChannel * aChannel = new G4StatMFChannel;
-		aChannel->CreateFragment(theFragment.GetA(),theFragment.GetZ());
-		return aChannel;
+	G4StatMFChannel * aChannel = new G4StatMFChannel;
+	aChannel->CreateFragment(theFragment.GetA(),theFragment.GetZ());
+	return aChannel;
 	
-	} else {
+    } else {
 	
-		G4double AccumWeight = _WCompoundNucleus;
-		for (G4int i = 1; i <= _ThePartitionManagerVector.entries(); i++) {
-			AccumWeight += _ThePartitionManagerVector(i-1)->GetProbability();
-			if (RandNumber < AccumWeight) {
-				return _ThePartitionManagerVector(i-1)->
-					ChooseChannel(theFragment.GetA(),theFragment.GetZ(),__MeanTemperature);
-			}
-		}
-		G4Exception("G4StatMFMicroCanonical::ChooseAandZ: wrong normalization!");
+	G4double AccumWeight = _WCompoundNucleus;
+	for (G4int i = 1; i <= _ThePartitionManagerVector.size(); i++) {
+	    AccumWeight += _ThePartitionManagerVector[i-1]->GetProbability();
+	    if (RandNumber < AccumWeight) {
+		return _ThePartitionManagerVector[i-1]->
+		    ChooseChannel(theFragment.GetA(),theFragment.GetZ(),__MeanTemperature);
+	    }
 	}
+	G4Exception("G4StatMFMicroCanonical::ChooseAandZ: wrong normalization!");
+    }
 
-	return 0;	
+    return 0;	
 }
 
 
@@ -271,9 +304,9 @@ G4StatMFChannel *  G4StatMFMicroCanonical::ChooseAandZ(const G4Fragment & theFra
 
 G4double G4StatMFMicroCanonical::CalcInvLevelDensity(const G4int anA)
 {
-	// Calculate Inverse Density Level
-	// Epsilon0*(1 + 3 /(Af - 1))
-	if (anA == 1) return 0.0;
-	else return
-		G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(anA - 1.0));
+    // Calculate Inverse Density Level
+    // Epsilon0*(1 + 3 /(Af - 1))
+    if (anA == 1) return 0.0;
+    else return
+	     G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(anA - 1.0));
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFParameters.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFParameters.cc
index f628048161..15fd0501f6 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFParameters.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4StatMFParameters.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4StatMFParameters.cc,v 1.3.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 
 #include "G4StatMFParameters.hh"
 
@@ -23,27 +52,27 @@ const G4double G4StatMFParameters::_r0 = 1.17*fermi;
 
 G4double G4StatMFParameters::Beta(const G4double T)
 {
-	if (T > _CriticalTemp) return 0.0;
-	else {
-		G4double CriticalTempSqr = _CriticalTemp*_CriticalTemp;
-		G4double TempSqr = T*T;
-		G4double tmp = (CriticalTempSqr-TempSqr)/(CriticalTempSqr+TempSqr);
+    if (T > _CriticalTemp) return 0.0;
+    else {
+	G4double CriticalTempSqr = _CriticalTemp*_CriticalTemp;
+	G4double TempSqr = T*T;
+	G4double tmp = (CriticalTempSqr-TempSqr)/(CriticalTempSqr+TempSqr);
 		
-		return _Beta0*tmp*pow(tmp,1.0/4.0);
-	}
+	return _Beta0*tmp*pow(tmp,1.0/4.0);
+    }
 }
 
 G4double G4StatMFParameters::DBetaDT(const G4double T) 
 {
-	if (T > _CriticalTemp) return 0.0;
-	else {
-		G4double CriticalTempSqr = _CriticalTemp*_CriticalTemp;
-		G4double TempSqr = T*T;
-		G4double tmp = (CriticalTempSqr-TempSqr)/(CriticalTempSqr+TempSqr);
+    if (T > _CriticalTemp) return 0.0;
+    else {
+	G4double CriticalTempSqr = _CriticalTemp*_CriticalTemp;
+	G4double TempSqr = T*T;
+	G4double tmp = (CriticalTempSqr-TempSqr)/(CriticalTempSqr+TempSqr);
 		
-		return -5.0*_Beta0*pow(tmp,1.0/4.0)*(CriticalTempSqr*T)/
-				((CriticalTempSqr+TempSqr)*(CriticalTempSqr+TempSqr));
-	}
+	return -5.0*_Beta0*pow(tmp,1.0/4.0)*(CriticalTempSqr*T)/
+	    ((CriticalTempSqr+TempSqr)*(CriticalTempSqr+TempSqr));
+    }
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
index 3fde34b738..3ca7799e61 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TritonCoulombBarrier.cc,v 1.1 2000/06/09 11:43:36 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TritonCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -16,43 +32,43 @@
 
 G4TritonCoulombBarrier::G4TritonCoulombBarrier(const G4TritonCoulombBarrier & right)
 {
-  G4Exception("G4TritonCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4TritonCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4TritonCoulombBarrier & G4TritonCoulombBarrier::operator=(const G4TritonCoulombBarrier & right)
 {
- G4Exception("G4TritonCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4TritonCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4TritonCoulombBarrier::operator==(const G4TritonCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4TritonCoulombBarrier::operator!=(const G4TritonCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
 
 G4double G4TritonCoulombBarrier::BarrierPenetrationFactor(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
-	// const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
-	// 
-	// K for Triton is K for protons + 0.12
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}
-	return K+0.12;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // const G4double Zlist[size] = {10.0, 20.0, 30.0, 50.0, 70.0};
+    // const G4double Kprot[size] = {0.42, 0.58, 0.68, 0.77, 0.80};
+    // 
+    // K for Triton is K for protons + 0.12
+    G4double K = 1.0;
+    if (aZ>=70.0) {
+	K = 0.80;
+    } else {
+	K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
+    }
+    return K+0.12;
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationChannel.cc
index 3f756d113a..dc2402a47c 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TritonEvaporationChannel.cc,v 1.2.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov. 1999)
@@ -12,25 +31,24 @@
 #include "G4TritonEvaporationChannel.hh"
 
 
-const G4TritonEvaporationChannel & G4TritonEvaporationChannel::operator=(const G4TritonEvaporationChannel & right)
+const G4TritonEvaporationChannel & G4TritonEvaporationChannel::
+operator=(const G4TritonEvaporationChannel & right)
 {
-	G4Exception("G4TritonEvaporationChannel::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4TritonEvaporationChannel::operator= meant to not be accessable");
+    return *this;
 }
 
 G4TritonEvaporationChannel::G4TritonEvaporationChannel(const G4TritonEvaporationChannel & right)
 {
-	G4Exception("G4TritonEvaporationChannel::CopyConstructor meant to not be accessable");
+    G4Exception("G4TritonEvaporationChannel::CopyConstructor meant to not be accessable");
 }
 
 G4bool G4TritonEvaporationChannel::operator==(const G4TritonEvaporationChannel & right) const 
 {
-	return (this == (G4TritonEvaporationChannel *) &right);
-	//  return false;
+    return (this == (G4TritonEvaporationChannel *) &right);
 }
 
 G4bool G4TritonEvaporationChannel::operator!=(const G4TritonEvaporationChannel & right) const 
 {
-	return (this != (G4TritonEvaporationChannel *) &right);
-	//  return true;
+    return (this != (G4TritonEvaporationChannel *) &right);
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationProbability.cc
index eef972ecff..6089dcc9b9 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4TritonEvaporationProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TritonEvaporationProbability.cc,v 1.2.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1999)
@@ -13,43 +32,43 @@
 #include "G4TritonEvaporationProbability.hh"
 
 G4TritonEvaporationProbability::G4TritonEvaporationProbability() :
-		G4EvaporationProbability(3,1,6) // A,Z,Gamma
+    G4EvaporationProbability(3,1,6) // A,Z,Gamma
 {
-	const G4int NumExcitedStates = 31+1;
-	ExcitEnergies.reshape(NumExcitedStates);
-	ExcitSpins.reshape(NumExcitedStates);
-	for (G4int i = 0; i < NumExcitedStates; i++) {
-		ExcitEnergies(i) = 0.0;
-		ExcitSpins(i) = 0;
-	}
+    G4std::vector<G4double>::size_type NumExcitedStatesEnergy = 31+1;
+    G4std::vector<G4int>::size_type NumExcitedStatesSpin = 31+1;
+    ExcitEnergies.reserve(NumExcitedStatesEnergy);
+    ExcitSpins.reserve(NumExcitedStatesSpin);
+    ExcitEnergies.insert(ExcitEnergies.begin(),NumExcitedStatesEnergy,0.0);
+    ExcitSpins.insert(ExcitSpins.begin(),NumExcitedStatesSpin,0.0);
+
 	
-	ExcitEnergies(15) = 6.26*MeV;
-	ExcitEnergies(17) = 3.59*MeV;
-	ExcitEnergies(18) = 6.76*MeV;
-	ExcitEnergies(20) = 6.34*MeV;
-	ExcitEnergies(23) = 7.34*MeV;
-	ExcitEnergies(25) = 5.11*MeV;
-	ExcitEnergies(26) = 7.57*MeV;
-	ExcitEnergies(28) = 7.28*MeV;
-	ExcitEnergies(31) = 4.46*MeV;
+    ExcitEnergies[15] = 6.26*MeV;
+    ExcitEnergies[17] = 3.59*MeV;
+    ExcitEnergies[18] = 6.76*MeV;
+    ExcitEnergies[20] = 6.34*MeV;
+    ExcitEnergies[23] = 7.34*MeV;
+    ExcitEnergies[25] = 5.11*MeV;
+    ExcitEnergies[26] = 7.57*MeV;
+    ExcitEnergies[28] = 7.28*MeV;
+    ExcitEnergies[31] = 4.46*MeV;
 
-	ExcitSpins(15) = 5;
-	ExcitSpins(17) = 5;
-	ExcitSpins(18) = 10;
-	ExcitSpins(20) = 2;
-	ExcitSpins(23) = 5;
-	ExcitSpins(25) = 5;
-	ExcitSpins(26) = 8;
-	ExcitSpins(28) = 8;
-	ExcitSpins(31) = 3;
+    ExcitSpins[15] = 5;
+    ExcitSpins[17] = 5;
+    ExcitSpins[18] = 10;
+    ExcitSpins[20] = 2;
+    ExcitSpins[23] = 5;
+    ExcitSpins[25] = 5;
+    ExcitSpins[26] = 8;
+    ExcitSpins[28] = 8;
+    ExcitSpins[31] = 3;
 
-	SetExcitationEnergiesPtr(&ExcitEnergies);
-	SetExcitationSpinsPtr(&ExcitSpins);	
+    SetExcitationEnergiesPtr(&ExcitEnergies);
+    SetExcitationSpinsPtr(&ExcitSpins);	
 }
 
 G4TritonEvaporationProbability::G4TritonEvaporationProbability(const G4TritonEvaporationProbability &right)
 {
- G4Exception("G4TritonEvaporationProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4TritonEvaporationProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -58,39 +77,39 @@ G4TritonEvaporationProbability::G4TritonEvaporationProbability(const G4TritonEva
 const G4TritonEvaporationProbability & G4TritonEvaporationProbability::
 operator=(const G4TritonEvaporationProbability &right)
 {
-  G4Exception("G4TritonEvaporationProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4TritonEvaporationProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4TritonEvaporationProbability::operator==(const G4TritonEvaporationProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4TritonEvaporationProbability::operator!=(const G4TritonEvaporationProbability &right) const
 {
-  return true;
+    return true;
 }
 
 G4double G4TritonEvaporationProbability::CCoeficient(const G4double aZ) const
 {
-	// Data comes from 
-	// Dostrovsky, Fraenkel and Friedlander
-	// Physical Review, vol 116, num. 3 1959
-	// 
-	// const G4int size = 5;
-	// G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
-	// G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
-	// C for triton is equal to C for protons divided by 3
-	G4double C = 0.0;
+    // Data comes from 
+    // Dostrovsky, Fraenkel and Friedlander
+    // Physical Review, vol 116, num. 3 1959
+    // 
+    // const G4int size = 5;
+    // G4double Zlist[5] = { 10.0, 20.0, 30.0, 50.0, 70.0};
+    // G4double Cp[5] = { 0.50, 0.28, 0.20, 0.15, 0.10};
+    // C for triton is equal to C for protons divided by 3
+    G4double C = 0.0;
 	
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}
+    if (aZ >= 70) {
+	C = 0.10;
+    } else {
+	C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+    }
 	
-	return C/3.0;
+    return C/3.0;
 	
 }
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4UnstableFermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4UnstableFermiFragment.cc
index 6ddb43809d..bc250e87d3 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4UnstableFermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4UnstableFermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4UnstableFermiFragment.cc,v 1.4.2.1 2001/06/28 19:13:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -44,13 +63,14 @@ G4bool G4UnstableFermiFragment::operator!=(const G4UnstableFermiFragment &right)
 }
 
 
-G4RWTPtrOrderedVector<G4LorentzVector> *
+G4std::deque<G4LorentzVector*> *
 G4UnstableFermiFragment::FragmentsMomentum(G4double KinE, const G4int K, const G4double * Masses)
   // Calculates momentum for K fragments (Kopylov's method of sampling is used)
   // KinetEnergy is the available kinetic energy
 {  
-  G4RWTPtrOrderedVector<G4LorentzVector>* MomentumList = 
-    new G4RWTPtrOrderedVector<G4LorentzVector>(K);
+  G4std::deque<G4LorentzVector*>* MomentumList = 
+    new G4std::deque<G4LorentzVector*>(K);
+
 
   G4double AvalaibleMass = 0; 
   for (G4int i=0; i<K; i++) AvalaibleMass += Masses[i];
@@ -102,12 +122,14 @@ G4UnstableFermiFragment::FragmentsMomentum(G4double KinE, const G4int K, const G
     PRestLab.boost(BoostV);
 
 
-    MomentumList->prepend(new G4LorentzVector(PFragLab));
+    //    MomentumList->prepend(new G4LorentzVector(PFragLab));
+    MomentumList->push_front(new G4LorentzVector(PFragLab));
 
     Mass = RestMass;
   }
 
-  MomentumList->prepend(new G4LorentzVector(PRestLab));
+  //  MomentumList->prepend(new G4LorentzVector(PRestLab));
+  MomentumList->push_front(new G4LorentzVector(PRestLab));
   return MomentumList;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
index eee71bcfdd..81f166343a 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VCoulombBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VCoulombBarrier.cc,v 1.1 2000/06/09 11:43:37 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VCoulombBarrier.cc,v 1.2.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Dec 1999)
@@ -17,40 +33,40 @@
 
 G4VCoulombBarrier::G4VCoulombBarrier(const G4int anA, const G4int aZ)
 {
-	if (anA >= aZ && anA > 0) {
-		theA = anA;
-		theZ = aZ;
-	} else {
-		char errMessage[1024];
-		G4std::ostrstream errOs(errMessage,1024);
-		errOs << "G4VCoulombBarrier::G4VCoulombBarrier: ";
-		errOs << "Wrong values for ";
-		errOs << "A = " << anA << " ";
-		errOs << "and Z = " << aZ << G4endl;
-		G4Exception(errMessage);
-	}
+    if (anA >= aZ && anA > 0) {
+	theA = anA;
+	theZ = aZ;
+    } else {
+	char errMessage[1024];
+	G4std::ostrstream errOs(errMessage,1024);
+	errOs << "G4VCoulombBarrier::G4VCoulombBarrier: ";
+	errOs << "Wrong values for ";
+	errOs << "A = " << anA << " ";
+	errOs << "and Z = " << aZ << G4endl;
+	G4Exception(errMessage);
+    }
 }
 
 
 G4VCoulombBarrier::G4VCoulombBarrier(const G4VCoulombBarrier & right)
 {
-  G4Exception("G4VCoulombBarrier::copy_constructor meant to not be accessable.");
+    G4Exception("G4VCoulombBarrier::copy_constructor meant to not be accessable.");
 }
 
 
 const G4VCoulombBarrier & G4VCoulombBarrier::operator=(const G4VCoulombBarrier & right)
 {
- G4Exception("G4VCoulombBarrier::operator= meant to not be accessable.");
- return *this;
+    G4Exception("G4VCoulombBarrier::operator= meant to not be accessable.");
+    return *this;
 }
 
 G4bool G4VCoulombBarrier::operator==(const G4VCoulombBarrier & right) const 
 {
- return false;
+    return false;
 }
 
 G4bool G4VCoulombBarrier::operator!=(const G4VCoulombBarrier & right) const 
 {
- return true;
+    return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VEmissionProbability.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VEmissionProbability.cc
index 17b29b1865..5bef46fa47 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VEmissionProbability.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VEmissionProbability.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VEmissionProbability.cc,v 1.4.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -15,7 +34,7 @@
 
 G4VEmissionProbability::G4VEmissionProbability(const G4VEmissionProbability &right)
 {
- G4Exception("G4VEmissionProbability::copy_constructor meant to not be accessable");
+    G4Exception("G4VEmissionProbability::copy_constructor meant to not be accessable");
 }
 
 
@@ -23,19 +42,19 @@ G4VEmissionProbability::G4VEmissionProbability(const G4VEmissionProbability &rig
 
 const G4VEmissionProbability & G4VEmissionProbability::operator=(const G4VEmissionProbability &right)
 {
-  G4Exception("G4VEmissionProbability::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4VEmissionProbability::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VEmissionProbability::operator==(const G4VEmissionProbability &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4VEmissionProbability::operator!=(const G4VEmissionProbability &right) const
 {
-  return true;
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporation.cc
index c9b4f3f5fb..7fa62a694d 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporation.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VEvaporation.cc,v 1.3.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998) writen from G4Evaporation.cc (May 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporationChannel.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporationChannel.cc
index b7a9088e06..39ce7eab07 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporationChannel.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VEvaporationChannel.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VEvaporationChannel.cc,v 1.3.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiBreakUp.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiBreakUp.cc
index bd624d3a29..d73eb8c263 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiBreakUp.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiBreakUp.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VFermiBreakUp.cc,v 1.3.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4VFermiBreakUp::G4VFermiBreakUp()
 
 G4VFermiBreakUp::G4VFermiBreakUp(const G4VFermiBreakUp &right)
 {
-  G4Exception("G4VFermiBreakUp::copy_constructor meant to not be accessable");
+    G4Exception("G4VFermiBreakUp::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,19 +47,19 @@ G4VFermiBreakUp::~G4VFermiBreakUp()
 
 const G4VFermiBreakUp & G4VFermiBreakUp::operator=(const G4VFermiBreakUp &right)
 {
-  G4Exception("G4VFermiBreakUp::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4VFermiBreakUp::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VFermiBreakUp::operator==(const G4VFermiBreakUp &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4VFermiBreakUp::operator!=(const G4VFermiBreakUp &right) const
 {
-  return true;
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiFragment.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiFragment.cc
index 302ce7f13a..de7af49bbd 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiFragment.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VFermiFragment.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VFermiFragment.cc,v 1.3.2.1 2001/06/28 19:13:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -13,25 +32,25 @@
 
 G4VFermiFragment::G4VFermiFragment(const G4VFermiFragment &right)
 {
-  G4Exception("G4VFermiFragment::copy_constructor meant to not be accessable");
+    G4Exception("G4VFermiFragment::copy_constructor meant to not be accessable");
 }
 
 
 const G4VFermiFragment & G4VFermiFragment::operator=(const G4VFermiFragment &right)
 {
-  G4Exception("G4VFermiFragment::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4VFermiFragment::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VFermiFragment::operator==(const G4VFermiFragment &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4VFermiFragment::operator!=(const G4VFermiFragment &right) const
 {
-  return true;
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
index e5d60a7d7d..437c831190 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VFissionBarrier.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFissionBarrier.cc,v 1.3 2000/06/09 11:43:37 larazb Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFissionBarrier.cc,v 1.3.8.1 2001/06/28 19:13:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
index 9533c2dd30..0a78d974d5 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VGammaDeexcitation.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4VGammaDeexcitation
@@ -61,7 +75,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoTransition()
      G4Fragment* gamma = GenerateGamma();
      if (gamma != 0)
        {
-	 products->append(gamma);
+	 products->push_back(gamma);
 	 UpdateNucleus(gamma);
 	 Update();
        }
@@ -87,7 +101,7 @@ G4FragmentVector* G4VGammaDeexcitation::DoChain()
       G4Fragment* gamma = GenerateGamma();
       if (gamma != 0) 
 	{
-	  products->append(gamma);
+	  products->push_back(gamma);
 	  UpdateNucleus(gamma);
 	}
      Update();
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VLevelDensityParameter.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VLevelDensityParameter.cc
index 6d05682dde..b92289eb77 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VLevelDensityParameter.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VLevelDensityParameter.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VLevelDensityParameter.cc,v 1.3.2.1 2001/06/28 19:13:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Oct 1998)
@@ -16,7 +35,7 @@
 G4VLevelDensityParameter::
 G4VLevelDensityParameter(const G4VLevelDensityParameter &right)
 {
- G4Exception("G4VLevelDensityParameter::copy_constructor meant to not be accessable");
+    G4Exception("G4VLevelDensityParameter::copy_constructor meant to not be accessable");
 }
 
 
@@ -25,21 +44,21 @@ G4VLevelDensityParameter(const G4VLevelDensityParameter &right)
 const G4VLevelDensityParameter & G4VLevelDensityParameter::
 operator=(const G4VLevelDensityParameter &right)
 {
-  G4Exception("G4VLevelDensityParameter::operator= meant to not be accessable");
-  return *this;
+    G4Exception("G4VLevelDensityParameter::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VLevelDensityParameter::
 operator==(const G4VLevelDensityParameter &right) const
 {
-  return false;
+    return false;
 }
 
 G4bool G4VLevelDensityParameter::
 operator!=(const G4VLevelDensityParameter &right) const
 {
-  return true;
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VMultiFragmentation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VMultiFragmentation.cc
index d80698d8b0..350423a707 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VMultiFragmentation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VMultiFragmentation.cc
@@ -1,9 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VMultiFragmentation.cc,v 1.4.2.1 2001/06/28 19:13:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (Nov 1998)
@@ -17,7 +36,7 @@ G4VMultiFragmentation::G4VMultiFragmentation()
 
 G4VMultiFragmentation::G4VMultiFragmentation(const G4VMultiFragmentation &right)
 {
-	G4Exception("G4VMultiFragmentation::copy_constructor meant to not be accessable");
+    G4Exception("G4VMultiFragmentation::copy_constructor meant to not be accessable");
 }
 
 
@@ -28,21 +47,21 @@ G4VMultiFragmentation::~G4VMultiFragmentation()
 
 const G4VMultiFragmentation & G4VMultiFragmentation::operator=(const G4VMultiFragmentation &right)
 {
-	G4Exception("G4VMultiFragmentation::operator= meant to not be accessable");
-  	return *this;
+    G4Exception("G4VMultiFragmentation::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VMultiFragmentation::operator==(const G4VMultiFragmentation &right) const
 {
-	G4Exception("G4VMultiFragmentation::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4VMultiFragmentation::operator== meant to not be accessable");
+    return false;
 }
 
 G4bool G4VMultiFragmentation::operator!=(const G4VMultiFragmentation &right) const
 {
-	G4Exception("G4VMultiFragmentation::operator=! meant to not be accessable");
-	return true;
+    G4Exception("G4VMultiFragmentation::operator=! meant to not be accessable");
+    return true;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VPhotonEvaporation.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VPhotonEvaporation.cc
index dba67cf242..c28c5e7fbc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VPhotonEvaporation.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VPhotonEvaporation.cc
@@ -1,15 +1,29 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      CERN, Geneva, Switzerland
 //
 //      File name:     G4VPhotonEvaporation
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFEnsemble.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFEnsemble.cc
index 620600882f..6a5235d5cc 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFEnsemble.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFEnsemble.cc
@@ -1,11 +1,39 @@
-#include "G4VStatMFEnsemble.hh"
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VStatMFEnsemble.cc,v 1.3.2.1 2001/06/28 19:13:23 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
 
+#include "G4VStatMFEnsemble.hh"
 
 
 // Copy constructor
 G4VStatMFEnsemble::G4VStatMFEnsemble(const G4VStatMFEnsemble & right)
 {
-	G4Exception("G4VStatMFEnsemble::copy_constructor meant to not be accessable");
+    G4Exception("G4VStatMFEnsemble::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -13,21 +41,21 @@ G4VStatMFEnsemble::G4VStatMFEnsemble(const G4VStatMFEnsemble & right)
 G4VStatMFEnsemble & G4VStatMFEnsemble::
 operator=(const G4VStatMFEnsemble & right)
 {
-	G4Exception("G4VStatMFEnsemble::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4VStatMFEnsemble::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VStatMFEnsemble::operator==(const G4VStatMFEnsemble & right) const
 {
-	G4Exception("G4VStatMFEnsemble::operator== meant to not be accessable");
-	return false;
+    G4Exception("G4VStatMFEnsemble::operator== meant to not be accessable");
+    return false;
 }
  
 
 G4bool G4VStatMFEnsemble::operator!=(const G4VStatMFEnsemble & right) const
 {
-	G4Exception("G4VStatMFEnsemble::operator!= meant to not be accessable");
-	return true;
+    G4Exception("G4VStatMFEnsemble::operator!= meant to not be accessable");
+    return true;
 }
 
diff --git a/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFMacroCluster.cc b/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFMacroCluster.cc
index 42aa5c6ef8..7dd4762b95 100644
--- a/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFMacroCluster.cc
+++ b/source/processes/hadronic/models/generator/de_excitation/src/G4VStatMFMacroCluster.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VStatMFMacroCluster.cc,v 1.4.2.1 2001/06/28 19:13:23 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear De-excitations
+// by V. Lara
+
 #include "G4VStatMFMacroCluster.hh"
 
 
@@ -5,7 +34,7 @@
 // Copy constructor
 G4VStatMFMacroCluster::G4VStatMFMacroCluster(const G4VStatMFMacroCluster & right)
 {
-	G4Exception("G4VStatMFMacroCluster::copy_constructor meant to not be accessable");
+    G4Exception("G4VStatMFMacroCluster::copy_constructor meant to not be accessable");
 }
 
 // Operators
@@ -13,31 +42,31 @@ G4VStatMFMacroCluster::G4VStatMFMacroCluster(const G4VStatMFMacroCluster & right
 G4VStatMFMacroCluster & G4VStatMFMacroCluster::
 operator=(const G4VStatMFMacroCluster & right)
 {
-	G4Exception("G4VStatMFMacroCluster::operator= meant to not be accessable");
-	return *this;
+    G4Exception("G4VStatMFMacroCluster::operator= meant to not be accessable");
+    return *this;
 }
 
 
 G4bool G4VStatMFMacroCluster::operator==(const G4VStatMFMacroCluster & right) const
 {
 //	G4Exception("G4VStatMFMacroCluster::operator== meant to not be accessable");
-	return false;
+    return false;
 }
  
 
 G4bool G4VStatMFMacroCluster::operator!=(const G4VStatMFMacroCluster & right) const
 {
 //	G4Exception("G4VStatMFMacroCluster::operator!= meant to not be accessable");
-	return true;
+    return true;
 }
 
 
 G4double G4VStatMFMacroCluster::CalcInvLevelDensity(void)
 {
-	// Calculate Inverse Density Level
-	// Epsilon0*(1 + 3 /(Af - 1))
-	if (theA == 1) return 0.0;
-	else return
-		G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(G4double(theA) - 1.0));
+    // Calculate Inverse Density Level
+    // Epsilon0*(1 + 3 /(Af - 1))
+    if (theA == 1) return 0.0;
+    else return
+	     G4StatMFParameters::GetEpsilon0()*(1.0+3.0/(G4double(theA) - 1.0));
 }
 
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveHHScatterer.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveHHScatterer.hh
index 7eb0fe6efe..f60596792f 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveHHScatterer.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveHHScatterer.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiffractiveHHScatterer.hh,v 1.2 1999/12/15 14:52:22 gunter Exp $
+//
+// $Id: G4DiffractiveHHScatterer.hh,v 1.2.8.2 2001/06/28 20:19:55 gunter Exp $
 
 #ifndef G4DiffractiveHHScatterer_h
 #define G4DiffractiveHHScatterer_h 1
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4DiffractiveExcitation --------------
 //             by Gunter Folger, October 1998.
 //      diffractive Excitation used by strings models
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
index 7d2e2021be..1caab2dae2 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4DiffractiveSplitableHadron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiffractiveSplitableHadron.hh,v 1.3 1999/12/15 14:52:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DiffractiveSplitableHadron.hh,v 1.3.8.2 2001/06/28 20:19:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4DiffractiveSplitableHadron_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4DiffractiveSplitableHadron----------------
 //             by Gunter Folger, August 1998.
 //       class splitting an interacting particle. Used by FTF String Model.
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
index 001c1562d5..87e338527f 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FTFModel.hh,v 1.4 2000/12/14 09:25:54 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FTFModel.hh,v 1.4.6.2 2001/06/28 20:19:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Class Description
 // Final state production code for hadron inelastic scattering above 20 GeV
@@ -22,8 +38,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4FTFModel ----------------
 //             by Gunter Folger, May 1998.
 //       class implementing the excitation in the FTF Parton String Model
diff --git a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
index 92298f0d71..de7516a4bb 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
+++ b/source/processes/hadronic/models/generator/diffractive_string/include/G4FTFParticipants.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FTFParticipants.hh,v 1.3 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FTFParticipants.hh,v 1.3.8.2 2001/06/28 20:19:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4FTFParticipants_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4FTFParticipants----------------
 //             by Gunter Folger, June 1998.
 //       class finding colliding particles in FTFPartonStringModel
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveHHScatterer.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveHHScatterer.cc
index e3712b2a0b..cf3083f2c9 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveHHScatterer.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveHHScatterer.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4DiffractiveHHScatterer.hh"
 #include "G4DiffractiveExcitation.hh"
 #include "G4ExcitedString.hh"
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
index db049610e9..f4de7406d0 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4DiffractiveSplitableHadron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiffractiveSplitableHadron.cc,v 1.2 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DiffractiveSplitableHadron.cc,v 1.2.8.2 2001/06/28 20:19:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4DiffractiveSplitableHadron----------------
 //             by Gunter Folger, August 1998.
 //       class splitting an interacting particle. Used by FTF String Model.
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
index b383fa5e71..17117eda1a 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFModel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FTFModel.cc,v 1.4 1999/12/15 14:52:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FTFModel.cc,v 1.4.8.2 2001/06/28 20:19:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4FTFModel ----------------
 //             by Gunter Folger, May 1998.
 //       class implementing the excitation in the FTF Parton String Model
diff --git a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
index 253d11e9f7..96f9c9b3c6 100644
--- a/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
+++ b/source/processes/hadronic/models/generator/diffractive_string/src/G4FTFParticipants.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FTFParticipants.cc,v 1.3 2000/08/19 16:23:48 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FTFParticipants.cc,v 1.3.8.2 2001/06/28 20:19:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4FTFParticipants----------------
 //             by Gunter Folger, June 1998.
 //       class finding colliding particles in FTFPartonStringModel
diff --git a/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh b/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
index 4813429e1e..f5fd363758 100644
--- a/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
+++ b/source/processes/hadronic/models/generator/high_energy/include/G4TheoFSGenerator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TheoFSGenerator.hh,v 1.3 2000/12/14 09:28:53 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TheoFSGenerator.hh,v 1.3.6.1 2001/06/28 19:13:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // Class Description
diff --git a/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc b/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
index aa1bfb1cd3..d0040d3c40 100644
--- a/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
+++ b/source/processes/hadronic/models/generator/high_energy/src/G4TheoFSGenerator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TheoFSGenerator.cc,v 1.3 1999/04/18 11:30:49 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TheoFSGenerator.cc,v 1.3.18.1 2001/06/28 19:13:27 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4TheoFSGenerator
 #include "G4DynamicParticle.hh"
diff --git a/source/processes/hadronic/models/generator/kinetic_model/include/G4GeneratorPrecompoundInterface.hh b/source/processes/hadronic/models/generator/kinetic_model/include/G4GeneratorPrecompoundInterface.hh
index 6373bcf9f8..b78eeeebd4 100644
--- a/source/processes/hadronic/models/generator/kinetic_model/include/G4GeneratorPrecompoundInterface.hh
+++ b/source/processes/hadronic/models/generator/kinetic_model/include/G4GeneratorPrecompoundInterface.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #ifndef G4GeneratorPrecompoundInterface_h
 #define G4GeneratorPrecompoundInterface_h 1
diff --git a/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc b/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
index 66344fc53d..a019ecae76 100644
--- a/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
+++ b/source/processes/hadronic/models/generator/kinetic_model/src/G4GeneratorPrecompoundInterface.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4GeneratorPrecompoundInterface.hh"
 #include "G4DynamicParticleVector.hh"
 #include "G4IonTable.hh"
@@ -95,8 +117,8 @@
          // now calculate  A, Z of the fragment, momentum, number of exciton states
          anA++;;
          numberOfEx++;
-         aZ += aTrack->GetDefinition()->GetPDGCharge();
-         numberOfCh += aTrack->GetDefinition()->GetPDGCharge();
+         aZ += G4int(aTrack->GetDefinition()->GetPDGCharge());
+         numberOfCh += G4int(aTrack->GetDefinition()->GetPDGCharge());
          exciton3Momentum += aTrack->Get4Momentum().vect();
          exEnergy += (aTrack->Get4Momentum().t()-aTrack->Get4Momentum().m());
        }
@@ -111,31 +133,35 @@
          numberOfHoles++;
          numberOfEx++;
          anA--;
-         aZ -= theCurrentNucleon->GetDefinition()->GetPDGCharge();
+         aZ -= G4int(theCurrentNucleon->GetDefinition()->GetPDGCharge());
          exciton3Momentum -= theCurrentNucleon->Get4Momentum().vect();
          exEnergy+=theCurrentNucleon->GetBindingEnergy();
        }
        theCurrentNucleon = theNucleus->GetNextNucleon();
      }   
      
-     G4double residualMass =  
-              G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(aZ ,anA);
-     residualMass += exEnergy;
-     G4LorentzVector exciton4Momentum(exciton3Momentum, 
-                                      sqrt(exciton3Momentum.mag2()+residualMass*residualMass));
+     if(!theDeExcitation)
+     {
+       // G4Exception("Please register an evaporation phase with G4GeneratorPrecompoundInterface.");
+     }
+     else if(0!=anA && 0!=aZ)
+     {
+       G4double residualMass =  
+                G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(aZ ,anA);
+       residualMass += exEnergy;
+       G4LorentzVector exciton4Momentum(exciton3Momentum, 
+                                        sqrt(exciton3Momentum.mag2()+residualMass*residualMass));
      
-     anInitialState.SetA(anA);
-     anInitialState.SetZ(aZ);
-     anInitialState.SetNumberOfCharged(numberOfCh);
-     anInitialState.SetNumberOfHoles(numberOfHoles);
-     anInitialState.SetNumberOfExcitons(numberOfEx);
-     anInitialState.SetMomentum(exciton4Momentum);
+       anInitialState.SetA(anA);
+       anInitialState.SetZ(aZ);
+       anInitialState.SetNumberOfParticles(numberOfEx-numberOfHoles);
+       anInitialState.SetNumberOfCharged(numberOfCh);
+       anInitialState.SetNumberOfHoles(numberOfHoles);
+       anInitialState.SetMomentum(exciton4Momentum);
 //      anInitialState.SetExcitationEnergy(exEnergy); // now a redundant call.
 
      // call pre-compound
-     const G4Fragment aFragment(anInitialState);
-     if(theDeExcitation)
-     {
+       const G4Fragment aFragment(anInitialState);
        G4ReactionProductVector * aPreResult = theDeExcitation->DeExcite(aFragment);
      
        // fill pre-compound part into the result, and return
@@ -151,8 +177,8 @@
      }
      // now return
      
-     
      result->clearAndDestroy();
      delete result;
      return theTotalResult;
    }
+  
diff --git a/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh b/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
index 11e879baa3..87b0c54570 100644
--- a/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4V3DNucleus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4V3DNucleus.hh,v 1.4 2000/08/19 16:24:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4V3DNucleus.hh,v 1.4.8.1 2001/06/28 19:13:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4V3DNucleus_h
 #define G4V3DNucleus_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VAnnihilator.hh b/source/processes/hadronic/models/generator/management/include/G4VAnnihilator.hh
index 0caeb03698..e106605339 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VAnnihilator.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VAnnihilator.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VAnnihilator_h
 #define G4VAnnihilator_h 1
 
diff --git a/source/processes/hadronic/models/generator/management/include/G4VCrossSectionBase.hh b/source/processes/hadronic/models/generator/management/include/G4VCrossSectionBase.hh
index 52b8047a22..b0a36555b0 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VCrossSectionBase.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VCrossSectionBase.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VCrossSectionBase_h
 #define G4VCrossSectionBase_h 1
 
diff --git a/source/processes/hadronic/models/generator/management/include/G4VElasticScatterer.hh b/source/processes/hadronic/models/generator/management/include/G4VElasticScatterer.hh
index 34168efbcc..79780ecafd 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VElasticScatterer.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VElasticScatterer.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VElasticScatterer_h
 #define G4VElasticScatterer_h 1
 
diff --git a/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh b/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
index 9922c43de2..aa92941dd7 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VHighEnergyGenerator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHighEnergyGenerator.hh,v 1.4 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHighEnergyGenerator.hh,v 1.4.6.1 2001/06/28 19:13:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VHighEnergyGenerator_h
 #define G4VHighEnergyGenerator_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VInElasticScatterer.hh b/source/processes/hadronic/models/generator/management/include/G4VInElasticScatterer.hh
index 67fb195166..ee4dc9f94a 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VInElasticScatterer.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VInElasticScatterer.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VInElasticScatterer_h
 #define G4VInElasticScatterer_h 1
 
diff --git a/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh b/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
index 261b663fcd..e4ff3a7497 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VIntraNuclearTransportModel.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIntraNuclearTransportModel.hh,v 1.6 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIntraNuclearTransportModel.hh,v 1.6.6.2 2001/06/28 20:19:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: G4IntraNuclearTransportMode.hh,v 1.0 1998/06/30
 // -----------------------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, A. Feliciello, 30th June 1998
 //      A.Pavliouk 26.11.98
 //          In Set...() methods a pointer is deleted now before new
diff --git a/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh b/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
index 17cfc81005..77d48b3e78 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VKineticNucleon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VKineticNucleon.hh,v 1.2 1999/12/15 14:52:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VKineticNucleon.hh,v 1.2.8.1 2001/06/28 19:13:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VKineticNucleon_h
 #define G4VKineticNucleon_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh b/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
index 1b0e63ce83..cb4893066d 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VNuclearDensity.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VNuclearDensity.hh,v 1.3 2000/05/23 13:41:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VNuclearDensity.hh,v 1.3.8.1 2001/06/28 19:13:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VNuclearDensity_h
 #define G4VNuclearDensity_h 1
diff --git a/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh b/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
index 5d8ed45f01..224f65772c 100644
--- a/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
+++ b/source/processes/hadronic/models/generator/management/include/G4VPreCompoundModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPreCompoundModel.hh,v 1.4 2000/12/14 09:36:03 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPreCompoundModel.hh,v 1.4.6.1 2001/06/28 19:13:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VPreCompoundModel_h
diff --git a/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc b/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
index 19f0f3033b..6b69e427b8 100644
--- a/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4V3DNucleus.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4V3DNucleus.cc,v 1.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4V3DNucleus.cc,v 1.2.8.1 2001/06/28 19:13:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4V3DNucleus.hh"
 
diff --git a/source/processes/hadronic/models/generator/management/src/G4VAnnihilator.cc b/source/processes/hadronic/models/generator/management/src/G4VAnnihilator.cc
index 5a5b2aefed..0d48b06d17 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VAnnihilator.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VAnnihilator.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4VAnnihilator.hh"
 
 //*********************************************************************************************
diff --git a/source/processes/hadronic/models/generator/management/src/G4VCrossSectionBase.cc b/source/processes/hadronic/models/generator/management/src/G4VCrossSectionBase.cc
index 038bd4f3a4..540be84c51 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VCrossSectionBase.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VCrossSectionBase.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4VCrossSectionBase.hh"
 
 //********************************************************************************
diff --git a/source/processes/hadronic/models/generator/management/src/G4VElasticScatterer.cc b/source/processes/hadronic/models/generator/management/src/G4VElasticScatterer.cc
index c2825765c5..327771f306 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VElasticScatterer.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VElasticScatterer.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4VElasticScatterer.hh"
 
 // Class G4VElasticScatterer
diff --git a/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc b/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
index 79b850c7ef..3ebb739702 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VHighEnergyGenerator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VHighEnergyGenerator.cc,v 1.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VHighEnergyGenerator.cc,v 1.2.8.1 2001/06/28 19:13:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VHighEnergyGenerator
 #include "G4VHighEnergyGenerator.hh"
diff --git a/source/processes/hadronic/models/generator/management/src/G4VInElasticScatterer.cc b/source/processes/hadronic/models/generator/management/src/G4VInElasticScatterer.cc
index 3edb601369..d8ab8fbb13 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VInElasticScatterer.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VInElasticScatterer.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4VInElasticScatterer.hh"
 
 //******************************************************************************
diff --git a/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc b/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
index 086368408e..156bde0b87 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VIntraNuclearTransportModel.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VIntraNuclearTransportModel.cc,v 1.3 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VIntraNuclearTransportModel.cc,v 1.3.8.2 2001/06/28 20:19:56 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, A. Feliciello, 30th June 1998
 //               Removed delete of DeExcitation model, deleted elsewhere.
 //                  F.W.Jones, 06-JUL-99
diff --git a/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc b/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
index e6f1b3bf6e..f48c83574d 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VKineticNucleon.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VKineticNucleon.cc,v 1.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VKineticNucleon.cc,v 1.2.8.1 2001/06/28 19:13:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4VKineticNucleon.hh"
 
diff --git a/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc b/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
index 34c96fa868..d008e6605d 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VNuclearDensity.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VNuclearDensity.cc,v 1.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VNuclearDensity.cc,v 1.2.8.1 2001/06/28 19:13:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VNuclearDensity.hh"
diff --git a/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc b/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
index d8ac59569a..738a59ff8a 100644
--- a/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
+++ b/source/processes/hadronic/models/generator/management/src/G4VPreCompoundModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPreCompoundModel.cc,v 1.2 1999/12/15 14:52:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPreCompoundModel.cc,v 1.2.8.1 2001/06/28 19:13:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VPreCompoundModel.hh"
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundAlpha.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundAlpha.hh
index 325889eb10..6629be9609 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundAlpha.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundAlpha.hh
@@ -1,109 +1,123 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundAlpha.hh,v 1.6.2.1 2001/06/28 19:13:31 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara 
 
 #ifndef G4PreCompoundAlpha_h
 #define G4PreCompoundAlpha_h 1
 
 #include "G4VPreCompoundIon.hh"
+#include "G4ReactionProduct.hh"
 #include "G4Alpha.hh"
 
+#include "G4AlphaCoulombBarrier.hh"
 
 class G4PreCompoundAlpha : public G4VPreCompoundIon
 {
 public:
-	// default constructor
-	G4PreCompoundAlpha():G4VPreCompoundIon(4,2) {}
+  // default constructor
+  G4PreCompoundAlpha():G4VPreCompoundIon(4,2,&theAlphaCoulombBarrier,"alpha") {}
 
-	// copy constructor
-	G4PreCompoundAlpha(const G4PreCompoundAlpha &right): G4VPreCompoundIon(right) {}
+  // copy constructor
+  G4PreCompoundAlpha(const G4PreCompoundAlpha &right): G4VPreCompoundIon(right) {}
 
-	// destructor
-	~G4PreCompoundAlpha() {}
+  // destructor
+  ~G4PreCompoundAlpha() {}
 
-	// operators  
-	const G4PreCompoundAlpha & operator=(const G4PreCompoundAlpha &right) {
-		if (&right != this) this->G4VPreCompoundIon::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4PreCompoundAlpha & operator=(const G4PreCompoundAlpha &right) {
+    if (&right != this) this->G4VPreCompoundIon::operator=(right);
+    return *this;
+  }
 
-	G4bool operator==(const G4PreCompoundAlpha &right) const
-	{ return G4VPreCompoundIon::operator==(right);}
+  G4bool operator==(const G4PreCompoundAlpha &right) const
+  { return G4VPreCompoundIon::operator==(right);}
   
-	G4bool operator!=(const G4PreCompoundAlpha &right) const
-	{ return G4VPreCompoundIon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundAlpha &right) const
+  { return G4VPreCompoundIon::operator!=(right);}
 
-	const G4DynamicParticle GetDynamicParticle() const {
-		G4DynamicParticle theDynamicParticle(G4Alpha::AlphaDefinition(),GetMomentum());
-		return theDynamicParticle;
-	}
+  G4ReactionProduct * GetReactionProduct() const 
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4Alpha::AlphaDefinition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 public:
-	void CalcExcitonLevelDensityRatios(const G4double Excitons,
-			             					  const G4double Particles)
-	{
-	// Level density ratios are calculated according to the formula
-	// (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
-	// where  P is number of particles
-	//        N is number of excitons
-	//        Af atomic number of emitting fragment
-	// the next is a simplification for alphas (Af = 4)
+  void CalcExcitonLevelDensityRatios(const G4double Excitons,
+				     const G4double Particles)
+  {
+    // Level density ratios are calculated according to the formula
+    // (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
+    // where  P is number of particles
+    //        N is number of excitons
+    //        Af atomic number of emitting fragment
+    // the next is a simplification for alphas (Af = 4)
     
-		SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
-											((Particles-1.0)*(Excitons-2.0)/2.0)*
-				 							((Particles-2.0)*(Excitons-3.0)/3.0)*
-						 					((Particles-3.0)*(Excitons-4.0)/4.0))/6.0);
-	}
+    SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
+				 ((Particles-1.0)*(Excitons-2.0)/2.0)*
+				 ((Particles-2.0)*(Excitons-3.0)/3.0)*
+				 ((Particles-3.0)*(Excitons-4.0)/4.0))/6.0);
+  }
 
 
 
-	void CalcCondensationProbability(const G4double A)
-	// This method computes condensation probability to create a fragment
-	// consisting from N nucleons inside a nucleus with A nucleons 
-	// This value comes from the formula N^3 (N/A)^(N-1) with N = 4 (alpha)
-	{
-		SetCondensationProbability(4096.0/(A*A*A));
-	}
+  void CalcCondensationProbability(const G4double A)
+    // This method computes condensation probability to create a fragment
+    // consisting from N nucleons inside a nucleus with A nucleons 
+    // This value comes from the formula N^3 (N/A)^(N-1) with N = 4 (alpha)
+  {
+    SetCondensationProbability(4096.0/(A*A*A));
+  }
 
 private:
 
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const;
-	virtual G4double GetCCoef(const G4double aZ) const;
+  virtual G4double GetCCoef(const G4double aZ) const;
+
+  G4AlphaCoulombBarrier theAlphaCoulombBarrier;
 
 };
-
-inline G4double G4PreCompoundAlpha::GetBarrierPenetrationFactor(const G4double aZ) const
-{
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.98;
-	} else {
-		K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
-	}
-	return K;    
-}
+ 
+#endif
 
 inline G4double G4PreCompoundAlpha::GetCCoef(const G4double aZ) const
 {
-	G4double C = 0.0;
+  G4double C = 0.0;
 
-	if (aZ <= 30) {
-		C = 0.10;
-	} else if (aZ <= 50) {
-		C = 0.1 + -((aZ-50.)/20.)*0.02;
-	} else if (aZ < 70) {
-		C = 0.08 + -((aZ-70.)/20.)*0.02;
-	} else {
-		C = 0.06;
-	}
-	return C;            
+  if (aZ <= 30) {
+    C = 0.10;
+  } else if (aZ <= 50) {
+    C = 0.1 + -((aZ-50.)/20.)*0.02;
+  } else if (aZ < 70) {
+    C = 0.08 + -((aZ-70.)/20.)*0.02;
+  } else {
+    C = 0.06;
+  }
+  return C;            
 }
 
-#endif
  
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundDeuteron.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundDeuteron.hh
index 4f8f1566ab..7348e4ea91 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundDeuteron.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundDeuteron.hh
@@ -1,54 +1,77 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundDeuteron.hh,v 1.6.2.1 2001/06/28 19:13:31 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara 
 
 #ifndef G4PreCompoundDeuteron_h
 #define G4PreCompoundDeuteron_h 1
 
 #include "G4VPreCompoundIon.hh"
+#include "G4ReactionProduct.hh"
 #include "G4Deuteron.hh"
 
+#include "G4DeuteronCoulombBarrier.hh"
+
 class G4PreCompoundDeuteron : public G4VPreCompoundIon
 {
 public:
-	// default constructor
-	G4PreCompoundDeuteron():G4VPreCompoundIon(2,1) {};
-	// copy constructor
-	G4PreCompoundDeuteron(const G4PreCompoundDeuteron &right):
+  // default constructor
+  G4PreCompoundDeuteron():G4VPreCompoundIon(2,1,&theDeuteronCoulombBarrier,"Deuteron") {};
+  // copy constructor
+  G4PreCompoundDeuteron(const G4PreCompoundDeuteron &right):
     G4VPreCompoundIon(right) {}
 	
-	// destructor
-	~G4PreCompoundDeuteron() {}
+  // destructor
+  ~G4PreCompoundDeuteron() {}
 
-	// operators  
-	const G4PreCompoundDeuteron & operator=(const G4PreCompoundDeuteron &right) {
-		if (&right != this) this->G4VPreCompoundIon::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4PreCompoundDeuteron & operator=(const G4PreCompoundDeuteron &right) {
+    if (&right != this) this->G4VPreCompoundIon::operator=(right);
+    return *this;
+  }
 
-	G4bool operator==(const G4PreCompoundDeuteron &right) const
-	{ return G4VPreCompoundIon::operator==(right);}
+  G4bool operator==(const G4PreCompoundDeuteron &right) const
+  { return G4VPreCompoundIon::operator==(right);}
   
-	G4bool operator!=(const G4PreCompoundDeuteron &right) const
-	{ return G4VPreCompoundIon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundDeuteron &right) const
+  { return G4VPreCompoundIon::operator!=(right);}
 
-	const G4DynamicParticle GetDynamicParticle() const
-	{
-		G4DynamicParticle theDynamicParticle(G4Deuteron::DeuteronDefinition(),GetMomentum());
-		return theDynamicParticle;
-	}
+  G4ReactionProduct * GetReactionProduct() const
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4Deuteron::DeuteronDefinition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 
 public:
-	void CalcExcitonLevelDensityRatios(const G4double Excitons,
+  void CalcExcitonLevelDensityRatios(const G4double Excitons,
 			             const G4double Particles)
-	{
+  {
     // Level density ratios are calculated according to the formula
     // (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
     // where  P is number of particles
@@ -56,49 +79,40 @@ public:
     //        Af atomic number of emitting fragment
     // the next is a simplification for deuterons (Af = 2)
 
-		SetExcitonLevelDensityRatio(Particles*(Excitons-1.0)*
+    SetExcitonLevelDensityRatio(Particles*(Excitons-1.0)*
 				(Particles-1.0)*(Excitons-2.0)/2.0);
-   }
+  }
 
 
-	void CalcCondensationProbability(const G4double A)
-		// This method computes condensation probability to create a fragment
+  void CalcCondensationProbability(const G4double A)
+    // This method computes condensation probability to create a fragment
     // consisting from N nucleons inside a nucleus with A nucleons 
     // This value comes from the formula N^3 (N/A)^(N-1) with N = 2 (deuteron)
-	{
-		SetCondensationProbability(16.0/A);
-	}
+  {
+    SetCondensationProbability(16.0/A);
+  }
 
 private:
 
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const;
-	virtual G4double GetCCoef(const G4double aZ) const;
+  virtual G4double GetCCoef(const G4double aZ) const;
+
+  G4DeuteronCoulombBarrier theDeuteronCoulombBarrier;
 
 };
 
-inline G4double G4PreCompoundDeuteron::GetBarrierPenetrationFactor(const G4double aZ) const
-{
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}
-	return K+0.06;                
-}
+#endif
 
 inline G4double G4PreCompoundDeuteron::GetCCoef(const G4double aZ) const
 {
-	G4double C = 0.0;
+  G4double C = 0.0;
 
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}
-	return C/2.0;
+  if (aZ >= 70) {
+    C = 0.10;
+  } else {
+    C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+  }
+  return C/2.0;
 }
 
 
-#endif
  
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundEmission.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundEmission.hh
index 5addae9eb0..94460267a8 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundEmission.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundEmission.hh
@@ -1,3 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PreCompoundEmission.hh,v 1.3.2.1 2001/06/28 19:13:32 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear Preequilibrium
+// by V. Lara 
 
 #ifndef G4PreCompoundEmission_h
 #define G4PreCompoundEmission_h 1
@@ -7,14 +35,16 @@
 #include "G4ReactionProduct.hh"
 #include "G4Fragment.hh"
 #include "Randomize.hh"
+#include "G4PreCompoundParameters.hh"
 
 class G4PreCompoundEmission
 {
 public:
-	G4PreCompoundEmission() {};
-	~G4PreCompoundEmission() {};
+  G4PreCompoundEmission(const G4Fragment& aFragment);
+  ~G4PreCompoundEmission() {};
 
 private:
+  G4PreCompoundEmission() {};
   G4PreCompoundEmission(const G4PreCompoundEmission &right);
   const G4PreCompoundEmission& operator=(const G4PreCompoundEmission &right);
   G4bool operator==(const G4PreCompoundEmission &right) const;
@@ -22,30 +52,38 @@ private:
 
 public:
 
-	void Initialize(const G4Fragment & aFragment) 
-	{
-		theFragmentsVector.Initialize(aFragment);
-		return;
-	}
+  void Initialize(const G4Fragment & aFragment) 
+  {
+    theFragmentsVector.Initialize(aFragment);
+    return;
+  }
 	
-	G4double GetTotalProbability(const G4Fragment & aFragment) 
-	{
-		return theFragmentsVector.CalculateProbabilities(aFragment);
-	}
+  G4double GetTotalProbability(const G4Fragment & aFragment) 
+  {
+    return theFragmentsVector.CalculateProbabilities(aFragment);
+  }
 	
-	G4ReactionProduct * PerformEmission(G4Fragment & aFragment);
+  G4ReactionProduct * PerformEmission(G4Fragment & aFragment);
 
 	
 private:
 
-	G4ThreeVector IsotropicRandom3Vector(G4double Magnitude = 1.0) const;
-
-	G4ParticleMomentum RotateMomentum(G4ParticleMomentum Pa, G4ParticleMomentum V,
-												 G4ParticleMomentum P) const;
+  G4ThreeVector AngularDistribution(G4VPreCompoundFragment * theFragment,
+				    const G4Fragment& aFragment,
+				    const G4double KineticEnergy) const;
+		
 
 
-	// A vector with the allowed emission fragments 
-	G4PreCompoundFragmentVector theFragmentsVector;
+  G4double rho(const G4double p, const G4double h, const G4double g, 
+	       const G4double E, const G4double Ef) const;
+
+  G4double bessi0(const G4double x) const;					 
+					 
+  // A vector with the allowed emission fragments 
+  G4PreCompoundFragmentVector theFragmentsVector;
+	
+  // Projectile energy
+  G4double ProjEnergy;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundFragmentVector.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundFragmentVector.hh
index 23a1334437..7d1d45865a 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundFragmentVector.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundFragmentVector.hh
@@ -1,40 +1,71 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PreCompoundFragmentVector.hh,v 1.2.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear Preequilibrium
+// by V. Lara 
+
 #ifndef G4PreCompoundFragmentVector_h
 #define G4PreCompoundFragmentVector_h 1
 
 
 #include "G4VPreCompoundFragment.hh"
-#include "g4rw/tpordvec.h"
 
 class G4PreCompoundFragmentVector 
 {
 public:
-	G4PreCompoundFragmentVector();
-	~G4PreCompoundFragmentVector();
+  G4PreCompoundFragmentVector();
+  ~G4PreCompoundFragmentVector();
 	
 private:
-	G4PreCompoundFragmentVector(const G4PreCompoundFragmentVector &right);
-	const G4PreCompoundFragmentVector& operator=(const G4PreCompoundFragmentVector &right);
-	G4bool operator==(const G4PreCompoundFragmentVector &right) const;
-	G4bool operator!=(const G4PreCompoundFragmentVector &right) const;	
+  G4PreCompoundFragmentVector(const G4PreCompoundFragmentVector &right);
+  const G4PreCompoundFragmentVector& operator=(const G4PreCompoundFragmentVector &right);
+  G4bool operator==(const G4PreCompoundFragmentVector &right) const;
+  G4bool operator!=(const G4PreCompoundFragmentVector &right) const;	
 
 public:
 
-	void Initialize(const G4Fragment & aFragment)
-	{
-		TotalEmissionProbability = 0.0;
-		for (G4int i=0; i < theChannels.entries(); i++)	theChannels(i)->Init(aFragment);
-		return;
-	}
+  void Initialize(const G4Fragment & aFragment)
+  {
+    TotalEmissionProbability = 0.0;
+    //    for (G4int i=0; i < theChannels.entries(); i++) theChannels(i)->Init(aFragment);
+    for (G4std::vector<G4VPreCompoundFragment*>::iterator i=theChannels.begin(); 
+	 i != theChannels.end(); i++) (*i)->Init(aFragment);
+    return;
+  }
 	
-	G4double CalculateProbabilities(const G4Fragment & aFragment);
+  G4double CalculateProbabilities(const G4Fragment & aFragment);
 	
-	G4VPreCompoundFragment * ChooseFragment(void);
+  G4VPreCompoundFragment * ChooseFragment(void);
 		
 private:
 
-	G4RWTPtrOrderedVector<G4VPreCompoundFragment> theChannels;
+  G4std::vector<G4VPreCompoundFragment*> theChannels;
 
-	G4double TotalEmissionProbability;
+
+  G4double TotalEmissionProbability;
 
 };
 #endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundHe3.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundHe3.hh
index e49f700e40..b2ae608efa 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundHe3.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundHe3.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundHe3.hh,v 1.6.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara 
 
 
@@ -13,101 +31,97 @@
 #define G4PreCompoundHe3_h 1
 
 #include "G4VPreCompoundIon.hh"
+#include "G4ReactionProduct.hh"
 #include "G4He3.hh"
 
+#include "G4He3CoulombBarrier.hh"
+
 class G4PreCompoundHe3 : public G4VPreCompoundIon
 {
 public:
-	// default constructor
-	G4PreCompoundHe3():G4VPreCompoundIon(3,2) {}
+  // default constructor
+  G4PreCompoundHe3():G4VPreCompoundIon(3,2,&theHe3CoulombBarrier,"He3") {}
 
-	// copy constructor
-	G4PreCompoundHe3(const G4PreCompoundHe3 &right): G4VPreCompoundIon(right) {}
+  // copy constructor
+  G4PreCompoundHe3(const G4PreCompoundHe3 &right): G4VPreCompoundIon(right) {}
 
-	// DEstructor
-	~G4PreCompoundHe3() {}
+  // DEstructor
+  ~G4PreCompoundHe3() {}
 
-	// operators  
-	const G4PreCompoundHe3 & operator=(const G4PreCompoundHe3 &right) {
-		if (&right != this) this->G4VPreCompoundIon::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4PreCompoundHe3 & operator=(const G4PreCompoundHe3 &right) {
+    if (&right != this) this->G4VPreCompoundIon::operator=(right);
+    return *this;
+  }
 
-	G4bool operator==(const G4PreCompoundHe3 &right) const
-	{ return G4VPreCompoundIon::operator==(right);}
+  G4bool operator==(const G4PreCompoundHe3 &right) const
+  { return G4VPreCompoundIon::operator==(right);}
   
-	G4bool operator!=(const G4PreCompoundHe3 &right) const
-	{ return G4VPreCompoundIon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundHe3 &right) const
+  { return G4VPreCompoundIon::operator!=(right);}
 
 
-	const G4DynamicParticle GetDynamicParticle() const {
-		G4DynamicParticle theDynamicParticle(G4He3::He3Definition(),GetMomentum());
-       return theDynamicParticle;
-	}
+  G4ReactionProduct * GetReactionProduct() const 
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4He3::He3Definition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 
 
 public:
-	void CalcExcitonLevelDensityRatios(const G4double Excitons,
-												  const G4double Particles)
-	{
-	// Level density ratios are calculated according to the formula
-	// (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
-	// where  P is number of particles
-	//        N is number of excitons
-	//        Af atomic number of emitting fragment
-	// the next is a simplification for He3 (Af = 3)
+  void CalcExcitonLevelDensityRatios(const G4double Excitons,
+				     const G4double Particles)
+  {
+    // Level density ratios are calculated according to the formula
+    // (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
+    // where  P is number of particles
+    //        N is number of excitons
+    //        Af atomic number of emitting fragment
+    // the next is a simplification for He3 (Af = 3)
 
-		SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
-											((Particles-1.0)*(Excitons-2.0)/2.0)*
-											((Particles-2.0)*(Excitons-3.0)/3.0))/2.0);
-	}
+    SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
+				 ((Particles-1.0)*(Excitons-2.0)/2.0)*
+				 ((Particles-2.0)*(Excitons-3.0)/3.0))/2.0);
+  }
   
 
 
-	void CalcCondensationProbability(const G4double A)
-		// This method computes condensation probability to create a fragment
-		// consisting from N nucleons inside a nucleus with A nucleons 
-  	  // This value comes from the formula N^3 (N/A)^(N-1) with N = 3 (He3)
-	{
-		SetCondensationProbability(243.0/(A*A));
-	}
+  void CalcCondensationProbability(const G4double A)
+    // This method computes condensation probability to create a fragment
+    // consisting from N nucleons inside a nucleus with A nucleons 
+    // This value comes from the formula N^3 (N/A)^(N-1) with N = 3 (He3)
+  {
+    SetCondensationProbability(243.0/(A*A));
+  }
 
 private:
 
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const;
-	virtual G4double GetCCoef(const G4double aZ) const;
-
+  virtual G4double GetCCoef(const G4double aZ) const;
+	
+  G4He3CoulombBarrier theHe3CoulombBarrier;
 
 };
 
-inline G4double G4PreCompoundHe3::GetBarrierPenetrationFactor(const G4double aZ) const
-{
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.98;
-	} else {
-		K = (((0.23684e-5*aZ) - 0.42143e-3)*aZ + 0.25222e-1)*aZ + 0.46699;
-	}
-	return K+0.12;   
-}
+#endif
 
 
 inline G4double G4PreCompoundHe3::GetCCoef(const G4double aZ) const
 {
-	G4double C = 0.0;
+  G4double C = 0.0;
 	
-	if (aZ <= 30) {
-		C = 0.10;
-	} else if (aZ <= 50) {
-		C = 0.1 + -((aZ-50.)/20.)*0.02;
-	} else if (aZ < 70) {
-		C = 0.08 + -((aZ-70.)/20.)*0.02;
-	} else {
-		C = 0.06;
-	}
-	return C*(4.0/3.0);   
+  if (aZ <= 30) {
+    C = 0.10;
+  } else if (aZ <= 50) {
+    C = 0.1 + -((aZ-50.)/20.)*0.02;
+  } else if (aZ < 70) {
+    C = 0.08 + -((aZ-70.)/20.)*0.02;
+  } else {
+    C = 0.06;
+  }
+  return C*(4.0/3.0);   
 }
 
-#endif
  
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
index 6ef94c69c7..70528bb088 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundModel.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundModel.hh,v 1.9.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 // Class Description
@@ -32,23 +50,27 @@
 #include "Randomize.hh"
 
 
+//#define debug
+//#define verbose
+
+
 class G4PreCompoundModel : public G4VPreCompoundModel
 {
 public:
   
-	G4PreCompoundModel(G4ExcitationHandler * const value) : 
-		G4VPreCompoundModel(value) {};
+  G4PreCompoundModel(G4ExcitationHandler * const value) : 
+    G4VPreCompoundModel(value) {};
 
-	~G4PreCompoundModel() {};
+  ~G4PreCompoundModel() {};
 
 private:
-	G4PreCompoundModel() {};
+  G4PreCompoundModel() {};
   
-	G4PreCompoundModel(const G4PreCompoundModel &right) {};
+  G4PreCompoundModel(const G4PreCompoundModel &right) {};
   
-	const G4PreCompoundModel& operator=(const G4PreCompoundModel &right);
-	G4bool operator==(const G4PreCompoundModel &right) const;
-	G4bool operator!=(const G4PreCompoundModel &right) const;
+  const G4PreCompoundModel& operator=(const G4PreCompoundModel &right);
+  G4bool operator==(const G4PreCompoundModel &right) const;
+  G4bool operator!=(const G4PreCompoundModel &right) const;
 
 public:
   G4VParticleChange * ApplyYourself(const G4Track & thePrimary, G4Nucleus & theNucleus);
@@ -59,8 +81,14 @@ private:
 
   void PerformEquilibriumEmission(const G4Fragment & aFragment, 
 				  G4ReactionProductVector * theResult) const;
-				  
-	G4ParticleChange theResult;
+
+#ifdef debug				  
+  void CheckConservation(const G4Fragment & theInitialState,
+					   const G4Fragment & aFragment,
+					     G4ReactionProductVector * Result) const;
+#endif
+
+  G4ParticleChange theResult;
 };
 
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundNeutron.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundNeutron.hh
index 5e5545b190..7d377431e9 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundNeutron.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundNeutron.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundNeutron.hh,v 1.5.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 
@@ -13,51 +31,59 @@
 #define G4PreCompoundNeutron_h 1
 
 #include "G4VPreCompoundNucleon.hh"
-#include "G4DynamicParticle.hh"
+#include "G4ReactionProduct.hh"
 #include "G4Neutron.hh"
 #include "G4PreCompoundParameters.hh"
 #include "Randomize.hh"
 
+#include "G4NeutronCoulombBarrier.hh"
 
 
 class G4PreCompoundNeutron : public G4VPreCompoundNucleon
 {
 public:
-	// default constructor
-	G4PreCompoundNeutron() : G4VPreCompoundNucleon(1,0) {}
+  // default constructor
+  G4PreCompoundNeutron() : G4VPreCompoundNucleon(1,0,&theNeutronCoulomBarrier,"Neutron") {}
 
-	// copy constructor
-	G4PreCompoundNeutron(const G4PreCompoundNeutron &right): G4VPreCompoundNucleon(right) {}
+  // copy constructor
+  G4PreCompoundNeutron(const G4PreCompoundNeutron &right): G4VPreCompoundNucleon(right) {}
 
-	// destructor
-	~G4PreCompoundNeutron() {}
+  // destructor
+  ~G4PreCompoundNeutron() {}
 
-	// operators  
-	const G4PreCompoundNeutron & operator=(const G4PreCompoundNeutron &right) {
-		if (&right != this) this->G4VPreCompoundNucleon::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4PreCompoundNeutron & operator=(const G4PreCompoundNeutron &right) {
+    if (&right != this) this->G4VPreCompoundNucleon::operator=(right);
+    return *this;
+  }
 
-	G4bool operator==(const G4PreCompoundNeutron &right) const
-	{ return G4VPreCompoundNucleon::operator==(right);}
+  G4bool operator==(const G4PreCompoundNeutron &right) const
+  { return G4VPreCompoundNucleon::operator==(right);}
   
-	G4bool operator!=(const G4PreCompoundNeutron &right) const
-	{ return G4VPreCompoundNucleon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundNeutron &right) const
+  { return G4VPreCompoundNucleon::operator!=(right);}
 
 
-	const G4DynamicParticle GetDynamicParticle() const
-	{
-		G4DynamicParticle theDynamicParticle(G4Neutron::NeutronDefinition(),GetMomentum());
-		return theDynamicParticle;
-	}
+  G4ReactionProduct * GetReactionProduct() const
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4Neutron::NeutronDefinition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 
 
 public:
-	G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
+  G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
 
-	// Gives the kinetic energy for fragments in pre-equilibrium decay
-	G4double GetKineticEnergy(const G4Fragment & aFragment);
+  // Gives the kinetic energy for fragments in pre-equilibrium decay
+  G4double GetKineticEnergy(const G4Fragment & aFragment);
+
+
+private:
+
+  G4NeutronCoulombBarrier theNeutronCoulomBarrier;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundParameters.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundParameters.hh
index 39f7f7226a..1e832fad3c 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundParameters.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundParameters.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundParameters.hh,v 1.5.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 
@@ -19,12 +37,9 @@ class G4PreCompoundParameters
 private:
   static G4PreCompoundParameters  thePreCompoundParameters;
 
-  // Level density parameter
-  const G4double theLevelDensity;
-
-
   // default constructor
-  G4PreCompoundParameters() : theLevelDensity(0.125/MeV) {}
+  G4PreCompoundParameters() : theLevelDensity(0.125/MeV),
+			      r0(1.5*fermi),Transitionsr0(0.6*fermi),FermiEnergy(35.0*MeV) {}
 
 public:
 
@@ -35,6 +50,30 @@ public:
   G4double GetLevelDensity()
   { return theLevelDensity; }
   
+  G4double Getr0()
+  { return r0; }
+
+  G4double GetTransitionsr0()
+  { return Transitionsr0; }
+
+
+  G4double GetFermiEnergy()
+  { return FermiEnergy; }
+
+private:
+  // Level density parameter
+  const G4double theLevelDensity;
+
+
+  // Nuclear radius r0
+  const G4double r0;
+	
+  // Nuclear radius r0 for transitions
+  const G4double Transitionsr0;
+
+  // Fermi energy level
+  const G4double FermiEnergy;
+  
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundProton.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundProton.hh
index 6607372f51..77f8e82f59 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundProton.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundProton.hh
@@ -1,64 +1,86 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundProton.hh,v 1.6.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #ifndef G4PreCompoundProton_h
 #define G4PreCompoundProton_h 1
 
 #include "G4VPreCompoundNucleon.hh"
-#include "G4DynamicParticle.hh"
+#include "G4ReactionProduct.hh"
 #include "G4Proton.hh"
 #include "G4PreCompoundParameters.hh"
 #include "Randomize.hh"
 
+#include "G4ProtonCoulombBarrier.hh"
+
 
 class G4PreCompoundProton : public G4VPreCompoundNucleon
 {
 public:
-	// default constructor
-	G4PreCompoundProton():G4VPreCompoundNucleon(1,1) {}
+  // default constructor
+  G4PreCompoundProton():G4VPreCompoundNucleon(1,1,&theProtonCoulombBarrier,"Proton") {}
 
-	// copy constructor
-	G4PreCompoundProton(const G4PreCompoundProton &right): G4VPreCompoundNucleon(right) {}
+  // copy constructor
+  G4PreCompoundProton(const G4PreCompoundProton &right): G4VPreCompoundNucleon(right) {}
 
-	// destructor
-	~G4PreCompoundProton() {};
+  // destructor
+  ~G4PreCompoundProton() {};
 
-	// operators  
-	const G4PreCompoundProton & operator=(const G4PreCompoundProton &right) {
-		if (&right != this) this->G4VPreCompoundNucleon::operator=(right);
-		return *this;
-	};
+  // operators  
+  const G4PreCompoundProton & operator=(const G4PreCompoundProton &right) {
+    if (&right != this) this->G4VPreCompoundNucleon::operator=(right);
+    return *this;
+  };
 
-	G4bool operator==(const G4PreCompoundProton &right) const
-	{ return G4VPreCompoundNucleon::operator==(right);}
+  G4bool operator==(const G4PreCompoundProton &right) const
+  { return G4VPreCompoundNucleon::operator==(right);}
 
   
-	G4bool operator!=(const G4PreCompoundProton &right) const
-	{ return G4VPreCompoundNucleon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundProton &right) const
+  { return G4VPreCompoundNucleon::operator!=(right);}
 
 
-	const G4DynamicParticle GetDynamicParticle() const
-	{
-		G4DynamicParticle theDynamicParticle(G4Proton::ProtonDefinition(),GetMomentum());
-      return theDynamicParticle;
-    }
+  G4ReactionProduct * GetReactionProduct() const
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4Proton::ProtonDefinition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 
-	G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
+  G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
 
-	// Gives the kinetic energy for fragments in pre-equilibrium decay
-	G4double GetKineticEnergy(const G4Fragment & aFragment);
+  // Gives the kinetic energy for fragments in pre-equilibrium decay
+  G4double GetKineticEnergy(const G4Fragment & aFragment);
 
 private:
-
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const;
+		
+  G4ProtonCoulombBarrier theProtonCoulombBarrier;
 
 };
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTransitions.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTransitions.hh
index 73df9d50d1..cb83db0e12 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTransitions.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTransitions.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundTransitions.hh,v 1.5.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #ifndef G4PreCompoundTransitions_h
@@ -32,10 +50,10 @@ public:
   // Calculates transition probabilities with Delta N = +2 (Trans1) -2 (Trans2) and 0 (Trans3)
   G4PreCompoundTransitions(const G4Fragment & aFragment);
 
-  ~G4PreCompoundTransitions() {};
+  ~G4PreCompoundTransitions() {}
 
 private:
-  G4PreCompoundTransitions() {};
+  G4PreCompoundTransitions() {}
   
   G4PreCompoundTransitions(const G4PreCompoundTransitions &right) {};
   
@@ -45,7 +63,6 @@ private:
   
   G4bool operator!=(const G4PreCompoundTransitions &right) const;
 
-
 public:
   G4double GetTotalProbability(void)
   { return TransitionProb1+TransitionProb2+TransitionProb3; }
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTriton.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTriton.hh
index 5d0311ff5a..217a985085 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTriton.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4PreCompoundTriton.hh
@@ -1,111 +1,127 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundTriton.hh,v 1.6.2.1 2001/06/28 19:13:33 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #ifndef G4PreCompoundTriton_h
 #define G4PreCompoundTriton_h 1
 
 #include "G4VPreCompoundIon.hh"
+#include "G4ReactionProduct.hh"
 #include "G4Triton.hh"
 
+#include "G4TritonCoulombBarrier.hh"
+
+#include "G4ProtonCoulombBarrier.hh"
+
+
 class G4PreCompoundTriton : public G4VPreCompoundIon
 {
 public:
-	// default constructor
-	G4PreCompoundTriton():G4VPreCompoundIon(3,1) {}
+  // default constructor
+  G4PreCompoundTriton():G4VPreCompoundIon(3,1,&theTritonCoulombBarrier,"Triton") {}
 
-	// copy constructor
-	G4PreCompoundTriton(const G4PreCompoundTriton &right): G4VPreCompoundIon(right) {}
+  // copy constructor
+  G4PreCompoundTriton(const G4PreCompoundTriton &right): G4VPreCompoundIon(right) {}
 	
-	// destructor
-	~G4PreCompoundTriton() {}
+  // destructor
+  ~G4PreCompoundTriton() {}
 
-	// operators  
-	const G4PreCompoundTriton & operator=(const G4PreCompoundTriton &right) {
-		if (&right != this) this->G4VPreCompoundIon::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4PreCompoundTriton & operator=(const G4PreCompoundTriton &right) {
+    if (&right != this) this->G4VPreCompoundIon::operator=(right);
+    return *this;
+  }
 
-	G4bool operator==(const G4PreCompoundTriton &right) const
-	{ return G4VPreCompoundIon::operator==(right);}
+  G4bool operator==(const G4PreCompoundTriton &right) const
+  { return G4VPreCompoundIon::operator==(right);}
 
   
-	G4bool operator!=(const G4PreCompoundTriton &right) const
-	{ return G4VPreCompoundIon::operator!=(right);}
+  G4bool operator!=(const G4PreCompoundTriton &right) const
+  { return G4VPreCompoundIon::operator!=(right);}
 
-	const G4DynamicParticle GetDynamicParticle() const {
-		G4DynamicParticle theDynamicParticle(G4Triton::TritonDefinition(),GetMomentum());
-		return theDynamicParticle;
-    }
+  G4ReactionProduct *  GetReactionProduct() const 
+  {
+    G4ReactionProduct * theReactionProduct = new G4ReactionProduct(G4Triton::TritonDefinition());
+    theReactionProduct->SetMomentum(GetMomentum().vect());
+    theReactionProduct->SetTotalEnergy(GetMomentum().e());
+    return theReactionProduct;
+  }
 
 
 
 
 public:
-	void CalcExcitonLevelDensityRatios(const G4double Excitons,
-												  const G4double Particles)
-	{
-	// Level density ratios are calculated according to the formula
-	// (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af! (Af-1)!)
-	// where  P is number of particles
-	//        N is number of excitons
-	//        Af atomic number of emitting fragment
-	// the next is a simplification for tritons (Af = 3)
+  void CalcExcitonLevelDensityRatios(const G4double Excitons,
+				     const G4double Particles)
+  {
+    // Level density ratios are calculated according to the formula
+    // (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af! (Af-1)!)
+    // where  P is number of particles
+    //        N is number of excitons
+    //        Af atomic number of emitting fragment
+    // the next is a simplification for tritons (Af = 3)
 
-		SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
-				 								((Particles-1.0)*(Excitons-2.0)/2.0)*
-				 								((Particles-2.0)*(Excitons-3.0)/3.0)/2.0));
-   }
+    SetExcitonLevelDensityRatio(((Particles*(Excitons-1.0))*
+				 ((Particles-1.0)*(Excitons-2.0)/2.0)*
+				 ((Particles-2.0)*(Excitons-3.0)/3.0)/2.0));
+  }
 
 
-	void CalcCondensationProbability(const G4double A)
-		// This method computes condensation probability to create a fragment
-		// consisting from N nucleons inside a nucleus with A nucleons 
-		// This value comes from the formula N^3 (N/A)^(N-1) with N = 3 (triton)
-	{
-    		SetCondensationProbability(243.0/(A*A));
-	}
+  void CalcCondensationProbability(const G4double A)
+    // This method computes condensation probability to create a fragment
+    // consisting from N nucleons inside a nucleus with A nucleons 
+    // This value comes from the formula N^3 (N/A)^(N-1) with N = 3 (triton)
+  {
+    SetCondensationProbability(243.0/(A*A));
+  }
 
 
 private:
 
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const;
-	virtual G4double GetCCoef(const G4double aZ) const;
-
+  virtual G4double GetCCoef(const G4double aZ) const;
 
+  G4TritonCoulombBarrier theTritonCoulombBarrier;
 };
 
 
- 
-inline G4double G4PreCompoundTriton::GetBarrierPenetrationFactor(const G4double aZ) const
-{
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}
-	return K+0.12;      
-}
+#endif
+
 
 inline G4double G4PreCompoundTriton::GetCCoef(const G4double aZ) const
 {
-	G4double C = 0.0;
+  G4double C = 0.0;
 
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}
+  if (aZ >= 70) {
+    C = 0.10;
+  } else {
+    C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+  }
 
-	return C/3.0;                               
+  return C/3.0;                               
 }
 
 
-#endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
index 8a13f055c2..bc41227cf5 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundFragment.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VPreCompoundFragment.hh,v 1.6.2.1 2001/06/28 19:13:34 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #ifndef G4VPreCompoundFragment_h
@@ -16,144 +34,147 @@
 #include "G4ParticleTable.hh"
 #include "G4IonTable.hh"
 #include "G4Fragment.hh"
+#include "G4VCoulombBarrier.hh"
 
-class G4DynamicParticle;
+
+class G4ReactionProduct;
 
 class G4VPreCompoundFragment
 {
-	// ============================
-	// Constructors and destructor
-	// ============================
+  // ============================
+  // Constructors and destructor
+  // ============================
 
 protected:
-	// default constructor
-	G4VPreCompoundFragment() {};
+  // default constructor
+  G4VPreCompoundFragment() {};
 
 public:  
-	// copy constructor
-	G4VPreCompoundFragment(const G4VPreCompoundFragment &right);
+  // copy constructor
+  G4VPreCompoundFragment(const G4VPreCompoundFragment &right);
 
-	// constructor  
-	G4VPreCompoundFragment(const G4double anA, const G4double aZ);
+    // constructor  
+  G4VPreCompoundFragment(const G4double anA, const G4double aZ,
+			 G4VCoulombBarrier * aCoulombBarrier);
 
-	virtual ~G4VPreCompoundFragment();
+  G4VPreCompoundFragment(const G4double anA, const G4double aZ,
+			 G4VCoulombBarrier * aCoulombBarrier,
+			 const G4String &  aName);
 
-	// ==========
-	// operators 
-	// ========== 
+  virtual ~G4VPreCompoundFragment();
+
+  // ==========
+  // operators 
+  // ========== 
 	
-	const G4VPreCompoundFragment& operator=(const G4VPreCompoundFragment &right);
+  const G4VPreCompoundFragment& operator=(const G4VPreCompoundFragment &right);
 
-	G4int operator==(const G4VPreCompoundFragment &right) const;
+  G4int operator==(const G4VPreCompoundFragment &right) const;
   
-	G4int operator!=(const G4VPreCompoundFragment &right) const;
+  G4int operator!=(const G4VPreCompoundFragment &right) const;
 
-	friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment*);
-	friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment&);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment*);
+  friend G4std::ostream& operator<<(G4std::ostream&, const G4VPreCompoundFragment&);
 
-	// =====================
-	// Pure Virtual methods
-	// =====================
-	virtual void CalcExcitonLevelDensityRatios(const G4double Excitons, const G4double Particles) = 0;
+  // =====================
+  // Pure Virtual methods
+  // =====================
+  virtual void CalcExcitonLevelDensityRatios(const G4double Excitons, const G4double Particles) = 0;
   
-	virtual G4double GetKineticEnergy(const G4Fragment & aFragment) = 0;
+  virtual G4double GetKineticEnergy(const G4Fragment & aFragment) = 0;
 
-	// Calculates condensation probabilities to create clusters  
-	// consisting of N nucleons inside a nucleus with A nucleons
-	virtual void CalcCondensationProbability(const G4double A) = 0;
+  // Calculates condensation probabilities to create clusters  
+  // consisting of N nucleons inside a nucleus with A nucleons
+  virtual void CalcCondensationProbability(const G4double A) = 0;
 	
-	virtual const G4DynamicParticle GetDynamicParticle() const = 0; 	
+  virtual G4ReactionProduct * GetReactionProduct() const = 0; 	
 
 protected:
   virtual G4double ProbabilityDistributionFunction(const G4double & K, const G4Fragment & aFragment) = 0;
 
 public:
 
-	// =====================
-	// Initialization method
-	// =====================
-	void Init(const G4Fragment & aFragment);
+  // =====================
+  // Initialization method
+  // =====================
+  void Init(const G4Fragment & aFragment);
   
-	// ================================================
-	// Methods for calculating the emission probability
-	// ================================================
+  // ================================================
+  // Methods for calculating the emission probability
+  // ================================================
 
-	// Calculates the total (integrated over kinetic energy) emission
-	// probability of a fragment
-	G4double CalcEmissionProbability(const G4Fragment & aFragment);
+  // Calculates the total (integrated over kinetic energy) emission
+  // probability of a fragment
+  G4double CalcEmissionProbability(const G4Fragment & aFragment);
 
-	// See above (in virtual methods) the method ProbabilityDistributionFunction
+  // See above (in virtual methods) the method ProbabilityDistributionFunction
 private:	
-	// This method performs integration for probability function over 
-	// fragment kinetic energy
-	G4double IntegrateEmissionProbability(const G4double & Low, const G4double & Up, 
-  													 const G4Fragment & aFragment);	
+  // This method performs integration for probability function over 
+  // fragment kinetic energy
+  G4double IntegrateEmissionProbability(const G4double & Low, const G4double & Up, 
+					const G4Fragment & aFragment);	
 
-	// ========================================
-	// Method for calculate the Coulomb barrier
-	// ========================================
-private:
-	G4double CalcCoulombBarrier(const G4double NucRad, const G4double aZ);
 
-	// ============================
-	// Data members access methods
-	// ============================
+  //      // This quantity takes account of the fact that proton and neutron degrees of 
+  //      // freedom are distinguishable 
+  //      G4double DistinguishablilityFactor(const G4Fragment & aFragment);
+
+    // ============================
+    // Data members access methods
+    // ============================
 
 public:
-	const G4double GetA() const { return theA;}
+  const G4double GetA() const { return theA;}
 
-	const G4double GetZ() const { return theZ;}
+  const G4double GetZ() const { return theZ;}
   
-	const G4double GetRestA() const { return theRestNucleusA;}
+  const G4double GetRestA() const { return theRestNucleusA;}
 
-	const G4double GetRestZ() const { return theRestNucleusZ;}
+  const G4double GetRestZ() const { return theRestNucleusZ;}
   
-	const G4double GetCoulombBarrier() const {return theCoulombBarrier;}
+  const G4double GetCoulombBarrier() const {return theCoulombBarrier;}
 
-	const G4double GetBindingEnergy() const { return theBindingEnergy;}
+  const G4double GetBindingEnergy() const { return theBindingEnergy;}
 
-	const G4double GetMaximalKineticEnergy() const { return theMaximalKineticEnergy;}
+  const G4double GetMaximalKineticEnergy() const { return theMaximalKineticEnergy;}
 
-	const G4double GetExcitonLevelDensityRatio() const { return theExcitonLevelDensityRatio;}
-	void SetExcitonLevelDensityRatio(const G4double value) { theExcitonLevelDensityRatio = value;} 
+  const G4double GetExcitonLevelDensityRatio() const { return theExcitonLevelDensityRatio;}
+  void SetExcitonLevelDensityRatio(const G4double value) { theExcitonLevelDensityRatio = value;} 
   
-	void SetEmissionProbability(const G4double value) { theEmissionProbability = value;}
+  void SetEmissionProbability(const G4double value) { theEmissionProbability = value;}
 	
-	const G4double GetEmissionProbability() const { return theEmissionProbability;}
+  const G4double GetEmissionProbability() const { return theEmissionProbability;}
 
-	const G4double GetCondensationProbability() const { return theCondensationProbability;}
-	void SetCondensationProbability(const G4double value) { theCondensationProbability = value;} 
+  const G4double GetCondensationProbability() const { return theCondensationProbability;}
+  void SetCondensationProbability(const G4double value) { theCondensationProbability = value;} 
 
-	const G4double GetNuclearMass() const {
-		return G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theZ,theA);
-	}
+  const G4double GetNuclearMass() const {
+    return G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theZ,theA);
+  }
 
-	const G4double GetRestNuclearMass() const {
-		return G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theRestNucleusZ,theRestNucleusA);
-	}
+  const G4double GetRestNuclearMass() const {
+    return G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(theRestNucleusZ,theRestNucleusA);
+  }
 
 
 
-	const G4double GetReducedMass() const {
-		return GetRestNuclearMass()*GetNuclearMass()/(GetNuclearMass()+GetRestNuclearMass());
-	}
+  const G4double GetReducedMass() const {
+    return GetRestNuclearMass()*GetNuclearMass()/(GetNuclearMass()+GetRestNuclearMass());
+  }
 
-	const G4LorentzVector GetMomentum() const { return theMomentum;}
+  const G4LorentzVector GetMomentum() const { return theMomentum;}
 
-	void SetMomentum(const G4LorentzVector & value) { theMomentum = value;}
+  void SetMomentum(const G4LorentzVector & value) { theMomentum = value;}
 
-protected:
 
-	virtual G4double GetBarrierPenetrationFactor(const G4double aZ) const
-	{return 1.0;}
-
-//	virtual G4double Get 
+  void SetFragmentName(const G4String& aName) { theFragmentName = aName; }
+  const G4String GetName() const { return theFragmentName; }
 
 
 
-	// =============
-	// Data members
-	// =============
+  // =============
+  // Data members
+  // =============
 	
 private:
 
@@ -164,8 +185,10 @@ private:
   G4double theRestNucleusA;
 
   G4double theRestNucleusZ;
-
+  
   G4double theCoulombBarrier;
+  
+  G4VCoulombBarrier * theCoulombBarrierPtr;
 
   G4double theBindingEnergy;
 
@@ -179,6 +202,10 @@ private:
 
   G4LorentzVector theMomentum;
 
+  G4String theFragmentName;
+
 };
 
 #endif
+
+
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundIon.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundIon.hh
index 052afbfc3e..28bf15ab1d 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundIon.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundIon.hh
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VPreCompoundIon.hh,v 1.6.2.1 2001/06/28 19:13:34 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 
@@ -16,49 +34,54 @@
 #include "G4VPreCompoundFragment.hh"
 #include "G4PreCompoundParameters.hh"
 #include "Randomize.hh"
-
+//#include "G4VCoulombBarrier.hh"
 
 class G4VPreCompoundIon : public G4VPreCompoundFragment
 {
 protected:
-	// default constructor
-	G4VPreCompoundIon() {}
+  // default constructor
+  G4VPreCompoundIon() {}
 
 public:
 
-	// copy constructor
-	G4VPreCompoundIon(const G4VPreCompoundIon &right): G4VPreCompoundFragment(right) {}
+  // copy constructor
+  G4VPreCompoundIon(const G4VPreCompoundIon &right): G4VPreCompoundFragment(right) {}
 
-	// constructor  
-	G4VPreCompoundIon(const G4double anA, const G4double aZ): G4VPreCompoundFragment(anA,aZ) {}
+  // constructor  
+  G4VPreCompoundIon(const G4double anA, const G4double aZ, G4VCoulombBarrier* aCoulombBarrier):
+    G4VPreCompoundFragment(anA,aZ,aCoulombBarrier) {}
+
+  G4VPreCompoundIon(const G4double anA, const G4double aZ, G4VCoulombBarrier* aCoulombBarrier, 
+		    const G4String & aName):
+    G4VPreCompoundFragment(anA,aZ,aCoulombBarrier,aName) {}
   
-	// destructor  
-	virtual ~G4VPreCompoundIon() {}
+  // destructor  
+  virtual ~G4VPreCompoundIon() {}
 
-	// operators  
-	const G4VPreCompoundIon & operator=(const G4VPreCompoundIon &right) {
-		if (&right != this) this->G4VPreCompoundFragment::operator=(right);
-		return *this;
-	}
+  // operators  
+  const G4VPreCompoundIon & operator=(const G4VPreCompoundIon &right) {
+    if (&right != this) this->G4VPreCompoundFragment::operator=(right);
+    return *this;
+  }
 
 
-	G4bool operator==(const G4VPreCompoundIon &right) const
-	{ return G4VPreCompoundFragment::operator==(right);}
+  G4bool operator==(const G4VPreCompoundIon &right) const
+  { return G4VPreCompoundFragment::operator==(right);}
 
-	G4bool operator!=(const G4VPreCompoundIon &right) const
-	{ return G4VPreCompoundFragment::operator!=(right);}
+  G4bool operator!=(const G4VPreCompoundIon &right) const
+  { return G4VPreCompoundFragment::operator!=(right);}
 
 
 
 public:
-	G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
+  G4double ProbabilityDistributionFunction(const G4double & eKin, const G4Fragment & aFragment);
 
-	// Gives the kinetic energy for fragments in pre-equilibrium decay
-	G4double GetKineticEnergy(const G4Fragment & aFragment);
+  // Gives the kinetic energy for fragments in pre-equilibrium decay
+  G4double GetKineticEnergy(const G4Fragment & aFragment);
 
 protected:
 
-	virtual G4double GetCCoef(const G4double aZ) const {return 1.0;}
+  virtual G4double GetCCoef(const G4double aZ) const {return 1.0;}
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundNucleon.hh b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundNucleon.hh
index f939a4a921..4664c30a56 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundNucleon.hh
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/include/G4VPreCompoundNucleon.hh
@@ -1,68 +1,91 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VPreCompoundNucleon.hh,v 1.5.2.1 2001/06/28 19:13:34 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #ifndef G4VPreCompoundNucleon_h
 #define G4VPreCompoundNucleon_h 1
 
 #include "G4VPreCompoundFragment.hh"
+#include "G4VCoulombBarrier.hh"
 
 
 class G4VPreCompoundNucleon : public G4VPreCompoundFragment
 {
 protected:
-	// copy constructor
-	G4VPreCompoundNucleon() {};
+  // default constructor
+  G4VPreCompoundNucleon() {};
 
 public:
 
-	// copy constructor
-	G4VPreCompoundNucleon(const G4VPreCompoundNucleon &right): G4VPreCompoundFragment(right) {}
+  // copy constructor
+  G4VPreCompoundNucleon(const G4VPreCompoundNucleon &right): G4VPreCompoundFragment(right) {}
 
-	// constructor  
-	G4VPreCompoundNucleon(const G4double anA, const G4double aZ): G4VPreCompoundFragment(anA,aZ) {}
+  // constructor  
+  G4VPreCompoundNucleon(const G4double anA, const G4double aZ, G4VCoulombBarrier* aCoulombBarrier): 
+    G4VPreCompoundFragment(anA,aZ,aCoulombBarrier) {}
 
-	virtual ~G4VPreCompoundNucleon() {}
+  G4VPreCompoundNucleon(const G4double anA, const G4double aZ, G4VCoulombBarrier* aCoulombBarrier,
+			const G4String & aName): 
+    G4VPreCompoundFragment(anA,aZ,aCoulombBarrier,aName) {}
 
-	// operators  
-	const G4VPreCompoundNucleon & operator=(const G4VPreCompoundNucleon &right) {
-		if (&right != this) this->G4VPreCompoundFragment::operator=(right);
-		return *this;
-	}
+  virtual ~G4VPreCompoundNucleon() {}
 
-	G4bool operator==(const G4VPreCompoundNucleon &right) const 
-	{ return G4VPreCompoundFragment::operator==(right);}
+  // operators  
+  const G4VPreCompoundNucleon & operator=(const G4VPreCompoundNucleon &right) {
+    if (&right != this) this->G4VPreCompoundFragment::operator=(right);
+    return *this;
+  }
+
+  G4bool operator==(const G4VPreCompoundNucleon &right) const 
+  { return G4VPreCompoundFragment::operator==(right);}
   
-	G4bool operator!=(const G4VPreCompoundNucleon &right) const 
-	{ return G4VPreCompoundFragment::operator!=(right);}
+  G4bool operator!=(const G4VPreCompoundNucleon &right) const 
+  { return G4VPreCompoundFragment::operator!=(right);}
 
 
-	void CalcExcitonLevelDensityRatios(const G4double Excitons,const G4double Particles)
-	{
-		// Level density ratios are calculated according to the formula
-		// (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
-		// where  P is number of particles
-		//        N is number of excitons
-		//        Af atomic number of emitting fragment
-		// the next is a simplification for nucleons (Af = 1)
+  void CalcExcitonLevelDensityRatios(const G4double Excitons,const G4double Particles)
+  {
+    // Level density ratios are calculated according to the formula
+    // (P!*(N-1)!)/((P-Af)!*(N-1-Af)!*Af!)
+    // where  P is number of particles
+    //        N is number of excitons
+    //        Af atomic number of emitting fragment
+    // the next is a simplification for nucleons (Af = 1)
 
-		SetExcitonLevelDensityRatio(Particles*(Excitons-1.0));
-	}
+    SetExcitonLevelDensityRatio(Particles*(Excitons-1.0));
+  }
    
-	void CalcCondensationProbability(const G4double A)
-		// This method computes condensation probability to create a cluster
-		// consisting of N nucleons inside a nucleus with A nucleons.
-		// For Nucleons this probability is, of course, equal to 1
-	{
-		SetCondensationProbability(1.0);
-	}
-
+  void CalcCondensationProbability(const G4double A)
+    // This method computes condensation probability to create a cluster
+    // consisting of N nucleons inside a nucleus with A nucleons.
+    // For Nucleons this probability is, of course, equal to 1
+  {
+    SetCondensationProbability(1.0);
+  }
 };
 
 #endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundEmission.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundEmission.cc
index 1784acf40d..06917bdff2 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundEmission.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundEmission.cc
@@ -1,9 +1,39 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PreCompoundEmission.cc,v 1.3.2.1 2001/06/28 19:13:34 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear Preequilibrium
+// by V. Lara 
+
+
 #include "G4PreCompoundEmission.hh"
 
 const G4PreCompoundEmission & G4PreCompoundEmission::operator=(const G4PreCompoundEmission &right)
 {
-    G4Exception("G4PreCompoundEmission::operator= meant to not be accessable");
-    return *this;
+  G4Exception("G4PreCompoundEmission::operator= meant to not be accessable");
+  return *this;
 }
 
 
@@ -18,125 +48,210 @@ G4bool G4PreCompoundEmission::operator!=(const G4PreCompoundEmission &right) con
 }
 
 
+G4PreCompoundEmission::G4PreCompoundEmission(const G4Fragment& aFragment)
+{
+  // Assume that projectile is a proton
+  ProjEnergy = aFragment.GetExcitationEnergy();
+}
+
+
 G4ReactionProduct * G4PreCompoundEmission::PerformEmission(G4Fragment & aFragment)
 {
-	// Choose a Fragment for emission
-	G4VPreCompoundFragment * theFragment = theFragmentsVector.ChooseFragment();
+  // Choose a Fragment for emission
+  G4VPreCompoundFragment * theFragment = theFragmentsVector.ChooseFragment();
 
-	// Kinetic Energy of emitted fragment
-	G4double KineticEnergyOfEmittedFragment = theFragment->GetKineticEnergy(aFragment);
-	  	  
-	// Sample the Fermi momentum of emitted fragment
-	static const G4double FermiMaxMom = 250.0*MeV;
-	G4ThreeVector FermiMomentum(IsotropicRandom3Vector(FermiMaxMom*pow(G4UniformRand(),1./3.)));
+  // Kinetic Energy of emitted fragment
+  G4double KineticEnergyOfEmittedFragment = theFragment->GetKineticEnergy(aFragment);
 
-	// Get the fragment momentum
-	G4ThreeVector P12(aFragment.GetMomentum().vect());	
-	// Share the fragment momentum between the particles system
-	P12 *= 1.0/G4double(aFragment.GetNumberOfParticles());
-	// Add the Fermi momentum
-	P12 += FermiMomentum;
-			
-	// Calculate the momentum magnitude of emitted fragment 	
-	G4double EmittedMass = theFragment->GetNuclearMass();
-	G4double p = sqrt(KineticEnergyOfEmittedFragment*(KineticEnergyOfEmittedFragment+2.0*EmittedMass));
-	// And sample a direction for it
-	G4ParticleMomentum momentum;	  				
-	if (aFragment.GetMomentum().boostVector().mag2() > 1.e-7) {
-		// sample a non-isotropic random vector
-		G4double CosTheta = sqrt(G4UniformRand());
-		G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-		G4double Phi = twopi*G4UniformRand();
-		momentum = G4ParticleMomentum(p*cos(Phi)*SinTheta,
-												p*sin(Phi)*SinTheta,
-												p*CosTheta);
-		momentum = RotateMomentum(P12,aFragment.GetMomentum().boostVector(),momentum);
-	} else {
-		momentum = IsotropicRandom3Vector(p);
-	}
+  // Calculate the fragment momentum (three vector)
+  G4ThreeVector momentum = AngularDistribution(theFragment,aFragment,KineticEnergyOfEmittedFragment);
 	
-	// Now we can calculate the four momentum 
-	G4LorentzVector EmittedMomentum(momentum,sqrt(momentum.mag2()+EmittedMass*EmittedMass));
+  // Mass of emittef fragment
+  G4double EmittedMass = theFragment->GetNuclearMass();
+
 	
-
-	// Excitation energy
-	G4double anU = theFragment->GetMaximalKineticEnergy() - KineticEnergyOfEmittedFragment + 
-						  theFragment->GetCoulombBarrier();
+  // Now we can calculate the four momentum 
+  // both options are valid and give the same result but 2nd one is faster
+  //  G4LorentzVector EmittedMomentum(momentum,sqrt(momentum.mag2()+EmittedMass*EmittedMass));
+  G4LorentzVector EmittedMomentum(momentum,EmittedMass+KineticEnergyOfEmittedFragment);
 	
-	// check that Excitation energy is > 0
-	if (anU < 0.0) G4Exception("G4PreCompoundModel::DeExcite: Excitation energy less than 0!");
+  // Perform Lorentz boost
+  EmittedMomentum.boost(aFragment.GetMomentum().boostVector());  
 
-	// Update nucleus parameters
-	// Number of excitons
-	aFragment.SetNumberOfExcitons(aFragment.GetNumberOfExcitons()-
-															G4int(theFragment->GetA()));
-	// Number of charges
-	aFragment.SetNumberOfCharged(aFragment.GetNumberOfCharged()-
-				 	      								G4int(theFragment->GetZ()));
+  // Set emitted fragment momentum
+  theFragment->SetMomentum(EmittedMomentum);	
 
-	// Atomic number
-	aFragment.SetA(theFragment->GetRestA());
+
+  // NOW THE RESIDUAL NUCLEUS
+  // ------------------------
+
+  // Now the residual nucleus. 
+  // The energy conservation says that 
+  G4double ResidualEcm = 
+    aFragment.GetGroundStateMass() + aFragment.GetExcitationEnergy() // initial energy in cm
+    - (EmittedMass+KineticEnergyOfEmittedFragment); 
+
+  // Then the four momentum for residual is 
+  G4LorentzVector RestMomentum(-momentum,ResidualEcm);
+  G4LorentzVector RestMomentum2(aFragment.GetMomentum()-EmittedMomentum);
+
+
+  // Just for test
+  // Excitation energy
+  //  G4double anU = ResidualEcm - theFragment->GetRestNuclearMass();
+  // This is equivalent
+  //  G4double anU = theFragment->GetMaximalKineticEnergy() - KineticEnergyOfEmittedFragment + 
+  //    theFragment->GetCoulombBarrier();
+	
+  // check that Excitation energy is >= 0
+  G4double anU = RestMomentum.m()-theFragment->GetRestNuclearMass();
+  if (anU < 0.0) G4Exception("G4PreCompoundModel::DeExcite: Excitation energy less than 0!");
+
+  
+  
+  // Update nucleus parameters:
+  // --------------------------
+  // Number of excitons
+  aFragment.SetNumberOfParticles(aFragment.GetNumberOfParticles()-
+				G4int(theFragment->GetA()));
+  // Number of charges
+  aFragment.SetNumberOfCharged(aFragment.GetNumberOfCharged()-
+			       G4int(theFragment->GetZ()));
+
+  // Atomic number
+  aFragment.SetA(theFragment->GetRestA());
 	  
-	// Charge
-	aFragment.SetZ(theFragment->GetRestZ());
+  // Charge
+  aFragment.SetZ(theFragment->GetRestZ());
 
 
-	// Calculate the residual Fragment momentum
-	G4double ResidualMass = theFragment->GetRestNuclearMass()+anU;
-	G4LorentzVector RestMomentum(-momentum,sqrt(momentum.mag2()+ ResidualMass*ResidualMass));	  
+  // Perform Lorentz boosts
+  RestMomentum.boost(aFragment.GetMomentum().boostVector());
 
-	// Perform Lorentz boosts
-   EmittedMomentum.boost(aFragment.GetMomentum().boostVector());
-	RestMomentum.boost(aFragment.GetMomentum().boostVector());
-
-
-	// Update nucleus momentum
-	aFragment.SetMomentum(RestMomentum);
+  // Update nucleus momentum
+  aFragment.SetMomentum(RestMomentum);
 	
-	// Set emitted fragment momentum
-	theFragment->SetMomentum(EmittedMomentum);	
-
-	G4DynamicParticle MyDP = theFragment->GetDynamicParticle();
-	G4ReactionProduct * theNew = new G4ReactionProduct(MyDP.GetDefinition());
-	theNew->SetMomentum(MyDP.GetMomentum());
-	theNew->SetTotalEnergy(MyDP.Get4Momentum().e());
-
-	return theNew;
+  // Create a G4ReactionProduct 
+  G4ReactionProduct * MyRP = theFragment->GetReactionProduct();
+  return MyRP;
 }
 
 
-G4ThreeVector G4PreCompoundEmission::IsotropicRandom3Vector(G4double Magnitude) const
-  // Create a unit vector with a random direction isotropically distributed
+G4ThreeVector G4PreCompoundEmission::AngularDistribution(G4VPreCompoundFragment * theFragment,
+							 const G4Fragment& aFragment,
+							 const G4double KineticEnergyOfEmittedFragment) const
 {
+  G4double p = aFragment.GetNumberOfParticles();
+  G4double h = aFragment.GetNumberOfHoles();
+  G4double U = aFragment.GetExcitationEnergy();
+	
+  // Kinetic Energy of emitted fragment
+  // G4double KineticEnergyOfEmittedFragment = theFragment->GetKineticEnergy(aFragment);
+	
+  // Emission particle separation energy
+  G4double Bemission = theFragment->GetBindingEnergy();
+	
+  // Fermi energy
+  G4double Ef = G4PreCompoundParameters::GetAddress()->GetFermiEnergy();
+	
+  //
+  G4double g = 0.595*aFragment.GetA()*G4PreCompoundParameters::GetAddress()->GetLevelDensity();
+	
+  // Average exciton energy relative to bottom of nuclear well
+  G4double Eav = 2.0*p*(p+1.0)/((p+h)*g);
+	
+  // Excitation energy relative to the Fermi Level
+  //	G4double Uf = U - (p - h)*Ef;
+  G4double Uf = U - KineticEnergyOfEmittedFragment - Bemission;
 
-  G4double CosTheta = 1.0 - 2.0*G4UniformRand();
-  G4double SinTheta = sqrt(1.0 - CosTheta*CosTheta);
-  G4double Phi = twopi*G4UniformRand();
-  G4ThreeVector Vector(Magnitude*cos(Phi)*SinTheta,
-                       Magnitude*sin(Phi)*SinTheta,
-                       Magnitude*CosTheta);
+	
+  Eav *= rho(p+1,h,g,Uf,Ef)/rho(p,h,g,Uf,Ef);
+	
+  Eav += - Uf/(p+h) + Ef;
+	
+  G4double zeta = G4std::max(1.0,9.3/sqrt(KineticEnergyOfEmittedFragment/MeV));
+	
+  G4double an = 3.0*sqrt((ProjEnergy+Ef)*(KineticEnergyOfEmittedFragment+Bemission+Ef))/
+    (zeta*2.0*aFragment.GetNumberOfExcitons()*Eav);
+  //			(zeta*(aFragment.GetNumberOfExcitons()-1.0)*Eav);
+			
+			
+  G4double normalization = pi*bessi0(an);
+	
+	
+  G4double theta = 0.0;
+  G4double distrib = 0.0;
+  do {
+    theta = pi*G4UniformRand();
+    distrib = exp(an*cos(theta))/normalization;
+  } while ( G4UniformRand() > distrib );
+	
+  G4double phi = twopi*G4UniformRand();
+	
+  // Calculate the momentum magnitude of emitted fragment 	
+  G4double EmittedMass = theFragment->GetNuclearMass();
+  G4double pmag = sqrt(KineticEnergyOfEmittedFragment*(KineticEnergyOfEmittedFragment+2.0*EmittedMass));
+  
+  G4double sinTheta = sin(theta);
+  G4double cosTheta = sqrt(1.0-sinTheta*sinTheta);
 
-  return Vector;
-		
+  G4ThreeVector momentum = G4ParticleMomentum(pmag*cos(phi)*sinTheta,pmag*sin(phi)*sinTheta,pmag*cosTheta);
+	
+  return momentum;
 }
 
 
-G4ParticleMomentum G4PreCompoundEmission::RotateMomentum(G4ParticleMomentum Pa,
-						      G4ParticleMomentum V,
-						      G4ParticleMomentum P) const 
+G4double G4PreCompoundEmission::rho(const G4double p, const G4double h, const G4double g, 
+				    const G4double E, const G4double Ef) const
 {
-  G4ParticleMomentum U = Pa.unit();
-  
-  G4double Alpha1 = U * V;
-  
-  G4double Alpha2 = sqrt(V.mag2() - Alpha1*Alpha1);
+  G4double fact[30];
+  fact[0] = 1;
+  for (G4int n = 1; n < 21; n++) {
+    fact[n] = fact[n-1]*G4double(n);
+  }
+	
+  G4double aph = (p*p + h*h + p - 3.0*h)/(4.0*g);
+	
+  G4double tot = 0.0;
+  for (G4int j = 0; j <= h; j++) {
+    G4double t1 = pow(-1.0, G4double(j));
+    G4double t2 = fact[j]/ (fact[G4int(h)-j]*fact[G4int(h)]);
+    G4double t3 = E - G4double(j)*Ef - aph;
+    if (t3 < 0.0) t3 = 0.0;
+    t3 = pow(t3,p+h-1);
+    tot += t1*t2*t3;
+  }
+	
+  tot *= pow(g,p+h)/(fact[G4int(p)]*fact[G4int(h)]*fact[G4int(p+h)-1]);
 
-  G4ThreeVector N = (1./Alpha2)*U.cross(V);
-
-  G4ParticleMomentum RotatedMomentum(
-				     ( (V.x() - Alpha1*U.x())/Alpha2 ) * P.x() + N.x() * P.y() + U.x() * P.z(),
-				     ( (V.y() - Alpha1*U.y())/Alpha2 ) * P.x() + N.y() * P.y() + U.y() * P.z(),
-				     ( (V.z() - Alpha1*U.z())/Alpha2 ) * P.x() + N.z() * P.y() + U.z() * P.z()
-				     );
-  return RotatedMomentum;
+  return tot;
+}
+
+G4double G4PreCompoundEmission::bessi0(const G4double x) const
+  // Returns the modified Bessel function I_0(x) for any real x.
+{
+  G4double ax,ans; 
+  G4double y;     
+
+  if ((ax=fabs(x)) < 3.75) {      /* Polynomial fit. */
+    y=x/3.75; 
+    y*=y; 
+    ans=1.0+y*(3.5156229+y*(3.0899424+
+			    y*(1.2067492+
+			       y*(0.2659732+
+				  y*(0.360768e-1+
+				     y*0.45813e-2))))); 
+  } else {
+    y=3.75/ax; 
+    ans=(exp(ax)/sqrt(ax))*(0.39894228+y*(0.1328592e-1+
+					  y*(0.225319e-2+
+					     y*(-0.157565e-2+
+						y*(0.916281e-2+
+						   y*(-0.2057706e-1+
+						      y*(0.2635537e-1+
+							 y*(-0.1647633e-1+
+							    y*0.392377e-2))))))));
+  } 
+  return ans; 
+	
 }
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundFragmentVector.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundFragmentVector.cc
index f00fe87d7a..0a2a845fc8 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundFragmentVector.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundFragmentVector.cc
@@ -1,3 +1,32 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4PreCompoundFragmentVector.cc,v 1.3.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// Hadronic Process: Nuclear Preequilibrium
+// by V. Lara 
+
 #include "G4PreCompoundFragmentVector.hh"
 
 #include "G4PreCompoundNeutron.hh"
@@ -8,32 +37,42 @@
 #include "G4PreCompoundAlpha.hh"
 
 G4PreCompoundFragmentVector::G4PreCompoundFragmentVector() :
-	TotalEmissionProbability(0.0)
+  TotalEmissionProbability(0.0)
 {
+  //  theChannels.reserve(6)
   // neutron 
-  theChannels.insert(new G4PreCompoundNeutron());
+    //  theChannels.insert(new G4PreCompoundNeutron());
+  theChannels.push_back(new G4PreCompoundNeutron());
   // proton
-  theChannels.insert(new G4PreCompoundProton());
+  //  theChannels.insert(new G4PreCompoundProton());
+  theChannels.push_back(new G4PreCompoundProton());
   // deuterium
-  theChannels.insert(new G4PreCompoundDeuteron());
+  //  theChannels.insert(new G4PreCompoundDeuteron());
+  theChannels.push_back(new G4PreCompoundDeuteron());
   // triton
-  theChannels.insert(new G4PreCompoundTriton());
+  //  theChannels.insert(new G4PreCompoundTriton());
+  theChannels.push_back(new G4PreCompoundTriton());
   // helium3
-  theChannels.insert(new G4PreCompoundHe3());
+  //  theChannels.insert(new G4PreCompoundHe3());
+  theChannels.push_back(new G4PreCompoundHe3());
   // alpha
-  theChannels.insert(new G4PreCompoundAlpha());
+  //  theChannels.insert(new G4PreCompoundAlpha());
+  theChannels.push_back(new G4PreCompoundAlpha());
 }
 
 
 G4PreCompoundFragmentVector::~G4PreCompoundFragmentVector()
 {
-	theChannels.clearAndDestroy();
+  //  theChannels.clearAndDestroy();
+  for (G4std::vector<G4VPreCompoundFragment*>::iterator i=theChannels.begin(); 
+       i != theChannels.end(); i++) delete *i;
+  theChannels.clear();
 }
 
 const G4PreCompoundFragmentVector & G4PreCompoundFragmentVector::operator=(const G4PreCompoundFragmentVector &right)
 {
-    G4Exception("G4PreCompoundFragmentVector::operator= meant to not be accessable");
-    return *this;
+  G4Exception("G4PreCompoundFragmentVector::operator= meant to not be accessable");
+  return *this;
 }
 
 
@@ -51,62 +90,64 @@ G4bool G4PreCompoundFragmentVector::operator!=(const G4PreCompoundFragmentVector
 
 G4double G4PreCompoundFragmentVector::CalculateProbabilities(const G4Fragment & aFragment)
 {
-	TotalEmissionProbability = 0.0;
-	for (G4int i = 0; i < theChannels.entries(); i++) {
-		theChannels(i)->CalcExcitonLevelDensityRatios(aFragment.GetNumberOfExcitons(),
-																	 aFragment.GetNumberOfParticles());	
-		theChannels(i)->CalcCondensationProbability(aFragment.GetA());
-		// Calculate emission probailities
-		if (aFragment.GetNumberOfParticles() <= theChannels(i)->GetA()-0.01) {
-			// if number of particles less than a fragment atomic number 
-			// set probability to emit a fragment 0
-			theChannels(i)->SetEmissionProbability(0.0);
-		} else if (aFragment.GetNumberOfExcitons() <= theChannels(i)->GetA()+0.01 && 
-															aFragment.GetNumberOfExcitons() != 1) {
-			theChannels(i)->SetEmissionProbability(0.0);
-		} else if (aFragment.GetNumberOfCharged() <= theChannels(i)->GetZ()-0.01) {
-			// if number of charged particles (protons) is less than charge of fragment
-			// set probability to emit a fragment 0
-			theChannels(i)->SetEmissionProbability(0.0);
-		} else if (theChannels(i)->GetMaximalKineticEnergy() <= 0.0) {
-			// if the energy threshold for emitted fragment is less or equal 0
-			// set probability to emit a fragment 0
-			theChannels(i)->SetEmissionProbability(0.0);
-		} else {
-			// Compute total (integrated over kinetic energy) emission 
-			// probability of a fragment and
-			// Summing channel emission probabilities
-			TotalEmissionProbability += theChannels(i)->CalcEmissionProbability(aFragment);
-		}
-	}
-	return TotalEmissionProbability;
+  TotalEmissionProbability = 0.0;
+  G4std::vector<G4VPreCompoundFragment*>::iterator aChannel; 
+  for (aChannel=theChannels.begin(); aChannel != theChannels.end(); aChannel++) {
+    (*aChannel)->CalcExcitonLevelDensityRatios(aFragment.GetNumberOfExcitons(),
+					       aFragment.GetNumberOfParticles());	
+    (*aChannel)->CalcCondensationProbability(aFragment.GetA());
+    // Calculate emission probailities
+    if (aFragment.GetNumberOfParticles() <= (*aChannel)->GetA()-0.01) {
+      // if number of particles less than a fragment atomic number 
+      // set probability to emit a fragment 0
+      (*aChannel)->SetEmissionProbability(0.0);
+    } else if (aFragment.GetNumberOfExcitons() <= (*aChannel)->GetA()+0.01 && 
+	       aFragment.GetNumberOfExcitons() != 1) {
+      (*aChannel)->SetEmissionProbability(0.0);
+    } else if (aFragment.GetNumberOfCharged() <= (*aChannel)->GetZ()-0.01) {
+      // if number of charged particles (protons) is less than charge of fragment
+      // set probability to emit a fragment 0
+      (*aChannel)->SetEmissionProbability(0.0);
+    } else if ((*aChannel)->GetMaximalKineticEnergy() <= 0.0) {
+      // if the energy threshold for emitted fragment is less or equal 0
+      // set probability to emit a fragment 0
+      (*aChannel)->SetEmissionProbability(0.0);
+    } else {
+      // Compute total (integrated over kinetic energy) emission 
+      // probability of a fragment and
+      // Summing channel emission probabilities
+      TotalEmissionProbability += (*aChannel)->CalcEmissionProbability(aFragment);
+    }
+  }
+  return TotalEmissionProbability;
 }
 
 
 G4VPreCompoundFragment * G4PreCompoundFragmentVector::ChooseFragment(void)
 {
-	const G4int NumOfFrags = theChannels.entries();
-	G4double * running = new G4double[NumOfFrags];
-	running[0] = theChannels(0)->GetEmissionProbability();
-        G4int i;
-	for (i = 1; i < NumOfFrags; i++) {
-		running[i]=running[i-1]+theChannels(i)->GetEmissionProbability();
-	}
+  const G4int NumOfFrags = theChannels.size();
+  G4double * running = new G4double[NumOfFrags];
+  running[0] = (*theChannels.begin())->GetEmissionProbability();
+  //  G4std::vector<G4VPreCompoundFragment*>::iterator aChannel; 
+  G4int i;
+  for (i = 1; i < NumOfFrags; i++) {
+    running[i]=running[i-1]+theChannels[i]->GetEmissionProbability();
+  }
 	
-	// Choose an emission channel
-	G4double aChannel = G4UniformRand()*TotalEmissionProbability;
-	G4int ChosenChannel = -1;
-	for (i = 0; i < NumOfFrags; i++) {
-		if (aChannel <= running[i]) {
-			ChosenChannel = i;
-			break;
-		}
-	}
-	delete [] running;
-	if (ChosenChannel < 0) 
-		G4Exception("G4PreCompoundFragmentVector::ChooseFragment: I can't determine a channel");
+  // Choose an emission channel
+  G4double aChannel = G4UniformRand()*TotalEmissionProbability;
+  G4int ChosenChannel = -1;
+  for (i = 0; i < NumOfFrags; i++) {
+    if (aChannel <= running[i]) {
+      ChosenChannel = i;
+      break;
+    }
+  }
+  delete [] running;
+  if (ChosenChannel < 0) 
+    G4Exception("G4PreCompoundFragmentVector::ChooseFragment: I can't determine a channel");
 	
-	return theChannels(ChosenChannel);
+  return theChannels[ChosenChannel];
 }
 
 
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
index d241791c78..a557780f5a 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundModel.cc
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundModel.cc,v 1.11.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4PreCompoundModel.hh"
@@ -13,8 +31,8 @@
 
 const G4PreCompoundModel & G4PreCompoundModel::operator=(const G4PreCompoundModel &right)
 {
-    G4Exception("G4PreCompoundModel::operator= meant to not be accessable");
-    return *this;
+  G4Exception("G4PreCompoundModel::operator= meant to not be accessable");
+  return *this;
 }
 
 
@@ -48,10 +66,10 @@ G4VParticleChange * G4PreCompoundModel::ApplyYourself(const G4Track & thePrimary
   anInitialState.SetZ(aZ);
   
   
-  // Number of Excitons
-  anInitialState.SetNumberOfExcitons(thePrimary.GetDynamicParticle()->GetDefinition()->GetBaryonNumber());
+  // Number of Excited Particles
+  anInitialState.SetNumberOfParticles(thePrimary.GetDynamicParticle()->GetDefinition()->GetBaryonNumber());
   
-  // Number of Charged
+  // Number of Charged Excited Particles
   anInitialState.SetNumberOfCharged(thePrimary.GetDynamicParticle()->GetDefinition()->GetPDGCharge());
   
   // Number of Holes 
@@ -82,9 +100,9 @@ G4VParticleChange * G4PreCompoundModel::ApplyYourself(const G4Track & thePrimary
   for(G4int i=0; i<result->length(); i++)
     {
       G4DynamicParticle * aNew = 
-         new G4DynamicParticle(result->at(i)->GetDefinition(),
-                               result->at(i)->GetTotalEnergy(),
-                               result->at(i)->GetMomentum());
+	new G4DynamicParticle(result->at(i)->GetDefinition(),
+			      result->at(i)->GetTotalEnergy(),
+			      result->at(i)->GetMomentum());
       delete result->at(i);
       theResult.AddSecondary(aNew);
     }
@@ -101,70 +119,77 @@ G4VParticleChange * G4PreCompoundModel::ApplyYourself(const G4Track & thePrimary
 G4ReactionProductVector* G4PreCompoundModel::DeExcite(const G4Fragment & theInitialState) const
 {
   
-	G4ReactionProductVector * Result = new G4ReactionProductVector;
+  G4ReactionProductVector * Result = new G4ReactionProductVector;
   
-	// Copy of the initial state 
-	G4Fragment aFragment(theInitialState);
+  // Copy of the initial state 
+  G4Fragment aFragment(theInitialState);
   
-	// Main loop. It is performed until equilibrium deexcitation.
-	for (;;) {
-		G4PreCompoundEmission aEmission;
-		// Initialize fragment according with the nucleus parameters
-		aEmission.Initialize(aFragment);
+  G4PreCompoundEmission aEmission(theInitialState);
+	
+  // Main loop. It is performed until equilibrium deexcitation.
+  for (;;) {
+    // Initialize fragment according with the nucleus parameters
+    aEmission.Initialize(aFragment);
 
-		// Equilibrium exciton number
-		G4double EquilibriumExcitonNumber = 
-			sqrt(1.19*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*aFragment.GetA()*
-															aFragment.GetExcitationEnergy()+0.5);
+    // Equilibrium exciton number
+    G4double EquilibriumExcitonNumber = 
+      sqrt(1.19*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*aFragment.GetA()*
+	   aFragment.GetExcitationEnergy()+0.5);
 															
-		// Loop for transitions, it is performed while there are preequilibrium transitions.
-		G4bool ThereIsTransition = false;
-		do {
-			if (aFragment.GetNumberOfExcitons() < EquilibriumExcitonNumber) {
-				if (aFragment.GetNumberOfParticles() < 1) {
-					aFragment.SetNumberOfHoles(aFragment.GetNumberOfHoles()+1);
-					aFragment.SetNumberOfExcitons(aFragment.GetNumberOfExcitons()+2);       
-				}
+    // Loop for transitions, it is performed while there are preequilibrium transitions.
+    G4bool ThereIsTransition = false;
+    do {
+      if (aFragment.GetNumberOfExcitons() < EquilibriumExcitonNumber) {
+//  	if (aFragment.GetNumberOfParticles() < 1) {
+//  	  aFragment.SetNumberOfHoles(aFragment.GetNumberOfHoles()+1);
+//  	  aFragment.SetNumberOfParticles(aFragment.GetNumberOfParticles()+1);       
+//  	}
 				
-				G4double TotalEmissionProbability = aEmission.GetTotalProbability(aFragment);
+	G4double TotalEmissionProbability = aEmission.GetTotalProbability(aFragment);
       	
-				// Check if number of excitons is greater than 0
-				// else perform equilibrium emission
-				if (aFragment.GetNumberOfExcitons() <= 0) {
-	  				// Perform Equilibrium Emission
-	  				PerformEquilibriumEmission(aFragment,Result);
-	  				return Result;
-				}
+	// Check if number of excitons is greater than 0
+        // else perform equilibrium emission
+	if (aFragment.GetNumberOfExcitons() <= 0) {
+	  // Perform Equilibrium Emission
+#ifdef debug
+	  CheckConservation(theInitialState,aFragment,Result);
+#endif
+	  PerformEquilibriumEmission(aFragment,Result);
+	  return Result;
+	}
 	
-				G4PreCompoundTransitions aTransition(aFragment);
+	G4PreCompoundTransitions aTransition(aFragment);
 	
-				// Sum of transition probabilities
-				G4double TotalTransitionProbability = aTransition.GetTotalProbability();
+       	// Sum of transition probabilities
+	G4double TotalTransitionProbability = aTransition.GetTotalProbability();
 	
-				// Sum of all probabilities
-				G4double TotalProbability = TotalEmissionProbability + TotalTransitionProbability;
+	// Sum of all probabilities
+	G4double TotalProbability = TotalEmissionProbability + TotalTransitionProbability;
 	
-				// Select subprocess
-				if (G4UniformRand() > TotalEmissionProbability/TotalProbability) {
-	  				// It will be transition to state with a new number of excitons
-	  				ThereIsTransition = true;
+	// Select subprocess
+	if (G4UniformRand() > TotalEmissionProbability/TotalProbability) {
+	  // It will be transition to state with a new number of excitons
+	  ThereIsTransition = true;
 					
-					// Perform the transition
-					aFragment = aTransition.PerformTransition(aFragment);
-				} else {
-	  				// It will be fragment emission
-	  				ThereIsTransition = false;
+	  // Perform the transition
+	  aFragment = aTransition.PerformTransition(aFragment);
+	} else {
+	  // It will be fragment emission
+	  ThereIsTransition = false;
 
-	  				// Perform the emission and Add emitted fragment to Result
-	  				Result->insert(aEmission.PerformEmission(aFragment));
-				}
-      	} else {
-				// Perform Equilibrium Emission
-				PerformEquilibriumEmission(aFragment,Result);
-				return Result;
-      	}
-    	} while (ThereIsTransition);   // end of do loop
-  	} // end of for (;;) loop
+	  // Perform the emission and Add emitted fragment to Result
+	  Result->insert(aEmission.PerformEmission(aFragment));
+	}
+      } else {
+	// Perform Equilibrium Emission
+#ifdef debug
+	CheckConservation(theInitialState,aFragment,Result);
+#endif
+	PerformEquilibriumEmission(aFragment,Result);
+	return Result;
+      }
+    } while (ThereIsTransition);   // end of do loop
+  } // end of for (;;) loop
 }
 
 
@@ -173,8 +198,8 @@ G4ReactionProductVector* G4PreCompoundModel::DeExcite(const G4Fragment & theInit
 void G4PreCompoundModel::PerformEquilibriumEmission(const G4Fragment & aFragment,
 						    G4ReactionProductVector * Result) const 
 {
- G4ReactionProductVector * theEquilibriumResult;
- theEquilibriumResult = GetExcitationHandler()->BreakItUp(aFragment);
+  G4ReactionProductVector * theEquilibriumResult;
+  theEquilibriumResult = GetExcitationHandler()->BreakItUp(aFragment);
   
   while (theEquilibriumResult->entries() > 0) Result->insert(theEquilibriumResult->removeFirst());
   
@@ -183,4 +208,57 @@ void G4PreCompoundModel::PerformEquilibriumEmission(const G4Fragment & aFragment
 }
 
 
+#ifdef debug
+void G4PreCompoundModel::CheckConservation(const G4Fragment & theInitialState,
+					   const G4Fragment & aFragment,
+					   G4ReactionProductVector * Result) const
+{
+  G4double ProductsEnergy = aFragment.GetMomentum().e();
+  G4ThreeVector ProductsMomentum = aFragment.GetMomentum();
+  G4int ProductsA = G4int(aFragment.GetA());
+  G4int ProductsZ = G4int(aFragment.GetZ());
+  for (G4int h = 0; h < Result->entries(); h++) {
+    ProductsEnergy += Result->at(h)->GetTotalEnergy();
+    ProductsMomentum += Result->at(h)->GetMomentum();
+    ProductsA += G4int(Result->at(h)->GetDefinition()->GetBaryonNumber());
+    ProductsZ += G4int(Result->at(h)->GetDefinition()->GetPDGCharge());
+  }
 
+  if (ProductsA != theInitialState.GetA()) {
+    G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PreCompoundModel.cc: Barionic Number Conservation test for just preequilibrium fragments" 
+	   << G4endl; 
+    G4cout << "Initial A = " << theInitialState.GetA() 
+	   << "   Fragments A = " << ProductsA << "   Diference --> " 
+	   << theInitialState.GetA() - ProductsA << G4endl;
+  }
+  if (ProductsZ != theInitialState.GetZ()) {
+    G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PreCompoundModel.cc: Charge Conservation test for just preequilibrium fragments" 
+	   << G4endl; 
+    G4cout << "Initial Z = " << theInitialState.GetZ() 
+	   << "   Fragments Z = " << ProductsZ << "   Diference --> " 
+	   << theInitialState.GetZ() - ProductsZ << G4endl;
+  }
+  if (abs(ProductsEnergy-theInitialState.GetMomentum().e()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Energy Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PreCompoundModel.cc: Energy Conservation test for just preequilibrium fragments" 
+	   << G4endl; 
+    G4cout << "Initial E = " << theInitialState.GetMomentum().e()/MeV << " MeV"
+	   << "   Fragments E = " << ProductsEnergy/MeV  << " MeV   Diference --> " 
+	   << (theInitialState.GetMomentum().e() - ProductsEnergy)/MeV << " MeV" << G4endl;
+  } 
+  if (abs(ProductsMomentum.x()-theInitialState.GetMomentum().x()) > 1.0*keV || 
+      abs(ProductsMomentum.y()-theInitialState.GetMomentum().y()) > 1.0*keV ||
+      abs(ProductsMomentum.z()-theInitialState.GetMomentum().z()) > 1.0*keV) {
+    G4cout << "!!!!!!!!!! Momentum Conservation Violation !!!!!!!!!!" << G4endl;
+    G4cout << "G4PreCompoundModel.cc: Momentum Conservation test for just preequilibrium fragments" 
+	   << G4endl; 
+    G4cout << "Initial P = " << theInitialState.GetMomentum().vect() << " MeV"
+	   << "   Fragments P = " << ProductsMomentum  << " MeV   Diference --> " 
+	   << theInitialState.GetMomentum().vect() - ProductsMomentum << " MeV" << G4endl;
+  }
+  return;
+}
+
+#endif
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundNeutron.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundNeutron.cc
index e530eb7469..9d1ef3505b 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundNeutron.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundNeutron.cc
@@ -1,63 +1,79 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundNeutron.cc,v 1.7.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4PreCompoundNeutron.hh"
 
 
 G4double G4PreCompoundNeutron::ProbabilityDistributionFunction(const G4double & eKin,
-																				  const G4Fragment & aFragment)
+							       const G4Fragment & aFragment)
 {
-	const G4double r0 = 1.5*fermi;
-	// g = 0.595*a*A
-	const G4double g = 0.595*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*GetRestA(); 
-	G4double Alpha = 0.76+2.2/pow(GetRestA(),1.0/3.0); 
-	G4double Beta = (2.12/pow(GetRestA(),2.0/3.0)-0.05)*MeV/Alpha;
+    if ( (aFragment.GetNumberOfParticles()-aFragment.GetNumberOfCharged()) < 1) 
+	return 0.0;
+    
+    const G4double r0 = G4PreCompoundParameters::GetAddress()->Getr0();
+    // g = 0.595*a*A
+    const G4double g = 0.595*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*GetRestA(); 
+    G4double Alpha = 0.76+2.2/pow(GetRestA(),1.0/3.0); 
+    G4double Beta = (2.12/pow(GetRestA(),2.0/3.0)-0.05)*MeV/Alpha;
 	
-	G4double Probability = 2.0/(pi*hbarc*hbarc*hbarc) * GetReducedMass() * Alpha * 
-										r0 * r0 * pow(GetRestA(),2.0/3.0) *
-										GetExcitonLevelDensityRatio()/(g*aFragment.GetExcitationEnergy()) *
-										pow((1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy()),
-	 									(aFragment.GetNumberOfExcitons()-2.0))*(eKin + Beta); 
-
-// 	G4double Probability = 0.000234*r0*r0*pow(GetRestA(),2.0/3.0)*Alpha*GetExcitonLevelDensityRatio()/
-//     (SingleParticleLevelDensity*aFragment.GetExcitationEnergy())*
-//     pow((1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy()),
-// 	 		(aFragment.GetNumberOfExcitons()-2.0))*(eKin + Beta); 
-			
-	return Probability;
+    G4double Probability = 2.0/(pi*hbarc*hbarc*hbarc) * GetReducedMass() * Alpha * 
+	r0 * r0 * pow(GetRestA(),2.0/3.0) *
+	GetExcitonLevelDensityRatio()/(g*aFragment.GetExcitationEnergy()) *
+	pow((1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy()),
+	    (aFragment.GetNumberOfExcitons()-2.0))*(eKin + Beta); 
+	
+    return Probability;
 }
 
 
 G4double G4PreCompoundNeutron::GetKineticEnergy(const G4Fragment & aFragment)
 {
-	G4double Beta = (2.12/pow(GetRestA(),2.0/3.0)-0.05)*MeV/(0.76+2.2/pow(GetRestA(),1.0/3.0));
+    G4double Beta = (2.12/pow(GetRestA(),2.0/3.0)-0.05)*MeV/(0.76+2.2/pow(GetRestA(),1.0/3.0));
 					 
-	G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
-	G4double R2 = GetMaximalKineticEnergy();
-	G4double R1 = R2 + GetCoulombBarrier();
+    G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
+    G4double R2 = GetMaximalKineticEnergy();
+    G4double R1 = R2 + GetCoulombBarrier();
 
-	G4double E = 0.0;
+    G4double E = 0.0;
 
-	if (T <= -0.1) {
-		 E = R1; 
-	} else if (T <= 0.1) {
-		E = -Beta + sqrt(Beta*Beta + (G4UniformRand()*(R2*R2 + 2.0*Beta*R2)));
-	} else {
-		G4double E1 = (R1 - Beta*T)/(T + 1.0);
-		G4double T3 = 0.0;
-		do {
-			E = GetCoulombBarrier()+G4UniformRand()*R2;
-			G4double T1 = (E + Beta)/(E1 + Beta);
-			G4double T2 = (R1 - E)/(R1 - E1);
-			T3 = T1*pow(T2,T);
-		} while (G4UniformRand() > T3);
-	}
-	return E;
+    if (T <= -0.1) {
+	E = R1; 
+    } else if (T <= 0.1) {
+	E = -Beta + sqrt(Beta*Beta + (G4UniformRand()*(R2*R2 + 2.0*Beta*R2)));
+    } else {
+	G4double E1 = (R1 - Beta*T)/(T + 1.0);
+	G4double T3 = 0.0;
+	do {
+	    E = GetCoulombBarrier()+G4UniformRand()*R2;
+	    G4double T1 = (E + Beta)/(E1 + Beta);
+	    G4double T2 = (R1 - E)/(R1 - E1);
+	    T3 = T1*pow(T2,T);
+	} while (G4UniformRand() > T3);
+    }
+    return E;
 }
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundParameters.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundParameters.cc
index 755a081130..74e915c251 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundParameters.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundParameters.cc
@@ -1,11 +1,29 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundParameters.cc,v 1.4.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4PreCompoundParameters.hh"
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundProton.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundProton.cc
index 306fccf830..f094a3a360 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundProton.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundProton.cc
@@ -1,46 +1,62 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundProton.cc,v 1.6.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4PreCompoundProton.hh"
 
-
 G4double G4PreCompoundProton::ProbabilityDistributionFunction(const G4double & eKin,
-																				 const G4Fragment & aFragment)
+							      const G4Fragment & aFragment)
 {
-  const G4double r0 = 1.5*fermi;
-  // g = 0.595*a*A;
-  const G4double g = 0.595*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*GetRestA();
-//  G4double R0J=1.2;
+    if (aFragment.GetNumberOfCharged() < 1) return 0.0;
 
-	G4double aZ = G4double(GetRestZ());
-	G4double C = 0.0;
-	if (aZ >= 70) {
-		C = 0.10;
-	} else {
-		C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
-	}                                         
+    const G4double r0 = G4PreCompoundParameters::GetAddress()->Getr0();
+    // g = 0.595*a*A;
+    const G4double g = 0.595*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*GetRestA();
+    //  G4double R0J=1.2;
 
+    G4double aZ = G4double(GetRestZ());
+    G4double C = 0.0;
+    if (aZ >= 70) {
+	C = 0.10;
+    } else {
+	C = ((((0.15417e-06*aZ) - 0.29875e-04)*aZ + 0.21071e-02)*aZ - 0.66612e-01)*aZ + 0.98375;
+    }                                         
+    G4double alpha = 1.0 + C;
+    G4double beta = -GetCoulombBarrier();
+    G4double XSinv = alpha * (1.0 + beta/eKin) * r0 * r0 * pow(GetRestA(),2.0/3.0);
 
-	G4double Probability = 2.0/(pi*hbarc*hbarc*hbarc) * GetReducedMass() * 
-										(1.0 + C) * r0 * r0 * pow(GetRestA(),2.0/3.0) *
-                            GetExcitonLevelDensityRatio()/(g*aFragment.GetExcitationEnergy()) *
-										pow(1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy(),
-										(aFragment.GetNumberOfExcitons()-2.0))*
-										(eKin - GetCoulombBarrier());
-										
-//   G4double Probability = 0.000234*r0*r0*pow(GetRestA(),2.0/3.0)*R0J*GetExcitonLevelDensityRatio()/
-//     (SingleParticleLevelDensity*aFragment.GetExcitationEnergy())*
-//     pow(1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy(),
-// 	(aFragment.GetNumberOfExcitons()-2.0))*(eKin - GetCoulombBarrier());
+    G4double Probability = 2.0/(pi*hbarc*hbarc*hbarc) * GetReducedMass() * 
+	XSinv * // CalcCorrection() * 
+	GetExcitonLevelDensityRatio()/(g*aFragment.GetExcitationEnergy()) *
+	pow(1.0 - (eKin+GetBindingEnergy())/aFragment.GetExcitationEnergy(),
+	    (aFragment.GetNumberOfExcitons()-2.0))*
+	(eKin - GetCoulombBarrier());
 	
-	return Probability;
+    return Probability;
 }
 
 
@@ -48,44 +64,35 @@ G4double G4PreCompoundProton::ProbabilityDistributionFunction(const G4double & e
 
 G4double G4PreCompoundProton::GetKineticEnergy(const G4Fragment & aFragment)
 {
-	G4double DJ = - GetCoulombBarrier();
+    G4double DJ = - GetCoulombBarrier();
 
-	G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
-	G4double R2 = GetMaximalKineticEnergy();
-	G4double R1 = R2 + GetCoulombBarrier();
+    G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
+    G4double R2 = GetMaximalKineticEnergy();
+    G4double R1 = R2 + GetCoulombBarrier();
 	
-	G4double E = 0.0; 
+    G4double E = 0.0; 
 
-	if (T <= -0.1) {
-  		E = R1;
-	} else if (T <= 0.1) {
-		E = sqrt(G4UniformRand())*R2 + GetCoulombBarrier();
-	} else {
-		G4double E1 = (R1 - DJ*T)/(T + 1.0);
-		G4double T3 = 0.0;
-		do {
-			E = GetCoulombBarrier() + G4UniformRand()*R2;
-			G4double T1 = (E + DJ)/(E1 + DJ);
-			G4double T2 = (R1 - E)/(R1 - E1);
-			T3 = T1*pow(T2,T);
-		} while (G4UniformRand() > T3);
-	}
-	return E;
-}
-
-
-G4double G4PreCompoundProton::GetBarrierPenetrationFactor(const G4double aZ) const
-{
-	G4double K = 1.0;
-	if (aZ>=70.0) {
-		K = 0.80;
-	} else {
-		K = (((0.2357e-5*aZ) - 0.42679e-3)*aZ + 0.27035e-1)*aZ + 0.19025;
-	}                                  
-
-	return K;
+    if (T <= -0.1) {
+	E = R1;
+    } else if (T <= 0.1) {
+	do {
+	    E = sqrt(G4UniformRand())*R2;
+	} while (E < GetCoulombBarrier());
+    } else {
+	G4double E1 = (R1 - DJ*T)/(T + 1.0);
+	G4double T3 = 0.0;
+	do {
+	    E = GetCoulombBarrier() + G4UniformRand()*R2;
+	    G4double T1 = (E + DJ)/(E1 + DJ);
+	    G4double T2 = (R1 - E)/(R1 - E1);
+	    T3 = T1*pow(T2,T);
+	} while (G4UniformRand() > T3);
+    }
+    return E;
 }
 
 
 
 
+
+
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
index 90e421a387..0787281ec6 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4PreCompoundTransitions.cc
@@ -1,23 +1,48 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4PreCompoundTransitions.cc,v 1.6.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4PreCompoundTransitions.hh"
 
+#include "G4EvaporationLevelDensityParameter.hh"
+#include "G4PairingCorrection.hh"
+
+
 G4PreCompoundTransitions::
 G4PreCompoundTransitions(const G4Fragment & aFragment)
 {
   // Fermi energy
-  const G4double FermiEnergy = 45.0*MeV;
-  // 
-  const G4double r0 = 0.6*fermi;
-
+  const G4double FermiEnergy = G4PreCompoundParameters::GetAddress()->GetFermiEnergy();
+  
+	// Nuclear radius
+  const G4double r0 = G4PreCompoundParameters::GetAddress()->GetTransitionsr0();
+   
+  // In order to calculate the level density parameter
+  G4EvaporationLevelDensityParameter theLDP;
 
   // Number of holes
   G4double H = aFragment.GetNumberOfHoles();
@@ -26,9 +51,13 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
   // Number of Excitons 
   G4double N = P+H;
 
+  // Nucleus 
+  G4double A = aFragment.GetA();
+  G4double Z = aFragment.GetZ();
+  G4double U = aFragment.GetExcitationEnergy();
 
   // Relative Energy (T_{rel})
-  G4double RelativeEnergy = (8.0/5.0)*FermiEnergy + aFragment.GetExcitationEnergy()/N;
+  G4double RelativeEnergy = (8.0/5.0)*FermiEnergy + U/N;
   
   // Relative Velocity: 
   // <V_{rel}>^2
@@ -61,8 +90,9 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
   if (TransitionProb1 < 0.0) TransitionProb1 = 0.0; 
 
   // g = 0.595aA; GE = g*E where E is Excitation Energy
-  G4double GE = 0.595*G4PreCompoundParameters::GetAddress()->GetLevelDensity()*
-                aFragment.GetA()*aFragment.GetExcitationEnergy();
+  G4double a = theLDP.LevelDensityParameter(A,Z,U-G4PairingCorrection::GetPairingCorrection(A,Z));
+  //  G4double a = G4PreCompoundParameters::GetAddress()->GetLevelDensity();
+  G4double GE = 0.595*a*A*U;
 
 
   // F(p,h) = 0.25*(p^2 + h^2 + p - h) - 0.5*h
@@ -70,7 +100,7 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
   // F(p+1,h+1)
   G4double Fph1 = Fph + N/2.0;
   // (n+1)/n ((g*E - F(p,h))/(g*E - F(p+1,h+1)))^(n+1)
-  G4double ProbFactor = pow((GE-Fph)/(GE-Fph1),N+1.0);
+  G4double ProbFactor = ((N+1.0)/N) * pow((GE-Fph)/(GE-Fph1),N+1.0);
 
 
   // Transition probability for \Delta n = -2 (at F(p,h) = 0)
@@ -81,7 +111,7 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
 
   // Transition probability for \Delta n = 0 (at F(p,h) = 0)
   //  TransitionProb3 = TransitionProb1*(P+H+1.0)*(P*(P-1.0)+4.0*P*H+H*(H-1.0))/((P+H)*GE);
-  TransitionProb3 = TransitionProb1 * ProbFactor * ((N+1.0)/N) *(P*(P-1.0) + 4.0*P*H + H*(H-1.0))/(GE-Fph);
+  TransitionProb3 = TransitionProb1 * ProbFactor * (P*(P-1.0) + 4.0*P*H + H*(H-1.0))/(GE-Fph);
   if (TransitionProb3 < 0.0) TransitionProb3 = 0.0; 
   
 
@@ -90,8 +120,8 @@ G4PreCompoundTransitions(const G4Fragment & aFragment)
 
 const G4PreCompoundTransitions & G4PreCompoundTransitions::operator=(const G4PreCompoundTransitions &right)
 {
-    G4Exception("G4PreCompoundTransitions::operator= meant to not be accessable");
-    return *this;
+  G4Exception("G4PreCompoundTransitions::operator= meant to not be accessable");
+  return *this;
 }
 
 
@@ -110,25 +140,26 @@ G4bool G4PreCompoundTransitions::operator!=(const G4PreCompoundTransitions &righ
 
 G4Fragment G4PreCompoundTransitions::PerformTransition(const G4Fragment & aFragment)
 {
-	G4Fragment result(aFragment);
-	G4double ChosenTransition = G4UniformRand()*this->GetTotalProbability();
-	G4int deltaN = 0;
-	if (ChosenTransition <= TransitionProb1) 
-	{
-		// Number of excitons is increased on \Delta n = +2
-		deltaN = 2;
-	} 
-	else if (ChosenTransition <= TransitionProb1+TransitionProb2) 
-	{
-		// Number of excitons is increased on \Delta n = -2
-		deltaN = -2;
-	}
-	result.SetNumberOfExcitons(result.GetNumberOfExcitons()+deltaN);
-	result.SetNumberOfHoles(result.GetNumberOfHoles()+deltaN/2); 
-	// With weight Z/A, number of charged particles is decreased on +1
-	if ((deltaN > 0 || result.GetNumberOfCharged() > 0) &&
-       (G4UniformRand() <= result.GetZ()/result.GetA())){
-		result.SetNumberOfCharged(result.GetNumberOfCharged()+deltaN/2);
-	}  
-	return result;
+  G4Fragment result(aFragment);
+  G4double ChosenTransition = G4UniformRand()*this->GetTotalProbability();
+  G4int deltaN = 0;
+  if (ChosenTransition <= TransitionProb1) 
+    {
+      // Number of excitons is increased on \Delta n = +2
+      deltaN = 2;
+    } 
+  else if (ChosenTransition <= TransitionProb1+TransitionProb2) 
+    {
+      // Number of excitons is increased on \Delta n = -2
+      deltaN = -2;
+    }
+  result.SetNumberOfParticles(result.GetNumberOfParticles()+deltaN/2);
+  result.SetNumberOfHoles(result.GetNumberOfHoles()+deltaN/2); 
+  // With weight Z/A, number of charged particles is decreased on +1
+  if ((deltaN > 0 || result.GetNumberOfCharged() > 0) &&
+      (G4UniformRand() <= result.GetZ()/result.GetA())){
+    result.SetNumberOfCharged(result.GetNumberOfCharged()+deltaN/2);
+  }  
+  return result;
 }
+
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
index 6a0fda40d8..3f669b536c 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundFragment.cc
@@ -1,36 +1,66 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VPreCompoundFragment.cc,v 1.8.2.1 2001/06/28 19:13:35 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
  
 #include "G4VPreCompoundFragment.hh"
-#include "G4ios.hh"
 
 
 G4VPreCompoundFragment::G4VPreCompoundFragment(const G4VPreCompoundFragment & right)
 {
-	theA = right.theA;
-	theZ = right.theZ;
-	theRestNucleusA = right.theRestNucleusA;
-	theRestNucleusZ = right.theRestNucleusZ;
-	theCoulombBarrier = right.theCoulombBarrier;
-	theMaximalKineticEnergy = right.theMaximalKineticEnergy;
-	theExcitonLevelDensityRatio = right.theExcitonLevelDensityRatio;
-	theEmissionProbability = right.theEmissionProbability;
-	theCondensationProbability = right.theCondensationProbability;
-	theMomentum = right.theMomentum;
+  theA = right.theA;
+  theZ = right.theZ;
+  theRestNucleusA = right.theRestNucleusA;
+  theRestNucleusZ = right.theRestNucleusZ;
+  theCoulombBarrier = right.theCoulombBarrier;
+  theCoulombBarrierPtr = right.theCoulombBarrierPtr;
+  theMaximalKineticEnergy = right.theMaximalKineticEnergy;
+  theExcitonLevelDensityRatio = right.theExcitonLevelDensityRatio;
+  theEmissionProbability = right.theEmissionProbability;
+  theCondensationProbability = right.theCondensationProbability;
+  theMomentum = right.theMomentum;
+  theFragmentName = right.theFragmentName;
 }
 
 
-G4VPreCompoundFragment::G4VPreCompoundFragment(const G4double anA, const G4double aZ):
-	theA(anA),theZ(aZ),theRestNucleusA(0.0),theRestNucleusZ(0.0),theCoulombBarrier(0.0),
-	theMaximalKineticEnergy(-1.0),theExcitonLevelDensityRatio(0.0),theEmissionProbability(0.0),
-	theCondensationProbability(0.0),theMomentum(0.0,0.0,0.0,0.0)
+G4VPreCompoundFragment::G4VPreCompoundFragment(const G4double anA,
+					       const G4double aZ, G4VCoulombBarrier* aCoulombBarrier):
+  theA(anA),theZ(aZ), theCoulombBarrierPtr(aCoulombBarrier),
+  theRestNucleusA(0.0),theRestNucleusZ(0.0),theCoulombBarrier(0.0),
+  theMaximalKineticEnergy(-1.0),theExcitonLevelDensityRatio(0.0),theEmissionProbability(0.0),
+  theCondensationProbability(0.0),theMomentum(0.0,0.0,0.0,0.0),theFragmentName("No Name")
+{}
+
+G4VPreCompoundFragment::G4VPreCompoundFragment(const G4double anA,
+					       const G4double aZ, G4VCoulombBarrier* aCoulombBarrier,
+					       const G4String & aName):
+  theA(anA),theZ(aZ), theCoulombBarrierPtr(aCoulombBarrier),
+  theRestNucleusA(0.0),theRestNucleusZ(0.0),theCoulombBarrier(0.0),
+  theMaximalKineticEnergy(-1.0),theExcitonLevelDensityRatio(0.0),theEmissionProbability(0.0),
+  theCondensationProbability(0.0),theMomentum(0.0,0.0,0.0,0.0),theFragmentName(aName)
 {}
 
 
@@ -43,60 +73,61 @@ G4VPreCompoundFragment::~G4VPreCompoundFragment()
 const G4VPreCompoundFragment & G4VPreCompoundFragment::operator=
 (const G4VPreCompoundFragment & right)
 {
-	if (this != &right) {
-		theA = right.theA;
-		theZ = right.theZ;
-		theRestNucleusA = right.theRestNucleusA;
-		theRestNucleusZ = right.theRestNucleusZ;
-		theCoulombBarrier = right.theCoulombBarrier;
-		theMaximalKineticEnergy = right.theMaximalKineticEnergy;
-		theExcitonLevelDensityRatio = right.theExcitonLevelDensityRatio;
-		theEmissionProbability = right.theEmissionProbability;
-		theCondensationProbability = right.theCondensationProbability;
-		theMomentum = right.theMomentum;
-	}
-	return *this;
+  if (this != &right) {
+    theA = right.theA;
+    theZ = right.theZ;
+    theRestNucleusA = right.theRestNucleusA;
+    theRestNucleusZ = right.theRestNucleusZ;
+    theCoulombBarrier = right.theCoulombBarrier;
+    theCoulombBarrierPtr = right.theCoulombBarrierPtr;
+    theMaximalKineticEnergy = right.theMaximalKineticEnergy;
+    theExcitonLevelDensityRatio = right.theExcitonLevelDensityRatio;
+    theEmissionProbability = right.theEmissionProbability;
+    theCondensationProbability = right.theCondensationProbability;
+    theMomentum = right.theMomentum;
+  }
+  return *this;
 }
 
 G4int G4VPreCompoundFragment::operator==(const G4VPreCompoundFragment & right) const
 {
-	return (this == (G4VPreCompoundFragment *) &right);
+  return (this == (G4VPreCompoundFragment *) &right);
 }
 
 G4int G4VPreCompoundFragment::operator!=(const G4VPreCompoundFragment & right) const
 {
-	return (this != (G4VPreCompoundFragment *) &right);
+  return (this != (G4VPreCompoundFragment *) &right);
 }
 
 
 G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment &theFragment)
 {
-	out << &theFragment;
-	return out; 
+  out << &theFragment;
+  return out; 
 }
 
 
 G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment *theFragment)
 {
-	long old_floatfield = out.setf(0,G4std::ios::floatfield);
+  long old_floatfield = out.setf(0,G4std::ios::floatfield);
 
-	out 
-		<< "PreCompound Model Emitted Fragment: A = " << G4std::setprecision(3) << theFragment->theA 
-		<< ", Z = " << G4std::setprecision(3) << theFragment->theZ;
-	out.setf(G4std::ios::scientific, G4std::ios::floatfield);
-//   out
-//     << ", U = " << theFragment->theExcitationEnergy/MeV 
-//     << " MeV" << endl
-//     << "          P = (" 
-//     << theFragment->theMomentum.x()/MeV << ","
-//     << theFragment->theMomentum.y()/MeV << ","
-//     << theFragment->theMomentum.z()/MeV 
-//     << ") MeV   E = " 
-//     << theFragment->theMomentum.t()/MeV << " MeV";
+  out 
+    << "PreCompound Model Emitted Fragment: A = " << G4std::setprecision(3) << theFragment->theA 
+    << ", Z = " << G4std::setprecision(3) << theFragment->theZ;
+  out.setf(G4std::ios::scientific,G4std::ios::floatfield);
+  //   out
+  //     << ", U = " << theFragment->theExcitationEnergy/MeV 
+  //     << " MeV" << endl
+  //     << "          P = (" 
+  //     << theFragment->theMomentum.x()/MeV << ","
+  //     << theFragment->theMomentum.y()/MeV << ","
+  //     << theFragment->theMomentum.z()/MeV 
+  //     << ") MeV   E = " 
+  //     << theFragment->theMomentum.t()/MeV << " MeV";
 
-	out.setf(old_floatfield,G4std::ios::floatfield);
+  out.setf(old_floatfield,G4std::ios::floatfield);
 
-	return out;
+  return out;
     
 }
 
@@ -104,56 +135,46 @@ G4std::ostream& operator << (G4std::ostream &out, const G4VPreCompoundFragment *
 void G4VPreCompoundFragment::Init(const G4Fragment & aFragment)
 {
   
-	theRestNucleusA = aFragment.GetA() - theA;
-	theRestNucleusZ = aFragment.GetZ() - theZ;
+  theRestNucleusA = aFragment.GetA() - theA;
+  theRestNucleusZ = aFragment.GetZ() - theZ;
 
-  	if ((theRestNucleusA < theRestNucleusZ) ||
-       (theRestNucleusA < theA) ||
-		 (theRestNucleusZ < theZ)) {
-		// In order to be sure that emission probability will be 0.
-    	theMaximalKineticEnergy = 0.0;
-		return;
-	}
+  if ((theRestNucleusA < theRestNucleusZ) ||
+      (theRestNucleusA < theA) ||
+      (theRestNucleusZ < theZ)) {
+    // In order to be sure that emission probability will be 0.
+    theMaximalKineticEnergy = 0.0;
+    return;
+  }
 
-	// Compute nuclear radius (needed to calculate Coulomb barrier)
-	G4double NuclearRadius = 2.173*fermi*
-			(1.0+0.006103*theZ*theRestNucleusZ)/(1.0+0.009443*theZ*theRestNucleusZ);
-	// Calculate Coulomb barrier
-	theCoulombBarrier = CalcCoulombBarrier(NuclearRadius,theRestNucleusZ);
+
+  // Calculate Coulomb barrier
+  theCoulombBarrier = theCoulombBarrierPtr->
+    GetCoulombBarrier(theRestNucleusA,theRestNucleusZ,
+		      aFragment.GetExcitationEnergy());
   
-	// Compute Binding Energies for fragments 
-	// (needed to separate a fragment from the nucleus)
+  // Compute Binding Energies for fragments 
+  // (needed to separate a fragment from the nucleus)
   
-	theBindingEnergy = G4NucleiProperties::GetMassExcess(theA,theZ) +
-		   G4NucleiProperties::GetMassExcess(theRestNucleusA,theRestNucleusZ) -
-		   G4NucleiProperties::GetMassExcess(aFragment.GetA(),aFragment.GetZ());
+  theBindingEnergy = G4NucleiProperties::GetMassExcess(theA,theZ) +
+    G4NucleiProperties::GetMassExcess(theRestNucleusA,theRestNucleusZ) -
+    G4NucleiProperties::GetMassExcess(aFragment.GetA(),aFragment.GetZ());
       
-	// Compute Maximal Kinetic Energy which can be carried by fragments after separation
-	theMaximalKineticEnergy = aFragment.GetExcitationEnergy() -
-			  						(theBindingEnergy + theCoulombBarrier);
+  // Compute Maximal Kinetic Energy which can be carried by fragments after separation
+  //  theMaximalKineticEnergy = aFragment.GetExcitationEnergy() -
+  //    (theBindingEnergy + theCoulombBarrier);
   
-	return;
-}
+  G4double m = aFragment.GetMomentum().m();
+  G4double rm = GetRestNuclearMass();
+  G4double em = GetNuclearMass();
+  theMaximalKineticEnergy = ((m - rm)*(m + rm) + em*em)/(2.0*m) - em - theCoulombBarrier;
 
-G4double G4VPreCompoundFragment::CalcCoulombBarrier(const G4double NucRad, const G4double aZ)
-  // Calculation of Coulomb potential energy (barrier) for outgoing particles 
-{
-	// for neutron 
-	G4double Barrier;
-	if (GetZ() == 0) {
-		Barrier = 0.0;
-	} else {
-		Barrier = (elm_coupling/NucRad)*((theZ*theRestNucleusZ)/
-               (pow(theA,1.0/3.0)+pow(theRestNucleusA,1.0/3.0)));
-		Barrier *= GetBarrierPenetrationFactor(aZ);
-	}
-	return Barrier;
+  return;
 }
 
 
 G4double G4VPreCompoundFragment::CalcEmissionProbability(const G4Fragment & aFragment)
 {
-	if (GetMaximalKineticEnergy() <= 0.0) return 0.0;
+  if (GetMaximalKineticEnergy() <= 0.0) return 0.0;
 
   // Coulomb barrier is the lower limit 
   // of integration over kinetic energy
@@ -172,30 +193,35 @@ G4double G4VPreCompoundFragment::
 IntegrateEmissionProbability(const G4double & Low, const G4double & Up,
 			     const G4Fragment & aFragment)
 {
-	static const G4double w[8] = {0.1012285363,
-										 0.2223810345,
-										 0.3137066459,
-										 0.3626837834,
-										 0.3626837834,
-										 0.3137066459,
-										 0.2223810345,
-										 0.1012285363};
+  static const G4double w[8] = {0.1012285363,
+				0.2223810345,
+				0.3137066459,
+				0.3626837834,
+				0.3626837834,
+				0.3137066459,
+				0.2223810345,
+				0.1012285363
+  };
 
-	static const G4double FIKS[8] = {0.9602898565,
-											 0.7966664774,
-											 0.5255324099,
-											 0.1834346425,
-											-0.1834346425,
-											-0.5255324099,
-											-0.7966664774,
-											-0.9602898565};
+  static const G4double FIKS[8] = { 0.9602898565,
+				    0.7966664774,
+				    0.5255324099,
+				    0.1834346425,
+				   -0.1834346425,
+				   -0.5255324099,
+				   -0.7966664774,
+				   -0.9602898565
+  };
 
-	G4double Total = 0.0;
-	for (G4int i = 0; i < 8; i++) {
-		G4double KineticE = ((Up-Low)*FIKS[i]+(Up+Low))/2.0;
-		Total += w[i]*ProbabilityDistributionFunction(KineticE, aFragment)*(Up-Low)/2.0;
-	}
-	return Total;
+  G4double Total = 0.0;
+  for (G4int i = 0; i < 8; i++) {
+    G4double KineticE = ((Up-Low)*FIKS[i]+(Up+Low))/2.0;
+    Total += w[i]*ProbabilityDistributionFunction(KineticE, aFragment)*(Up-Low)/2.0;
+  }
+  return Total;
 }
 
 
+
+
+
diff --git a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundIon.cc b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundIon.cc
index a8794c5f11..07f4004979 100644
--- a/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundIon.cc
+++ b/source/processes/hadronic/models/generator/pre_equilibrium/src/G4VPreCompoundIon.cc
@@ -1,105 +1,128 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
 //
+// $Id: G4VPreCompoundIon.cc,v 1.8.2.1 2001/06/28 19:13:36 gunter Exp $
+// GEANT4 tag $Name:  $
+//
 // by V. Lara
 
 #include "G4VPreCompoundIon.hh"  
 
+
 G4double G4VPreCompoundIon::ProbabilityDistributionFunction(const G4double & eKin, 
-																			  const G4Fragment & aFragment)
+							    const G4Fragment & aFragment)
 {
-	const G4double r0 = 1.5*fermi;
-	G4double exEnergy = aFragment.GetExcitationEnergy();
-	G4double B = GetBindingEnergy();
+    G4int pplus = aFragment.GetNumberOfCharged();
+    G4int pneut = aFragment.GetNumberOfParticles()-pplus;
+    if (pneut < (GetA()-GetZ()) || pplus < GetZ()) return 0.0;
 
-	G4double Z = aFragment.GetZ();
-	G4double C = GetCCoef(Z);
+    const G4double r0 = G4PreCompoundParameters::GetAddress()->Getr0();
+    G4double exEnergy = aFragment.GetExcitationEnergy();
+    G4double B = GetBindingEnergy();
 
-	G4double probA = (3.0/4.0)*sqrt(2.0/GetReducedMass())*(1.0+C)*GetExcitonLevelDensityRatio()*
-								GetCondensationProbability()*(eKin - GetCoulombBarrier())/
-								(r0*pow(GetRestA(),1.0/3.0)*exEnergy*sqrt(eKin+B));
+    G4double Z = aFragment.GetZ();
+    G4double C = GetCCoef(Z);
 
-	G4double base = 1.0 + B/exEnergy;
-	G4double exponent = GetA() - 1.0;
-	if (exponent > 100.0 && base < 1.0) return 0.0;
-	G4double probB = pow(base,exponent);
+    G4double probA = (3.0/4.0)*sqrt(2.0/GetReducedMass())*(1.0+C)*GetExcitonLevelDensityRatio()*
+	GetCondensationProbability()*(eKin - GetCoulombBarrier())/
+	(r0*pow(GetRestA(),1.0/3.0)*exEnergy*sqrt(eKin+B));
 
-	base = 1.0 - ((eKin+B)/exEnergy);
-	exponent = aFragment.GetNumberOfExcitons() - 1.0 - GetA();
-	if (exponent > 100.0 && base < 1.0) return 0.0;
-	G4double probC = pow(base,exponent);
+    G4double base = 1.0 + B/exEnergy;
+    G4double exponent = GetA() - 1.0;
+    if (exponent > 100.0 && base < 1.0) return 0.0;
+    G4double probB = pow(base,exponent);
+
+    base = 1.0 - ((eKin+B)/exEnergy);
+    exponent = aFragment.GetNumberOfExcitons() - 1.0 - GetA();
+    if (exponent > 100.0 && base < 1.0) return 0.0;
+    G4double probC = pow(base,exponent);
 	
-	G4double prob = probA * probB * probC;
+    G4double prob = probA * probB * probC;
 	
 
-// 	G4double R0J = 1.1;
-// 	G4double probA = GetCondensationProbability()*R0J*0.104/
-// 					(r0*pow(GetRestA(),1.0/3.0)*sqrt(GetA()*exEnergy));
-// 	G4double probB = GetExcitonLevelDensityRatio()*((eKin-GetCoulombBarrier())/exEnergy);
-// 	G4double ratio = (eKin+GetBindingEnergy())/exEnergy;
-// 	G4double exponent = GetRestA()-1.5;
-// 	if ( exponent>100. && ratio<1. ) return 0.;
-// 	G4double probC = pow( ratio, exponent );
-// 	G4double probD = pow( 1.0 - ratio,
-// 			aFragment.GetNumberOfExcitons()-GetA()-1.0 );
-// 	G4double prob = probA*probB*probC*probD;
+    // 	G4double R0J = 1.1;
+    // 	G4double probA = GetCondensationProbability()*R0J*0.104/
+    // 					(r0*pow(GetRestA(),1.0/3.0)*sqrt(GetA()*exEnergy));
+    // 	G4double probB = GetExcitonLevelDensityRatio()*((eKin-GetCoulombBarrier())/exEnergy);
+    // 	G4double ratio = (eKin+GetBindingEnergy())/exEnergy;
+    // 	G4double exponent = GetRestA()-1.5;
+    // 	if ( exponent>100. && ratio<1. ) return 0.;
+    // 	G4double probC = pow( ratio, exponent );
+    // 	G4double probD = pow( 1.0 - ratio,
+    // 			aFragment.GetNumberOfExcitons()-GetA()-1.0 );
+    // 	G4double prob = probA*probB*probC*probD;
 	
 	
-	if (prob < 1.e-100) return 0.;
-	else return prob;
+    if (prob < 1.e-100) return 0.;
+    else return prob;
 }
 
 
 G4double G4VPreCompoundIon::GetKineticEnergy(const G4Fragment & aFragment)
 {
-	G4double DJ = - GetCoulombBarrier();
+    G4double DJ = - GetCoulombBarrier();
 
-	G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
-	G4double R2 = GetMaximalKineticEnergy();
-	G4double R1 = R2 + GetCoulombBarrier();
+    G4double T = aFragment.GetNumberOfParticles() + aFragment.GetNumberOfHoles() - GetA() - 1.0;
+    G4double R2 = GetMaximalKineticEnergy();
+    G4double R1 = R2 + GetCoulombBarrier();
 	
-	G4double E = 0.0;
+    G4double E = 0.0;
 
-	if (T <= -0.1) E = R1;
-	else if (T <= 0.1) {
-		G4double E1 = R1;
-		G4double T3 = 0.0;
-		do {
-			G4double PJ1 = GetA() - 1.5;
-			G4double AbsBindingE = abs(GetBindingEnergy());
-			if (GetBindingEnergy() <= 0.0 && AbsBindingE > GetCoulombBarrier()) {
-				E = AbsBindingE + G4UniformRand()*aFragment.GetExcitationEnergy();
-			} else {
-				E = GetCoulombBarrier() + G4UniformRand()*R2;
-			}
-			T3 = pow((E+GetBindingEnergy())/(E1+GetBindingEnergy()),PJ1)*((E+DJ)/(E1+DJ));
-		} while (G4UniformRand() > T3);
-	} else {
-		G4double PJ1 = GetA() - 1.5;
-		G4double ES = aFragment.GetExcitationEnergy()*(GetA()-0.5)+
-      (aFragment.GetExcitationEnergy()-R2)*(aFragment.GetNumberOfParticles()+
+    if (T <= -0.1) E = R1;
+    else if (T <= 0.1) {
+	G4double E1 = R1;
+	G4double T3 = 0.0;
+	do {
+	    G4double PJ1 = GetA() - 1.5;
+	    G4double AbsBindingE = abs(GetBindingEnergy());
+	    if (GetBindingEnergy() <= 0.0 && AbsBindingE > GetCoulombBarrier()) {
+		E = AbsBindingE + G4UniformRand()*aFragment.GetExcitationEnergy();
+	    } else {
+		E = GetCoulombBarrier() + G4UniformRand()*R2;
+	    }
+	    T3 = pow((E+GetBindingEnergy())/(E1+GetBindingEnergy()),PJ1)*((E+DJ)/(E1+DJ));
+	} while (G4UniformRand() > T3);
+    } else {
+	G4double PJ1 = GetA() - 1.5;
+	G4double ES = aFragment.GetExcitationEnergy()*(GetA()-0.5)+
+	    (aFragment.GetExcitationEnergy()-R2)*(aFragment.GetNumberOfParticles()+
 						  aFragment.GetNumberOfHoles()-2.5);
-		G4double E1 = (ES + sqrt(ES*ES-(aFragment.GetExcitationEnergy()-R2)*(GetA()-1.5)*
-			     (aFragment.GetNumberOfParticles()+aFragment.GetNumberOfHoles()-1.5)*
-			     4.0*aFragment.GetExcitationEnergy()))/
-      		((aFragment.GetNumberOfParticles()+aFragment.GetNumberOfHoles()-1.5)*2.0)
-      		- aFragment.GetExcitationEnergy() + R1;
-		G4double E = 0.0;
-		G4double T3 = 0.0;
-		do {
-			if (GetBindingEnergy() <= 0.0 && abs(GetBindingEnergy()) > GetCoulombBarrier()) {
-				E = abs(GetBindingEnergy()) + G4UniformRand()*(aFragment.GetExcitationEnergy());
-			} else { 
-				E = GetCoulombBarrier() + G4UniformRand()*R2;
-			}
-      		T3 = (pow((E + GetBindingEnergy())/(E1 + GetBindingEnergy()),PJ1)*
-	    				((E+DJ)/(E1+DJ))) * pow((R1-E)/(R1-E1),T);
-		} while (G4UniformRand() > T3);
-	}
-	return E;
+	G4double E1 = (ES + sqrt(ES*ES-(aFragment.GetExcitationEnergy()-R2)*(GetA()-1.5)*
+				 (aFragment.GetNumberOfParticles()+aFragment.GetNumberOfHoles()-1.5)*
+				 4.0*aFragment.GetExcitationEnergy()))/
+	    ((aFragment.GetNumberOfParticles()+aFragment.GetNumberOfHoles()-1.5)*2.0)
+	    - aFragment.GetExcitationEnergy() + R1;
+	//
+	G4double T3 = 0.0;
+	do {
+	    if (GetBindingEnergy() <= 0.0 && abs(GetBindingEnergy()) > GetCoulombBarrier()) {
+		E = abs(GetBindingEnergy()) + G4UniformRand()*(aFragment.GetExcitationEnergy());
+	    } else { 
+		E = GetCoulombBarrier() + G4UniformRand()*R2;
+	    }
+	    T3 = (pow((E + GetBindingEnergy())/(E1 + GetBindingEnergy()),PJ1)*
+		  ((E+DJ)/(E1+DJ))) * pow((R1-E)/(R1-E1),T);
+	} while (G4UniformRand() > T3);
+    }
+    return E;
 }
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4ASCCrossSection.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4ASCCrossSection.hh
index b26402a432..20f9e49534 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4ASCCrossSection.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4ASCCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ASCCrossSection_h
 #define G4ASCCrossSection_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4AnnihilationCrossSection.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4AnnihilationCrossSection.hh
index a8ea630309..55c847aa33 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4AnnihilationCrossSection.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4AnnihilationCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4AnnihilationCrossSection_h
 #define G4AnnihilationCrossSection_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4BaryonSplitter.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4BaryonSplitter.hh
index 923a6adf5f..5537c54e67 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4BaryonSplitter.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4BaryonSplitter.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4BaryonSplitter_h
 #define G4BaryonSplitter_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4DiffractiveStringBuilder.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4DiffractiveStringBuilder.hh
index f9d5c80a6c..f0fd0cbab0 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4DiffractiveStringBuilder.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4DiffractiveStringBuilder.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4DiffractiveStringBuilder_h
 #define G4DiffractiveStringBuilder_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4GammaAnnCrossSection.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4GammaAnnCrossSection.hh
index d99a5291d4..21b91339b4 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4GammaAnnCrossSection.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4GammaAnnCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4GammaAnnCrossSection_h
 #define G4GammaAnnCrossSection_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
index bda5e6c6c8..43b7f672aa 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4InelasticSplitableHadron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InelasticSplitableHadron.hh,v 1.2 1999/12/15 14:52:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InelasticSplitableHadron.hh,v 1.2.8.1 2001/06/28 19:13:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4InelasticSplitableHadron_h
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4MesonSplitter.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4MesonSplitter.hh
index 0718de9da7..f8f3a0017f 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4MesonSplitter.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4MesonSplitter.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4MesonSplitter_h
 #define G4MesonSplitter_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonPair.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonPair.hh
index 81045bed42..f3aacd4dde 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonPair.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonPair.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4PartonPair_h
 #define G4PartonPair_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
index 875289160b..9e73cb01b4 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4PartonStringAnnihilator.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PartonStringAnnihilator.hh,v 1.3 1999/12/15 14:52:42 gunter Exp $
+//
+// $Id: G4PartonStringAnnihilator.hh,v 1.3.8.2 2001/06/28 20:19:57 gunter Exp $
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 9-Oct-1998
 // -----------------------------------------------------------------------------
 #ifndef G4PartonStringAnnihilator_h
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMParameters.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMParameters.hh
index c45912ceb6..c6bd6cee5d 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMParameters.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMParameters.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4QGSMParameters_h
 #define G4QGSMParameters_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMSplitableHadron.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMSplitableHadron.hh
index d53653e85e..b78c4415bc 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSMSplitableHadron.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4QGSMSplitableHadron_h
 #define G4QGSMSplitableHadron_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSModel.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSModel.hh
index fe52712697..4627f52f59 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSModel.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSModel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4QGSModel_h
 #define G4QGSModel_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSParticipants.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSParticipants.hh
index d1172e5d79..b9f282f52f 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSParticipants.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4QGSParticipants.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4QGSParticipants_h
 #define G4QGSParticipants_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryon.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryon.hh
index a64facc065..d1fc18f86c 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryon.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryon.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4SPBaryon_h
 #define G4SPBaryon_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryonTable.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryonTable.hh
index 2549723478..97b97ce3b2 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryonTable.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPBaryonTable.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4SPBaryonTable_h
 #define G4SPBaryonTable_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPPartonInfo.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPPartonInfo.hh
index 00e739563d..323c5b5b96 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPPartonInfo.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SPPartonInfo.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4SPPartonInfo_h
 #define G4SPPartonInfo_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SoftStringBuilder.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SoftStringBuilder.hh
index c318f5b921..4124affc2d 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SoftStringBuilder.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4SoftStringBuilder.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4SoftStringBuilder_h
 #define G4SoftStringBuilder_h 1
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4VAnnihilationCrossSection.hh b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4VAnnihilationCrossSection.hh
index 07cec17913..c9339b1b69 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/include/G4VAnnihilationCrossSection.hh
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/include/G4VAnnihilationCrossSection.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4VAnnihilationCrossSection_h
 #define G4VAnnihilationCrossSection_h
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4ASCCrossSection.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4ASCCrossSection.cc
index ededfc5479..40625f8e22 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4ASCCrossSection.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4ASCCrossSection.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4ASCCrossSection.hh"
 
 G4ASCCrossSection::
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4AnnihilationCrossSection.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4AnnihilationCrossSection.cc
index 7e8f866d35..d5be0939cd 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4AnnihilationCrossSection.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4AnnihilationCrossSection.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4AnnihilationCrossSection.hh"
 #include "G4ASCCrossSection.hh"
 #include "G4GammaAnnCrossSection.hh"
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4BaryonSplitter.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4BaryonSplitter.cc
index 01b67c43f3..08f1efd7a4 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4BaryonSplitter.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4BaryonSplitter.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Split barion (antibarion) into quark and diquark (antidiquark and antiqaurk ) 
 // based on prototype, needs clean up of interfaces HPW Feb 1999  
 // Numbers verified and errors corrected, HPW Dec 1999
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4DiffractiveStringBuilder.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4DiffractiveStringBuilder.cc
index 99213fcd71..1f7d90bf08 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4DiffractiveStringBuilder.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4DiffractiveStringBuilder.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4DiffractiveStringBuilder.hh"
 
 //***************************************************************************************************
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4GammaAnnCrossSection.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4GammaAnnCrossSection.cc
index ba4a5a6c93..dd1acdbfc4 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4GammaAnnCrossSection.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4GammaAnnCrossSection.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4GammaAnnCrossSection.hh"
 #include "G4Gamma.hh"
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
index 4174800d8a..f57fb4de40 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4InelasticSplitableHadron.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4InelasticSplitableHadron.hh"
 
 #include "G4ParticleDefinition.hh"
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
index 5d98dac45d..289471dcea 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4MesonSplitter.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4MesonSplitter.hh"
 
 G4bool G4MesonSplitter::SplitMeson(G4int PDGcode, G4int* aEnd, G4int* bEnd)
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonPair.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonPair.cc
index 115f05af26..959ba2f5df 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonPair.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonPair.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4PartonPair.hh"
 
 G4PartonPair::G4PartonPair(G4Parton* P1, G4Parton* P2, G4int Type, G4int aDirection)
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonStringAnnihilator.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonStringAnnihilator.cc
index 6cbe792530..86b47f07cf 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonStringAnnihilator.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4PartonStringAnnihilator.cc
@@ -1,185 +1,22 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// implementation file
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//      History: first partial implementation, Maxim Komogorov, 9-Oct-1998
-//
-//      new OO design and implementation, largely replaces the 
-//      initial prototype, H.P. Wellisch, Dec 1999.
-// -----------------------------------------------------------------------------
-#include "G4PartonStringAnnihilator.hh" 
-
-
-G4PartonStringAnnihilator::G4PartonStringAnnihilator()
-{
-  widthOfPtSquare = 0.1*GeV*GeV; 
-}
-
-
-G4bool G4PartonStringAnnihilator::isMeson(G4int Encoding)
-{
-  return (abs(Encoding)%10000 < 1000) && abs(Encoding) > 100;
-}
-
-G4bool G4PartonStringAnnihilator::isBarion(G4int Encoding)
-{
-  return (abs(Encoding)%10000 > 1000) && abs(Encoding)%100 > 10;
-}
-
-G4bool G4PartonStringAnnihilator::isAntiParticle(G4int Encoding)
-{
-  return (Encoding < 0);
-}
-
-
-G4bool G4PartonStringAnnihilator::GetStringEnds(G4int Projectile, G4int Target, G4int* Left, G4int* Right)
-{
-   G4int LeftProjectile, RightProjectile;
-   G4int LeftTarget,     RightTarget;
-   G4bool result = FALSE;
-   
-   if (isBarion(Projectile) && isMeson(Target))
-       G4SwapObj(&Projectile, &Target);
- 
-    // meson - meson annihilation
-   if (isMeson(Projectile) && isMeson(Target))
-   {
-     theMesonSplitter.SplitMeson(Projectile, &LeftProjectile, &RightProjectile); 
-     theMesonSplitter.SplitMeson(Target,     &LeftTarget,     &RightTarget); 
-     if  (LeftProjectile == -RightTarget)
-     {
-       if (RightProjectile == -LeftTarget && G4UniformRand() < 0.5) 
-       {
-         *Left = LeftProjectile; 
-         *Right = RightTarget;
-       }
-       else
-       { 
-         *Left  = LeftTarget;  
-         *Right = RightProjectile;
-       }
-       result = TRUE;
-     }        
-     else if (-RightProjectile == LeftTarget)
-     {
-       *Left = LeftProjectile; 
-       *Right = RightTarget;
-       result = TRUE;
-     }
-   }
-   
-   // meson - barion(antibarion) annihilation
-   else if (isMeson(Projectile) && isBarion(Target))
-   {
-     theMesonSplitter.SplitMeson (Projectile, &LeftProjectile, &RightProjectile); 
-     G4int Diquark;
-     if (isAntiParticle(Target))
-     {
-       if (theBaryonSplitter.FindDiquark(Target, LeftProjectile, &Diquark)) // assumes that LeftProjectile from mesonsplitter is quark.
-       {
-         *Left  = -Diquark;
-         *Right = RightProjectile;
-         result = TRUE;
-       }            
-     }
-     else if (theBaryonSplitter.FindDiquark(Target, RightProjectile, &Diquark))
-     {
-       *Left  = LeftProjectile;
-       *Right = Diquark;
-       result = TRUE;
-     }            
-   }
-         
-   // barion-antibarion annihilation
-   if (isAntiParticle(Projectile))
-       G4SwapObj(&Projectile, &Target);
-   if (!(isAntiParticle(Projectile) || !isAntiParticle(Target))) result = TRUE;
-       
-   if(!result) return FALSE;
-
-   
-   const G4SPBaryon & theProjectile = theBaryonSplitter.GetSPBaryon(Projectile);
-   const G4SPBaryon & theTarget     = theBaryonSplitter.GetSPBaryon(Target);
-
-   // Assumes that di-quarks always annihilate. Good only for nucleon
-   // annihilation; not for strange baryons, etc.. (mass is higher)
-   G4int activeDiquark=0;
-   
-   *Left = theProjectile.MatchDiQuarkAndGetQuark(theTarget, activeDiquark);
-   
-   *Right = theTarget.FindQuark(activeDiquark);
-   
-   return result;
-}
-
-
-//**************************************************************************************************************************
-
-G4ExcitedString* G4PartonStringAnnihilator::GetString(G4KineticTrack& Target, G4KineticTrack& Projectile)
-{
-  G4LorentzVector Mom = Target.Get4Momentum() +  Projectile.Get4Momentum();
-  G4ThreeVector   Pos = Target.GetPosition();
-  
-  // Convert the hadrons into one highmass colorneutral object with axis.
-
-  G4int LeftEncoding;
-  G4int RightEncoding;
-  G4bool canAnnihilate = GetStringEnds(Projectile.GetDefinition()->GetPDGEncoding(), 
-                                       Target.GetDefinition()->GetPDGEncoding(), 
-                                      &LeftEncoding, &RightEncoding);
-  if (!canAnnihilate) return 0;
-  
-  G4Parton* Left = new G4Parton(LeftEncoding);
-  Left->SetPosition(Pos);
-
-  G4Parton* Right = new G4Parton(RightEncoding);
-  Right->SetPosition(Pos);
-
-  // momenta of string ends
-  G4double pt2 = Mom.perp2();
-  G4double transverseMass2 = Mom.plus()*Mom.minus();
-  G4double maxAvailMomentum2 = sqr(sqrt(transverseMass2) - sqrt(pt2));
-
-  G4double R;
-  while((R = -widthOfPtSquare*log(G4UniformRand())) > maxAvailMomentum2);
-  R = sqrt(R);
-  G4double phi = twopi*G4UniformRand();
-  G4ThreeVector pt(R*cos(phi), R*sin(phi), 0.);    
-
-  G4LorentzVector LeftMom(pt, 0.);
-  G4LorentzVector RightMom;
-  RightMom.setPx(Mom.px() - pt.x());
-  RightMom.setPy(Mom.py() - pt.y());
-
-  G4double Local1 = Mom.minus() + (RightMom.perp2() - LeftMom.perp2())/Mom.plus();
-  G4double Local2 = sqrt(G4std::max(0., sqr(Local1) - 4.*RightMom.perp2()*Mom.minus()/Mom.plus()));
-  G4double RightMinus   = 0.5*(Local1 + Local2);
-  G4double LeftMinus = Mom.minus() - RightMinus;
-
-  G4double LeftPlus  = LeftMom.perp2()/LeftMinus;
-  G4double RightPlus = Mom.plus() - LeftPlus;
-  LeftMom.setPz(0.5*(LeftPlus - LeftMinus));
-  LeftMom.setE (0.5*(LeftPlus + LeftMinus));
-  RightMom.setPz(0.5*(RightPlus - RightMinus));
-  RightMom.setE (0.5*(RightPlus + RightMinus));
-
-  Left->Set4Momentum(LeftMom);
-  Right->Set4Momentum(RightMom);
-  G4int aDirection=1;
-  if(G4UniformRand()<0.5) aDirection = -1;
-  return new G4ExcitedString(Left, Right, aDirection); 
-}
-
-//**************************************************************************************************************************
-
-
-
-
-
-
-
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMParameters.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMParameters.cc
index c34a268185..34e4a88263 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMParameters.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMParameters.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4QGSMParameters.hh"
 
 G4QGSMParameters::G4QGSMParameters()
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
index 47e12e8480..9787936186 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSMSplitableHadron.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4QGSMSplitableHadron.hh"
 #include "G4ParticleTable.hh" 
 #include "G4PionPlus.hh"
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
index 21e54a68c3..ddb649706c 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSModel.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4QGSModel.hh"
 #include <stdlib.h>
 
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
index d93df59daa..febbe9529b 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4QGSParticipants.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "globals.hh"
 #include "G4QGSParticipants.hh"
 #include "G4LorentzVector.hh"
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SPBaryon.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SPBaryon.cc
index 005cdf4ed2..1c00e96608 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SPBaryon.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SPBaryon.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4SPBaryon.hh"
 #include "Randomize.hh"
 #include "G4ParticleTable.hh"
@@ -44,7 +66,7 @@ G4double G4SPBaryon::GetProbability(G4int diQuark) const
 G4int G4SPBaryon::
 MatchDiQuarkAndGetQuark(const G4SPBaryon & aBaryon, G4int & aDiQuark) const
 {
-  G4double result=0;
+  G4int    result=0;
   typedef G4std::vector<G4SPPartonInfo *>::const_iterator iter;
   iter i;
   G4double running = 0;
diff --git a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SoftStringBuilder.cc b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SoftStringBuilder.cc
index 609bc3c15e..9f8ee5a2f5 100644
--- a/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SoftStringBuilder.cc
+++ b/source/processes/hadronic/models/generator/quark_gluon_string/src/G4SoftStringBuilder.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4SoftStringBuilder.hh"
 
 //***************************************************************************************************
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4DiffractiveExcitation.hh b/source/processes/hadronic/models/generator/string_common/include/G4DiffractiveExcitation.hh
index 999288a3dc..f6abd3d882 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4DiffractiveExcitation.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4DiffractiveExcitation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiffractiveExcitation.hh,v 1.4 1999/12/15 14:52:45 gunter Exp $
+//
+// $Id: G4DiffractiveExcitation.hh,v 1.4.8.2 2001/06/28 20:19:57 gunter Exp $
 
 #ifndef G4DiffractiveExcitation_h
 #define G4DiffractiveExcitation_h 1
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4DiffractiveExcitation --------------
 //             by Gunter Folger, October 1998.
 //      diffractive Excitation used by strings models
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh b/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
index 651d576255..a77f64fc00 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4EventGenerator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EventGenerator.hh,v 1.2 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EventGenerator.hh,v 1.2.8.1 2001/06/28 19:13:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4EventGenerator_h
 #define G4EventGenerator_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh b/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
index add67f0037..25d426740a 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4InteractionCode.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InteractionCode.hh,v 1.2 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InteractionCode.hh,v 1.2.8.1 2001/06/28 19:13:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4InteractionCode_h
 #define G4InteractionCode_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh b/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
index 0e4cf10046..9f04b2ffb9 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4InteractionContent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InteractionContent.hh,v 1.3 2000/09/18 07:40:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InteractionContent.hh,v 1.3.8.2 2001/06/28 20:19:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4InteractionContent_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4InteractionContent----------------
 //             by Gunter Folger, June 1998.
 //       class for a storing colliding particles in PartonString Models
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh b/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
index ced0d11200..ca832f26ef 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4PomeronCrossSection.hh
@@ -1,14 +1,30 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4PomeronCrossSection_h
 #define G4PomeronCrossSection_h 1
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4PomeronCrossSection.hh,v 1.3 1999/12/15 14:52:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4PomeronCrossSection.hh,v 1.3.8.1 2001/06/28 19:13:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4Proton.hh"
 #include "G4Neutron.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4SingleDiffractiveExcitation.hh b/source/processes/hadronic/models/generator/string_common/include/G4SingleDiffractiveExcitation.hh
index 29f1bec053..b80368330c 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4SingleDiffractiveExcitation.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4SingleDiffractiveExcitation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SingleDiffractiveExcitation.hh,v 1.2 1999/12/15 14:52:46 gunter Exp $
+//
+// $Id: G4SingleDiffractiveExcitation.hh,v 1.2.8.2 2001/06/28 20:19:57 gunter Exp $
 
 #ifndef G4SingleDiffractiveExcitation_h
 #define G4SingleDiffractiveExcitation_h 1
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4SingleDiffractiveExcitation --------------
 //             by Gunter Folger, October 1998.
 //      diffractive Excitation used by strings models
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh b/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
index 70fc1a3571..8d0014c785 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4StringModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StringModel.hh,v 1.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StringModel.hh,v 1.3.8.1 2001/06/28 19:13:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4StringModel_h
 #define G4StringModel_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh b/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
index 45d4eab9c9..51fb7ab750 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VParticipants.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VParticipants.hh,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VParticipants.hh,v 1.2.8.2 2001/06/28 20:19:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VParticipants_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VParticipants ----------------
 //             by Gunter Folger, May 1998.
 //      abstract class finding participants in a hadron Nucleus collision
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh b/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
index 0e92a98745..19a1229264 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VPartonStringModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPartonStringModel.hh,v 1.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPartonStringModel.hh,v 1.3.8.2 2001/06/28 20:19:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VPartonStringModel_h
 #define G4VPartonStringModel_h 1
@@ -14,8 +30,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VPartonStringModel ----------------
 //             by Gunter Folger, May 1998.
 //      abstract class for all Parton String Models
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh b/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
index 2be26dcba2..8a960eaf05 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VSplitableHadron.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSplitableHadron.hh,v 1.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSplitableHadron.hh,v 1.3.8.2 2001/06/28 20:19:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VSplitableHadron_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VSplitableHadron----------------
 //             by Gunter Folger, June 1998.
 //       class storing an interacting particle. Used by Parton String Models.
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh b/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
index ce05f45abd..764481fc84 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VStringFragmentation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VStringFragmentation.hh,v 1.3 2000/08/02 08:13:05 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VStringFragmentation.hh,v 1.3.8.1 2001/06/28 19:13:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VStringFragmentation_h
 #define G4VStringFragmentation_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh b/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
index 973fcefe73..f011354d7a 100644
--- a/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
+++ b/source/processes/hadronic/models/generator/string_common/include/G4VertexCode.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VertexCode.hh,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VertexCode.hh,v 1.2.8.1 2001/06/28 19:13:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VertexCode_h
 #define G4VertexCode_h 1
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc b/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
index a097a18e7a..8f92f2c159 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4DiffractiveExcitation.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DiffractiveExcitation.cc,v 1.7 1999/12/15 17:51:26 gcosmo Exp $
+//
+// $Id: G4DiffractiveExcitation.cc,v 1.8.2.2 2001/06/28 20:19:58 gunter Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4DiffractiveExcitation --------------
 //             by Gunter Folger, October 1998.
 //      diffractive Excitation used by strings models
@@ -99,7 +113,7 @@ G4bool G4DiffractiveExcitation::
 //           	 << whilecount << " / " << maxPtSquare << G4endl;
                if (whilecount > 1000 ) 
                {
-           	   Qmomentum=0;
+           	   Qmomentum=G4LorentzVector(0.,0.,0.,0.);
 //	   	 G4cout << "G4DiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
 	   	 return false; 	  //  Ignore this interaction 
                }
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc b/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
index 215c55510c..c945e875b4 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4EventGenerator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EventGenerator.cc,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EventGenerator.cc,v 1.2.8.1 2001/06/28 19:13:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4EventGenerator
 #include "G4EventGenerator.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc b/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
index b7f8a90504..56815d6156 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4InteractionContent.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InteractionContent.cc,v 1.3 2000/09/18 07:40:45 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InteractionContent.cc,v 1.3.8.2 2001/06/28 20:19:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4InteractionContent----------------
 //             by Gunter Folger, June 1998.
 //       class for a storing two colliding particles in PartonString Models
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc b/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
index 2613fb12f2..064e997bbe 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4PomeronCrossSection.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PomeronCrossSection.cc,v 1.3 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PomeronCrossSection.cc,v 1.3.8.1 2001/06/28 19:13:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4PomeronCrossSection.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc b/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
index 70a051480f..fe7ec199bd 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4SingleDiffractiveExcitation.cc
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SingleDiffractiveExcitation.cc,v 1.4 1999/12/15 14:52:46 gunter Exp $
+//
+// $Id: G4SingleDiffractiveExcitation.cc,v 1.5.2.2 2001/06/28 20:19:59 gunter Exp $
 // ------------------------------------------------------------
 //      GEANT 4 class implemetation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4SingleDiffractiveExcitation --------------
 //             by Gunter Folger, October 1998.
 //      diffractive Excitation used by strings models
@@ -102,7 +116,7 @@ G4bool G4SingleDiffractiveExcitation::
 //           	 << whilecount << " / " << maxPtSquare << G4endl;
                if (whilecount > 1000 ) 
                {
-           	   Qmomentum=0;
+           	   Qmomentum=G4LorentzVector(0.,0.,0.,0.);
 //	   	 G4cout << "G4SingleDiffractiveExcitation::ExciteParticipants: Aborting loop!" << G4endl;
 	   	 return false; 	  //  Ignore this interaction 
                }
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc b/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
index 995d7cc066..64f472c49c 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4StringModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StringModel.cc,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StringModel.cc,v 1.2.8.1 2001/06/28 19:13:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4StringModel
 #include "G4StringModel.hh"
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc b/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
index dc9b26f5cc..dba74a6f0d 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VParticipants.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VParticipants.cc,v 1.2 1999/12/15 14:52:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VParticipants.cc,v 1.2.8.2 2001/06/28 20:19:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VParticipants ----------------
 //             by Gunter Folger, May 1998.
 //      abstract class finding participants in a hadron Nucleus collision
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc b/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
index 89f0995d4f..e0369330b9 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VPartonStringModel.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPartonStringModel.cc,v 1.7 2000/08/02 08:13:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPartonStringModel.cc,v 1.7.8.2 2001/06/28 20:19:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //// ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VPartonStringModel ----------------
 //             by Gunter Folger, May 1998.
 //      abstract class for all Parton String Models
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc b/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
index ebb8192bbe..d5cf27dfa0 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VSplitableHadron.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSplitableHadron.cc,v 1.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSplitableHadron.cc,v 1.2.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4VSplitableHadron----------------
 //             by Gunter Folger, June 1998.
 //       class storing an interacting particle. Used by Parton String Models.
diff --git a/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc b/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
index 55ae4f5016..f597093c17 100644
--- a/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_common/src/G4VStringFragmentation.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VStringFragmentation.cc,v 1.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VStringFragmentation.cc,v 1.2.8.1 2001/06/28 19:13:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VStringFragmentation
 #include "G4VStringFragmentation.hh"
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
index 50e25afbee..4be28a381f 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4ExcitedStringDecay.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedStringDecay.hh,v 1.6 2000/11/10 08:30:07 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedStringDecay.hh,v 1.6.8.1 2001/06/28 19:13:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4ExcitedStringDecay_h
 #define G4ExcitedStringDecay_h 1
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
index 0888a867fb..edc707ce67 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4LundStringFragmentation.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LundStringFragmentation.hh,v 1.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $ Maxim Komogorov
+//
+// $Id: G4LundStringFragmentation.hh,v 1.2.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $ Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 10-Jul-1998
 // -----------------------------------------------------------------------------
 
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
index b594972a2b..288b4d243c 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4QGSMFragmentation.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4QGSMFragmentation.hh,v 1.3 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4QGSMFragmentation.hh,v 1.3.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 10-Jul-1998
 // -----------------------------------------------------------------------------
 #ifndef G4QGSMFragmentation_h
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
deleted file mode 100644
index eaec55db86..0000000000
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VKinkyStringDecay.hh
+++ /dev/null
@@ -1,55 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VKinkyStringDecay.hh,v 1.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//  Maxim Komogorov
-//
-// -----------------------------------------------------------------------------
-//      GEANT 4 class implementation file
-//
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//      History: first implementation, Maxim Komogorov, 10-Oct-1998
-// -----------------------------------------------------------------------------
-
-#ifndef G4VKinkyStringDecay_h
-#define G4VKinkyStringDecay_h 1
-
-#include "G4VLongitudinalStringDecay.hh"
-
-//*********************************************************************************************** 
-
-class G4VKinkyStringDecay 
-    {
-
-// Constructors   
-public:
-    G4VKinkyStringDecay(G4VLongitudinalStringDecay* theModal);
-   ~G4VKinkyStringDecay() {};
-
-// 
-public:
-    G4KineticTrackVector* FragmentString(const G4ExcitedString& String);
-    virtual G4double GetLightConeGluonZ(G4double zmin, G4double zmax);
-    void SetLongitudinalStringDecay(G4VLongitudinalStringDecay*);
-
-private:
-   G4VLongitudinalStringDecay* theLongitudinalStringDecay;  
-   
-   };
-
-//*****************************************************************************************
-
-inline void G4VKinkyStringDecay::SetLongitudinalStringDecay(G4VLongitudinalStringDecay* theModal)
-   {
-   theLongitudinalStringDecay = theModal;
-   }
-
-//*****************************************************************************************************
-
-#endif
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
index f329b8e1f6..337aafc61a 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
+++ b/source/processes/hadronic/models/generator/string_fragmentation/include/G4VLongitudinalStringDecay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VLongitudinalStringDecay.hh,v 1.7 2000/08/02 08:14:13 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VLongitudinalStringDecay.hh,v 1.7.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $
 // Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 1-Jul-1998
 // -----------------------------------------------------------------------------
 #ifndef G4VLongitudinalStringDecay_h
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
index d4de2a2eb0..67262a67b3 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4ExcitedStringDecay.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // Historic fragment from M.Komogorov; clean-up still necessary @@@
 #include "G4ExcitedStringDecay.hh"
 
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
index ea1e3c233e..91f44111cf 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4LundStringFragmentation.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LundStringFragmentation.cc,v 1.2 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LundStringFragmentation.cc,v 1.2.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 10-Jul-1998
 // -----------------------------------------------------------------------------
 #include "G4LundStringFragmentation.hh"
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
index ab13f4a092..ec815281fb 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4QGSMFragmentation.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4QGSMFragmentation.cc,v 1.4 1999/12/15 14:52:47 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4QGSMFragmentation.cc,v 1.4.8.2 2001/06/28 20:20:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 10-Jul-1998
 // -----------------------------------------------------------------------------
 #include "G4QGSMFragmentation.hh"
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
deleted file mode 100644
index ae614ef363..0000000000
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VKinkyStringDecay.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VKinkyStringDecay.cc,v 1.3 1999/12/15 14:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//  Maxim Komogorov
-//
-// -----------------------------------------------------------------------------
-//      GEANT 4 class implementation file
-//
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
-//      History: first implementation, Maxim Komogorov, 10-Oct-1998
-// -----------------------------------------------------------------------------
-
-#include "G4VKinkyStringDecay.hh"
-#include "G4KineticTrackVector.hh"
-#include "G4KineticTrack.hh"
-#include "Randomize.hh"
-
-//*****************************************************************************************************
-
-G4VKinkyStringDecay::G4VKinkyStringDecay(G4VLongitudinalStringDecay* theModal)
-   {
-   this->SetLongitudinalStringDecay(theModal);
-   }
-
-//*****************************************************************************************************
-
-G4double G4VKinkyStringDecay::GetLightConeGluonZ(G4double zmin, G4double zmax)
-    {
-    G4double z, yf;
-    do {
-       z = zmin + G4UniformRand()*(zmax-zmin);
-       yf = z*z +sqr(1 - z);	
-       } 
-    while (G4UniformRand() > yf); 
-    return z;
-    }
-
-//*****************************************************************************************************
-
-G4KineticTrackVector* G4VKinkyStringDecay::FragmentString(const G4ExcitedString& String) 
-    {
-    G4LorentzVector Mom = String.GetGluon()->Get4Momentum();
-    G4ThreeVector Pos = String.GetGluon()->GetPosition();
-    G4int QuarkEncoding = theLongitudinalStringDecay->SampleQuarkFlavor();
-    G4double Px, Py; 
-    theLongitudinalStringDecay->SampleQuarkPt(&Px, &Py);
-    G4double Pt2 = Px*Px + Py*Py;
-    G4double z = GetLightConeGluonZ(0, 1);
-    G4double w = Mom.e() + Mom.pz();
-    //... now compute quark longitudinal momentum and energy
-
-    G4double Pz = (z*w - Pt2/(z*w))*0.5;
-    G4double E  = (z*w + Pt2/(z*w))*0.5;
-    
-    G4Parton* AntiColor = new G4Parton(-QuarkEncoding);
-    AntiColor->SetPosition(Pos);
-    G4LorentzVector AntiColorMom(-Px, -Py, -Pz, E);
-    AntiColor->Set4Momentum(AntiColorMom);
-    G4Parton* Color = new G4Parton(*String.GetColorParton());
-    G4ExcitedString Str1(Color, AntiColor, String.GetDirection());
-    G4KineticTrackVector* KTV1 = theLongitudinalStringDecay->FragmentString(Str1);
-
-    Color = new G4Parton(QuarkEncoding);
-    Color->SetPosition(Pos);
-    G4LorentzVector ColorMom(Px, Py, Pz, E);
-    Color->Set4Momentum(ColorMom);
-    AntiColor = new G4Parton(*String.GetAntiColorParton());
-    G4ExcitedString Str2(Color, AntiColor, String.GetDirection());
-    G4KineticTrackVector* KTV2 = theLongitudinalStringDecay->FragmentString(Str2);
-
-    if (KTV1 && KTV2)
-         while(!KTV2->isEmpty())
-             KTV1->insert(KTV2->removeLast());
-    return KTV1;            
-    } 
- 
-//*****************************************************************************************************
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
diff --git a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
index 21f38c7ba6..3c9793a068 100644
--- a/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
+++ b/source/processes/hadronic/models/generator/string_fragmentation/src/G4VLongitudinalStringDecay.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VLongitudinalStringDecay.cc,v 1.6 1999/12/15 14:52:48 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VLongitudinalStringDecay.cc,v 1.6.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //  Maxim Komogorov
 //
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, Maxim Komogorov, 1-Jul-1998
 // -----------------------------------------------------------------------------
 #include "G4ios.hh"
diff --git a/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh b/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
index 8e4c4b96dd..961f8714b8 100644
--- a/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4ExcitedString.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedString.hh,v 1.5 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedString.hh,v 1.5.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4ExcitedString_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4ExcitedString ----------------
 //             by Gunter Folger, June 1998.
 //       class for an excited string used by Parton String Models
diff --git a/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh b/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
index 06799ee043..8225d2b7be 100644
--- a/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4ExcitedStringVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedStringVector.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedStringVector.hh,v 1.3.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4ExcitedStringVector_h
 #define G4ExcitedStringPartonVector_h 1
@@ -14,8 +30,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4ExcitedStringVector ----------------
 //             by Gunter Folger, June 1998.
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh b/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
index 86edcb9c10..1283be0f39 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Fancy3DNucleus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Fancy3DNucleus.hh,v 1.6 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Fancy3DNucleus.hh,v 1.6.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4Fancy3DNucleus_h
 #define G4Fancy3DNucleus_h 1
@@ -14,8 +30,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Fancy3DNucleus ----------------
 //             by Gunter Folger, May 1998.
 //       class for a 3D nucleus, arranging nucleons in space and momentum.
diff --git a/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh b/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
index d8a5ce5de9..a52540ce5d 100644
--- a/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4FermiMomentum.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FermiMomentum.hh,v 1.2 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FermiMomentum.hh,v 1.3.2.1 2001/06/28 19:13:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4FermiMomentum_h
 #define G4FermiMomentum_h 1
@@ -40,7 +56,11 @@ class G4FermiMomentum
 	    } while ( p.mag() > 1. );
 	return p*GetFermiMomentum(density); 
      }
-    
+
+  private:
+
+    G4double cbrt(G4double x) { return pow(x,1./3.); }
+
   private:
   
     G4double theA;
diff --git a/source/processes/hadronic/models/generator/util/include/G4Fragment.hh b/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
index 454a7304f3..96da9082fc 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Fragment.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Fragment.hh,v 1.7 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Fragment.hh,v 1.8.2.1 2001/06/28 19:13:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -33,11 +49,16 @@
 class G4ParticleDefinition;
 
 class G4Fragment;     // Forward deckaration
-typedef G4RWTPtrOrderedVector<G4Fragment> G4FragmentVector;
+//typedef G4RWTPtrOrderedVector<G4Fragment> G4FragmentVector;
+typedef G4std::vector<G4Fragment*> G4FragmentVector;
+
 
 class G4Fragment 
 {
 public:
+
+  // ============= CONSTRUCTORS ==================
+
   // Default constructor
   G4Fragment();
 
@@ -55,16 +76,7 @@ public:
   // 4-momentum and pointer to G4particleDefinition (for gammas)
   G4Fragment(const G4LorentzVector aMomentum, G4ParticleDefinition * aParticleDefinition);
 
-  
-//   G4Fragment(const G4int A, const G4int Z, const G4double anExEnergy, const G4LorentzVector aMomentum,
-// 	     const G4ThreeVector anAngularMomentum, const G4int aNumberOfExcitons, const G4int aNumberOfHoles,
-// 	     const G4int aNumberOfCharged);
-
-//   G4Fragment(const G4int A, const G4int Z, const G4double anExEnergy, 
-// 	     const G4LorentzVector aMomentum, 
-// 	     const G4ThreeVector anAngularMomentum, const G4int aNumberOfExcitons, 
-// 	     const G4int aNumberOfHoles, const G4int aNumberOfCharged,
-// 	     G4ParticleDefinition * aParticleDefinition);
+  // ============= OPERATORS ==================
     
   const G4Fragment & operator=(const G4Fragment &right);
   G4bool operator==(const G4Fragment &right) const;
@@ -73,6 +85,7 @@ public:
   friend G4std::ostream& operator<<(G4std::ostream&, const G4Fragment*);
   friend G4std::ostream& operator<<(G4std::ostream&, const G4Fragment&);
 
+  // ============= METHODS ==================
 
   inline G4double GetA(void) const;
   void SetA(const G4double value);
@@ -90,7 +103,7 @@ public:
   void SetAngularMomentum(const G4ThreeVector value);
   
   G4int GetNumberOfExcitons(void) const;
-  void SetNumberOfExcitons(const G4int value);
+  //  void SetNumberOfExcitons(const G4int value);
   
   G4int GetNumberOfHoles(void) const;
   void SetNumberOfHoles(const G4int value);
@@ -99,7 +112,7 @@ public:
   void SetNumberOfCharged(const G4int value);
 
   G4int GetNumberOfParticles(void) const;
-
+  void SetNumberOfParticles(const G4int value);
 
   inline G4ParticleDefinition * GetParticleDefinition(void) const;
   void SetParticleDefinition(G4ParticleDefinition * aParticleDefinition);
@@ -110,9 +123,9 @@ public:
 
 // Some utility methods
 
-	inline G4double GetGroundStateMass(void) const;
-	
-	inline G4double GetBindingEnergy(void) const;
+  inline G4double GetGroundStateMass(void) const;
+  
+  inline G4double GetBindingEnergy(void) const;
 
 private:
 
@@ -121,6 +134,8 @@ private:
   G4ThreeVector IsotropicRandom3Vector(const G4double Magnitude = 1.0) const;
   
 
+  // ============= DATA MEMBERS ==================
+
   G4double theA;
   
   G4double theZ;
@@ -131,7 +146,7 @@ private:
   
   G4ThreeVector theAngularMomentum;
   
-  G4int numberOfExcitons;
+  G4int numberOfParticles;
   
   G4int numberOfHoles;
   
@@ -206,12 +221,12 @@ inline void G4Fragment::SetAngularMomentum(const G4ThreeVector value)
 
 inline G4int G4Fragment::GetNumberOfExcitons()  const
 {
-  return numberOfExcitons;
+  return numberOfParticles + numberOfHoles;
 }
 
-inline void G4Fragment::SetNumberOfExcitons(const G4int value)
+inline void G4Fragment::SetNumberOfParticles(const G4int value)
 {
-  numberOfExcitons = value;
+  numberOfParticles = value;
 }
 
 inline G4int G4Fragment::GetNumberOfHoles()  const
@@ -231,12 +246,13 @@ inline G4int G4Fragment::GetNumberOfCharged()  const
 
 inline void G4Fragment::SetNumberOfCharged(const G4int value)
 {
-  numberOfCharged = value;
+  if (value <= numberOfParticles) numberOfCharged = value;
+  else G4Exception("G4Fragment::SetNumberOfCharged: Number of charged particles can't be greater than number of particles");
 }
 
 inline G4int G4Fragment::GetNumberOfParticles()  const
 {
-  return numberOfExcitons - numberOfHoles;
+  return numberOfParticles;
 }
 
 
diff --git a/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh b/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
index 221fe943f2..df54df0d83 100644
--- a/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4FragmentVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FragmentVector.hh,v 1.2 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FragmentVector.hh,v 1.2.8.1 2001/06/28 19:13:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
diff --git a/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh b/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
index 4395249a91..c647c69485 100644
--- a/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4GeneralPhaseSpaceDecay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeneralPhaseSpaceDecay.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeneralPhaseSpaceDecay.hh,v 1.3.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //$Id: G4GeneralPhaseSpaceDecay.hh,v 1.1 1997/05/21
 // ----------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, A. Feliciello, 20th May 1998
 //
 //      Note: this class is a generalization of the 
diff --git a/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh b/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
index 16ac5e72b6..37993da673 100644
--- a/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4KineticTrack.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KineticTrack.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KineticTrack.hh,v 1.3.8.2 2001/06/28 20:20:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: G4KineticTrack.hh,v 1.0 1998/05/20
 // -----------------------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, A. Feliciello, 20th May 1998
 // -----------------------------------------------------------------------------
 
diff --git a/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh b/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
index 52500ecb58..95cf4798ff 100644
--- a/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4KineticTrackVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KineticTrackVector.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KineticTrackVector.hh,v 1.3.8.1 2001/06/28 19:13:47 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Modified at 8-Oct-1998 by Maxim Komogorov. Methods BoostBeam,Boost,Shift
 // were added.
diff --git a/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh b/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
index 9f41a71fe6..d945330258 100644
--- a/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4NuclearFermiDensity.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NuclearFermiDensity.hh,v 1.3 2000/05/23 13:41:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NuclearFermiDensity.hh,v 1.3.8.1 2001/06/28 19:13:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NuclearFermiDensity_h
 #define G4NuclearFermiDensity_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh b/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
index c5556a060a..80a0394550 100644
--- a/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4NuclearShellModelDensity.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NuclearShellModelDensity.hh,v 1.3 2000/05/23 13:41:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NuclearShellModelDensity.hh,v 1.3.8.1 2001/06/28 19:13:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NuclearShellModelDensity_h
 #define G4NuclearShellModelDensity_h 1
diff --git a/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh b/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
index aa4687642f..8416811490 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Nucleon.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Nucleon.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Nucleon.hh,v 1.3.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4Nucleon_h
 #define G4Nucleon_h 1
@@ -14,8 +30,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Nucleon ----------------
 //             by Gunter Folger, May 1998.
 //       class for a nucleon (inside a 3D Nucleus)
diff --git a/source/processes/hadronic/models/generator/util/include/G4Parton.hh b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
index 9d982bdc7b..79c0f53a48 100644
--- a/source/processes/hadronic/models/generator/util/include/G4Parton.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4Parton.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Parton.hh,v 1.9 2000/08/02 08:15:31 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Parton.hh,v 1.9.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4Parton_h
@@ -15,8 +31,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Parton ----------------
 //             by Gunter Folger, June 1998.
 //       class for Parton (inside a string) used by Parton String Models
diff --git a/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh b/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
index bb89451db8..d6d5d0e104 100644
--- a/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
+++ b/source/processes/hadronic/models/generator/util/include/G4PartonVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PartonVector.hh,v 1.3 1999/12/15 14:52:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PartonVector.hh,v 1.3.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4PartonVector_h
 #define G4PartonVector_h 1
@@ -14,8 +30,6 @@
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4PartonVector ----------------
 //             by Gunter Folger, May 1998.
 // ------------------------------------------------------------
diff --git a/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc b/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
index 034703a91c..7223093ecc 100644
--- a/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4ExcitedString.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ExcitedString.cc,v 1.3 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ExcitedString.cc,v 1.3.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4ExcitedString ----------------
 //             by Gunter Folger, June 1998.
 //       class for an excited string used by Parton String Models
diff --git a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
index 5f7822b113..dce4231e82 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fancy3DNucleus.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Fancy3DNucleus.cc,v 1.8 2000/08/11 08:22:15 hweber Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Fancy3DNucleus.cc,v 1.8.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Fancy3DNucleus ----------------
 //             by Gunter Folger, May 1998.
 //       class for a 3D nucleus, arranging nucleons in space and momentum.
diff --git a/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc b/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
index dc30a8833a..a5ee6443a7 100644
--- a/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4FermiMomentum.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FermiMomentum.cc,v 1.2 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FermiMomentum.cc,v 1.2.8.1 2001/06/28 19:13:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4FermiMomentum.hh"
 
diff --git a/source/processes/hadronic/models/generator/util/src/G4Fragment.cc b/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
index eb948aad50..4d935ffaa3 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Fragment.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Fragment.cc,v 1.8.2.1 2000/11/23 08:31:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Fragment.cc,v 1.9.2.1 2001/06/28 19:13:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Hadronic Process: Nuclear De-excitations
 // by V. Lara (May 1998)
@@ -21,7 +37,7 @@ G4Fragment::G4Fragment() :
   theExcitationEnergy(0.0),
   theMomentum(0),
   theAngularMomentum(0),
-  numberOfExcitons(0),
+  numberOfParticles(0),
   numberOfHoles(0),
   numberOfCharged(0),
   theParticleDefinition(0),
@@ -38,7 +54,7 @@ G4Fragment::G4Fragment(const G4Fragment &right)
    theExcitationEnergy = right.theExcitationEnergy;
    theMomentum  = right.theMomentum;
    theAngularMomentum = right.theAngularMomentum;
-   numberOfExcitons = right.numberOfExcitons;
+   numberOfParticles = right.numberOfParticles;
    numberOfHoles = right.numberOfHoles;
    numberOfCharged = right.numberOfCharged;
    theParticleDefinition = right.theParticleDefinition;
@@ -55,7 +71,7 @@ G4Fragment::G4Fragment(const G4int A, const G4int Z, const G4LorentzVector aMome
   theA(A),
   theZ(Z),
   theMomentum(aMomentum),
-  numberOfExcitons(0),
+  numberOfParticles(0),
   numberOfHoles(0),
   numberOfCharged(0),
   theParticleDefinition(0),
@@ -79,7 +95,7 @@ G4Fragment::G4Fragment(const G4LorentzVector aMomentum, G4ParticleDefinition * a
   theA(0),
   theZ(0),
   theMomentum(aMomentum),
-  numberOfExcitons(0),
+  numberOfParticles(0),
   numberOfHoles(0),
   numberOfCharged(0),
   theParticleDefinition(aParticleDefinition),
@@ -92,40 +108,6 @@ G4Fragment::G4Fragment(const G4LorentzVector aMomentum, G4ParticleDefinition * a
 
 
 
-// G4Fragment::G4Fragment(const G4int A, const G4int Z, const G4double anExEnergy, 
-// 		       const G4LorentzVector aMomentum, 
-// 		       const G4ThreeVector anAngularMomentum, const G4int aNumberOfExcitons, 
-// 		       const G4int aNumberOfHoles, const G4int aNumberOfCharged) : 
-//   theA(A),
-//   theZ(Z),
-//   theExcitationEnergy(anExEnergy),
-//   theMomentum(aMomentum),
-//   theAngularMomentum(anAngularMomentum),
-//   numberOfExcitons(aNumberOfExcitons),
-//   numberOfHoles(aNumberOfHoles),
-//   numberOfCharged(aNumberOfCharged),
-//   theParticleDefinition(0)
-// {}
-
-// G4Fragment::G4Fragment(const G4int A, const G4int Z, const G4double anExEnergy, 
-// 		       const G4LorentzVector aMomentum, 
-// 		       const G4ThreeVector anAngularMomentum, const G4int aNumberOfExcitons, 
-// 		       const G4int aNumberOfHoles, const G4int aNumberOfCharged,
-// 		       G4ParticleDefinition * aParticleDefinition) : 
-//   theA(A),
-//   theZ(Z),
-//   theExcitationEnergy(anExEnergy),
-//   theMomentum(aMomentum),
-//   theAngularMomentum(anAngularMomentum),
-//   numberOfExcitons(aNumberOfExcitons),
-//   numberOfHoles(aNumberOfHoles),
-//   numberOfCharged(aNumberOfCharged),
-//   theParticleDefinition(aParticleDefinition)
-// {}
-
-
-
-
 const G4Fragment & G4Fragment::operator=(const G4Fragment &right)
 {
   if (this != &right) {
@@ -134,7 +116,7 @@ const G4Fragment & G4Fragment::operator=(const G4Fragment &right)
     theExcitationEnergy = right.theExcitationEnergy;
     theMomentum  = right.theMomentum;
     theAngularMomentum = right.theAngularMomentum;
-    numberOfExcitons = right.numberOfExcitons;
+    numberOfParticles = right.numberOfParticles;
     numberOfHoles = right.numberOfHoles;
     numberOfCharged = right.numberOfCharged;
     theParticleDefinition = right.theParticleDefinition;
@@ -175,10 +157,10 @@ G4std::ostream& operator << (G4std::ostream &out, const G4Fragment *theFragment)
 
   // What about Angular momentum???
 
-  if (theFragment->numberOfExcitons != 0) {
+  if (theFragment->GetNumberOfExcitons() != 0) {
     out << G4endl;
     out << "          " 
-	<< "#Excitons = " << theFragment->numberOfExcitons 
+	<< "#Particles = " << theFragment->numberOfParticles 
 	<< ", #Holes = "   << theFragment->numberOfHoles
 	<< ", #Charged = " << theFragment->numberOfCharged;
   }
diff --git a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
index 49edfc61c4..8f206c4d96 100644
--- a/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4GeneralPhaseSpaceDecay.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GeneralPhaseSpaceDecay.cc,v 1.2 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GeneralPhaseSpaceDecay.cc,v 1.2.8.2 2001/06/28 20:20:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: G4GeneralSpaceDecay.cc,v 1.0 1998/05/21
 // ----------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, A. Feliciello, 21st May 1998
 //
 //      Note: this class is a generalization of the 
diff --git a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
index 10a21f2897..353d02e0b0 100644
--- a/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4KineticTrack.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KineticTrack.cc,v 1.10 2000/12/07 14:38:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KineticTrack.cc,v 1.10.6.2 2001/06/28 20:20:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: G4KineticTrack.cc,v 1.0 1998/05/20
 // -----------------------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD Group
 //      History: first implementation, A. Feliciello, 20th May 1998
 // -----------------------------------------------------------------------------
 
diff --git a/source/processes/hadronic/models/generator/util/src/G4KineticTrackVector.cc b/source/processes/hadronic/models/generator/util/src/G4KineticTrackVector.cc
index daf90894c9..44c8c564ed 100644
--- a/source/processes/hadronic/models/generator/util/src/G4KineticTrackVector.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4KineticTrackVector.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4KineticTrackVector.hh"
 
 G4KineticTrackVector::G4KineticTrackVector()
diff --git a/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc b/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
index aba49bb59c..fe6b02b589 100644
--- a/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4NuclearFermiDensity.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NuclearFermiDensity.cc,v 1.6 2000/05/23 13:41:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NuclearFermiDensity.cc,v 1.6.8.1 2001/06/28 19:13:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4NuclearFermiDensity.hh"
diff --git a/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc b/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
index 69c8a1dd03..518bfc2f53 100644
--- a/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4NuclearShellModelDensity.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NuclearShellModelDensity.cc,v 1.4 2000/05/23 13:41:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NuclearShellModelDensity.cc,v 1.4.8.1 2001/06/28 19:13:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4NuclearShellModelDensity.hh"
diff --git a/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc b/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
index 720fa42782..0e188e5c94 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Nucleon.cc
@@ -1,20 +1,34 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Nucleon.cc,v 1.3 1999/12/15 14:52:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Nucleon.cc,v 1.3.8.2 2001/06/28 20:20:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4Nucleon.hh"
 
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Nucleon ----------------
 //             by Gunter Folger, May 1998.
 //       class for a nucleon (inside a 3D Nucleus)
diff --git a/source/processes/hadronic/models/generator/util/src/G4Parton.cc b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
index 2b5ea4315a..d6e8a36104 100644
--- a/source/processes/hadronic/models/generator/util/src/G4Parton.cc
+++ b/source/processes/hadronic/models/generator/util/src/G4Parton.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Parton.cc,v 1.7 2000/08/02 08:15:47 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Parton.cc,v 1.7.8.2 2001/06/28 20:20:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class implementation file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ---------------- G4Parton ----------------
 //             by Gunter Folger, June 1998.
 //       class for Parton (inside a string) used by Parton String Models
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
index b816a234cd..ac7c5f07f8 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiKaonZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiKaonZeroInelastic.hh,v 1.4 2000/12/14 09:02:41 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiKaonZeroInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiKaonZeroInelastic_h
 #define G4HEAntiKaonZeroInelastic_h 1
 
-// Class Description
-// Final state production model for AntiKaonZero inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiKaonZeroInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiKaonZeroInelastic : public G4HEInelastic
  public: 
         G4HEAntiKaonZeroInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiKaonZeroInelastic(){ };
@@ -44,7 +56,6 @@ class G4HEAntiKaonZeroInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
 
         void   FirstIntInCasAntiKaonZero(G4bool &inElastic, const G4double availableEnergy,
                                          G4HEVector pv[],
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
index 0c67069e24..8c3dcf1da6 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiLambdaInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiLambdaInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiLambdaInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiLambdaInelastic_h
 #define G4HEAntiLambdaInelastic_h 1
 
-// Class Description
-// Final state production model for AntiLambda inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiLambdaInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiLambdaInelastic : public G4HEInelastic
  public: 
         G4HEAntiLambdaInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiLambdaInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiLambdaInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiLambda(G4bool &inElastic, const G4double availableEnergy,
                                        G4HEVector pv[],
                                        G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
index 30bfa921d9..c674564ce8 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiNeutronInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiNeutronInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiNeutronInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiNeutronInelastic_h
 #define G4HEAntiNeutronInelastic_h 1
 
-// Class Description
-// Final state production model for AntiNeutron inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiNeutronInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiNeutronInelastic : public G4HEInelastic
  public: 
         G4HEAntiNeutronInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiNeutronInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiNeutronInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiNeutron(G4bool &inElastic, const G4double availableEnergy,
                                          G4HEVector pv[],
                                          G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
index 86105eb5ce..db56d8b96d 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiOmegaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiOmegaMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiOmegaMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiOmegaMinusInelastic_h
 #define G4HEAntiOmegaMinusInelastic_h 1
 
-// Class Description
-// Final state production model for AntiOmegaMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiOmegaMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiOmegaMinusInelastic : public G4HEInelastic
  public: 
         G4HEAntiOmegaMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiOmegaMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiOmegaMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiOmegaMinus(G4bool &inElastic, const G4double availableEnergy,
                                            G4HEVector pv[],
                                            G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
index fc9c0b4183..02faf08026 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiProtonInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiProtonInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiProtonInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiProtonInelastic_h
 #define G4HEAntiProtonInelastic_h 1
 
-// Class Description
-// Final state production model for AntiProton inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiProtonInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiProtonInelastic : public G4HEInelastic
  public: 
         G4HEAntiProtonInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiProtonInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiProtonInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiProton(G4bool &inElastic, const G4double availableEnergy,
                                        G4HEVector pv[],
                                        G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
index 8f97c63580..69f95204da 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiSigmaMinusInelastic_h
 #define G4HEAntiSigmaMinusInelastic_h 1
 
-// Class Description
-// Final state production model for AntiSigmaMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiSigmaMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiSigmaMinusInelastic : public G4HEInelastic
  public: 
         G4HEAntiSigmaMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiSigmaMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiSigmaMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiSigmaMinus(G4bool &inElastic, const G4double availableEnergy,
                                            G4HEVector pv[],
                                            G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
index f9581f6f4c..711c635111 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaPlusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaPlusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiSigmaPlusInelastic_h
 #define G4HEAntiSigmaPlusInelastic_h 1
 
-// Class Description
-// Final state production model for AntiSigmaPlus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiSigmaPlusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiSigmaPlusInelastic : public G4HEInelastic
  public: 
         G4HEAntiSigmaPlusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiSigmaPlusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiSigmaPlusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiSigmaPlus(G4bool &inElastic, const G4double availableEnergy,
                                           G4HEVector pv[],
                                           G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
index 652094a7b3..f618eea9d4 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiSigmaZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaZeroInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaZeroInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiSigmaZeroInelastic_h
 #define G4HEAntiSigmaZeroInelastic_h 1
 
-// Class Description
-// Final state production model for AntiSigmaZero inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEAntiLambdaInelastic.hh"
 
 class G4HEAntiSigmaZeroInelastic : public G4HEInelastic  
@@ -32,6 +41,10 @@ class G4HEAntiSigmaZeroInelastic : public G4HEInelastic
  public: 
         G4HEAntiSigmaZeroInelastic() : G4HEInelastic()
            {
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiSigmaZeroInelastic(){ };
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
index 791da1c0c4..ea38e9f2f4 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiXiMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiXiMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiXiMinusInelastic_h
 #define G4HEAntiXiMinusInelastic_h 1
 
-// Class Description
-// Final state production model for AntiXiMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiXiMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiXiMinusInelastic : public G4HEInelastic
  public: 
         G4HEAntiXiMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiXiMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiXiMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiXiMinus(G4bool &inElastic, const G4double availableEnergy,
                                         G4HEVector pv[],
                                         G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
index 71efb855d1..fe192f4f20 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEAntiXiZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiXiZeroInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiXiZeroInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEAntiXiZeroInelastic_h
 #define G4HEAntiXiZeroInelastic_h 1
 
-// Class Description
-// Final state production model for AntiXiZero inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEAntiXiZeroInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEAntiXiZeroInelastic : public G4HEInelastic
  public: 
         G4HEAntiXiZeroInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEAntiXiZeroInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEAntiXiZeroInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasAntiXiZero(G4bool &inElastic, const G4double availableEnergy,
                                        G4HEVector pv[],
                                        G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
index c98ee9defc..f28a88b49d 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEInelastic.hh,v 1.4 2000/07/09 09:48:10 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy (GHE) model class -- header file
@@ -38,10 +54,6 @@ class G4HEInelastic : public G4HadronicInteraction
  public: 
          G4HEInelastic()
             { 
-              SetMinEnergy(20*GeV);
-              SetMaxEnergy(10*TeV);
-              MAXPART = 512;
-              verboseLevel = 0;
               SetParticles();
               conserveEnergy = false;
             };
@@ -61,6 +73,11 @@ class G4HEInelastic : public G4HadronicInteraction
          G4bool     EnergyConservation(void)
                          { return conserveEnergy;} 
 
+         G4double   Amin(G4double a, G4double b);
+         G4double   Amax(G4double a, G4double b);
+         G4int      Imin(G4int a, G4int b);
+         G4int      Imax(G4int a, G4int b);
+ 
          void       FillParticleChange(G4HEVector pv[], G4int aVecLength);
 
          G4double   pmltpc(G4int np, G4int nm, G4int nz, G4int n, G4double b, G4double c);
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
index 369525c996..309beb324a 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEKaonMinusInelastic_h
 #define G4HEKaonMinusInelastic_h 1
 
-// Class Description
-// Final state production model for KaonMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEKaonMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEKaonMinusInelastic : public G4HEInelastic
  public: 
         G4HEKaonMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEKaonMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEKaonMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasKaonMinus(G4bool &inElastic, const G4double availableEnergy,
                                      G4HEVector pv[],
                                      G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
index d0caab1894..e23e5dd136 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonPlusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonPlusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEKaonPlusInelastic_h
 #define G4HEKaonPlusInelastic_h 1
 
-// Class Description
-// Final state production model for KaonPlus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEKaonPlusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEKaonPlusInelastic : public G4HEInelastic
  public: 
         G4HEKaonPlusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEKaonPlusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEKaonPlusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasKaonPlus(G4bool &inElastic, const G4double availableEnergy,
                                      G4HEVector pv[],
                                      G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
index 438a32dc91..86bd338ed7 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroInelastic.hh,v 1.3 1999/12/15 14:52:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroInelastic.hh,v 1.5.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -25,7 +41,10 @@ class G4HEKaonZeroInelastic : public G4HEInelastic
  public: 
         G4HEKaonZeroInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEKaonZeroInelastic(){ };
@@ -37,7 +56,6 @@ class G4HEKaonZeroInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
 
         void   FirstIntInCasKaonZero(G4bool &inElastic, const G4double availableEnergy,
                                      G4HEVector pv[],
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
index 3ff68f0e09..0debc19292 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroLongInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroLongInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroLongInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEKaonZeroLongInelastic_h
 #define G4HEKaonZeroLongInelastic_h 1
 
-// Class Description
-// Final state production model for KaonZeroLong inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEKaonZeroInelastic.hh"
 #include "G4HEAntiKaonZeroInelastic.hh"
 
@@ -33,6 +42,10 @@ class G4HEKaonZeroLongInelastic : public G4HEInelastic
  public: 
         G4HEKaonZeroLongInelastic() 
            {
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEKaonZeroLongInelastic(){ };
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
index e045d829fc..c93bd84d79 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEKaonZeroShortInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroShortInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroShortInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEKaonZeroShortInelastic_h
 #define G4HEKaonZeroShortInelastic_h 1
 
-// Class Description
-// Final state production model for KaonZeroShor inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEKaonZeroInelastic.hh"
 #include "G4HEAntiKaonZeroInelastic.hh"
 
@@ -33,6 +42,10 @@ class G4HEKaonZeroShortInelastic : public G4HEInelastic
  public: 
         G4HEKaonZeroShortInelastic() 
            {
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEKaonZeroShortInelastic(){ };
diff --git a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
index 6c5d5000bb..7aa33f9dc7 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HELambdaInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HELambdaInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HELambdaInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HELambdaInelastic_h
 #define G4HELambdaInelastic_h 1
 
-// Class Description
-// Final state production model for Lambda inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HELambdaInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HELambdaInelastic : public G4HEInelastic
  public: 
         G4HELambdaInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HELambdaInelastic(){ };
@@ -44,8 +56,6 @@ class G4HELambdaInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasLambda(G4bool &inElastic, const G4double availableEnergy,
                                    G4HEVector pv[],
                                    G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
index c0e621ba8a..e80f69529a 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HENeutronInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HENeutronInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HENeutronInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HENeutronInelastic_h
 #define G4HENeutronInelastic_h 1
 
-// Class Description
-// Final state production model for Neutron inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HENeutronInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HENeutronInelastic : public G4HEInelastic
  public: 
         G4HENeutronInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HENeutronInelastic(){ };
@@ -44,8 +56,6 @@ class G4HENeutronInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasNeutron(G4bool &inElastic, const G4double availableEnergy,
                                    G4HEVector pv[],
                                    G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
index 9beaa4af75..f6d25042dd 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEOmegaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEOmegaMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEOmegaMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEOmegaMinusInelastic_h
 #define G4HEOmegaMinusInelastic_h 1
 
-// Class Description
-// Final state production model for OmegaMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEOmegaMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEOmegaMinusInelastic : public G4HEInelastic
  public: 
         G4HEOmegaMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEOmegaMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEOmegaMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasOmegaMinus(G4bool &inElastic, const G4double availableEnergy,
                                        G4HEVector pv[],
                                        G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
index 4342dd353b..f441c23dfd 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPionMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPionMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPionMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEPionMinusInelastic_h
 #define G4HEPionMinusInelastic_h 1
 
-// Class Description
-// Final state production model for PionMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEPionMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEPionMinusInelastic : public G4HEInelastic
  public: 
         G4HEPionMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEPionMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEPionMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasPionMinus(G4bool &inElastic, const G4double availableEnergy,
                                      G4HEVector pv[],
                                      G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
index a4c71ca78b..f6d40f1ca1 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPionPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPionPlusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPionPlusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEPionPlusInelastic_h
 #define G4HEPionPlusInelastic_h 1
 
-// Class Description
-// Final state production model for PionPlus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEPionPlusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEPionPlusInelastic : public G4HEInelastic
  public: 
         G4HEPionPlusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEPionPlusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEPionPlusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasPionPlus(G4bool &inElastic, const G4double availableEnergy,
                                      G4HEVector pv[],
                                      G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
index febaa09016..79457dd9d8 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEPlot.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPlot.hh,v 1.3 1999/12/15 14:52:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPlot.hh,v 1.4.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha friend class G4HEPlot  -- header file
@@ -17,7 +33,7 @@
 
 class G4HEPlot
  {
-  protected:
+  public:
      G4double Xstart;
      G4double Xbin;
      G4double Weight;
@@ -30,8 +46,6 @@ class G4HEPlot
      G4double* Xvalue;
      G4double* Yvalue;
 
-  public:
-
    G4HEPlot(){ };
 
   ~G4HEPlot(){ };
@@ -73,7 +87,9 @@ class G4HEPlot
 
    void Scale( G4double s, const G4HEPlot & p);
 
-   void XScale( G4double a, G4double b, const G4HEPlot & p); 
+   void XScale( G4double a, G4double b); 
+
+   void Shift( G4int nshift);
 
    void Log( G4double s, const G4HEPlot & p);
 
@@ -81,6 +97,8 @@ class G4HEPlot
 
    void Reset();
 
+   void LinearFit(G4double& a, G4double& b);
+
    void Fill(G4double x, G4double w);
 
    void Print(G4String name, G4int i);
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
index 7f284771e6..d42921f7ba 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEProtonInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEProtonInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEProtonInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEProtonInelastic_h
 #define G4HEProtonInelastic_h 1
 
-// Class Description
-// Final state production model for Proton inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEProtonInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEProtonInelastic : public G4HEInelastic
  public: 
         G4HEProtonInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEProtonInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEProtonInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasProton(G4bool &inElastic, const G4double availableEnergy,
                                    G4HEVector pv[],
                                    G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
index b2ef3a516f..f92f72af2f 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HESigmaMinusInelastic_h
 #define G4HESigmaMinusInelastic_h 1
 
-// Class Description
-// Final state production model for SigmaMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HESigmaMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HESigmaMinusInelastic : public G4HEInelastic
  public: 
         G4HESigmaMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HESigmaMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HESigmaMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasSigmaMinus(G4bool &inElastic, const G4double availableEnergy,
                                        G4HEVector pv[],
                                        G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
index deda0d7200..4ab0502163 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaPlusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaPlusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HESigmaPlusInelastic_h
 #define G4HESigmaPlusInelastic_h 1
 
-// Class Description
-// Final state production model for SigmaPlus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HESigmaPlusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HESigmaPlusInelastic : public G4HEInelastic
  public: 
         G4HESigmaPlusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HESigmaPlusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HESigmaPlusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasSigmaPlus(G4bool &inElastic, const G4double availableEnergy,
                                       G4HEVector pv[],
                                       G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
index 60d251a83a..bee2f556d7 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HESigmaZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaZeroInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaZeroInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HESigmaZeroInelastic_h
 #define G4HESigmaZeroInelastic_h 1
 
-// Class Description
-// Final state production model for SigmaZero inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HELambdaInelastic.hh"
 
 class G4HESigmaZeroInelastic : public G4HEInelastic  
@@ -32,6 +41,10 @@ class G4HESigmaZeroInelastic : public G4HEInelastic
  public: 
         G4HESigmaZeroInelastic() : G4HEInelastic()
            {
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HESigmaZeroInelastic(){ };
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
index 260b028a6c..1bfaacc50e 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEVector.hh,v 1.4 1999/12/15 16:42:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEVector.hh,v 1.5.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha friend class G4KinematicParticle  -- header file
@@ -37,6 +53,7 @@ class G4HEVector
      G4String particleName;
      G4String particleType;
      G4int    baryon;
+     G4int    strangeness;
      enum {NumberOfQuarkFlavor = 8};
      G4int theQuarkContent[NumberOfQuarkFlavor];
      G4int theAntiQuarkContent[NumberOfQuarkFlavor];
@@ -61,6 +78,7 @@ class G4HEVector
      particleName     = "";
      particleType     = "";
      baryon           = 0;
+     strangeness      = 0;
    }
 
 
@@ -80,32 +98,34 @@ class G4HEVector
      particleName  = p.particleName;
      particleType  = p.particleType;
      baryon        = p.baryon;
+     strangeness   = p.strangeness;
    }
 
 
   G4HEVector & operator = ( const G4HEVector & p )
    {
-     if ( this != &p ) {
-       px            = p.px;
-       py            = p.py;
-       pz            = p.pz;
-       energy        = p.energy;
-       kineticEnergy = p.kineticEnergy;
-       mass          = p.mass;
-       charge        = p.charge;
-       timeOfFlight  = p.timeOfFlight;
-       side          = p.side;
-       flag          = p.flag;
-       code          = p.code;
-       particleName  = p.particleName;
-       particleType  = p.particleType;
-       baryon        = p.baryon;
-     }
+     px            = p.px;
+     py            = p.py;
+     pz            = p.pz;
+     energy        = p.energy;
+     kineticEnergy = p.kineticEnergy;
+     mass          = p.mass;
+     charge        = p.charge;
+     timeOfFlight  = p.timeOfFlight;
+     side          = p.side;
+     flag          = p.flag;
+     code          = p.code;
+     particleName  = p.particleName;
+     particleType  = p.particleType;
+     baryon        = p.baryon;
+     strangeness   = p.strangeness;
      return *this;
    }
 
    ~G4HEVector(){ };
 
+   G4double Amax(G4double a, G4double b);
+
    G4String getParticleName(G4int code, G4int baryon);
  
    void setMomentum( const G4ParticleMomentum mom ); 
@@ -174,6 +194,8 @@ class G4HEVector
 
    G4int getBaryonNumber();
 
+   G4int getStrangenessNumber();
+
    G4int getQuarkContent(G4int flavor);
 
    G4int getAntiQuarkContent(G4int flavor);
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
index 3c751c83d0..4b80e3223d 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEXiMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEXiMinusInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEXiMinusInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEXiMinusInelastic_h
 #define G4HEXiMinusInelastic_h 1
 
-// Class Description
-// Final state production model for XiMinus inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEXiMinusInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEXiMinusInelastic : public G4HEInelastic
  public: 
         G4HEXiMinusInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEXiMinusInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEXiMinusInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasXiMinus(G4bool &inElastic, const G4double availableEnergy,
                                     G4HEVector pv[],
                                     G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
index 0c88120962..c9efa45c7e 100644
--- a/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/high_energy/include/G4HEXiZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEXiZeroInelastic.hh,v 1.4 2000/12/14 09:02:42 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEXiZeroInelastic.hh,v 1.6.4.1 2001/06/28 19:13:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Gheisha High Energy model class -- header file
@@ -18,13 +34,6 @@
 #ifndef G4HEXiZeroInelastic_h
 #define G4HEXiZeroInelastic_h 1
 
-// Class Description
-// Final state production model for XiZero inelastic scattering above 20 GeV; 
-// To be used in your physics list in case you need this physics.
-// In this case you want to register an object of this class with 
-// the corresponding process.
-// Class Description - End
-
 #include "G4HEInelastic.hh"
 
 class G4HEXiZeroInelastic : public G4HEInelastic  
@@ -32,7 +41,10 @@ class G4HEXiZeroInelastic : public G4HEInelastic
  public: 
         G4HEXiZeroInelastic() : G4HEInelastic()
            {
-             G4int    vecLen       = 0;
+              theMinEnergy =  20*GeV;
+              theMaxEnergy = 10*TeV;
+              MAXPART      = 2048;
+              verboseLevel = 0; 
            }
 
         ~G4HEXiZeroInelastic(){ };
@@ -44,8 +56,6 @@ class G4HEXiZeroInelastic : public G4HEInelastic
         G4int  GetNumberOfSecondaries()
                { return vecLength; }         
 
- private:
-
         void   FirstIntInCasXiZero(G4bool &inElastic, const G4double availableEnergy,
                                    G4HEVector pv[],
                                    G4int &vecLen, 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
index 3acedc9407..5ff7b64715 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiKaonZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiKaonZeroInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiKaonZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:13:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
index 8e60ccd754..69d775d5ac 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiLambdaInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiLambdaInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiLambdaInelastic.cc,v 1.4.4.1 2001/06/28 19:13:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
index d46797a1b6..5a3a927cb2 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiNeutronInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiNeutronInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiNeutronInelastic.cc,v 1.4.4.1 2001/06/28 19:13:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
index 16b1db00d3..f133493378 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiOmegaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiOmegaMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
index fc9c8d7170..12c9cfefe0 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiProtonInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiProtonInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiProtonInelastic.cc,v 1.4.4.1 2001/06/28 19:13:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -226,7 +242,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -330,7 +346,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                               0.11, 0.082, 0.065, 0.050, 0.041, 0.035, 0.028, 0.024, 0.010, 0.000};
 
            G4int iplab = G4int( incidentTotalMomentum*10.);
-           if (iplab > 9) iplab = G4std::min(19, G4int( incidentTotalMomentum) + 9);
+           if (iplab > 9) iplab = Imin(19, G4int( incidentTotalMomentum) + 9);
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                                            // charge exchange  pi+ n -> pi0 p
                pv[0] = AntiNeutron;
@@ -351,7 +367,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
    G4int            iplab =      G4int( incidentTotalMomentum*10.);
    if ( iplab >  9) iplab =  9 + G4int( incidentTotalMomentum);          
    if ( iplab > 18) iplab = 18 + G4int( incidentTotalMomentum*10.);
-                    iplab = G4std::min(28, iplab);
+                    iplab = Imin(28, iplab);
 
    if ( G4UniformRand() > anhl[iplab] )
      {
@@ -408,7 +424,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
 
            for( nt=1; nt<=numSec; nt++ ) 
              {
-               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -423,7 +439,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                counter = -1;
                for( np=0; np<numSec/3; np++ ) 
                   {
-                    for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+                    for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                        {
                          for( nz=0; nz<numSec/3; nz++ ) 
                             {
@@ -432,7 +448,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>0) && (nt<=numSec) ) 
                                     {
-                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                             if( test >= 1.0e-10 )excs += dum*test;
@@ -463,7 +479,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                                   nt = np+nm+nz;
                                   if( (nt>=1) && (nt<=numSec) ) 
                                     {
-                                      test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                      test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                       dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                       if( fabs(dum) < 1.0 ) 
                                           if( test >= 1.0e-10 )excs += dum*test;
@@ -543,7 +559,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
 
            for( nt=2; nt<=numSec; nt++ ) 
              {
-               test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+               test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                dum = M_PI*nt/(2.0*n*n);
                if( fabs(dum) < 1.0 ) 
                  if( test >= 1.0e-10 )anpn += dum*test;
@@ -566,7 +582,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>0) && (nt<=numSec) ) 
                               {
-                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*protmulAn[counter]*protnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                      if( test >= 1.0e-10 )excs += dum*test;
@@ -594,7 +610,7 @@ G4HEAntiProtonInelastic::FirstIntInCasAntiProton( G4bool &inElastic,
                             nt = np+nm+nz;
                             if( (nt>=1) && (nt<=numSec) ) 
                               {
-                                test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                 dum = (M_PI/anpn)*nt*neutmulAn[counter]*neutnormAn[nt-1]/(2.0*n*n);
                                 if( fabs(dum) < 1.0 ) 
                                     if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
index 28bc17db4c..6540de1161 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
index 5a6625591c..427e9c2c9f 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaPlusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
index d3ed9bb65a..469d6682a3 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiSigmaZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiSigmaZeroInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiSigmaZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:13:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
index 41f93e8701..eaad9afd18 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiXiMinusInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiXiMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
index 0fa3fc4dfd..c1c5ae0d38 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEAntiXiZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEAntiXiZeroInelastic.cc,v 1.3 1999/12/15 14:52:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEAntiXiZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:13:55 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
index c7a243ddd6..ff5d83d97c 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEInelastic.cc
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEInelastic.cc,v 1.5 2000/07/09 09:48:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 
@@ -24,6 +37,7 @@
 // HPW, fixed bug in getting pdgencoding for nuclei
 // Hisaya, fixed HighEnergyCascading
 // Fesefeldt, fixed bug in TuningOfHighEnergyCascading, 23 June 2000 
+// Fesefeldt, fixed next bug in TuningOfHighEnergyCascading, 14 August 2000
 #include "G4HEInelastic.hh"
 #include "G4HEVector.hh"
 #include "G4ParticleDefinition.hh"
@@ -99,6 +113,36 @@ G4HEInelastic::SetParticles()
     return;
   }
  
+G4double
+G4HEInelastic::Amin(G4double a, G4double b)
+  {
+    G4double c = a;
+    if(b < a) c = b;
+    return c;
+  } 
+G4double
+G4HEInelastic::Amax(G4double a, G4double b)
+  {
+    G4double c = a;
+    if(b > a) c = b;
+    return c;
+  } 
+G4int
+G4HEInelastic::Imin(G4int a, G4int b)
+  {
+    G4int c = a;
+    if(b < a) c = b;
+    return c;
+  } 
+G4int
+G4HEInelastic::Imax(G4int a, G4int b)
+  {
+    G4int c = a;
+    if(b > a) c = b;
+    return c;
+  } 
+
+
 G4double
 G4HEInelastic::NuclearInelasticity(G4double incidentKineticEnergy,
                                    G4double atomicWeight,
@@ -110,17 +154,17 @@ G4HEInelastic::NuclearInelasticity(G4double incidentKineticEnergy,
     G4double ale    = log(incidentKineticEnergy);
     G4double sig1   = 0.5;
     G4double sig2   = 0.5;
-    G4double em     = G4std::min(0.239 + 0.0408*ala*ala, 1.);
-    G4double cinem  = G4std::min(0.0019*pow(ala,3.), 0.15);
+    G4double em     = Amin(0.239 + 0.0408*ala*ala, 1.);
+    G4double cinem  = Amin(0.0019*pow(ala,3.), 0.15);
     G4double sig    = (ale > em) ? sig2 : sig1; 
-    G4double corr   = G4std::min(G4std::max(-pow(ale-em,2.)/(2.*sig*sig),expl), expu);
+    G4double corr   = Amin(Amax(-pow(ale-em,2.)/(2.*sig*sig),expl), expu);
     G4double dum1   = -(incidentKineticEnergy)*cinem;
     G4double dum2   = abs(dum1);
     G4double dum3   = exp(corr);
     G4double cinema = 0.;
     if (dum2 >= 1.)           cinema = dum1*dum3;
     else if (dum3 > 1.e-10) cinema = dum1*dum3;    
-    cinema = - G4std::max(-incidentKineticEnergy, cinema);
+    cinema = - Amax(-incidentKineticEnergy, cinema);
     if(verboseLevel > 1)
       { G4cout << " NuclearInelasticity: " << ala << " " <<  ale << " "  << em << " " << corr
              << " " <<  dum1 << " "  << dum2 << " " <<  dum3 << " " <<  cinema << G4endl;
@@ -144,13 +188,13 @@ G4HEInelastic::NuclearExcitation(G4double  incidentKineticEnergy,
     if (atomicWeight > (neutronMass + 2.*electronMass))
        {
          G4int    magic = ((G4int)(atomicNumber+0.1) == 82) ? 1 : 0;
-         G4double ekin  = G4std::min(G4std::max(incidentKineticEnergy, 0.1), 4.);
-         G4double cfa   = G4std::max(0.35 +((0.35 - 0.05)/2.3)*log(ekin), 0.15);
+         G4double ekin  = Amin(Amax(incidentKineticEnergy, 0.1), 4.);
+         G4double cfa   = Amax(0.35 +((0.35 - 0.05)/2.3)*log(ekin), 0.15);
                   exnu  = 7.716*cfa*exp(-cfa);
-         G4double atno  = G4std::min(atomicWeight, 120.);
+         G4double atno  = Amin(atomicWeight, 120.);
                   cfa   = ((atno - 1.)/120.) * exp(-(atno-1.)/120.);
                   exnu  = exnu * cfa;
-         G4double fpdiv = G4std::max(1.-0.25*ekin*ekin, 0.5);
+         G4double fpdiv = Amax(1.-0.25*ekin*ekin, 0.5);
          G4double gfa   = 2.*((atomicWeight-1.)/70.) 
                             * exp(-(atomicWeight-1.)/70.);
 
@@ -162,8 +206,8 @@ G4HEInelastic::NuclearExcitation(G4double  incidentKineticEnergy,
 	    { ran1 = normal();
               ran2 = normal();
             }
-         excitationEnergyGPN = G4std::max(excitationEnergyGPN*(1.+ran1*gfa),0.);
-         excitationEnergyDTA = G4std::max(excitationEnergyDTA*(1.+ran2*gfa),0.);
+         excitationEnergyGPN = Amax(excitationEnergyGPN*(1.+ran1*gfa),0.);
+         excitationEnergyDTA = Amax(excitationEnergyDTA*(1.+ran2*gfa),0.);
          exnu = excitationEnergyGPN + excitationEnergyDTA;
          if(verboseLevel > 1)
            {
@@ -192,7 +236,7 @@ G4HEInelastic::pmltpc(G4int np, G4int nm, G4int nz, G4int n, G4double b, G4doubl
    for(i=2;i<=np;i++) npf += log((G4double)i);
    for(i=2;i<=nm;i++) nmf += log((G4double)i);
    for(i=2;i<=nz;i++) nzf += log((G4double)i);
-   G4double r = G4std::min(expxu,G4std::max(expxl,-(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf));
+   G4double r = Amin(expxu,Amax(expxl,-(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf));
    return exp(r);
  }
 
@@ -217,7 +261,7 @@ G4int G4HEInelastic::Poisson( G4double x )
    G4double ran;
    if ( x > 9.9 )
       {
-        iran = G4int( G4std::max( 0.0, x + normal() * sqrt( x ) ) );
+        iran = G4int( Amax( 0.0, x + normal() * sqrt( x ) ) );
       }
    else
       {
@@ -586,8 +630,8 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    G4int pionPlusCode     = PionPlus.getCode();    
    G4int pionZeroCode     = PionZero.getCode();    
    G4int pionMinusCode    = PionMinus.getCode(); 
-   G4String mesonType     = "meson";
-   G4String baryonType    = "baryon"; 
+   G4String mesonType     = PionPlus.getType();
+   G4String baryonType    = Proton.getType(); 
    
    G4int    targetCode   = targetParticle.getCode();
    G4double targetMass   = targetParticle.getMass();
@@ -640,7 +684,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
 
    if (annihilation)
       {                        // do some corrections of incident particle kinematic
-        G4double ekcor = G4std::max( 1., 1./incidentKineticEnergy);
+        G4double ekcor = Amax( 1., 1./incidentKineticEnergy);
         incidentKineticEnergy = 2*targetMass + incidentKineticEnergy*(1.+ekcor/atomicWeight);
         G4double excitation = NuclearExcitation(incidentKineticEnergy,
                                                 atomicWeight,
@@ -651,13 +695,13 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         if (incidentKineticEnergy < excitationEnergyDTA) incidentKineticEnergy = 0.;
         incidentEnergy = incidentKineticEnergy + incidentMass;
         incidentTotalMomentum =
-                 sqrt( G4std::max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
+                 sqrt( Amax(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
       }  
     
    G4HEVector pTemp;
    for (i = 2; i<vecLen; i++)
      {
-       j = G4std::min( vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen - 2)));
+       j = Imin( vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen - 2)));
        pTemp = pv[j];
        pv[j] = pv[i];
        pv[i] = pTemp;
@@ -761,22 +805,20 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                               //  nuclearCascadeCount = number of new secondaries 
                               //  produced by nuclear cascading.
                               //  extraCount = number of nucleons within these new secondaries
-   
+
    G4double s, xtarg, ran;
    s = centerOfMassEnergy*centerOfMassEnergy;
    G4double afc;
-   afc = G4std::min( 0.5, 0.312 + 0.200 * log(log(s))+ pow(s,1.5)/6000.0 ); 
-   xtarg = G4std::max(0.01, afc * (pow(atomicWeight, 0.33) - 1.0) * tb);
-
+   afc = Amin(0.5, 0.312 + 0.200 * log(log(s))+ pow(s,1.5)/6000.0); 
+   xtarg = Amax(0.01, afc * (pow(atomicWeight, 0.33) - 1.0) * tb);
    G4int nstran = Poisson( 0.03*xtarg);
-     
    G4int momentumBin = 0;
    G4double nucsup[] = { 1.00, 0.7, 0.5, 0.4, 0.5, 0.5 };
    G4double psup[]   = {   3.,  6., 20., 50., 100., 1000. };
    while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin])) momentumBin++;
-   momentumBin = G4std::min(5, momentumBin);
-   G4double xpnhmf = G4std::max(0.01,xtarg*nucsup[momentumBin]);
-   G4double xshhmf = G4std::max(0.01,xtarg - xpnhmf);
+   momentumBin = Imin(5, momentumBin);
+   G4double xpnhmf = Amax(0.01,xtarg*nucsup[momentumBin]);
+   G4double xshhmf = Amax(0.01,xtarg - xpnhmf);
    G4double rshhmf = 0.25*xshhmf;
    G4double rpnhmf = 0.81*xpnhmf;
    G4double xhmf;
@@ -1010,6 +1052,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    G4int npg   = 0;
    G4double rmg0 = 0.;
    G4int targ1 = 0;                           // no fragmentation model for nucleons from the
+   phi = G4UniformRand()*M_2PI;
    for( i=vecLen-1; i>=0; i-- )               // intranuclear cascade. Mark them with -3 and 
       {                                       // leave the loop
         if( i == 1)
@@ -1066,9 +1109,8 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         if (pv[i].getSide() <= -2) j = 6;
         if (j == 6 && pv[i].getType() == baryonType) j = 7;
         pt    = sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j]));
-        if(pt<0.05) pt = G4std::max(0.001, 0.3*G4UniformRand());
+        if(pt<0.05) pt = Amax(0.001, 0.3*G4UniformRand());
         aspar = maspar[j]; 
-        phi   = G4UniformRand()*M_2PI; 
         pv[i].setMomentum( pt*cos(phi), pt*sin(phi) );        // set x- and y-momentum
 
         for( j=0; j<20; j++ ) binl[j] = j/(19.*pt);           // set the lambda - bins.
@@ -1104,8 +1146,8 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                       l = 1;
                       ran = G4UniformRand()*dndl[19];
                       while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-                      l = G4std::min( 19, l );
-                      xval = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+                      l = Imin( 19, l );
+                      xval = Amin( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
                       if( pv[i].getSide() < 0 ) xval *= -1.;
                       pv[i].setMomentumAndUpdate( xval*et );                  // set the z-momentum
                       pvEnergy = pv[i].getEnergy();
@@ -1119,9 +1161,9 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                if (pp1 >= 1.e-6)
                                   {
                                     G4double pp = sqrt(ekin*(ekin+2*pvMass));
-                                    pp = G4std::max(0., pp*pp - pt*pt);
+                                    pp = Amax(0., pp*pp - pt*pt);
                                     pp = sqrt(pp)*pv[i].getSide()/fabs(G4double(pv[i].getSide())); // cast for aCC 
-                                    pv[i].setMomentum( pp );
+                                    pv[i].setMomentumAndUpdate( pp );
                                   }
                                else
                                   {
@@ -1129,9 +1171,10 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                                     pv[i].setKineticEnergyAndUpdate( ekin);
                                   }
                                pvmx[4].Add( pvmx[4], pv[i]);
+                               outerCounter = 2;
                                resetEnergies = false;
                                eliminateThisParticle = false; 
-                               continue;
+                               break;
                              }      
                           else if( (ekin1+pvEnergy-pvMass) < 0.95*tavai1 ) 
                             {
@@ -1161,7 +1204,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                         } 
                       else 
                         {                                            // backward side
-                          xval = G4std::min(0.999,0.95+0.05*targ/20.0);
+                          xval = Amin(0.999,0.95+0.05*targ/20.0);
                           if( (ekin2+pvEnergy-pvMass) < xval*tavai2 ) 
                             {
                               pvmx[5].Add( pvmx[5], pv[i] );
@@ -1291,7 +1334,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
             if (pv[i].getSide() == -3)
               {
                 G4double ekit = pow(G4UniformRand()*(1.-ga)/avalue + pow(ekit1,1.-ga), 1./(1.-ga) );
-                G4double cost = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                G4double cost = Amax(-1., Amin(1., log(2.23*G4UniformRand()+0.383)/0.96));
                 G4double sint = sqrt(1. - cost*cost);
                 G4double phi  = M_2PI*G4UniformRand();
                 G4double pp   = sqrt(ekit*(ekit+2*pvMass));
@@ -1468,13 +1511,17 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
    G4double alem[] = {1.40, 2.30, 2.70, 3.00, 3.40, 4.60, 7.00, 10.00};
    G4double val0[] = {0.00, 0.40, 0.48, 0.51, 0.54, 0.60, 0.65,  0.70};
    
+   if (verboseLevel > 1)
+     G4cout << " Rotation in Direction  of primary particle (Defs1)" << G4endl;
 
    for (i = 0; i < vecLen; i++)
       { 
+        if(verboseLevel > 1) pv[i].Print(i);
         pv[i].Defs1( pv[i], pvI );
+        if(verboseLevel > 1) pv[i].Print(i);
         if (atomicWeight > 1.5)
            {
-             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = Amax( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              if(incidentCode == pionPlusCode || incidentCode == pionMinusCode)
@@ -1515,7 +1562,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = Amax( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
@@ -1537,9 +1584,9 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
 
    G4double sprob = 0.;
    if (incidentKineticEnergy > 5.)
-       sprob = G4std::min(1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
-
-   if( atomicWeight > 1.5 && G4UniformRand() > sprob ) 
+//       sprob = Amin(1., (0.394-0.063*log(atomicWeight))*log(incidentKineticEnergy-4.) );
+     sprob = Amin(1., 0.000314*atomicWeight*log(incidentKineticEnergy-4.)); 
+     if( atomicWeight > 1.5 && G4UniformRand() > sprob ) 
      {
 
        G4double ekw, tex, cost, sint, pp, eka, etb;
@@ -1553,7 +1600,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
        
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
-           if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
+           if( targ+nbl > atomicWeight ) nbl = (int)(atomicWeight - targ);
            if (verboseLevel > 1) 
               G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
@@ -1574,7 +1621,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = Amax( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen] = Proton;
                     else
@@ -1600,7 +1647,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = G4std::max( 0.1, eka );
+                    eka = Amax( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -1650,7 +1697,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = Amax( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -1661,7 +1708,7 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
                       pv[vecLen] = Triton;
                   else
                       pv[vecLen] = Alpha;
-                  spall += pv[vecLen].getMass() * 1.066;
+                  spall += (int)(pv[vecLen].getMass() * 1.066);
                   if( spall > atomicWeight ) break;
                   pv[vecLen].setFlag( true );                    // true is the same as IPA(i)<0
                   pv[vecLen].setSide( -4 );
@@ -1710,8 +1757,31 @@ G4HEInelastic::HighEnergyCascading(G4bool &successful,
         && (incidentKineticEnergy <= 0.2) )
            tof -= 500.0 * exp(-incidentKineticEnergy /0.04) * log( G4UniformRand() );
 
+   for(i=0; i<vecLen; i++)
+   {
+     if(pv[i].getName() == "KaonZero" || pv[i].getName() == "AntiKaonZero")
+     {
+       pvmx[0] = pv[i];
+       if(G4UniformRand() < 0.5) pv[i].setDefinition("KaonZeroShort");
+       else                    pv[i].setDefinition("KaonZeroLong");
+       pv[i].setMomentumAndUpdate(pvmx[0].getMomentum());
+     }
+   } 
+
    successful = true;
    delete [] pvmx;
+   G4int testCurr=0;
+   G4double totKin=0;
+   for(testCurr=0; testCurr<vecLen; testCurr++)
+   {
+      totKin+=pv[testCurr].getKineticEnergy();
+      if(totKin>incidentKineticEnergy*1.05)
+      {
+        vecLen = testCurr;
+        break;
+      }
+   }
+   
    return;
  }
 
@@ -1741,7 +1811,9 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
    if ( incidentKineticEnergy > (25.+G4UniformRand()*75.) )
      {
        G4double reden = -0.7 + 0.29*log10(incidentKineticEnergy);
-       G4double redat =  1.0 - 0.40*log10(atomicWeight);
+//       G4double redat =  1.0 - 0.40*log10(atomicWeight);
+//       G4double redat = 0.5 - 0.18*log10(atomicWeight);
+       G4double redat = 0.722 - 0.278*log10(atomicWeight);
        G4double pmax   = -200.;
        G4double pmapim = -200.;
        G4double pmapi0 = -200.;
@@ -1752,7 +1824,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
        G4int maxpip = 0;
        G4int iphmf; 
        if (   (G4UniformRand() > (atomicWeight/100.-0.28)) 
-           && (incidentCharge != 0.) )
+           && (fabs(incidentCharge) > 0.) )
          { 
            for (i=0; i < vecLen; i++)
              { 
@@ -1789,7 +1861,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
            for (i=2; i<vecLen; i++)
              { 
                iphmf = pv[i].getCode();
-               if (    ((iphmf==protonCode)||(iphmf==neutronCode)||(pv[i].getMass()>1.7))   
+               if (    ((iphmf==protonCode)||(iphmf==neutronCode)||(pv[i].getType()=="Nucleus"))   
                     && (pv[i].Length()<1.5)
                     && ((G4UniformRand()<reden)||(G4UniformRand()<redat)))
 		  {
@@ -1806,7 +1878,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
          { 
            if (G4UniformRand() < pmapi0/incidentTotalMomentum) 
             { 
-              if ((incidentCharge > 0.) && (maxpip != 0))
+              if ((incidentCharge > 0.5) && (maxpip != 0))
                 { 
                   G4ParticleMomentum mompi0 = pv[maxpi0].getMomentum();
                   pv[maxpi0].setMomentumAndUpdate( pv[maxpip].getMomentum() );
@@ -1816,7 +1888,7 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                       G4cout << " exchange Momentum for " << maxpi0 << " and " << maxpip << G4endl;
                     } 
                 }
-              else if ((incidentCharge < 0.) && (maxpim != 0))
+              else if ((incidentCharge < -0.5) && (maxpim != 0))
                 { 
                   G4ParticleMomentum mompi0 = pv[maxpi0].getMomentum();
                   pv[maxpi0].setMomentumAndUpdate( pv[maxpim].getMomentum() );
@@ -1830,8 +1902,9 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
          }
        G4double bntot = - incidentParticle.getBaryonNumber() - atomicWeight;
        for (i=0; i<vecLen; i++) bntot += pv[i].getBaryonNumber();
-       bntot = ( (atomicWeight < 1.5) || (atomicWeight > (75.+G4UniformRand()*25.))) ? 
-               0. : 1.+bntot/atomicWeight;
+       if(atomicWeight < 1.5) { bntot = 0.; }
+       else                   { bntot = 1. + bntot/atomicWeight; }
+       if(atomicWeight > (75.+G4UniformRand()*50.)) bntot = 0.;
        if(verboseLevel > 1) 
          {
            G4cout << " Calculated Baryon- Number " << bntot << G4endl;
@@ -1845,8 +1918,9 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
              { 
                iphmf = pv[i].getCode();
                if(    (bntot > 0.3) 
-                   && ((iphmf == protonCode) || (iphmf == neutronCode) || (pv[i].getMass() > 1.7) )
-                   && (G4UniformRand() < 0.5) 
+                   && ((iphmf == protonCode) || (iphmf == neutronCode) 
+                                             || (pv[i].getType() == "Nucleus") )
+                   && (G4UniformRand() < 0.25) 
                    && (ppp < 1.2)  ) 
                  { 
                    if(verboseLevel > 1)
@@ -1888,8 +1962,12 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
    G4int ledpar = -1;
    G4double redpar = 0.;
    G4double gespar = 0.;
-   G4int incidentS =   incidentParticle.getQuarkContent( 3 )
-                     - incidentParticle.getAntiQuarkContent( 3 );
+   G4int incidentS = incidentParticle.getStrangenessNumber();
+   if(incidentParticle.getName() == "KaonZeroShort" || incidentParticle.getName() == "KaonZeroLong")
+     {
+       if(G4UniformRand() < 0.5) { incidentS = 1;}
+       else                      { incidentS = -1;}
+     }
    G4int incidentB =   incidentParticle.getBaryonNumber();   
 
    if(verboseLevel > 1)
@@ -1904,8 +1982,12 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
          { 
            pvmx[5].Lor( pv[i], pvmx[2] );
            G4double cost = pvmx[3].CosAng( pvmx[5] );
-           G4int particleS =   pv[i].getQuarkContent( 3 )
-                             - pv[i].getAntiQuarkContent( 3 );
+           G4int particleS =   pv[i].getStrangenessNumber();
+           if(pv[i].getName() == "KaonZeroShort" || pv[i].getName() == "KaonZeroLong")
+             {
+               if(G4UniformRand() < 0.5) { particleS = 1;}
+               else                      { particleS = -1;}
+             } 
            G4int particleB =   pv[i].getBaryonNumber();
            G4double hfmass;
            if (cost > 0.)
@@ -1945,8 +2027,14 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
                G4double plhmf = ppp*cost*(1.-sbqwgt);
                pvmx[7].Cross( pvmx[3], pvmx[5] );
                pvmx[7].Cross( pvmx[7], pvmx[3] );
-               pvmx[6].SmulAndUpdate( pvmx[3], plhmf/pvmx[3].Length() );
-               pvmx[7].SmulAndUpdate( pvmx[7], pthmf/pvmx[7].Length() );
+               if(pvmx[3].Length() > 0.)
+                 pvmx[6].SmulAndUpdate( pvmx[3], plhmf/pvmx[3].Length() );
+               else if(verboseLevel > 1)
+                 G4cout << "NaNQ in Tuning of High Energy Hadronic Interactions" << G4endl;
+               if(pvmx[7].Length() > 0.)    
+                 pvmx[7].SmulAndUpdate( pvmx[7], pthmf/pvmx[7].Length() );
+               else if(verboseLevel > 1)
+                 G4cout << "NaNQ in Tuning of High Energy Hadronic Interactions" << G4endl;
                pvmx[5].Add3(pvmx[6], pvmx[7] );
                pvmx[5].setEnergy( sqrt(sqr(pvmx[5].Length()) + sqr(pv[i].getMass())));
                pv[i].Lor( pvmx[5], pvmx[4] );
@@ -1958,12 +2046,10 @@ G4HEInelastic::TuningOfHighEnergyCascading( G4HEVector pv[],
              }    
            if (iphmf != pionZeroCode)
              { 
-               pvmx[9].setMomentum( incidentParticle.getMomentum());
-               pvmx[9].Smul( pvmx[9], 1.);
-               pvmx[7].Sub3( pvmx[9], pv[i] );
+               pvmx[7].Sub3( incidentParticle, pv[i] );
                reddec[4] = pvmx[7].Length()/incidentTotalMomentum;
                reddec[6] = reddec[4]*2./3. + reddec[5]/12.;
-               reddec[6] = G4std::max(0., 1. - reddec[6]);
+               reddec[6] = Amax(0., 1. - reddec[6]);
                gespar   += reddec[6];
                if ( (reddec[5] <= 3.75) && (reddec[6] > redpar) )
                  { ledpar = i;
@@ -2150,13 +2236,13 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    G4double  psup[]   = { 3. , 6. , 20., 50., 100.,1000.};   
    G4double s = centerOfMassEnergy*centerOfMassEnergy;
 
-   G4double xtarg = G4std::max(0.01, G4std::min(0.50, 0.312+0.2*log(log(s))+pow(s,1.5)/6000.) 
+   G4double xtarg = Amax(0.01, Amin(0.50, 0.312+0.2*log(log(s))+pow(s,1.5)/6000.) 
                              * (pow(atomicWeight,0.33)-1.) * tb);
    G4int momentumBin = 0;
    while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin])) momentumBin++;
-   momentumBin = G4std::min(5, momentumBin);
-   G4double xpnhmf = G4std::max(0.01,xtarg*nucsup[momentumBin]);
-   G4double xshhmf = G4std::max(0.01,xtarg-xpnhmf);
+   momentumBin = Imin(5, momentumBin);
+   G4double xpnhmf = Amax(0.01,xtarg*nucsup[momentumBin]);
+   G4double xshhmf = Amax(0.01,xtarg-xpnhmf);
    G4double rshhmf = 0.25*xshhmf;
    G4double rpnhmf = 0.81*xpnhmf;
    G4double xhmf;
@@ -2333,9 +2419,9 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    G4double gpar[] = {2.6, 2.6, 1.80, 1.30, 1.20};
     
    G4double rmc = rmc0, rmd = rmd0, rme = rme0; 
-   G4int ntc1 = G4std::min(4,ntc-1);
-   G4int ntd1 = G4std::min(4,ntd-1);
-   G4int nte1 = G4std::min(4,nte-1);
+   G4int ntc1 = Imin(4,ntc-1);
+   G4int ntd1 = Imin(4,ntd-1);
+   G4int nte1 = Imin(4,nte-1);
    if (ntc > 1) rmc = rmc0 + pow(-log(1.-G4UniformRand()),cpar[ntc1])/gpar[ntc1];
    if (ntd > 1) rmd = rmd0 + pow(-log(1.-G4UniformRand()),cpar[ntd1])/gpar[ntd1];
    if (nte > 1) rme = rme0 + pow(-log(1.-G4UniformRand()),cpar[nte1])/gpar[nte1];
@@ -2366,7 +2452,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[0] );
    pvmx[2].Lor( pvmx[2], pvmx[0] );
 
-   G4double pf = sqrt(G4std::max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
+   G4double pf = sqrt(Amax(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
                                  - 4*sqr(centerOfMassEnergy)*rmd*rmd))/(2.*centerOfMassEnergy);
    pvmx[3].setMass( rmc );
    pvmx[4].setMass( rmd );
@@ -2374,12 +2460,12 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
    pvmx[4].setEnergy( sqrt(pf*pf + rmd*rmd) );
    
    G4double tvalue = -MAXFLOAT;
-   G4double bvalue = G4std::max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
+   G4double bvalue = Amax(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
    if (bvalue != 0.0) tvalue = log(G4UniformRand())/bvalue;
    G4double pin = pvmx[1].Length();
    G4double tacmin = sqr( pvmx[1].getEnergy() - pvmx[3].getEnergy()) - sqr( pin - pf);
-   G4double ctet   = G4std::max(-1., G4std::min(1., 1.+2.*(tvalue-tacmin)/G4std::max(1.e-10, 4.*pin*pf)));
-   G4double stet   = sqrt(G4std::max(0., 1.0 - ctet*ctet));
+   G4double ctet   = Amax(-1., Amin(1., 1.+2.*(tvalue-tacmin)/Amax(1.e-10, 4.*pin*pf)));
+   G4double stet   = sqrt(Amax(0., 1.0 - ctet*ctet));
    G4double phi    = M_2PI * G4UniformRand();
    pvmx[3].setMomentum( pf * stet * sin(phi), 
                         pf * stet * cos(phi),
@@ -2404,8 +2490,8 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                    G4double ekit = pow(G4UniformRand()*(1.-gaval)/avalue +pow(ekit1, 1.-gaval),
                                        1./(1.-gaval));
                    pv[i].setKineticEnergyAndUpdate( ekit );
-                   ctet = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
-                   stet = sqrt( G4std::max( 0.0, 1. - ctet*ctet ));
+                   ctet = Amax(-1., Amin(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                   stet = sqrt( Amax( 0.0, 1. - ctet*ctet ));
                    phi  = G4UniformRand()*M_2PI;
                    G4double pp = pv[i].Length();
                    pv[i].setMomentum( pp * stet * sin(phi),
@@ -2415,8 +2501,8 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                  }              
             }             
       }
-   pvmx[1] = pvmx[3];
-   pvmx[2] = pvmx[4];
+//   pvmx[1] = pvmx[3];
+//   pvmx[2] = pvmx[4];
    pvmx[5].SmulAndUpdate( pvmx[3], -1.);
    pvmx[6].SmulAndUpdate( pvmx[4], -1.);
 
@@ -2673,7 +2759,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = Amax( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              xxh   = 1.;
@@ -2715,7 +2801,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = Amax( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
@@ -2735,9 +2821,9 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 
    G4double sprob = 0.;
    if (incidentKineticEnergy > 5. )
-       sprob = G4std::min( 1., (0.25-0.02*log(atomicWeight))*log(incidentKineticEnergy-4.) );
-
-   if( atomicWeight > 1.5 && G4UniformRand() > sprob) 
+//       sprob = Amin( 1., (0.394-0.063*log(atomicWeight))*log(incidentKineticEnergy-4.) );
+     sprob = Amin(1., 0.000314*atomicWeight*log(incidentKineticEnergy-4.)); 
+     if( atomicWeight > 1.5 && G4UniformRand() > sprob) 
      {
 
        G4double ekw, tex, cost, sint, ekin2, ran, pp, eka;
@@ -2751,7 +2837,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
        
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
-           if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
+           if( targ+nbl > atomicWeight ) nbl = (int)(atomicWeight - targ);
            if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
@@ -2767,7 +2853,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = Amax( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -2793,7 +2879,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = G4std::max( 0.1, eka );
+                    eka = Amax( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -2837,7 +2923,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA )
-                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = Amax( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -2848,7 +2934,7 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
                       pv[vecLen].setDefinition( "Triton" );
                   else
                       pv[vecLen].setDefinition( "Alpha" );
-                  spall += pv[vecLen].getMass() * 1.066;
+                  spall += (int)(pv[vecLen].getMass() * 1.066);
                   if( spall > atomicWeight ) break;
                   pv[vecLen].setFlag( true );                    // true is the same as IPA(i)<0
                   pv[vecLen].setSide( -4 );
@@ -2891,6 +2977,17 @@ G4HEInelastic::HighEnergyClusterProduction(G4bool &successful,
 //       vec[i].SetTOF ( tof );
      }
 
+   for(i=0; i<vecLen; i++)
+   {
+     if(pv[i].getName() == "KaonZero" || pv[i].getName() == "AntiKaonZero")
+     {
+       pvmx[0] = pv[i];
+       if(G4UniformRand() < 0.5) pv[i].setDefinition("KaonZeroShort");
+       else                    pv[i].setDefinition("KaonZeroLong");
+       pv[i].setMomentumAndUpdate(pvmx[0].getMomentum());
+     }
+   } 
+
    successful = true;
    delete [] pvmx;
    delete [] tempV;
@@ -2984,7 +3081,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    
    if (annihilation)
       {                        // do some corrections of incident particle kinematic
-        G4double ekcor = G4std::max( 1., 1./incidentKineticEnergy);
+        G4double ekcor = Amax( 1., 1./incidentKineticEnergy);
         incidentKineticEnergy = 2*targetMass + incidentKineticEnergy*(1.+ekcor/atomicWeight);
         G4double excitation = NuclearExcitation(incidentKineticEnergy,
                                                 atomicWeight,
@@ -2995,13 +3092,13 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if (incidentKineticEnergy < excitationEnergyDTA) incidentKineticEnergy = 0.;
         incidentEnergy = incidentKineticEnergy + incidentMass;
         incidentTotalMomentum =
-                 sqrt( G4std::max(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
+                 sqrt( Amax(0., incidentEnergy*incidentEnergy - incidentMass*incidentMass));
       }  
                   
    G4HEVector pTemp;
    for(i = 2; i<vecLen; i++)
      {
-       j = G4std::min(vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen-2)));
+       j = Imin(vecLen-1, (G4int)(2. + G4UniformRand()*(vecLen-2)));
        pTemp = pv[j];
        pv[j] = pv[i];
        pv[i] = pTemp;
@@ -3106,7 +3203,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    
    G4double s, xtarg, ran;
    s = centerOfMassEnergy*centerOfMassEnergy;
-   xtarg = G4std::max( 0.01, G4std::min( 0.75, 0.312 + 0.200 * log(log(s)) 
+   xtarg = Amax( 0.01, Amin( 0.75, 0.312 + 0.200 * log(log(s)) 
                                        + pow(s,1.5)/6000.0 ) 
                      *(pow(atomicWeight, 0.33) - 1.0) * tb);
 
@@ -3120,7 +3217,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        G4int momentumBin = 0;
        while( (momentumBin < 6) && (incidentTotalMomentum > psup[momentumBin]) )
              momentumBin++;
-       momentumBin = G4std::min( 5, momentumBin );
+       momentumBin = Imin( 5, momentumBin );
      
                               // NOTE: in GENXPT, these new particles were given negative codes
                               //       here I use  flag = true  instead
@@ -3279,6 +3376,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
    G4double ekin  = 0.;
    G4double ekin1 = 0.;
    G4double ekin2 = 0.;
+   phi = G4UniformRand()*M_2PI;
    G4int npg   = 0;
    G4int targ1 = 0;                           // no fragmentation model for nucleons from the
    for( i=vecLen-1; i>=0; i-- )               // intranuclear cascade. Mark them with -3 and 
@@ -3312,9 +3410,8 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if ( i <= 1 ) j += 3;
         if (pv[i].getSide() <= -2) j = 6;
         if (j == 6 && pv[i].getType() == baryonType) j = 7;
-        pt    = G4std::max(0.001, sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j])));
+        pt    = Amax(0.001, sqrt(pow(-log(1.-G4UniformRand())/bp[j],ptex[j])));
         aspar = maspar[j]; 
-        phi   = G4UniformRand()*M_2PI; 
         pv[i].setMomentum( pt*cos(phi), pt*sin(phi) );        // set x- and y-momentum
 
         for( j=0; j<20; j++ ) binl[j] = j/(19.*pt);           // set the lambda - bins.
@@ -3351,8 +3448,8 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                       l = 1;
                       ran = G4UniformRand()*dndl[19];
                       while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-                      l = G4std::min( 19, l );
-                      xval = G4std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
+                      l = Imin( 19, l );
+                      xval = Amin( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
                       if( pv[i].getSide() < 0 ) xval *= -1.;
                       pv[i].setMomentumAndUpdate( xval*et );                  // set the z-momentum
                       pvEnergy = pv[i].getEnergy();
@@ -3362,9 +3459,24 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                              { 
                                ekin = tavai1 - ekin1;
                                if (ekin < 0.) ekin = 0.04*fabs(normal());
-                               pv[i].setKineticEnergyAndUpdate( ekin);
+                               G4double pp1 = pv[i].Length();
+                               if (pp1 >= 1.e-6)
+			          { 
+                                    G4double pp = sqrt(ekin*(ekin+2*pvMass));
+                                    pp = Amax(0.,pp*pp-pt*pt);
+                                    pp = sqrt(pp)*pv[i].getSide()/fabs(G4double(pv[i].getSide()));
+                                    pv[i].setMomentumAndUpdate( pp );
+                                  }
+                               else
+				  {
+                                    pv[i].setMomentum(0.,0.,0.);
+                                    pv[i].setKineticEnergyAndUpdate( ekin);
+                                  } 
                                pvmx[4].Add( pvmx[4], pv[i]);
-                               continue;
+                               outerCounter = 2;
+                               resetEnergies = false;
+                               eliminateThisParticle = false;
+                               break;
                              }      
                           else if( (ekin1+pvEnergy-pvMass) < 0.95*tavai1 ) 
                             {
@@ -3394,7 +3506,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                         } 
                       else 
                         {                                            // backward side
-                          xval = G4std::min(0.999,0.95+0.05*targ/20.0);
+                          xval = Amin(0.999,0.95+0.05*targ/20.0);
                           if( (ekin2+pvEnergy-pvMass) < xval*tavai2 ) 
                             {
                               pvmx[5].Add( pvmx[5], pv[i] );
@@ -3438,7 +3550,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                          {
                            if( (pv[l].getMass() < protonMass) || (pv[l].getSide() > 0) ) 
                              {
-                                pvEnergy = G4std::max( pv[l].getMass(),   0.95*pv[l].getEnergy() 
+                                pvEnergy = Amax( pv[l].getMass(),   0.95*pv[l].getEnergy() 
                                                                  + 0.05*pv[l].getMass() );
                                 pv[l].setEnergyAndUpdate( pvEnergy );
                                 if( pv[l].getSide() > 0) 
@@ -3512,9 +3624,19 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
      }  
    if( targ1 == 1 || npg < 2) 
      {                                                  // target particle is the only backward nucleon
-       ekin = G4std::min( tavai2-ekin2, centerOfMassEnergy/2.0-protonMass );
+       ekin = Amin( tavai2-ekin2, centerOfMassEnergy/2.0-protonMass );
        if( ekin < 0.04 ) ekin = 0.04 * fabs( normal() );
-       pv[1].setKineticEnergyAndUpdate( ekin );
+       G4double pp = sqrt(ekin*(ekin+2*pv[1].getMass()));
+       G4double pp1 = pvmx[6].Length();
+       if(pp1 < 1.e-6)
+         {
+            pv[1].setKineticEnergyAndUpdate(ekin);
+         }
+       else
+         {
+            pv[1].setMomentum(pvmx[6].getMomentum());
+            pv[1].SmulAndUpdate(pv[1],pp/pp1);
+         }
        pvmx[5].Add( pvmx[5], pv[1] );
      } 
    else 
@@ -3522,7 +3644,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        G4double cpar[] = { 0.6, 0.6, 0.35, 0.15, 0.10 };
        G4double gpar[] = { 2.6, 2.6, 1.80, 1.30, 1.20 };
 
-       G4int tempCount = G4std::min( 5, targ1 ) - 1;
+       G4int tempCount = Imin( 5, targ1 ) - 1;
 
        rmb = rmb0 + pow(-log(1.0-G4UniformRand()), cpar[tempCount])/gpar[tempCount];
        pvEnergy = pvmx[6].getEnergy();
@@ -3574,7 +3696,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         if( pv[i].getType() == baryonType )targ++;
         pv[i].Lor( pv[i], pvmx[1] );
       }
-   targ = G4std::max( 1, targ );
+   targ = Imax( 1, targ );
 
    G4bool dum;
    if( lead ) 
@@ -3723,7 +3845,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = Amax( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              if(incidentCode == pionPlusCode || incidentCode == pionMinusCode)
@@ -3764,7 +3886,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = Amax( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
@@ -3791,7 +3913,8 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        if( incidentKineticEnergy < 5.0 )
          sprob = 0.0;
        else
-         sprob = G4std::min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
+	 //	 sprob = Amin( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
+         sprob = Amin(1., 0.000314*atomicWeight*log(incidentKineticEnergy-4.)); 
 
                                      //  first add protons and neutrons
 
@@ -3802,7 +3925,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
-           if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
+           if( targ+nbl > atomicWeight ) nbl = (int)(atomicWeight - targ);
            if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " << sprob << G4endl; 
            spall = targ;
            if( nbl > 0) 
@@ -3818,7 +3941,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = Amax( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -3844,7 +3967,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = G4std::max( 0.1, eka );
+                    eka = Amax( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -3888,7 +4011,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = Amax( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -3899,7 +4022,7 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
                       pv[vecLen].setDefinition( "Triton");
                   else
                       pv[vecLen].setDefinition( "Alpha");
-                  spall += pv[vecLen].getMass() * 1.066;
+                  spall += (int)(pv[vecLen].getMass() * 1.066);
                   if( spall > atomicWeight ) break;
                   pv[vecLen].setFlag( true );                    // true is the same as IPA(i)<0
                   pv[vecLen].setSide( -4 );
@@ -3938,6 +4061,18 @@ G4HEInelastic::MediumEnergyCascading(G4bool &successful,
        pv[i].setTOF ( tof );
 //       vec[i].SetTOF ( tof );
      }
+
+   for(i=0; i<vecLen; i++)
+   {
+     if(pv[i].getName() == "KaonZero" || pv[i].getName() == "AntiKaonZero")
+     {
+       pvmx[0] = pv[i];
+       if(G4UniformRand() < 0.5) pv[i].setDefinition("KaonZeroShort");
+       else                    pv[i].setDefinition("KaonZeroLong");
+       pv[i].setMomentumAndUpdate(pvmx[0].getMomentum());
+     }
+   } 
+
    successful = true;
    delete [] pvmx;
    return;
@@ -4072,12 +4207,12 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    
    G4double nucsup[] = { 1.0, 0.8, 0.6, 0.5, 0.4}; 
 
-   G4double xtarg = G4std::max(0.01,  (0.312+0.2*log(log(centerOfMassEnergy*centerOfMassEnergy)))
+   G4double xtarg = Amax(0.01,  (0.312+0.2*log(log(centerOfMassEnergy*centerOfMassEnergy)))
                              * (pow(atomicWeight,0.33)-1.) * tb);
    G4int ntarg = Poisson(xtarg);
    if (ntarg > 0)
       {
-        G4int ipx = G4std::min(4, (G4int)(incidentTotalMomentum/3.));
+        G4int ipx = Imin(4, (G4int)(incidentTotalMomentum/3.));
         for (i=0; i < ntarg; i++)
             { 
                if (G4UniformRand() < nucsup[ipx] )
@@ -4226,9 +4361,9 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    G4double gpar[] = {2.6, 2.6, 1.80, 1.30, 1.20};
     
    G4double rmc = rmc0, rmd = rmd0, rme = rme0; 
-   G4int ntc1 = G4std::min(4,ntc-1);
-   G4int ntd1 = G4std::min(4,ntd-1);
-   G4int nte1 = G4std::min(4,nte-1);
+   G4int ntc1 = Imin(4,ntc-1);
+   G4int ntd1 = Imin(4,ntd-1);
+   G4int nte1 = Imin(4,nte-1);
    if (ntc > 1) rmc = rmc0 + pow(-log(1.-G4UniformRand()),cpar[ntc1])/gpar[ntc1];
    if (ntd > 1) rmd = rmd0 + pow(-log(1.-G4UniformRand()),cpar[ntd1])/gpar[ntd1];
    if (nte > 1) rme = rme0 + pow(-log(1.-G4UniformRand()),cpar[nte1])/gpar[nte1];
@@ -4259,7 +4394,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    pvmx[1].Lor( pvmx[1], pvmx[0] );
    pvmx[2].Lor( pvmx[2], pvmx[0] );
 
-   G4double pf = sqrt(G4std::max(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
+   G4double pf = sqrt(Amax(0.0001,  sqr(sqr(centerOfMassEnergy) + rmd*rmd -rmc*rmc)
                                  - 4*sqr(centerOfMassEnergy)*rmd*rmd))/(2.*centerOfMassEnergy);
    pvmx[3].setMass( rmc );
    pvmx[4].setMass( rmd );
@@ -4267,12 +4402,12 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
    pvmx[4].setEnergy( sqrt(pf*pf + rmd*rmd) );
    
    G4double tvalue = -MAXFLOAT;
-   G4double bvalue = G4std::max(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
+   G4double bvalue = Amax(0.01, 4.0 + 1.6*log(incidentTotalMomentum));
    if (bvalue != 0.0) tvalue = log(G4UniformRand())/bvalue;
    G4double pin = pvmx[1].Length();
    G4double tacmin = sqr( pvmx[1].getEnergy() - pvmx[3].getEnergy()) - sqr( pin - pf);
-   G4double ctet   = G4std::max(-1., G4std::min(1., 1.+2.*(tvalue-tacmin)/G4std::max(1.e-10, 4.*pin*pf)));
-   G4double stet   = sqrt(G4std::max(0., 1.0 - ctet*ctet));
+   G4double ctet   = Amax(-1., Amin(1., 1.+2.*(tvalue-tacmin)/Amax(1.e-10, 4.*pin*pf)));
+   G4double stet   = sqrt(Amax(0., 1.0 - ctet*ctet));
    G4double phi    = M_2PI * G4UniformRand();
    pvmx[3].setMomentum( pf * stet * sin(phi), 
                       pf * stet * cos(phi),
@@ -4297,8 +4432,8 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                    G4double ekit = pow(G4UniformRand()*(1.-gaval)/avalue +pow(ekit1, 1.-gaval),
                                        1./(1.-gaval));
                    pv[i].setKineticEnergyAndUpdate( ekit );
-                   ctet = G4std::max(-1., G4std::min(1., log(2.23*G4UniformRand()+0.383)/0.96));
-                   stet = sqrt( G4std::max( 0.0, 1. - ctet*ctet ));
+                   ctet = Amax(-1., Amin(1., log(2.23*G4UniformRand()+0.383)/0.96));
+                   stet = sqrt( Amax( 0.0, 1. - ctet*ctet ));
                    phi  = G4UniformRand()*M_2PI;
                    G4double pp = pv[i].Length();
                    pv[i].setMomentum( pp * stet * sin(phi),
@@ -4308,8 +4443,8 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                  }              
             }             
       }
-   pvmx[1] = pvmx[3];
-   pvmx[2] = pvmx[4];
+//   pvmx[1] = pvmx[3];
+//   pvmx[2] = pvmx[4];
    pvmx[5].SmulAndUpdate( pvmx[3], -1.);
    pvmx[6].SmulAndUpdate( pvmx[4], -1.);
 
@@ -4566,7 +4701,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
         pv[i].Defs1( pv[i], pvI );
         if (atomicWeight > 1.5)
            {
-             ekin  = G4std::max( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
+             ekin  = Amax( 1.e-6,pv[i].getKineticEnergy() - cfa*( 1. + 0.5*normal()));
              alekw = log( incidentKineticEnergy );
              xxh   = 1.;
              xxh   = 1.;
@@ -4608,7 +4743,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
             pvCode = pv[i].getCode();
             if((pvCode == pionPlusCode) || (pvCode == pionMinusCode) || (pvCode == pionZeroCode)) 
               {
-                ekin = G4std::max( 1.0e-6, pv[i].getKineticEnergy() * dekin );
+                ekin = Amax( 1.0e-6, pv[i].getKineticEnergy() * dekin );
                 pv[i].setKineticEnergyAndUpdate( ekin );
               }
           }
@@ -4635,8 +4770,8 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
        if( incidentKineticEnergy < 5.0 )
          sprob = 0.0;
        else
-         sprob = G4std::min( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
-
+//         sprob = Amin( 1.0, 0.6*log(incidentKineticEnergy-4.0) );
+         sprob = Amin(1., 0.000314*atomicWeight*log(incidentKineticEnergy-4.)); 
                                      //  first add protons and neutrons
 
        if( excitationEnergyGNP >= 0.001 ) 
@@ -4646,7 +4781,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
        
            nbl = Poisson( (1.5+1.25*targ)*excitationEnergyGNP/
                                          (excitationEnergyGNP+excitationEnergyDTA));
-           if( targ+nbl > atomicWeight ) nbl = atomicWeight - targ;
+           if( targ+nbl > atomicWeight ) nbl = (int)(atomicWeight - targ);
            if (verboseLevel > 1) G4cout << " evaporation " << targ << " " << nbl << " " 
                                       << sprob << G4endl; 
            spall = targ;
@@ -4663,7 +4798,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP )
-                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = Amax( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -4689,7 +4824,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = G4std::max( 0.1, eka );
+                    eka = Amax( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -4733,7 +4868,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = Amax( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -4744,7 +4879,7 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
                       pv[vecLen].setDefinition( "Triton");
                   else
                       pv[vecLen].setDefinition( "Alpha");
-                  spall += pv[vecLen].getMass() * 1.066;
+                  spall += (int)(pv[vecLen].getMass() * 1.066);
                   if( spall > atomicWeight ) break;
                   pv[vecLen].setFlag( true );                    // true is the same as IPA(i)<0
                   pv[vecLen].setSide( -4 );
@@ -4782,6 +4917,18 @@ G4HEInelastic::MediumEnergyClusterProduction(G4bool &successful,
        pv[i].setTOF ( tof );
 //       vec[i].SetTOF ( tof );
      }
+
+   for(i=0; i<vecLen; i++)
+   {
+     if(pv[i].getName() == "KaonZero" || pv[i].getName() == "AntiKaonZero")
+     {
+       pvmx[0] = pv[i];
+       if(G4UniformRand() < 0.5) pv[i].setDefinition("KaonZeroShort");
+       else                    pv[i].setDefinition("KaonZeroLong");
+       pv[i].setMomentumAndUpdate(pvmx[0].getMomentum());
+     }
+   } 
+
    successful = true;
    delete [] pvmx;
    delete [] tempV;
@@ -4893,7 +5040,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
         pvmx[1].Lor( pvI, pvmx[0] );
         pvmx[2].Lor( pvT, pvmx[0] );
         G4double pin = pvmx[1].Length();
-        G4double bvalue = G4std::max(0.01 , 4.225+1.795*log(incidentTotalMomentum));
+        G4double bvalue = Amax(0.01 , 4.225+1.795*log(incidentTotalMomentum));
         G4double pf =   sqr( sqr(centerOfMassEnergy) + sqr(pv[1].getMass()) - sqr(pv[0].getMass()))
                       - 4 * sqr(centerOfMassEnergy) * sqr(pv[1].getMass());
         if ( pf < 0.001)
@@ -4906,7 +5053,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
         G4double exindt = -1.;
         if (btrang < 46.) exindt += exp(-btrang);
         G4double tdn = log(1. + G4UniformRand()*exindt)/btrang;
-        G4double ctet = G4std::max( -1., G4std::min(1., 1. + 2.*tdn));
+        G4double ctet = Amax( -1., Amin(1., 1. + 2.*tdn));
         G4double stet = sqrt((1.-ctet)*(1.+ctet));
         G4double phi  = M_2PI * G4UniformRand();
         pv[0].setMomentumAndUpdate( pf*stet*sin(phi),
@@ -4923,7 +5070,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                  G4double ekin =    pv[i].getKineticEnergy() 
                                  -  0.025*((atomicWeight-1.)/120.)*exp(-(atomicWeight-1.)/120.)
                                    *(1. + 0.5*normal()); 
-                 ekin = G4std::max(0.0001, ekin);
+                 ekin = Amax(0.0001, ekin);
                  pv[i].setKineticEnergyAndUpdate( ekin );
                }
            }
@@ -4954,7 +5101,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                                      //  tex is their total kinetic energy (GeV)
        
            nbl = Poisson( excitationEnergyGNP/0.02);
-           if( nbl > atomicWeight ) nbl = atomicWeight;
+           if( nbl > atomicWeight ) nbl = (int)(atomicWeight);
            if (verboseLevel > 1) G4cout << " evaporation " << nbl << " " << sprob << G4endl; 
            spall = 0;
            if( nbl > 0) 
@@ -4970,7 +5117,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                     if (ekin1 < 0) ekin1 = -0.010*log(ran);
                     ekin2 += ekin1;
                     if( ekin2 > excitationEnergyGNP)
-                    ekin1 = G4std::max( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
+                    ekin1 = Amax( 1.0e-6, excitationEnergyGNP-(ekin2-ekin1) );
                     if( G4UniformRand() > (1.0-atomicNumber/(atomicWeight)))
                        pv[vecLen].setDefinition( "Proton");
                     else
@@ -4996,7 +5143,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                     G4int ika, kk = 0;
                     eka = incidentKineticEnergy;
                     if( eka > 1.0 )eka *= eka;
-                    eka = G4std::max( 0.1, eka );
+                    eka = Amax( 0.1, eka );
                     ika = G4int(3.6*exp((atomicNumber*atomicNumber
                                 /atomicWeight-35.56)/6.45)/eka);
                     if( ika > 0 ) 
@@ -5037,7 +5184,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                   if( ekin1 < 0.0 ) ekin1 = -0.010*log(ran);
                   ekin2 += ekin1;
                   if( ekin2 > excitationEnergyDTA)
-                     ekin1 = G4std::max( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
+                     ekin1 = Amax( 1.0e-6, excitationEnergyDTA-(ekin2-ekin1));
                   cost = G4UniformRand()*2.0 - 1.0;
                   sint = sqrt(fabs(1.0-cost*cost));
                   phi = M_2PI*G4UniformRand();
@@ -5048,7 +5195,7 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
                       pv[vecLen].setDefinition( "Triton");
                   else
                       pv[vecLen].setDefinition( "Alpha");
-                  spall += pv[vecLen].getMass() * 1.066;
+                  spall += (int)(pv[vecLen].getMass() * 1.066);
                   if( spall > atomicWeight ) break;
                   pv[vecLen].setFlag( true );                    // true is the same as IPA(i)<0
                   pv[vecLen].setSide( -4 );
@@ -5077,6 +5224,18 @@ G4HEInelastic::QuasiElasticScattering(G4bool &successful,
        pv[i].setTOF ( tof );
 //       vec[i].SetTOF ( tof );
      }
+
+   for(i=0; i<vecLen; i++)
+   {
+     if(pv[i].getName() == "KaonZero" || pv[i].getName() == "AntiKaonZero")
+     {
+       pvmx[0] = pv[i];
+       if(G4UniformRand() < 0.5) pv[i].setDefinition("KaonZeroShort");
+       else                    pv[i].setDefinition("KaonZeroLong");
+       pv[i].setMomentumAndUpdate(pvmx[0].getMomentum());
+     }
+   } 
+
    successful = true;
    delete [] pvmx;
    return;
@@ -5164,7 +5323,7 @@ G4HEInelastic::ElasticScattering(G4bool &successful,
    if (verboseLevel > 1)
       G4cout << "rr=" << rr << G4endl;
    G4double cost = 1. - rr;
-   G4double sint = sqrt(G4std::max(rr*(2. - rr), 0.));
+   G4double sint = sqrt(Amax(rr*(2. - rr), 0.));
    if (verboseLevel > 1)
       G4cout << "cos(t)=" << cost << "  sin(t)=" << sint << G4endl;
                                          // Scattered particle referred to axis of incident particle
@@ -5442,7 +5601,7 @@ G4HEInelastic::fctcos(G4double t,
         wtmax += log( pd[i] );
     }
     G4double weight = 0.0;           // weight is returned by GenerateNBodyEvent
-    if( lzero )weight = exp( G4std::max(G4std::min(wtmax,expxu),expxl) );
+    if( lzero )weight = exp( Amax(Amin(wtmax,expxu),expxl) );
     
     G4double bang, cb, sb, s0, s1, s2, c, s, esys, a, b, gama, beta;
     pcm[0][0] = 0.0;
@@ -5566,7 +5725,7 @@ G4HEInelastic::NBodyPhaseSpace(G4int npart, G4HEVector pv[],
            cost = 1. - 2.*ranarr[npart+2*j-9];
            sint = sqrt(1.-cost*cost);
            phi  = M_2PI*ranarr[npart+2*j-8];
-           p2   = sqrt( G4std::max(0., p2));
+           p2   = sqrt( Amax(0., p2));
            wps *= p2;
            pv[j].setMomentumAndUpdate( p2*sint*sin(phi), p2*sint*cos(phi),p2*cost);
            pv[j].Lor(pv[j], pvcms);
@@ -5579,7 +5738,7 @@ G4HEInelastic::NBodyPhaseSpace(G4int npart, G4HEVector pv[],
        cost = 1. - 2.*ranarr[npart+2*j-9];
        sint = sqrt(1.-cost*cost);
        phi  = M_2PI*ranarr[npart+2*j-8];
-       p2   = sqrt( G4std::max(0. , p2));
+       p2   = sqrt( Amax(0. , p2));
        wps *= p2;
        pv[j].setMomentumAndUpdate( p2*sint*sin(phi), p2*sint*cos(phi), p2*cost);
        pv[j+1].setMomentumAndUpdate( -p2*sint*sin(phi), -p2*sint*cos(phi), -p2*cost);
@@ -5604,7 +5763,7 @@ G4HEInelastic::QuickSort(G4double arr[], const G4int lidx, const G4int ridx)
    G4double buffer;
    G4int k, e, mid;
    if(lidx>=ridx) return;
-   mid = (lidx+ridx)/2.;
+   mid = (int)((lidx+ridx)/2.);
    buffer   = arr[lidx];
    arr[lidx]= arr[mid];
    arr[mid] = buffer;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
index 6a22947d57..3517ee21b6 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonMinusInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -229,7 +245,7 @@ void
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=np+1; nm++ ) 
+            for( nm=Imax(0,np-1); nm<=np+1; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -293,7 +309,7 @@ void
    G4int iplab = G4int( incidentTotalMomentum*5.);
    if( (iplab < 10) && (G4UniformRand() < cech[iplab])) 
      {
-       G4int     iplab = G4std::min(19, G4int( incidentTotalMomentum*5.));
+       G4int     iplab = Imin(19, G4int( incidentTotalMomentum*5.));
        G4double cnk0[] = {0.17, 0.18, 0.17, 0.24, 0.26, 0.20, 0.22, 0.21, 0.34, 0.45,
                           0.58, 0.55, 0.36, 0.29, 0.29, 0.32, 0.32, 0.33, 0.33, 0.33};
        if( G4UniformRand() < cnk0[iplab] )
@@ -370,7 +386,7 @@ void
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -385,7 +401,7 @@ void
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-1); nm<=np+1; nm++ ) 
+                for( nm=Imax(0,np-1); nm<=np+1; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -394,7 +410,7 @@ void
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -425,7 +441,7 @@ void
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
index feec61aa5c..328a6d6ce0 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonPlusInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonPlusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -228,7 +244,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+            for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -250,7 +266,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -286,7 +302,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*5. ) );
+           G4int iplab = G4int( Amin( 9.0, incidentTotalMomentum*5. ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                             // charge exchange  K+ n -> K0 p
                pv[0] = KaonZero;
@@ -351,7 +367,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -366,7 +382,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+                for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -375,7 +391,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -397,7 +413,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -406,7 +422,7 @@ G4HEKaonPlusInelastic::FirstIntInCasKaonPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
index 07c14f292a..9d91702fde 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:13:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
index 4150f069ee..4ef24e24fa 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroLongInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroLongInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroLongInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
index 7286d43bef..5725d9c821 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEKaonZeroShortInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEKaonZeroShortInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEKaonZeroShortInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
index a753722f52..0ea0a1ecf5 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HELambdaInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HELambdaInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HELambdaInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
index 077a0d95cb..6b273311a2 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HENeutronInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HENeutronInelastic.cc,v 1.3 1999/12/15 14:52:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HENeutronInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
index 93c7871aa2..04f25ef137 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEOmegaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEOmegaMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEOmegaMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
index fbf2ef3736..384242cd0a 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPionMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPionMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -225,7 +241,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -294,7 +310,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
 //                                            suppress high multiplicity events at low momentum
 //                                            only one additional pion will be produced
        G4double cech[] = {1., 0.95, 0.79, 0.32, 0.19, 0.16, 0.14, 0.12, 0.10, 0.08};
-       G4int iplab = G4std::max(9, G4int( incidentTotalMomentum*5.));
+       G4int iplab = Imax(9, G4int( incidentTotalMomentum*5.));
        if( G4UniformRand() < cech[iplab] )
          {
            if( targetCode == protonCode )
@@ -353,7 +369,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -368,7 +384,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -377,7 +393,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -408,7 +424,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
@@ -441,7 +457,7 @@ G4HEPionMinusInelastic::FirstIntInCasPionMinus( G4bool &inElastic,
            else
              {
                pv[0] = PionZero;
-               pv[0] = Neutron;
+               pv[1] = Neutron;
              }
          }
        else      
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
index 0672e9b057..754f805c39 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPionPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPionPlusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPionPlusInelastic.cc,v 1.5.2.1 2001/06/28 19:13:58 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -167,6 +183,7 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
       { 
         G4cout << "GHEInelasticInteraction::ApplyYourself fails to produce final state particles" << G4endl;
       }
+
       FillParticleChange(pv,  vecLength);
       delete [] pv;
       theParticleChange.SetStatusChange(fStopAndKill);
@@ -227,7 +244,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+            for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -249,7 +266,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -285,7 +302,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.33,0.27,0.29,0.31,0.27,0.18,0.13,0.10,0.09,0.07};
-           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*5. ) );
+           G4int iplab = G4int( Amin( 9.0, incidentTotalMomentum*5. ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                             // charge exchange  pi+ n -> pi0 p
                pv[0] = PionZero;
@@ -349,7 +366,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -364,7 +381,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+                for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -373,7 +390,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -395,7 +412,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -404,7 +421,7 @@ G4HEPionPlusInelastic::FirstIntInCasPionPlus( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
index 42b2a904fd..ab85135380 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEPlot.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEPlot.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEPlot.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -162,35 +178,44 @@ G4HEPlot::Scale( G4double s, const G4HEPlot & p)
    }
 
 void
-G4HEPlot::XScale(G4double a, G4double b, const G4HEPlot & p)
+G4HEPlot::XScale(G4double a, G4double b)
    {
-     G4int i;
-     Entries = 0;
-     EntriesOverflow = 0;
-     EntriesUnderflow = 0;
-     Weight = 0.;
-     WeightOverflow = 0.;
-     WeightUnderflow = 0.;
-     Xstart = p.Xstart;
-     Xbin = p.Xbin;
-     Nbin = p.Nbin;
-     for(i=0; i<Nbin; i++)
-       {
-         Xvalue[i] = p.Yvalue[i];
-         Yvalue[i] = 0.;
-       }
-     G4double xval = Xstart - Xbin/2.;
-     for(i=0; i<Nbin; i++)
-       {
-         xval += Xbin;
-         Fill(xval*a + b, Xvalue[i]); 
-       }
-    for(i=0; i<Nbin; i++)
+     Xstart = b + Xstart;
+     Xbin   = a*Xbin;
+     for(G4int i=0; i<Nbin; i++)
        {
          Xvalue[i] = Xstart + i*Xbin;
-       } 
+       }
    }      
 
+void
+G4HEPlot::Shift(G4int nshift)
+   {
+     G4int i;
+     if(nshift < 0)
+     {
+       for(i=0;i<Nbin-nshift;i++)
+       {
+          Yvalue[i] = Yvalue[i-nshift];
+       }
+       for(i=Nbin-nshift;i<Nbin;i++)
+       {
+          Yvalue[i] = 0.;
+       }
+     }
+     if(nshift > 0)
+     {
+       for(i=Nbin-1;i>nshift-1;i--)
+       {
+          Yvalue[i] = Yvalue[i-nshift];
+       }
+       for(i=0;i<nshift;i++)
+       {
+          Yvalue[i] = 0.;
+       }
+       return; 
+     }
+   }    
 void 
 G4HEPlot::Log( G4double s, const G4HEPlot & p)
    {
@@ -256,6 +281,30 @@ G4HEPlot::Reset()
      return;
    }
 
+void
+G4HEPlot::LinearFit(G4double& a, G4double& b)
+   {
+     G4double a11 = 0.;
+     G4double a12 = 0.;
+     G4double a22 = 0.;
+     G4double b1  = 0.;
+     G4double b2  = 0.;
+     for(G4int i = 0; i<Nbin; i++)
+     {
+       if(Yvalue[i] != 0.)
+       {
+          a11 += (Xvalue[i]+Xbin/2.)*(Xvalue[i]+Xbin/2.);
+          a12 += (Xvalue[i]+Xbin/2.);
+          a22 += 1.;
+          b1  += Yvalue[i]*(Xvalue[i]+Xbin/2.);
+          b2  += Yvalue[i];
+       }
+     }
+     b = (b1*a12-b2*a11)/(a12*a12-a11*a22);
+     a = (b1 - b*a12)/a11;
+     return;
+   }
+
 void 
 G4HEPlot::Fill(G4double x, G4double weight)
    {
@@ -329,7 +378,7 @@ G4HEPlot::GetFromFile(G4int aPlot, G4String aName)
            {
              if(ip == aPlot) 
                {
-                 if(Nbin != nb) Init(nb, xs, xb);
+                 if(Nbin == 0) Init(nb, xs, xb);
                }
              for (G4int i=0; i<nb; i++)
                {
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
index 1b788075de..3e2fb9ef0b 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEProtonInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEProtonInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEProtonInelastic.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -38,7 +54,6 @@ ApplyYourself( const G4Track &aTrack, G4Nucleus &targetNucleus )
      
     G4double atomicNumber = Z;
     G4double atomicWeight = A;
-    SetParticles();
 
     if(verboseLevel > 1)
       G4cout << "Z , A = " << atomicNumber << "  " << atomicWeight << G4endl;
@@ -232,7 +247,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<(numSec/3); np++ ) 
           {
-            for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+            for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -254,7 +269,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        counter = -1;
        for( np=0; np<numSec/3; np++ ) 
           {
-            for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+            for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                {
                  for( nz=0; nz<numSec/3; nz++ ) 
                     {
@@ -290,7 +305,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
        if( targetCode == neutronCode ) 
          {
            G4double cech[] = {0.50, 0.45, 0.40, 0.35, 0.30, 0.25, 0.06, 0.04, 0.005, 0.};
-           G4int iplab = G4int( G4std::min( 9.0, incidentTotalMomentum*2.5 ) );
+           G4int iplab = G4int( Amin( 9.0, incidentTotalMomentum*2.5 ) );
            if( G4UniformRand() < cech[iplab]/pow(atomicWeight,0.42) ) 
              {                                            // charge exchange  pi+ n -> pi0 p
                pv[0] = PionZero;
@@ -355,7 +370,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
 
        for( nt=1; nt<=numSec; nt++ ) 
          {
-           test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+           test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
            dum = M_PI*nt/(2.0*n*n);
            if( fabs(dum) < 1.0 ) 
              if( test >= 1.0e-10 )anpn += dum*test;
@@ -370,7 +385,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-2); nm<=np; nm++ ) 
+                for( nm=Imax(0,np-2); nm<=np; nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -379,7 +394,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>0) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                         if( test >= 1.0e-10 )excs += dum*test;
@@ -401,7 +416,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
            counter = -1;
            for( np=0; np<numSec/3; np++ ) 
               {
-                for( nm=G4std::max(0,np-1); nm<=(np+1); nm++ ) 
+                for( nm=Imax(0,np-1); nm<=(np+1); nm++ ) 
                    {
                      for( nz=0; nz<numSec/3; nz++ ) 
                         {
@@ -410,7 +425,7 @@ G4HEProtonInelastic::FirstIntInCasProton( G4bool &inElastic,
                               nt = np+nm+nz;
                               if( (nt>=1) && (nt<=numSec) ) 
                                 {
-                                  test = exp( G4std::min( expxu, G4std::max( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
+                                  test = exp( Amin( expxu, Amax( expxl, -(M_PI/4.0)*(nt*nt)/(n*n) ) ) );
                                   dum = (M_PI/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
                                   if( fabs(dum) < 1.0 ) 
                                       if( test >= 1.0e-10 )excs += dum*test;
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
index 0a4eb03d70..5529d831b1 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
index bb4ed4ceed..4f34fe69d1 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaPlusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaPlusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
index b1d3ed633a..df10d0a857 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HESigmaZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HESigmaZeroInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HESigmaZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
index 77dd83fd1f..240ea04451 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEVector.cc,v 1.5 2000/08/09 07:24:21 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEVector.cc,v 1.7.2.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
@@ -17,6 +33,7 @@
 // G4 Gheisha friend class G4GHEVector
 // J.L. Chuma, TRIUMF, 22-Feb-1996
 // last modified: H. Fesefeldt 02-July--1998
+// Fesefeldt, bug fixed in Defs1, 14 August 2000
 
 #include "G4HEVector.hh"
 
@@ -37,8 +54,15 @@ G4HEVector::G4HEVector(const G4DynamicParticle * aParticle)
      baryon           = aParticle->GetDefinition()->GetBaryonNumber();
      particleName     = getParticleName(code, baryon);
      particleType     = aParticle->GetDefinition()->GetParticleType();
+     strangeness       = aParticle->GetDefinition()->GetQuarkContent(2);
   }
   
+G4double G4HEVector::Amax(G4double a, G4double b)
+  {
+     G4double c = a;
+     if(b > a) c = b;
+     return c;
+  } 
 
 G4String G4HEVector::getParticleName(G4int aCode, G4int aBaryon)
    {
@@ -110,7 +134,7 @@ G4HEVector::setMomentumAndUpdate( const G4ParticleMomentum mom )
      py = mom.y();
      pz = mom.z();
      energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = G4std::max(0.,energy - mass);
+     kineticEnergy = Amax(0.,energy - mass);
      return;
    }
 
@@ -121,7 +145,7 @@ G4HEVector::setMomentumAndUpdate( const G4ParticleMomentum * mom )
      py = mom->y();
      pz = mom->z();
      energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = G4std::max(0.,energy - mass);
+     kineticEnergy = Amax(0.,energy - mass);
      return;
    }
 
@@ -157,7 +181,7 @@ G4HEVector::setMomentumAndUpdate( G4double x, G4double y, G4double z )
      py = y;
      pz = z;
      energy        = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = G4std::max(0.,energy-mass);
+     kineticEnergy = Amax(0.,energy-mass);
      return;
    }
 
@@ -175,7 +199,7 @@ G4HEVector::setMomentumAndUpdate( G4double x, G4double y )
      px = x;
      py = y;
      energy = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = G4std::max(0.,energy-mass);
+     kineticEnergy = Amax(0.,energy-mass);
      return;
    }
 
@@ -191,7 +215,7 @@ G4HEVector::setMomentumAndUpdate( G4double z )
    {
      pz = z;
      energy = sqrt(mass*mass + px*px + py*py + pz*pz);
-     kineticEnergy = G4std::max(0.,energy-mass);
+     kineticEnergy = Amax(0.,energy-mass);
      return;
    }
 
@@ -305,10 +329,10 @@ G4HEVector::setMass( G4double m )
 void 
 G4HEVector::setMassAndUpdate( G4double m )
    {
-     kineticEnergy = G4std::max(0., energy - mass);
+     kineticEnergy = Amax(0., energy - mass);
      mass = m;
      energy = kineticEnergy + mass;
-     G4double momnew = sqrt(G4std::max(0., energy*energy - mass*mass));
+     G4double momnew = sqrt(Amax(0., energy*energy - mass*mass));
      if ( momnew == 0.0) 
         {
          px = 0.;
@@ -429,6 +453,11 @@ G4HEVector::getBaryonNumber()
    }
 
 G4int 
+G4HEVector::getStrangenessNumber()
+   {
+     return strangeness;
+   }
+G4int 
 G4HEVector::getQuarkContent(G4int flavor)
    {
      if(flavor > 0 && flavor < 8)
@@ -489,6 +518,7 @@ G4HEVector::setZero()
      particleName  = "";
      particleType  = "";
      baryon        = 0;
+     strangeness   = 0;
    }
 
 void 
@@ -503,12 +533,13 @@ G4HEVector::Add( const G4HEVector & p1, const G4HEVector & p2 )
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = G4std::max(0.,energy - mass);
+     kineticEnergy = Amax(0.,energy - mass);
      charge        = p1.charge + p2.charge;
      code          = 0;
      particleName  = "";
      particleType  = "";
      baryon        = 0;
+     strangeness   = 0;
    }
 
 void 
@@ -523,12 +554,13 @@ G4HEVector::Sub( const G4HEVector & p1, const G4HEVector & p2 )
        mass = -1. * sqrt( -b );
      else
        mass = sqrt( b );
-     kineticEnergy = G4std::max(0.,energy - mass);
+     kineticEnergy = Amax(0.,energy - mass);
      charge        = p1.charge - p2.charge;
      code          = 0;
      particleName  = "";
      particleType  = "";
      baryon        = 0;
+     strangeness   = 0;
    }
 
 void 
@@ -541,7 +573,7 @@ G4HEVector::Lor( const G4HEVector & p1, const G4HEVector & p2 )
      pz = p1.pz + a*p2.pz; 
      energy = sqrt( sqr(p1.mass) + px*px + py*py + pz*pz);
      mass = p1.mass;
-     kineticEnergy = G4std::max(0.,energy - mass);
+     kineticEnergy = Amax(0.,energy - mass);
      timeOfFlight  = p1.timeOfFlight;
      side          = p1.side;
      flag          = p1.flag;
@@ -549,6 +581,7 @@ G4HEVector::Lor( const G4HEVector & p1, const G4HEVector & p2 )
      particleName  = p1.particleName;
      particleType  = p1.particleType; 
      baryon        = p1.baryon;
+     strangeness   = p1.strangeness;
    }
 
 G4double 
@@ -657,6 +690,7 @@ G4HEVector::SmulAndUpdate( const G4HEVector & p, G4double h)
      particleName  = p.particleName;
      particleType  = p.particleType;
      baryon        = p.baryon;
+     strangeness   = p.strangeness;
      return;
    }
  
@@ -679,6 +713,7 @@ G4HEVector::Norz( const G4HEVector & p )
      particleName  = p.particleName;
      particleType  = p.particleType;
      baryon        = p.baryon;
+     strangeness   = p.strangeness;
      return;
    }
 
@@ -791,243 +826,270 @@ G4HEVector::setDefinition(G4String name)
             mass = 0.1395700;
             charge = 1.;
             code = 211;
-            particleType = "meson";
+            particleType = "Meson";
             particleName = name;
             baryon       = 0;
+            strangeness  = 0;
 	  }
         else if(name == "PionZero")
           {
              mass = 0.1349764;
              charge = 0.;
              code = 111;
-             particleType = "meson";
+             particleType = "Meson";
              particleName = name;
-             baryon       = 0; 
+             baryon       = 0;
+             strangeness  = 0; 
           }
         else if(name == "PionMinus")
           {
               mass = 0.1395700;
               charge = -1.;
               code = -211;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = 0;
           }        
         else if(name == "KaonPlus")
           {
               mass = 0.493677;
               charge = 1.;
               code = 321;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = 1;
           }
         else if(name == "KaonZero")
           {
               mass = 0.497672;
               charge = 0.;
               code = 311;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = 1;
           }
         else if(name == "AntiKaonZero")
           {
               mass = 0.497672;
               charge = 0.;
               code = -311;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  =-1;
           }
         else if(name == "KaonMinus")
           {
               mass = 0.493677;
               charge = -1.;
               code = -321;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = -1;          
           }
         else if(name == "KaonZeroShort")
           {
               mass = 0.497672;
               charge = 0.;
               code = 310;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = 0;
           }
         else if(name == "KaonZeroLong")
           {
               mass = 0.497672;
               charge = 0.;
               code = 130;
-              particleType = "meson";
+              particleType = "Meson";
               particleName = name;
               baryon       = 0;
+              strangeness  = 0;
           }
         else if(name == "Proton")
           {
               mass = 0.9382723;
               charge = 1.;
               code = 2212;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = 0;
           }
         else if(name == "AntiProton")
           {
               mass = 0.9382723;
               charge = -1.;
               code = -2212;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = -1;
+              strangeness  = 0;
 	  }
         else if(name == "Neutron")
           {
               mass = 0.93956563;
               charge = 0.;
               code = 2112;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = 0;
           }
         else if(name == "AntiNeutron")
           {
               mass = 0.93956563;
               charge = 0.;
               code = -2112;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon = -1;
+              strangeness  = 0;
           }
         else if(name == "Lambda")
           {
               mass = 1.115684; 
               charge = 0.;
               code = 3122;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon = 1;
+              strangeness  = -1;
           }
         else if(name == "AntiLambda")
           {
               mass = 1.115684;
               charge = 0.;
               code = -3122;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon = -1;
+              strangeness  = 1;
           }
         else if(name == "SigmaPlus")
           {
               mass = 1.18937;
               charge = 1.;
               code = 3222;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = -1;
           }
         else if(name == "SigmaZero") 
           {
               mass = 1.19255;
               charge = 0.;
               code = 3212;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = -1;
           }
         else if(name == "SigmaMinus")
           {
               mass = 1.19744;
               charge = -1.;
               code = 3112;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = -1;
           }
         else if(name == "AntiSigmaPlus") 
           {
               mass = 1.18937;
               charge = -1.;
               code = -3222;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon = -1;
+              strangeness  = 1;
           }
         else if(name == "AntiSigmaZero")
           {
               mass = 1.19255;
               charge = 0.;
               code = -3212;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = -1;
+              strangeness  = 1;
           }        
         else if(name == "AntiSigmaMinus")
           {
               mass = 1.19744;
               charge = 1.;
               code = -3112;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = -1;
+              strangeness  = 1;
           }
         else if(name == "XiZero")
           {
               mass = 1.3149;
               charge = 0.;
               code = 3322;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = -2;
           }        
         else if(name == "XiMinus")
           {
               mass = 1.32132;
               charge = -1.;
               code = 3312;
-              particleType = "baryon";
+              particleType = "Baryon";
               particleName = name;
               baryon       = 1;
+              strangeness  = -2;
           }
         else if(name == "AntiXiZero")
           {
                mass = 1.3149;
                charge = 0.;
                code = -3322;
-               particleType = "baryon";
+               particleType = "Baryon";
                particleName = name;
                baryon = -1;
+               strangeness  = 2;
           }        
         else if(name == "AntiXiMinus")
           {
                mass = 1.32132;
                charge = 1.;
                code = -3312;
-               particleType = "baryon";
+               particleType = "Baryon";
                particleName = name;
                baryon       = -1;
+               strangeness  = 2;
           }
         else if(name == "OmegaMinus")
           {
                mass = 1.67245;
                charge = -1.;
                code = 3334;
-               particleType = "baryon";
+               particleType = "Baryon";
                particleName = name;
                baryon       = 1;
+               strangeness  = -3;
           }        
         else if(name == "AntiOmegaMinus")
           {
                mass = 1.67245;
                charge = 1.;
                code = -3334;
-               particleType = "baryon";
+               particleType = "Baryon";
                particleName = name;
                baryon       = -1;
+               strangeness  = 3;
           }
         else if(name == "Deuteron")
           {
@@ -1037,6 +1099,7 @@ G4HEVector::setDefinition(G4String name)
                particleType = "Nucleus";
                particleName = name;
                baryon       = 2;
+               strangeness  = 0;
           }        
         else if(name == "Triton")
           {
@@ -1046,6 +1109,7 @@ G4HEVector::setDefinition(G4String name)
                particleType = "Nucleus";
                particleName = name;
                baryon       = 3;
+               strangeness  = 0;
           }
         else if(name == "Alpha")
           {
@@ -1055,6 +1119,7 @@ G4HEVector::setDefinition(G4String name)
                particleType = "Nucleus";
                particleName = name;
                baryon       = 4;
+               strangeness  = 0;
           }
         else if(name == "Gamma")
           {
@@ -1064,6 +1129,7 @@ G4HEVector::setDefinition(G4String name)
                particleType = "Boson";
                particleName = name;
                baryon = 0;
+               strangeness  = 0;
           }
         else
           {
@@ -1124,7 +1190,7 @@ G4int G4HEVector::FillQuarkContent()
       }
     }
 
-  } else if (particleType == "meson") {
+  } else if (particleType == "Meson") {
     //   -- exceptions --
     if (tempPDGcode == 310) spin = 0;        //K0s
     if (tempPDGcode == 130) {     //K0l
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
index c80ed464ed..0aa886894d 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEXiMinusInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEXiMinusInelastic.cc,v 1.4.4.1 2001/06/28 19:13:59 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
index dec1fe67c8..7732a69607 100644
--- a/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/high_energy/src/G4HEXiZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HEXiZeroInelastic.cc,v 1.3 1999/12/15 14:52:57 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HEXiZeroInelastic.cc,v 1.4.4.1 2001/06/28 19:14:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.hh b/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.hh
index 278e707462..e6defd67b2 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ElementIsoCrossSections_h
 #define G4ElementIsoCrossSections_h
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.icc b/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.icc
index 8759d63b33..880d015435 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.icc
+++ b/source/processes/hadronic/models/isotope_production/include/G4ElementIsoCrossSections.icc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4ElementIsoCrossSections.hh"
 
 template <class IsoIsoCrossSectionType>
diff --git a/source/processes/hadronic/models/isotope_production/include/G4IsoProdCrossSections.hh b/source/processes/hadronic/models/isotope_production/include/G4IsoProdCrossSections.hh
index 9cf8872aec..a9f8fe238a 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4IsoProdCrossSections.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4IsoProdCrossSections.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4IsoProdCrossSections_h
 #define G4IsoProdCrossSections_h
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoIsoCrossSections.hh b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoIsoCrossSections.hh
index f818df8cbf..f99001934b 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoIsoCrossSections.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsoIsoCrossSections.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NeutronIsoIsoCrossSections_h
 #define G4NeutronIsoIsoCrossSections_h
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsotopeProduction.hh b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsotopeProduction.hh
index f00809b380..2e0daef0ed 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4NeutronIsotopeProduction.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4NeutronIsotopeProduction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NeutronIsotopeProduction_h
 #define G4NeutronIsotopeProduction_h
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4ProtonIsoIsoCrossSections.hh b/source/processes/hadronic/models/isotope_production/include/G4ProtonIsoIsoCrossSections.hh
index aa0b8f2305..e185beffd6 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4ProtonIsoIsoCrossSections.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4ProtonIsoIsoCrossSections.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ProtonIsoIsoCrossSections_h
 #define G4ProtonIsoIsoCrossSections_h
 
diff --git a/source/processes/hadronic/models/isotope_production/include/G4ProtonIsotopeProduction.hh b/source/processes/hadronic/models/isotope_production/include/G4ProtonIsotopeProduction.hh
index f976df48cd..2ab48031cd 100644
--- a/source/processes/hadronic/models/isotope_production/include/G4ProtonIsotopeProduction.hh
+++ b/source/processes/hadronic/models/isotope_production/include/G4ProtonIsotopeProduction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ProtonIsotopeProduction_h
 #define G4ProtonIsotopeProduction_h
 
diff --git a/source/processes/hadronic/models/isotope_production/src/G4IsoProdCrossSection.cc b/source/processes/hadronic/models/isotope_production/src/G4IsoProdCrossSection.cc
index 397d8561c7..b2bdf25b6d 100644
--- a/source/processes/hadronic/models/isotope_production/src/G4IsoProdCrossSection.cc
+++ b/source/processes/hadronic/models/isotope_production/src/G4IsoProdCrossSection.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4IsoProdCrossSections.hh"
 
 void G4IsoProdCrossSections::
diff --git a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
index 2e1dfcf612..b0ea0b327a 100644
--- a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
+++ b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsoIsoCrossSections.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4NeutronIsoIsoCrossSections.hh"
 #include "G4NeutronHPDataUsed.hh"
 #include "G4NeutronInelasticCrossSection.hh"
diff --git a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsotopeProduction.cc b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsotopeProduction.cc
index 6bc779feda..341a6c85cd 100644
--- a/source/processes/hadronic/models/isotope_production/src/G4NeutronIsotopeProduction.cc
+++ b/source/processes/hadronic/models/isotope_production/src/G4NeutronIsotopeProduction.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #include "G4NeutronIsotopeProduction.hh"
 
 G4NeutronIsotopeProduction::
diff --git a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
index 5d4e8dee02..3cf391b423 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LCapture.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LCapture.hh,v 1.5 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LCapture.hh,v 1.5.6.1 2001/06/28 19:14:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Low energy model: neutron capture -- header file
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
index 80d9e6d08d..94d8691709 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAlphaInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAlphaInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAlphaInelastic.hh,v 1.3.6.1 2001/06/28 19:14:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy Alpha Inelastic Process
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
index 9878f01bb6..7d4d637b26 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiLambdaInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiLambdaInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiLambdaInelastic.hh,v 1.3.6.1 2001/06/28 19:14:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
index c32eadf01b..fa93ca5397 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiNeutronInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiNeutronInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiNeutronInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
index d9e8518f7d..af462faf2f 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiOmegaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiOmegaMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiOmegaMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
index 0ff98bacb3..b43e4f2ed7 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiProtonInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiProtonInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiProtonInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
index 5a84264554..8c0039af59 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiSigmaMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiSigmaMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
index ce3e612e11..4703bc0322 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiSigmaPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiSigmaPlusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiSigmaPlusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
index e450b84c53..275faaabb5 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiXiMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiXiMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
index a55e565377..767a4fe050 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEAntiXiZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiXiZeroInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiXiZeroInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
index 22081d6a26..77dab57595 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEDeuteronInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEDeuteronInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEDeuteronInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy Deuteron Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
index 57a71a32d4..de5553a699 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
index 90ed2a69a8..c198964e48 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonPlusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonPlusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
index b4faab2485..024bbe9810 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroLInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonZeroLInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonZeroLInelastic.hh,v 1.3.6.1 2001/06/28 19:14:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonZeroL Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
index 16a1a96773..e98ac69511 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEKaonZeroSInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonZeroSInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonZeroSInelastic.hh,v 1.3.6.1 2001/06/28 19:14:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonZeroS Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
index d9e55f9504..eb607f7f93 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LELambdaInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LELambdaInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LELambdaInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LENeutronInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LENeutronInelastic.hh
index 9aa13ed170..ba4cc48171 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LENeutronInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LENeutronInelastic.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
  // Hadronic Process: Low Energy Neutron Inelastic Process
  // original by J.L. Chuma, TRIUMF, 04-Feb-1997
  
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
index 9ef408a1fd..a2acbf44fa 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEOmegaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEOmegaMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEOmegaMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
index 44f805dcc5..6b63093866 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEPionMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEPionMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEPionMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy PionMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
index 04b5059211..f84706001f 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEPionPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEPionPlusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEPionPlusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
index 22bcb5fe84..5e9f2bf2d1 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEProtonInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEProtonInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEProtonInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy Proton Inelastic Process
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
index aea0fe9d5a..46df7da194 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LESigmaMinusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LESigmaMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy SigmaMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
index dc7430923f..17783634dd 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LESigmaPlusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LESigmaPlusInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LESigmaPlusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy SigmaPlus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
index 9fd7d81317..748009f5d5 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LETritonInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LETritonInelastic.hh,v 1.3 2000/12/14 09:12:43 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LETritonInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
index fa2e4491c2..720335d8d1 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEXiMinusInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEXiMinusInelastic.hh,v 1.3 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEXiMinusInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy XiMinus Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
index 7bdc981e39..30d42b1b98 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LEXiZeroInelastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEXiZeroInelastic.hh,v 1.3 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEXiZeroInelastic.hh,v 1.3.6.1 2001/06/28 19:14:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy XiZero Inelastic Process
  // original by J.L. Chuma, TRIUMF, 03-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
index 971dc9bbf4..9839370f65 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LElastic.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LElastic.hh,v 1.5 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LElastic.hh,v 1.5.6.1 2001/06/28 19:14:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Model: Low energy elastic scattering -- header file
diff --git a/source/processes/hadronic/models/low_energy/include/G4LFission.hh b/source/processes/hadronic/models/low_energy/include/G4LFission.hh
index ec1dfe99ea..c6275f3546 100644
--- a/source/processes/hadronic/models/low_energy/include/G4LFission.hh
+++ b/source/processes/hadronic/models/low_energy/include/G4LFission.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LFission.hh,v 1.5 2000/12/14 09:12:44 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LFission.hh,v 1.5.6.1 2001/06/28 19:14:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Low-energy Model: Fission -- header file
diff --git a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
index b1a3997294..caecad3600 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LCapture.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LCapture.cc,v 1.4 2000/08/03 08:49:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LCapture.cc,v 1.4.8.1 2001/06/28 19:14:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Model: Low-energy Neutron Capture
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
index d02cbafbd7..255fc6e26d 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAlphaInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: Alpha Inelastic Process
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
index 7abd371818..f6c6858d1b 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiLambdaInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiLambdaInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiLambdaInelastic.cc,v 1.2.8.1 2001/06/28 19:14:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
index d301ae3a51..84962d14c0 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiNeutronInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiNeutronInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiNeutronInelastic.cc,v 1.3.2.1 2001/06/28 19:14:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
@@ -278,7 +294,7 @@
         quasiElastic = true;
         return;
       }
-      G4int ieab = availableEnergy*5.0/GeV;
+      G4int ieab = static_cast<G4int>(availableEnergy*5.0/GeV);
       const G4double supp[] = {0.,0.4,0.55,0.65,0.75,0.82,0.86,0.90,0.94,0.98};
       G4double w0, wp, wt, wm;
       if( (availableEnergy < 2.0*GeV) && (G4UniformRand() >= supp[ieab]) )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
index 476faf48e5..eb51c5e513 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiOmegaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiOmegaMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
index af76d25f10..e1f11b8e9e 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiProtonInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiProtonInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiProtonInelastic.cc,v 1.3.2.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 13-Feb-1997
@@ -278,7 +294,7 @@
         quasiElastic = true;
         return;
       }
-      G4int ieab = availableEnergy*5.0/GeV;
+      G4int ieab = static_cast<G4int>(availableEnergy*5.0/GeV);
       const G4double supp[] = {0.,0.4,0.55,0.65,0.75,0.82,0.86,0.90,0.94,0.98};
       G4double w0, wp, wt, wm;
       if( (availableEnergy < 2.0*GeV) && (G4UniformRand() >= supp[ieab]) )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
index 20398d81c6..c99fe72d83 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiSigmaMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
index 635bb5b46a..3a8e583d3a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiSigmaPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiSigmaPlusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
index f4a3416f21..e8a8e6d010 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiXiMinusInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiXiMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
index be1ba19213..f139413d00 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEAntiXiZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEAntiXiZeroInelastic.cc,v 1.2 1999/12/15 14:53:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEAntiXiZeroInelastic.cc,v 1.2.8.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
index 9ac2697eb3..1d7982ab85 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEDeuteronInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: Deuteron Inelastic Process
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
index fc0e4d3e6f..bc556719d6 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonMinusInelastic.cc,v 1.4.2.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
@@ -214,11 +230,11 @@
     G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
     G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
     const G4double cech[] = {1.,1.,1.,0.70,0.60,0.55,0.35,0.25,0.18,0.15};
-    G4int iplab = G4std::min( 9.0, pOriginal/GeV*5.0 );
+    G4int iplab = G4int(G4std::min( 9.0, pOriginal/GeV*5.0 ));
     if( (pOriginal <= 2.0*GeV) && (G4UniformRand() < cech[iplab]) )
     {
       np = nm = nz = nt = 0;
-      iplab = G4std::min( 19.0, pOriginal/GeV*10.0 );
+      iplab = G4int(G4std::min( 19.0, pOriginal/GeV*10.0 ));
       const G4double cnk0[] = {0.17,0.18,0.17,0.24,0.26,0.20,0.22,0.21,0.34,0.45,
                                0.58,0.55,0.36,0.29,0.29,0.32,0.32,0.33,0.33,0.33};
       if( G4UniformRand() <= cnk0[iplab] )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
index 43fc19966e..dd8d79a709 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonPlusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonPlusInelastic.cc,v 1.3.2.1 2001/06/28 19:14:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Feb-1997
@@ -208,7 +224,7 @@
     G4ParticleDefinition *aKaonZL = G4KaonZeroLong::KaonZeroLong();
     G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
     G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4int ieab = availableEnergy*5.0/GeV;
+    G4int ieab = static_cast<G4int>(availableEnergy*5.0/GeV);
     const G4double supp[] = {0.,0.4,0.55,0.65,0.75,0.82,0.86,0.90,0.94,0.98};
     G4double test, w0, wp, wt, wm;
     if( (availableEnergy < 2.0*GeV) && (G4UniformRand() >= supp[ieab]) )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
index 1139537517..729b1b93dc 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroLInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonZeroLInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonZeroLInelastic.cc,v 1.4.2.1 2001/06/28 19:14:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonZeroLong Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
@@ -210,11 +226,11 @@
     G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
     G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
     const G4double cech[] = {1.,1.,1.,0.70,0.60,0.55,0.35,0.25,0.18,0.15};
-    G4int iplab = G4std::min( 9.0, 5.0*pOriginal*MeV/GeV );
+    G4int iplab = G4int(G4std::min( 9.0, 5.0*pOriginal*MeV/GeV ));
     if( (pOriginal*MeV/GeV <= 2.0) && (G4UniformRand() < cech[iplab]) )
     {
       np = nm = nz = nt = 0;
-      iplab = G4std::min( 19.0, pOriginal*MeV/GeV*10.0 );
+      iplab = G4int(G4std::min( 19.0, pOriginal*MeV/GeV*10.0 ));
       const G4double cnk0[] = {0.17,0.18,0.17,0.24,0.26,0.20,0.22,0.21,0.34,0.45,
                                0.58,0.55,0.36,0.29,0.29,0.32,0.32,0.33,0.33,0.33};
       if( G4UniformRand() > cnk0[iplab] )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
index 07d0348af8..6ba226021f 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEKaonZeroSInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEKaonZeroSInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEKaonZeroSInelastic.cc,v 1.3.2.1 2001/06/28 19:14:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Low Energy KaonZeroShort Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
@@ -204,7 +220,7 @@
     G4ParticleDefinition *aKaonZS = G4KaonZeroShort::KaonZeroShort();
     G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
     G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4int ieab = 5.0*availableEnergy*MeV/GeV;
+    G4int ieab = static_cast<G4int>(5.0*availableEnergy*MeV/GeV);
     const G4double supp[] = {0.,0.4,0.55,0.65,0.75,0.82,0.86,0.90,0.94,0.98};
     G4double test, w0, wp, wt, wm;
     if( (availableEnergy*MeV/GeV < 2.0) && (G4UniformRand() >= supp[ieab]) )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
index abd0854f01..e1f053c752 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LELambdaInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LELambdaInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LELambdaInelastic.cc,v 1.2.8.1 2001/06/28 19:14:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
index 21b7ff8fa5..298a6f6790 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LENeutronInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // Hadronic Process: Low Energy Neutron Inelastic Process
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
index c1daaabd94..18b08cc40a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEOmegaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEOmegaMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEOmegaMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
index 5194ac2c01..dc1c120907 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEPionMinusInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: PionMinus Inelastic Process
@@ -206,7 +222,7 @@
     G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
     G4ParticleDefinition *aProton = G4Proton::Proton();
     G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    G4int ieab = availableEnergy*5.0/GeV;
+    G4int ieab = G4int(availableEnergy*5.0/GeV);
     const G4double supp[] = {0.,0.4,0.55,0.65,0.75,0.82,0.86,0.90,0.94,0.98};
     G4double test, w0, wp, wt, wm;
     if( (availableEnergy<2.0*GeV) && (G4UniformRand()>=supp[ieab]) )
@@ -217,7 +233,7 @@
       // charge exchange reaction is included in inelastic cross section
         
       const G4double cech[] = {1.,0.95,0.79,0.32,0.19,0.16,0.14,0.12,0.10,0.08};
-      G4int iplab = G4std::min( 9.0, pOriginal/GeV*5.0 );
+      G4int iplab = G4int(G4std::min( 9.0, pOriginal/GeV*5.0 ));
       if( G4UniformRand() <= cech[iplab] )
       {
         if( targetParticle.GetDefinition() == aProton )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
index 81635add98..063421ab1a 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEPionPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEPionPlusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEPionPlusInelastic.cc,v 1.3.2.1 2001/06/28 19:14:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -195,7 +211,7 @@
     G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
     G4ParticleDefinition *aProton = G4Proton::Proton();
     G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    G4int ieab = availableEnergy*5.0/GeV;
+    G4int ieab = static_cast<G4int>(availableEnergy*5.0/GeV);
     const G4double supp[] = {0.,0.2,0.45,0.55,0.65,0.75,0.85,0.90,0.94,0.98};
     G4double test, w0, wp, wt, wm;
     if( (availableEnergy < 2.0*GeV) && (G4UniformRand() >= supp[ieab]) )
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
index 8eceb9f18f..289a261516 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEProtonInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // Hadronic Process: Low Energy Proton Inelastic Process
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
index 74dc010ef2..f2beb7c70c 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LESigmaMinusInelastic.cc,v 1.2 1999/12/15 14:53:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LESigmaMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: SigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
index f23e9bd2ba..79af3086b0 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LESigmaPlusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LESigmaPlusInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LESigmaPlusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: SigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 19-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
index 8e2e885cc4..3ead7ecde7 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LETritonInelastic.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
  // Hadronic Process: Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
index 6ceb58b600..baa8a43e65 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiMinusInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEXiMinusInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEXiMinusInelastic.cc,v 1.2.8.1 2001/06/28 19:14:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: XiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
index e2c89578ce..1f8dfbcaf7 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LEXiZeroInelastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LEXiZeroInelastic.cc,v 1.2 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LEXiZeroInelastic.cc,v 1.2.8.1 2001/06/28 19:14:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: XiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 20-Feb-1997
diff --git a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
index 4697b2fc26..9799910e93 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LElastic.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LElastic.cc,v 1.3 1999/12/15 14:53:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LElastic.cc,v 1.3.8.1 2001/06/28 19:14:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Physics model class G4LElastic
 //
diff --git a/source/processes/hadronic/models/low_energy/src/G4LFission.cc b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
index 14e0bebfb3..896549cb88 100644
--- a/source/processes/hadronic/models/low_energy/src/G4LFission.cc
+++ b/source/processes/hadronic/models/low_energy/src/G4LFission.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LFission.cc,v 1.4 2000/08/03 08:49:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LFission.cc,v 1.5.2.1 2001/06/28 19:14:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // G4 Model: Low Energy Fission
@@ -131,10 +147,10 @@ G4LFission::ApplyYourself(const G4Track & aTrack,G4Nucleus & targetNucleus)
 
    G4double ran = G4RandGauss::shoot();
 // Number of neutrons
-   G4int nn = avern + ran*1.23 + 0.5;
+   G4int nn = static_cast<G4int>(avern + ran*1.23 + 0.5);
    ran = G4RandGauss::shoot();
 // Number of gammas
-   G4int ng = averg + ran*3. + 0.5;
+   G4int ng = static_cast<G4int>(averg + ran*3. + 0.5);
    if (nn < 1) nn = 1;
    if (ng < 1) ng = 1;
    G4double exn = 0.;
@@ -227,9 +243,9 @@ G4LFission::Atomas(const G4double A, const G4double Z)
    G4double rmd  = G4Deuteron::DeuteronDefinition()->GetPDGMass()/MeV;
    G4double rma  = G4Alpha::AlphaDefinition()->GetPDGMass()/MeV;
 
-   G4int ia = A + 0.5;
+   G4int ia = static_cast<G4int>(A + 0.5);
    if (ia < 1) return 0;
-   G4int iz = Z + 0.5;
+   G4int iz = static_cast<G4int>(Z + 0.5);
    if (iz < 0) return 0;
    if (iz > ia) return 0;
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
index abca4fae2c..c091186d7f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationIterator.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InterpolationIterator.hh,v 1.3 1999/07/02 09:58:02 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InterpolationIterator.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4InterpolationIterator_h
 #define G4InterpolationIterator_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
index 9c3c0479ef..2b5fbcd88e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationManager.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InterpolationManager.hh,v 1.5 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InterpolationManager.hh,v 1.5.8.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4InterpolationManager_h
 #define G4InterpolationManager_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
index 576d0cd47e..0d82b6532b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4InterpolationScheme.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4InterpolationScheme.hh,v 1.2 1999/07/02 09:58:05 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4InterpolationScheme.hh,v 1.2.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4InterpolationScheme_h
 #define G4InterpolationScheme_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
index 90bee8be3b..c59140e1ec 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2AInelasticFS.hh,v 1.3 1999/07/02 09:58:07 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2AInelasticFS_h
 #define G4NeutronHP2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
index d9e0dda5e7..5e2818b678 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2N2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.3 1999/07/02 09:58:08 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2N2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2N2AInelasticFS_h
 #define G4NeutronHP2N2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
index 680314ec94..8dd7a582a0 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2NAInelasticFS.hh,v 1.3 1999/07/02 09:58:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2NAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2NAInelasticFS_h
 #define G4NeutronHP2NAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
index 73134c5a43..53d2e0ef24 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NDInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2NDInelasticFS.hh,v 1.3 1999/07/02 09:58:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2NDInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2NDInelasticFS_h
 #define G4NeutronHP2NDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
index 4adae10170..5f060d684b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2NInelasticFS.hh,v 1.3 1999/07/02 09:58:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2NInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2NInelasticFS_h
 #define G4NeutronHP2NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
index 7eae2783c9..316b9d287a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2NPInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2NPInelasticFS.hh,v 1.3 1999/07/02 09:58:13 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2NPInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2NPInelasticFS_h
 #define G4NeutronHP2NPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
index d3dfa9ede0..01065c536c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP2PInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP2PInelasticFS.hh,v 1.3 1999/07/02 09:58:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP2PInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP2PInelasticFS_h
 #define G4NeutronHP2PInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
index 1bd1bc825c..6cbeac1261 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP3AInelasticFS.hh,v 1.3 1999/07/02 09:58:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP3AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP3AInelasticFS_h
 #define G4NeutronHP3AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
index 905dc4bbbc..eb482f6f5c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP3NAInelasticFS.hh,v 1.3 1999/07/02 09:58:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP3NAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP3NAInelasticFS_h
 #define G4NeutronHP3NAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
index 1823ac5d25..2ec3abb9f9 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP3NInelasticFS.hh,v 1.3 1999/07/02 09:58:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP3NInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP3NInelasticFS_h
 #define G4NeutronHP3NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
index 503452c146..54be8cdc7d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP3NPInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP3NPInelasticFS.hh,v 1.3 1999/07/02 09:58:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP3NPInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP3NPInelasticFS_h
 #define G4NeutronHP3NPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
index 22ef870afb..22d469659e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHP4NInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHP4NInelasticFS.hh,v 1.3 1999/07/02 09:58:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHP4NInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHP4NInelasticFS_h
 #define G4NeutronHP4NInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
index a53cbb284f..4015fd8bf5 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPAInelasticFS.hh,v 1.3 1999/07/02 09:58:21 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPAInelasticFS_h
 #define G4NeutronHPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
index a29e462147..36b4eb2d6b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngular.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPAngular.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPAngular.hh,v 1.4.8.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPAngular_h
 #define G4NeutronHPAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
index e2ababc785..729c76528d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPAngularP.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPAngularP.hh,v 1.4 1999/12/15 14:53:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPAngularP.hh,v 1.4.8.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPAngularP_h
 #define G4NeutronHPAngularP_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
index de13d179f2..a128ed7c47 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPArbitaryTab.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPArbitaryTab.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPArbitaryTab.hh,v 1.4.8.1 2001/06/28 19:14:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPArbitaryTab_h
 #define G4NeutronHPArbitaryTab_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
index dc32494d2c..97fc9a1a24 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCapture.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPCapture.hh,v 1.4 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPCapture.hh,v 1.4.6.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
index da9bcb7a45..aa051160fe 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPCaptureData.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPCaptureData.hh,v 1.4.2.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPCaptureData_h
 #define G4NeutronHPCaptureData_h 1
@@ -37,7 +51,7 @@ class G4NeutronHPCaptureData : public G4VCrossSectionDataSet
    
    G4bool IsApplicable(const G4DynamicParticle*, const G4Element*);
 
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT);
 
    void BuildPhysicsTable(const G4ParticleDefinition&);
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
index d345cd1b6b..6553002921 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPCaptureFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPCaptureFS.hh,v 1.4 1999/07/06 14:16:55 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPCaptureFS.hh,v 1.5.4.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPCaptureFS_h
 #define G4NeutronHPCaptureFS_h 1
@@ -50,5 +64,8 @@ class G4NeutronHPCaptureFS : public G4NeutronHPFinalState
   G4NeutronHPPhotonDist theFinalStatePhotons;
   
   G4NeutronHPNames theNames;
+  
+  G4double theCurrentA;
+  G4double theCurrentZ;
 };
 #endif
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
index a2fed9f039..d1757ecb65 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannel.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPChannel.hh,v 1.4 1999/07/06 16:56:21 stesting Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPChannel.hh,v 1.5.2.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
@@ -96,6 +110,9 @@ public:
     
   inline G4int GetNiso() {return niso;}
   
+  inline G4double GetN(G4int i) {return theFinalStates[i]->GetN();}
+  inline G4double GetZ(G4int i) {return theFinalStates[i]->GetZ();}
+  
   inline G4bool HasDataInAnyFinalState()
   {
     G4bool result = false;
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
index 09fc13c647..001d81d24e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPChannelList.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPChannelList.hh,v 1.3 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPChannelList.hh,v 1.3.8.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
index 026520263a..e2d79ecf5d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContAngularPar.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPContAngularPar.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPContAngularPar.hh,v 1.4.8.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPContAngularPar_h
 #define G4NeutronHPContAngularPar_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
index b3b07e480a..d26c3b8c8d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPContEnergyAngular.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPContEnergyAngular.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPContEnergyAngular.hh,v 1.4.8.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPContEnergyAngular_h
 #define G4NeutronHPContEnergyAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
index b46cc53440..5e0c29c939 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPD2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPD2AInelasticFS.hh,v 1.3 1999/07/02 09:58:35 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPD2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPD2AInelasticFS_h
 #define G4NeutronHPD2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
index 0bbd5943aa..a605c816a8 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPDAInelasticFS.hh,v 1.3 1999/07/02 09:58:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPDAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPDAInelasticFS_h
 #define G4NeutronHPDAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
index 937bc00c1e..28310430a2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPDInelasticFS.hh,v 1.3 1999/07/02 09:58:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPDInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPDInelasticFS_h
 #define G4NeutronHPDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
index 07f530d63f..41984207c7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPData.hh,v 1.3 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPData.hh,v 1.3.8.1 2001/06/28 19:14:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
index 3761845ae8..b2d08bb30c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataPoint.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPDataPoint.hh,v 1.3 1999/07/02 09:58:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPDataPoint.hh,v 1.3.18.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPDataPoint_h
 #define G4NeutronHPDataPoint_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataUsed.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataUsed.hh
index 6385e85f66..a0ca6179b5 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataUsed.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDataUsed.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NeutronHPDataUsed_h
 #define G4NeutronHPDataUsed_h 1
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
index c0683bb9ab..8f61a58239 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDeExGammas.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPDeExGammas.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPDeExGammas.hh,v 1.4.8.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPDeExGammas_h
 #define G4NeutronHPDeExGammas_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
index 7c394bfee9..6553a9f405 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPDiscreteTwoBody.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPDiscreteTwoBody.hh,v 1.4.8.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPDiscreteTwoBody_h
 #define G4NeutronHPDiscreteTwoBody_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
index fa778e2e8d..b4739da661 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElastic.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPElastic.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPElastic.hh,v 1.3.6.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
index aa03c834d8..fe90b5279e 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPElasticData.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPElasticData.hh,v 1.4.2.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPElasticData_h
 #define G4NeutronHPElasticData_h 1
@@ -37,7 +51,7 @@ class G4NeutronHPElasticData : public G4VCrossSectionDataSet
    
    G4bool IsApplicable(const G4DynamicParticle*, const G4Element*);
 
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT);
 
    void BuildPhysicsTable(const G4ParticleDefinition&);
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
index d310330358..4cfcc75938 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPElasticFS.hh,v 1.3 1999/07/02 09:58:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPElasticFS.hh,v 1.3.18.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPElasticFS_h
 #define G4NeutronHPElasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
index 36d56c2180..75e8a3f1df 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPElementData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPElementData.hh,v 1.3 1999/10/22 08:24:57 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPElementData.hh,v 1.3.14.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
index b2bee388cb..ed4d1c2d75 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnAngCorrelation.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPEnAngCorrelation.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPEnAngCorrelation.hh,v 1.4.8.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPEnAngCorrelation_h
 #define G4NeutronHPEnAngCorrelation_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
index f31210d516..976fe9427c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEnergyDistribution.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPEnergyDistribution.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPEnergyDistribution.hh,v 1.4.8.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPEnergyDistribution_h
 #define G4NeutronHPEnergyDistribution_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
index f399f80a25..db8eb8daec 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPEvapSpectrum.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPEvapSpectrum.hh,v 1.4 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPEvapSpectrum.hh,v 1.4.8.1 2001/06/28 19:14:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPEvapSpectrum_h
 #define G4NeutronHPEvapSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
index bc3973ea9e..a244051004 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFCFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFCFissionFS.hh,v 1.3 1999/07/02 09:58:54 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFCFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFCFissionFS_h
 #define G4NeutronHPFCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
index be19f155be..6953a88049 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFSFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFSFissionFS.hh,v 1.3 1999/07/02 09:58:55 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFSFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFSFissionFS_h
 #define G4NeutronHPFSFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
index 84621d6709..f5afb63b0b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFastLegendre.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFastLegendre.hh,v 1.5 1999/12/15 14:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFastLegendre.hh,v 1.5.8.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFastLegendre_h
 #define G4NeutronHPFastLegendre_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
index 39ef7c305b..e03f1ffa0d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPField.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPField.hh,v 1.3 1999/07/02 09:58:58 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPField.hh,v 1.3.18.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPField_h
 #define G4NeutronHPField_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
index a2021a0d13..ad37c13fb3 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFieldPoint.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFieldPoint.hh,v 1.3 1999/07/02 09:58:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFieldPoint.hh,v 1.3.18.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFieldPoint_h
 #define G4NeutronHPFieldPoint_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
index 2d68a40e39..8e428ce8ba 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFinalState.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFinalState.hh,v 1.3 1999/07/02 09:59:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFinalState.hh,v 1.4.2.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFinalState_h
 #define G4NeutronHPFinalState_h
@@ -53,6 +67,7 @@ public:
   virtual G4double GetXsec(G4double anEnergy) { return 0; }
   virtual G4NeutronHPVector * GetXsec() { return NULL; }
   
+  void     SetA_Z(G4double anA, G4double aZ) {theBaseA = anA; theBaseZ = aZ; }
   G4double GetZ() { return theBaseZ; }
   G4double GetN() { return theBaseA; }
   
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
index 01e4cd31a9..cfe5b22a85 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFission.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFission.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFission.hh,v 1.3.6.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
index 62858804bf..6da2cdf6e6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionBaseFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFissionBaseFS.hh,v 1.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFissionBaseFS.hh,v 1.4.8.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFissionBaseFS_h
 #define G4NeutronHPFissionBaseFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
index ccb85e564c..c18854e560 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFissionData.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFissionData.hh,v 1.4.2.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFissionData_h
 #define G4NeutronHPFissionData_h 1
@@ -37,7 +51,7 @@ class G4NeutronHPFissionData : public G4VCrossSectionDataSet
    
    G4bool IsApplicable(const G4DynamicParticle*, const G4Element*);
 
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT);
 
    void BuildPhysicsTable(const G4ParticleDefinition&);
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
index 72d8c7d347..7589f19f2f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionERelease.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFissionERelease.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFissionERelease.hh,v 1.4.8.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFissionERelease_h
 #define G4NeutronHPFissionERelease_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
index a3b1eded47..9b5d949820 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFissionFS.hh,v 1.3 1999/07/02 09:59:06 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFissionFS_h
 #define G4NeutronHPFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
index 33b7426de1..6ef43b2b7a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPFissionSpectrum.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPFissionSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPFissionSpectrum.hh,v 1.4.8.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPFissionSpectrum_h
 #define G4NeutronHPFissionSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
index 6c3d5b2004..004b9a7415 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPGamma.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPGamma.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPGamma.hh,v 1.5.4.1 2001/06/28 19:14:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPGamma_h
 #define G4NeutronHPGamma_h 1
@@ -28,8 +42,9 @@ class G4NeutronHPGamma
   G4NeutronHPGamma() 
   {
     next = NULL;
+    instancecount ++;
   }
-  ~G4NeutronHPGamma() {}
+  ~G4NeutronHPGamma() {instancecount--;}
   
   G4bool Init(G4std::ifstream & aDataFile);
   
@@ -78,6 +93,7 @@ class G4NeutronHPGamma
   G4double probability;
   
   G4NeutronHPLevel * next;
+  static int instancecount;
 };
 
 #endif
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHash.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHash.hh
index b1ae31816d..0d70f39cf6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHash.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHash.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NeutronHPHash_h
 #define G4NeutronHPHash_h
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
index 9e0322fafe..a50d4dcb00 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPHe3InelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPHe3InelasticFS.hh,v 1.3 1999/07/02 09:59:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPHe3InelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPHe3InelasticFS_h
 #define G4NeutronHPHe3InelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
index f60f77f6ad..e8f269a886 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelastic.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPInelastic.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPInelastic.hh,v 1.3.6.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: High Precision low E neutron tracking
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
index 8d346de745..10b0a9ddaa 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticBaseFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPInelasticBaseFS.hh,v 1.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPInelasticBaseFS.hh,v 1.4.8.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPInelasticBaseFS_h
 #define G4NeutronHPInelasticBaseFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
index 25ff2837b7..4d062da22d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticCompFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPInelasticCompFS.hh,v 1.4 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPInelasticCompFS.hh,v 1.5.4.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPInelasticCompFS_h
 #define G4NeutronHPInelasticCompFS_h 1
@@ -88,5 +102,8 @@ class G4NeutronHPInelasticCompFS : public G4NeutronHPFinalState
   
   G4NeutronHPDeExGammas theGammas;
   G4String gammaPath;
+  
+  G4double theCurrentA;
+  G4double theCurrentZ;
 };
 #endif
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
index 799e7ca997..e9f015af68 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInelasticData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPInelasticData.hh,v 1.3 2000/12/14 09:20:35 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPInelasticData.hh,v 1.4.2.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPInelasticData_h
 #define G4NeutronHPInelasticData_h 1
@@ -37,7 +51,7 @@ class G4NeutronHPInelasticData : public G4VCrossSectionDataSet
    
    G4bool IsApplicable(const G4DynamicParticle*, const G4Element*);
 
-   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*);
+   G4double GetCrossSection(const G4DynamicParticle*, const G4Element*, G4double aT);
 
    void BuildPhysicsTable(const G4ParticleDefinition&);
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
index ef47bfe6e1..3389405296 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPInterpolator.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPInterpolator.hh,v 1.5 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPInterpolator.hh,v 1.5.8.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPInterpolator_h
 #define G4NeutronHPInterpolator_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
index 6a53f64b11..7ee593c0c7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsoData.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPIsoData.hh,v 1.7 2000/11/09 16:13:38 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPIsoData.hh,v 1.7.8.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPIsoData_h
 #define G4NeutronHPIsoData_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
index 2b80fd84d2..0b9fe51c3c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPIsotropic.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPIsotropic.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPIsotropic.hh,v 1.4.8.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPIsotropic_h
 #define G4NeutronHPIsotropic_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
index 29a3e6fcc3..365e90f134 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPKallbachMannSyst.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPKallbachMannSyst.hh,v 1.3 1999/07/02 09:59:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPKallbachMannSyst.hh,v 1.3.18.1 2001/06/28 19:14:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPKallbachMannSyst_h
 #define G4NeutronHPKallbachMannSyst_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
index 7f945025f9..bccf96a216 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLCFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPLCFissionFS.hh,v 1.3 1999/07/02 09:59:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPLCFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPLCFissionFS_h
 #define G4NeutronHPLCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
index 5b74da0a06..682b3f7985 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLabAngularEnergy.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPLabAngularEnergy.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPLabAngularEnergy.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPLabAngularEnergy_h
 #define G4NeutronHPLabAngularEnergy_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
index f5f857efa4..bbfdaf7455 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreStore.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPLegendreStore.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPLegendreStore.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPLegendreStore_h
 #define G4NeutronHPLegendreStore_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
index 4d11b88508..78f18c5093 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLegendreTable.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPLegendreTable.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPLegendreTable.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPLegendreTable_h
 #define G4NeutronHPLegendreTable_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
index c13dc7d0b2..448bea61c7 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPLevel.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPLevel.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPLevel.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPLevel_h
 #define G4NeutronHPLevel_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
index 253ad6785c..30f3857eff 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPList.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPList.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPList.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPList_h
 #define G4NeutronHPList_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
index 7442530303..d6b65dd48d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPMadlandNixSpectrum.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPMadlandNixSpectrum.hh,v 1.4.8.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPMadlandNixSpectrum_h
 #define G4NeutronHPMadlandNixSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
index d0820c99e2..7a2744abc0 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPN2AInelasticFS.hh,v 1.3 1999/07/02 09:59:27 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPN2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPN2AInelasticFS_h
 #define G4NeutronHPN2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
index 57521bd3cd..b763abc1a0 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN2PInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPN2PInelasticFS.hh,v 1.3 1999/07/02 09:59:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPN2PInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPN2PInelasticFS_h
 #define G4NeutronHPN2PInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
index 84f25af7f9..c3f951f83c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPN3AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPN3AInelasticFS.hh,v 1.3 1999/07/02 09:59:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPN3AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPN3AInelasticFS_h
 #define G4NeutronHPN3AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
index f6f9a7a5f2..f4720b701b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNAInelasticFS.hh,v 1.3 1999/07/02 09:59:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNAInelasticFS_h
 #define G4NeutronHPNAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
index 141585cca9..5b8a64858d 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNBodyPhaseSpace.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.4 1999/12/15 14:53:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNBodyPhaseSpace.hh,v 1.4.8.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNBodyPhaseSpace_h
 #define G4NeutronHPNBodyPhaseSpace_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
index 894dc633b7..3068279fa6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPND2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPND2AInelasticFS.hh,v 1.3 1999/07/02 09:59:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPND2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPND2AInelasticFS_h
 #define G4NeutronHPND2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
index a5dc022e61..83dc839fcc 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNDInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNDInelasticFS.hh,v 1.3 1999/07/02 09:59:34 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNDInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNDInelasticFS_h
 #define G4NeutronHPNDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
index 1d88595873..c0feef880f 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNHe3InelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.3 1999/07/02 09:59:35 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNHe3InelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNHe3InelasticFS_h
 #define G4NeutronHPNHe3InelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
index e9099adb2a..c21e4db560 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNInelasticFS.hh,v 1.3 1999/07/02 09:59:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNInelasticFS_h
 #define G4NeutronHPNInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
index b4279b417b..f59f55ea18 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNPAInelasticFS.hh,v 1.3 1999/07/02 09:59:37 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNPAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNPAInelasticFS_h
 #define G4NeutronHPNPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
index 8c6a34dcbe..62808a19a2 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNPInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNPInelasticFS.hh,v 1.3 1999/07/02 09:59:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNPInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNPInelasticFS_h
 #define G4NeutronHPNPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
index e3738948ef..f2059d51fb 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNT2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.3 1999/07/02 09:59:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNT2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNT2AInelasticFS_h
 #define G4NeutronHPNT2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
index c1f3473d0b..b87764e028 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNTInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNTInelasticFS.hh,v 1.3 1999/07/02 09:59:41 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNTInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNTInelasticFS_h
 #define G4NeutronHPNTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
index 67e49342f0..8849913852 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNXInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNXInelasticFS.hh,v 1.3 1999/07/02 09:59:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNXInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNXInelasticFS_h
 #define G4NeutronHPNXInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
index aa20c5b12c..d5d4d756fa 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNames.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNames.hh,v 1.6 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNames.hh,v 1.6.8.1 2001/06/28 19:14:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNames_h
 #define G4NeutronHPNames_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
index 4f1b69ff51..420f5d80fa 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPNeutronYield.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNeutronYield.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNeutronYield.hh,v 1.4.8.1 2001/06/28 19:14:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPNeutronYield_h
 #define G4NeutronHPNeutronYield_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
index d5a2cd14b8..867e772c94 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPAInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPAInelasticFS.hh,v 1.3 1999/07/02 09:59:45 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPAInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPAInelasticFS_h
 #define G4NeutronHPPAInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
index 74bca10c39..232a96be9b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPDInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPDInelasticFS.hh,v 1.3 1999/07/02 09:59:46 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPDInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPDInelasticFS_h
 #define G4NeutronHPPDInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
index 4ef68592b5..2b6802cd0a 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPInelasticFS.hh,v 1.3 1999/07/02 09:59:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPInelasticFS_h
 #define G4NeutronHPPInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
index df14fd50e8..1bd09af912 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPTInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPTInelasticFS.hh,v 1.3 1999/07/02 09:59:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPTInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPTInelasticFS_h
 #define G4NeutronHPPTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
index 349c76998b..a28f024f79 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPartial.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPartial.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPartial.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPartial_h
 #define G4NeutronHPPartial_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
index 1155de79f9..9009e77603 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonDist.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPhotonDist.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPhotonDist.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Very Low Energy Neutron X-Sections
  // original by H.P. Wellisch, TRIUMF, 14-Feb-97
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
index e7b8d03ec3..15aeaa4927 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPhotonXSection.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPhotonXSection.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPhotonXSection.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPhotonXSection_h
 #define G4NeutronHPPhotonXSection_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
index fd97c91d9c..f8374c2887 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPPolynomExpansion.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPPolynomExpansion.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPPolynomExpansion.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPPolynomExpansion_h
 #define G4NeutronHPPolynomExpansion_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
index aa02a356fc..39b8d1e932 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPProduct.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPProduct.hh,v 1.4 1999/12/15 14:53:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPProduct.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPProduct_h
 #define G4NeutronHPProduct_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
index a17e4e3e38..5995147219 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSCFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPSCFissionFS.hh,v 1.3 1999/07/02 09:59:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPSCFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPSCFissionFS_h
 #define G4NeutronHPSCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
index 3c4eb5a4ec..366ff27942 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPSimpleEvapSpectrum.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPSimpleEvapSpectrum.hh,v 1.4.8.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPSimpleEvapSpectrum_h
 #define G4NeutronHPSimpleEvapSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
index 290c886d17..dcd07cc05c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPT2AInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPT2AInelasticFS.hh,v 1.3 1999/07/02 09:59:58 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPT2AInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPT2AInelasticFS_h
 #define G4NeutronHPT2AInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
index bcd76e8ed2..734691c76c 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTCFissionFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPTCFissionFS.hh,v 1.3 1999/07/02 09:59:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPTCFissionFS.hh,v 1.3.18.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPTCFissionFS_h
 #define G4NeutronHPTCFissionFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
index fbbac05070..e1fd0bf99b 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPTInelasticFS.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPTInelasticFS.hh,v 1.3 1999/07/02 10:00:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPTInelasticFS.hh,v 1.3.18.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPTInelasticFS_h
 #define G4NeutronHPTInelasticFS_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalBoost.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalBoost.hh
new file mode 100644
index 0000000000..62b9d35b22
--- /dev/null
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPThermalBoost.hh
@@ -0,0 +1,73 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+#ifndef G4NeutronHPThermalBoost_h
+#define G4NeutronHPThermalBoost_h
+
+#include "G4DynamicParticle.hh"
+#include "G4Element.hh"
+#include "G4ReactionProduct.hh"
+#include "G4Nucleus.hh"
+#include "G4NucleiPropertiesTable.hh"
+#include "G4Electron.hh"
+#include "G4Neutron.hh"
+
+class G4NeutronHPThermalBoost
+{
+public: 
+  G4double GetThermalEnergy(const G4DynamicParticle * aP, 
+                            const G4Element * anE, 
+			    G4double aT)
+  {
+    G4double theA = anE->GetN();
+    G4double theZ = anE->GetZ();
+    return GetThermalEnergy(aP, theA ,theZ, aT);
+  }
+  			    
+  G4double GetThermalEnergy(const G4DynamicParticle * aP, 
+                            G4double theA, G4double theZ,
+			    G4double aT)
+  {
+    // prepare neutron
+    G4double eKinetic = aP->GetKineticEnergy();
+    G4ReactionProduct theNeutron( aP->GetDefinition() );
+    theNeutron.SetMomentum( aP->GetMomentum() );
+    theNeutron.SetKineticEnergy( eKinetic );
+    G4ThreeVector neuVelo = (1./aP->GetDefinition()->GetPDGMass())*theNeutron.GetMomentum();
+
+    // prepare properly biased thermal nucleus
+    G4Nucleus aNuc;
+    G4double eps = 0.0001;
+    G4double eleMass; 
+    eleMass = ( G4NucleiPropertiesTable::GetAtomicMass(theZ+eps, theA+eps)-
+                theZ*G4Electron::ElectronDefinition()->GetPDGMass() 
+  	       ) / G4Neutron::Neutron()->GetPDGMass();
+  
+    G4ReactionProduct aThermalNuc = aNuc.GetBiasedThermalNucleus(eleMass, neuVelo, aT);
+    
+    // boost to rest system and return
+    G4ReactionProduct boosted;
+    boosted.Lorentz(theNeutron, aThermalNuc);
+    return boosted.GetKineticEnergy();
+  }
+};
+#endif
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
index e879273744..692d43cf02 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPVector.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPVector.hh,v 1.14 2000/11/20 10:07:41 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPVector.hh,v 1.15.2.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPVector_h
 #define G4NeutronHPVector_h 1
@@ -126,7 +140,47 @@ class G4NeutronHPVector
   }
   
   G4double GetXsec(G4double e);
-
+  G4double GetXsec(G4double e, G4int min)
+  {
+    G4int i;
+    for(i=min ; i<nEntries; i++)
+    {
+      if(theData[i].GetX()>e) break;
+    }
+    G4int low = i-1;
+    G4int high = i;
+    if(i==0)
+    {
+      low = 0;
+      high = 1;
+    }
+    else if(i==nEntries)
+    {
+      low = nEntries-2;
+      high = nEntries-1;
+    }
+    G4double y;
+    if(e<theData[nEntries-1].GetX()) 
+    {
+      // Protect against doubled-up x values
+      if( (theData[high].GetX()-theData[low].GetX())/theData[high].GetX() < 0.000001)
+      {
+        y = theData[low].GetY();
+      }
+      else
+      {
+        y = theInt.Interpolate(theManager.GetScheme(high), e, 
+                               theData[low].GetX(), theData[high].GetX(),
+		  	       theData[low].GetY(), theData[high].GetY());
+      }
+    }
+    else
+    {
+      y=theData[nEntries-1].GetY();
+    }
+    return y;
+  }
+  
   inline G4double GetY(G4double x)  {return GetXsec(x);}
   inline G4int GetVectorLength() const {return nEntries;}
 
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
index 69e085c73c..ee20c8b9b6 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4NeutronHPWattSpectrum.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPWattSpectrum.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPWattSpectrum.hh,v 1.4.8.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4NeutronHPWattSpectrum_h
 #define G4NeutronHPWattSpectrum_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
index f448620534..ba7fd36693 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEDis.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VNeutronHPEDis.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VNeutronHPEDis.hh,v 1.4.8.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VNeutronHPEDis_h
 #define G4VNeutronHPEDis_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
index 59736768bc..ad7d0b1815 100644
--- a/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
+++ b/source/processes/hadronic/models/neutron_hp/include/G4VNeutronHPEnergyAngular.hh
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- header file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VNeutronHPEnergyAngular.hh,v 1.4 1999/12/15 14:53:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VNeutronHPEnergyAngular.hh,v 1.4.8.1 2001/06/28 19:14:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VNeutronHPEnergyAngular_h
 #define G4VNeutronHPEnergyAngular_h 1
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc b/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
index 0702eed18b..2568aaba25 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4InterpolationManager.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2AInelasticFS.cc
index 4e589b052d..89881ad577 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2N2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2N2AInelasticFS.cc
index 12be0c6163..e3cfe11c17 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2N2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2N2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NAInelasticFS.cc
index a53aa0f5fb..37aead4747 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NDInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NDInelasticFS.cc
index 8c8ea67123..f085fb70b8 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NDInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NDInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NInelasticFS.cc
index 7be6b403cf..8e27b8d950 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NPInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NPInelasticFS.cc
index 22daf9758f..90cb01065a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NPInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2NPInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2PInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2PInelasticFS.cc
index a6e106148e..a766f40546 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2PInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP2PInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3AInelasticFS.cc
index 7342078d31..d3bbc5ad02 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NAInelasticFS.cc
index 6a71e0cef0..a3053ca268 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NInelasticFS.cc
index ad3daa6935..9b696bb590 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NPInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NPInelasticFS.cc
index dba23f1d88..80fdfba81c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NPInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP3NPInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP4NInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP4NInelasticFS.cc
index 49f8872d96..546737aeb0 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP4NInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHP4NInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAInelasticFS.cc
index 065eb153ab..e75cfc5016 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
index 07b9844abd..6d3d5c2867 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPAngular.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
index 258daffea3..032b2dfa6b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPArbitaryTab.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
index bf9a77c84a..c973f3d28c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCapture.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -10,6 +32,8 @@
 
   G4NeutronHPCapture::G4NeutronHPCapture()
   {
+    SetMinEnergy( 0.0 );
+    SetMaxEnergy( 20.*MeV );
 //    G4cout << "Capture : start of construction!!!!!!!!"<<G4endl;
     if(!getenv("NeutronHPCrossSections")) 
        G4Exception("Please setenv NeutronHPCrossSections to point to the neutron cross-section files.");
@@ -39,119 +63,40 @@
 //    G4cout << "Leaving G4NeutronHPCapture::~G4NeutronHPCapture"<<G4endl;
   }
   
+  #include "G4NeutronHPThermalBoost.hh"
   G4VParticleChange * G4NeutronHPCapture::ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus)
   {
     G4Material * theMaterial = aTrack.GetMaterial();
     G4int n = theMaterial->GetNumberOfElements();
-    xSec = new G4double[n];
-    G4double sum=0;
-    G4int i, index;
-    const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
-    G4double rWeight;    
-    for (i=0; i<n; i++)
+    G4int index = theMaterial->GetElement(0)->GetIndex();
+    if(n!=1)
     {
-      index = theMaterial->GetElement(i)->GetIndex();
-      rWeight = NumAtomsPerVolume[i];
-      xSec[i] = theCapture[index].GetXsec(aTrack.GetKineticEnergy());
-      xSec[i] *= rWeight;
-      sum+=xSec[i];
-    }
-    G4double random = G4UniformRand();
-    G4double running = 0;
-    for (i=0; i<n; i++)
-    {
-      running += xSec[i];
-      index = theMaterial->GetElement(i)->GetIndex();
-      if(random<=running/sum) break;
-    }
-    delete [] xSec;
-    if(aTrack.GetKineticEnergy()<100*keV)
-    {
-      G4NeutronHPDeExGammas theGammas;
-      G4int aA = theMaterial->GetElement(i)->GetN();
-      G4int aZ = theMaterial->GetElement(i)->GetZ();
-      char the[100] = {""};
-      G4std::ostrstream ost(the, 100, G4std::ios::out);
-      ost
-      <<getenv("NeutronHPCrossSections")<<"/Inelastic/Gammas/"<<"z"<<aZ<<".a"<<aA;
-      G4String * aName = new G4String(the);
-#ifdef G4USE_STD_NAMESPACE
-      G4std::ifstream from(*aName, G4std::ios::in);
-#else
-      ifstream from(*aName, ios::in|ios::nocreate);
-#endif
-      G4std::ifstream theGammaData(*aName, G4std::ios::in);
-     
-      theGammas.Init(theGammaData);
-      G4double theGammaEnergy = aTrack.GetKineticEnergy();
-      theGammaEnergy+=G4Neutron::Neutron()->GetPDGMass();
-      theGammaEnergy+=
-             G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(aZ,aA);
-      theGammaEnergy-=
-             G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(aZ,aA+1);
-    
-      if(theGammaEnergy<1.1*theGammas.GetLevelEnergy(theGammas.GetNumberOfLevels()-1))
+      xSec = new G4double[n];
+      G4double sum=0;
+      G4int i, index;
+      const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
+      G4double rWeight;    
+      G4NeutronHPThermalBoost aThermalE;
+      for (i=0; i<n; i++)
       {
-        G4ReactionProductVector * thePhotons = 0;
-        G4ReactionProductVector * theOtherPhotons = NULL;
-        G4int iLevel;
-        while(theGammaEnergy>=theGammas.GetLevelEnergy(0))
-        {
-          for(iLevel=theGammas.GetNumberOfLevels()-1; iLevel>=0; iLevel--)
-          {
-    	    if(theGammas.GetLevelEnergy(iLevel)<theGammaEnergy) break;
-          }
-          if(iLevel==0||iLevel==theGammas.GetNumberOfLevels()-1)
-          {
- 	    theOtherPhotons = theGammas.GetDecayGammas(iLevel);
-          }
-          else
-          {
-  	    G4double random = G4UniformRand();
-	    G4double eLow  = theGammas.GetLevelEnergy(iLevel);
-	    G4double eHigh = theGammas.GetLevelEnergy(iLevel+1);
-	    if(random > (eHigh-eLow)/(theGammaEnergy-eLow)) iLevel++;
-	    theOtherPhotons = theGammas.GetDecayGammas(iLevel);
-          }
-          if(thePhotons==NULL) thePhotons = new G4ReactionProductVector;
-          if(theOtherPhotons != NULL)
-          {
-            for(G4int ii=0; ii<theOtherPhotons->length(); ii++)
-            {
-              thePhotons->insert(theOtherPhotons->at(ii));
-            }
-            delete theOtherPhotons; 
-          }
-          theGammaEnergy -= theGammas.GetLevelEnergy(iLevel);
-          if(iLevel == -1) break;
-        }  
-      
-        // clean up the primary neutron
-        theResult.SetStatusChange(fStopAndKill);
-      
-        // fill particle change
-        theResult.Initialize(aTrack);
-        G4int nSecondaries = thePhotons->length();
-        theResult.SetNumberOfSecondaries(nSecondaries);
-        theResult.SetStatusChange(fStopAndKill);
-        G4DynamicParticle * theSec;
-        for(G4int gammaCount=0; gammaCount<nSecondaries; gammaCount++)
-        {
-          theSec = new G4DynamicParticle;    
-          theSec->SetDefinition(thePhotons->at(gammaCount)->GetDefinition());
-          theSec->SetMomentum(thePhotons->at(gammaCount)->GetMomentum());
-          theResult.AddSecondary(theSec); 
-          delete thePhotons->at(gammaCount);
-        }
-        delete thePhotons;
-      
-        // return   
-        if(0!=nSecondaries) return &theResult;
+        index = theMaterial->GetElement(i)->GetIndex();
+        rWeight = NumAtomsPerVolume[i];
+        xSec[i] = theCapture[index].GetXsec(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+  		                                                     theMaterial->GetElement(i),
+  								     theMaterial->GetTemperature()));
+        xSec[i] *= rWeight;
+        sum+=xSec[i];
       }
-      return theCapture[index].ApplyYourself(aTrack);
-    }
-    else
-    {
-      return theCapture[index].ApplyYourself(aTrack);
+      G4double random = G4UniformRand();
+      G4double running = 0;
+      for (i=0; i<n; i++)
+      {
+        running += xSec[i];
+        index = theMaterial->GetElement(i)->GetIndex();
+        if(random<=running/sum) break;
+      }
+      if(i==n) i=G4std::max(0, n-1);
+      delete [] xSec;
     }
+    return theCapture[index].ApplyYourself(aTrack);
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
index 575f33cc5f..a61f994925 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -50,13 +72,57 @@ void G4NeutronHPCaptureData::DumpPhysicsTable(const G4ParticleDefinition& aP)
   G4cout << "G4NeutronHPCaptureData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
-G4double G4NeutronHPCaptureData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
+#include "G4NucleiPropertiesTable.hh"
+
+G4double G4NeutronHPCaptureData::
+GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE, G4double aT)
 {
-  G4double result;
+  G4double result = 0;
   G4bool outOfRange;
   G4int index = anE->GetIndex();
-    
-  result = (*((*theCrossSections)(index))).GetValue(
-                             aP->GetKineticEnergy(), outOfRange);
+
+  // prepare neutron
+  G4double eKinetic = aP->GetKineticEnergy();
+  G4ReactionProduct theNeutron( aP->GetDefinition() );
+  theNeutron.SetMomentum( aP->GetMomentum() );
+  theNeutron.SetKineticEnergy( eKinetic );
+
+  // prepare thermal nucleus
+  G4Nucleus aNuc;
+  G4double eps = 0.0001;
+  G4double theA = anE->GetN();
+  G4double theZ = anE->GetZ();
+  G4double eleMass; 
+  eleMass = ( G4NucleiPropertiesTable::GetAtomicMass(theZ+eps, theA+eps)-
+              theZ*G4Electron::ElectronDefinition()->GetPDGMass() 
+	     ) / G4Neutron::Neutron()->GetPDGMass();
+  
+  G4ReactionProduct boosted;
+  G4double aXsection;
+  
+  // MC integration loop
+  G4int counter = 0;
+  G4double buffer = 0;
+  G4int size = G4int(G4std::max(10., aT/60*kelvin));
+  G4ThreeVector neutronVelocity = 1./G4Neutron::Neutron()->GetPDGMass()*theNeutron.GetMomentum();
+  G4double neutronVMag = neutronVelocity.mag();
+  while(counter == 0 || abs(buffer-result/counter) > 0.03*buffer)
+  {
+    if(counter) buffer = result/counter;
+    while (counter<size)
+    {
+      counter ++;
+      G4ReactionProduct aThermalNuc = aNuc.GetThermalNucleus(eleMass, aT);
+      boosted.Lorentz(theNeutron, aThermalNuc);
+      G4double theEkin = boosted.GetKineticEnergy();
+      aXsection = (*((*theCrossSections)(index))).GetValue(theEkin, outOfRange);
+      // velocity correction.
+      G4ThreeVector targetVelocity = 1./aThermalNuc.GetMass()*aThermalNuc.GetMomentum();
+      aXsection *= (targetVelocity+neutronVelocity).mag()/neutronVMag;
+      result += aXsection;
+    }
+    size += size;
+  }
+  result /= counter;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
index 66f009c0fe..8b9b74bf4d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPCaptureFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -31,7 +53,9 @@
       targetMass = ( G4NucleiPropertiesTable::GetAtomicMass(theBaseZ+eps, theBaseA+eps)-
                        theBaseZ* G4Electron::Electron()->GetPDGMass() ) /
                      G4Neutron::Neutron()->GetPDGMass();
-    theTarget = aNucleus.GetThermalNucleus(targetMass);
+    G4ThreeVector neutronVelocity = 1./G4Neutron::Neutron()->GetPDGMass()*theNeutron.GetMomentum();
+    G4double temperature = theTrack.GetMaterial()->GetTemperature();
+    theTarget = aNucleus.GetBiasedThermalNucleus(targetMass, neutronVelocity, temperature);
 
 // go to nucleus rest system
     theNeutron.Lorentz(theNeutron, -1*theTarget);
@@ -51,20 +75,20 @@
       G4Fragment nucleus(theBaseA+1, theBaseZ ,p4);
       G4PhotonEvaporation photonEvaporation;
       G4FragmentVector* products = photonEvaporation.BreakItUp(nucleus);
-      G4int i;
+      G4FragmentVector::iterator i;
       thePhotons = new G4ReactionProductVector;
-      for(i=0; i<products->entries(); i++)
+      for(i=products->begin(); i!=products->end(); i++)
       {
         G4ReactionProduct * theOne = new G4ReactionProduct;
         theOne->SetDefinition( G4Gamma::Gamma() );
         G4ParticleTable* theTable = G4ParticleTable::GetParticleTable();
-        if(products->at(i)->GetMomentum().mag() > 10*MeV) 
+        if((*i)->GetMomentum().mag() > 10*MeV) 
                  theOne->SetDefinition( 
                  theTable->FindIon(theBaseZ, theBaseA+1, 0, theBaseZ) );
-        theOne->SetMomentum( products->at(i)->GetMomentum().vect() ) ;
-        theOne->SetTotalEnergy( products->at(i)->GetMomentum().t() );
+        theOne->SetMomentum( (*i)->GetMomentum().vect() ) ;
+        theOne->SetTotalEnergy( (*i)->GetMomentum().t() );
         thePhotons->insert(theOne);
-        delete products->at(i);
+        delete *i;
       } 
       delete products;
     }
@@ -73,11 +97,44 @@
 
     G4int nPhotons = 0;
     if(thePhotons!=NULL) nPhotons=thePhotons->length();
-    theResult.SetNumberOfSecondaries(nPhotons);
+    G4int nParticles = nPhotons;
+    if(1==nPhotons) nParticles = 2;
+    theResult.SetNumberOfSecondaries(nParticles);
+
+    // back to lab system
+    for(i=0; i<nPhotons; i++)
+    {
+      thePhotons->at(i)->Lorentz(*(thePhotons->at(i)), theTarget);
+    }
+    
+    // Recoil, if only one gamma
+    if (1==nPhotons)
+    {
+       G4DynamicParticle * theOne = new G4DynamicParticle;
+       G4ParticleDefinition * aRecoil = G4ParticleTable::GetParticleTable()
+                                        ->FindIon(theBaseZ, theBaseA+1, 0, theBaseZ);
+       theOne->SetDefinition(aRecoil);
+       // Now energy; 
+       // Can be done slightly better @
+       G4ThreeVector aMomentum =  theTrack.GetMomentum()
+                                 +theTarget.GetMomentum()
+				 -thePhotons->at(0)->GetMomentum();
+
+       G4ThreeVector theMomUnit = aMomentum.unit();
+       G4double aKinEnergy =  theTrack.GetKineticEnergy()
+                             +theTarget.GetKineticEnergy(); // gammas come from Q-value
+       G4double theResMass = aRecoil->GetPDGMass();
+       G4double theResE = aRecoil->GetPDGMass()+aKinEnergy;
+       G4double theAbsMom = sqrt(theResE*theResE - theResMass*theResMass);
+       G4ThreeVector theMomentum = theAbsMom*theMomUnit;
+       theOne->SetMomentum(theMomentum);
+       theResult.AddSecondary(theOne);
+    }
+
+    // Now fill in the gammas.
     for(i=0; i<nPhotons; i++)
     {
       // back to lab system
-      thePhotons->at(i)->Lorentz(*(thePhotons->at(i)), theTarget);
       G4DynamicParticle * theOne = new G4DynamicParticle;
       theOne->SetDefinition(thePhotons->at(i)->GetDefinition());
       theOne->SetMomentum(thePhotons->at(i)->GetMomentum());
@@ -85,7 +142,6 @@
       delete thePhotons->at(i);
     }
     delete thePhotons; 
-
 // clean up the primary neutron
     theResult.SetStatusChange(fStopAndKill);
     return &theResult;
@@ -97,9 +153,9 @@
     G4bool dbool;
     G4NeutronHPDataUsed aFile = theNames.GetName(A, Z, dirName, tString, dbool);
     G4String filename = aFile.GetName();
-    theBaseA = aFile.GetA();
-    theBaseZ = aFile.GetZ();
-    if(!dbool)
+    theBaseA = A;
+    theBaseZ = G4int(Z+.5);
+    if(!dbool || ( Z<2.5 && ( abs(theBaseZ - Z)>0.0001 || abs(theBaseA - A)>0.0001)))
     {
       hasAnyData = false;
       hasFSData = false; 
@@ -115,4 +171,5 @@
       theFinalStatePhotons.InitAngular(theData); 
       theFinalStatePhotons.InitEnergies(theData); 
     }
+    theData.close();
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
index 87ac7f40f3..a6bd0ceb8b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannel.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -37,7 +59,7 @@
   G4bool G4NeutronHPChannel::Register(G4NeutronHPFinalState *theFS)
   {
     registerCount++;
-    G4int Z = theElement->GetZ();
+    G4int Z = static_cast<G4int>(theElement->GetZ()+0.0001);
     if(registerCount<5)
     {
       Z = Z-registerCount;
@@ -69,7 +91,8 @@
 //        G4cout <<" Init: normal case"<<G4endl;
         G4int A = theElement->GetIsotope(i1)->GetN();
         G4double frac = theElement->GetRelativeAbundanceVector()[i1]/perCent;
-        UpdateData(A, Z, count++, frac);
+        theFinalStates[i1]->SetA_Z(A, Z);
+	UpdateData(A, Z, count++, frac);
       }
     } else {
       G4int first = theStableOnes.GetFirstIsotope(Z);
@@ -79,6 +102,7 @@
       {
         G4int A = theStableOnes.GetIsotopeNucleonCount(first+i1);
         G4double frac = theStableOnes.GetAbundance(first+i1);
+        theFinalStates[i1]->SetA_Z(A, Z);
         UpdateData(A, Z, count++, frac);
       }
     }
@@ -151,18 +175,25 @@
     theStore = theMerge;
   }
 
-  G4ParticleChange * G4NeutronHPChannel::ApplyYourself(const G4Track & theTrack, G4int anIsotope)
+#include "G4NeutronHPThermalBoost.hh"
+
+  G4ParticleChange * G4NeutronHPChannel::
+  ApplyYourself(const G4Track & theTrack, G4int anIsotope)
   {
 //    G4cout << "G4NeutronHPChannel::ApplyYourself+"<<niso<<G4endl;
     if(anIsotope != -1) return theFinalStates[anIsotope]->ApplyYourself(theTrack);
     G4double sum=0;
     G4int it=0;
     G4double * xsec = new G4double[niso];
+    G4NeutronHPThermalBoost aThermalE;
     for (G4int i=0; i<niso; i++)
     {
       if(theFinalStates[i]->HasAnyData())
       {
-        xsec[i] = theIsotopeWiseData[i].GetXsec(theTrack.GetKineticEnergy());
+        xsec[i] = theIsotopeWiseData[i].GetXsec(aThermalE.GetThermalEnergy(theTrack.GetDynamicParticle(),
+		                                                           theFinalStates[i]->GetN(),
+									   theFinalStates[i]->GetZ(),
+						  		           theTrack.GetMaterial()->GetTemperature()));
         sum += xsec[i];
       }
       else
@@ -174,7 +205,7 @@
     {
 //      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize+"<<G4endl;
 //      G4cout << "G4NeutronHPChannel::ApplyYourself theFinalState->Initialize-"<<G4endl;
-      it = niso*G4UniformRand();
+      it = static_cast<G4int>(niso*G4UniformRand());
     }
     else
     {
@@ -190,10 +221,9 @@
         if(random<=running/sum) 
         { 
           it = ix;
-          goto OUT;
+	  break;
         }
       }
-      OUT:
       if(it==niso) it--;
     }
     delete [] xsec;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
index 26a658a6e7..3418c76c80 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPChannelList.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -38,8 +60,10 @@
     }
   }
     
+  #include "G4NeutronHPThermalBoost.hh"
   G4ParticleChange * G4NeutronHPChannelList::ApplyYourself(const G4Element * anElement, const G4Track & aTrack)
   {
+    G4NeutronHPThermalBoost aThermalE;
     G4int i, ii;
     // decide on the isotope
     G4int numberOfIsos;
@@ -57,7 +81,11 @@
       {
 	if(theChannels[ii]->HasAnyData(i))
 	{
-	  running[i] +=theChannels[ii]->GetWeightedXsec(aTrack.GetKineticEnergy(), i);
+          running[i] +=theChannels[ii]->GetWeightedXsec(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+		                                                  theChannels[ii]->GetN(i),
+								  theChannels[ii]->GetZ(i),
+						  		  aTrack.GetMaterial()->GetTemperature()),
+					                i);
 	}
       }
     }
@@ -78,7 +106,11 @@
       if(i!=0) running[i] = running[i-1];
       if(theChannels[i]->HasAnyData(isotope))
       {
-        running[i] += theChannels[i]->GetFSCrossSection(aTrack.GetKineticEnergy(), isotope);
+        running[i] += theChannels[i]->GetFSCrossSection(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+		                                                  theChannels[i]->GetN(isotope),
+								  theChannels[i]->GetZ(isotope),
+						  		  aTrack.GetMaterial()->GetTemperature()),
+					                isotope);
       }
     }
     G4int lChan=0;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
index 7dcf46761b..cbdbfef87f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContAngularPar.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -38,8 +60,8 @@
                                     G4int angularRep, G4int interpolE)
   {
     G4ReactionProduct * result = new G4ReactionProduct;
-    G4int Z = massCode/1000;
-    G4int A = massCode-1000*Z;
+    G4int Z = static_cast<G4int>(massCode/1000);
+    G4int A = static_cast<G4int>(massCode-1000*Z);
     if(massCode==0)
     {
       result->SetDefinition(G4Gamma::Gamma());
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContEnergyAngular.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContEnergyAngular.cc
index 0fca82e169..b0e05d00c3 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContEnergyAngular.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPContEnergyAngular.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPD2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPD2AInelasticFS.cc
index 14385bcf30..d68a9be540 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPD2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPD2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDAInelasticFS.cc
index 9427166825..1e90df8b3a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDInelasticFS.cc
index 7fe65a44ad..967ea8cc49 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
index 971fe4e0f5..663e3c508c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
index c2fb74e189..b5c3f9978f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDeExGammas.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDiscreteTwoBody.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDiscreteTwoBody.cc
index 4a387ef80b..19a9f182a2 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDiscreteTwoBody.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPDiscreteTwoBody.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -18,8 +40,8 @@
 G4ReactionProduct * G4NeutronHPDiscreteTwoBody::Sample(G4double anEnergy, G4double massCode, G4double mass)
 { // Interpolation still only for the most used parts; rest to be Done @@@@@
    G4ReactionProduct * result = new G4ReactionProduct;
-   G4int Z = massCode/1000;
-   G4int A = massCode-1000*Z;
+   G4int Z = static_cast<G4int>(massCode/1000);
+   G4int A = static_cast<G4int>(massCode-1000*Z);
 
    if(massCode==0)
    {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
index bedd80b626..c326192b3a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElastic.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -22,6 +44,8 @@
       while(!theElastic[i].Register(theFS));
     }
     delete theFS;
+    SetMinEnergy(0.*eV);
+    SetMaxEnergy(20.*MeV);
   }
   
   G4NeutronHPElastic::~G4NeutronHPElastic()
@@ -29,33 +53,42 @@
     delete [] theElastic;
   }
   
+  #include "G4NeutronHPThermalBoost.hh"
+  
   G4VParticleChange * G4NeutronHPElastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus)
   {
     G4Material * theMaterial = aTrack.GetMaterial();
     G4int n = theMaterial->GetNumberOfElements();
-    G4int it = n-1;
-    xSec = new G4double[n];
-    G4double sum=0;
-    G4int i, index;
-    const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
-    G4double rWeight;    
-    for (i=0; i<n; i++)
+    G4int index = theMaterial->GetElement(0)->GetIndex();
+    if(n!=1)
     {
-      index = theMaterial->GetElement(i)->GetIndex();
-      rWeight = NumAtomsPerVolume[i];
-      xSec[i] = theElastic[index].GetXsec(aTrack.GetKineticEnergy());
-      xSec[i] *= rWeight;
-      sum+=xSec[i];
+      G4int i;
+      G4int it = n-1;
+      xSec = new G4double[n];
+      G4double sum=0;
+      const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
+      G4double rWeight;    
+      G4NeutronHPThermalBoost aThermalE;
+      for (i=0; i<n; i++)
+      {
+        index = theMaterial->GetElement(i)->GetIndex();
+        rWeight = NumAtomsPerVolume[i];
+        xSec[i] = theElastic[index].GetXsec(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+  		                                                     theMaterial->GetElement(i),
+  								     theMaterial->GetTemperature()));
+        xSec[i] *= rWeight;
+        sum+=xSec[i];
+      }
+      G4double random = G4UniformRand();
+      G4double running = 0;
+      for (i=0; i<n; i++)
+      {
+        running += xSec[i];
+        index = theMaterial->GetElement(i)->GetIndex();
+        if(random<=running/sum) break;
+      }
+      delete [] xSec;
+      // it is element-wise initialised.
     }
-    G4double random = G4UniformRand();
-    G4double running = 0;
-    for (i=0; i<n; i++)
-    {
-      running += xSec[i];
-      index = theMaterial->GetElement(i)->GetIndex();
-      if(random<=running/sum) break;
-    }
-    delete [] xSec;
-     // it is element-wise initialised.
     return theElastic[index].ApplyYourself(aTrack); 
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
index ddd81ec1e9..9673ae4591 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -50,13 +72,60 @@ void G4NeutronHPElasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
 //  G4cout << "G4NeutronHPElasticData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
-G4double G4NeutronHPElasticData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
+#include "G4Nucleus.hh"
+#include "G4NucleiPropertiesTable.hh"
+#include "G4Neutron.hh"
+#include "G4Electron.hh"
+
+G4double G4NeutronHPElasticData::
+GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE, G4double aT)
 {
-  G4double result;
+  G4double result = 0;
   G4bool outOfRange;
   G4int index = anE->GetIndex();
-    
-  result = (*((*theCrossSections)(index))).GetValue(
-                             aP->GetKineticEnergy(), outOfRange);
+
+  // prepare neutron
+  G4double eKinetic = aP->GetKineticEnergy();
+  G4ReactionProduct theNeutron( aP->GetDefinition() );
+  theNeutron.SetMomentum( aP->GetMomentum() );
+  theNeutron.SetKineticEnergy( eKinetic );
+
+  // prepare thermal nucleus
+  G4Nucleus aNuc;
+  G4double eps = 0.0001;
+  G4double theA = anE->GetN();
+  G4double theZ = anE->GetZ();
+  G4double eleMass; 
+  eleMass = ( G4NucleiPropertiesTable::GetAtomicMass(theZ+eps, theA+eps)-
+              theZ*G4Electron::ElectronDefinition()->GetPDGMass() 
+	     ) / G4Neutron::Neutron()->GetPDGMass();
+  
+  G4ReactionProduct boosted;
+  G4double aXsection;
+  
+  // MC integration loop
+  G4int counter = 0;
+  G4double buffer = 0;
+  G4int size = G4int(G4std::max(10., aT/60*kelvin));
+  G4ThreeVector neutronVelocity = 1./G4Neutron::Neutron()->GetPDGMass()*theNeutron.GetMomentum();
+  G4double neutronVMag = neutronVelocity.mag();
+  while(counter == 0 || abs(buffer-result/counter) > 0.03*buffer)
+  {
+    if(counter) buffer = result/counter;
+    while (counter<size)
+    {
+      counter ++;
+      G4ReactionProduct aThermalNuc = aNuc.GetThermalNucleus(eleMass, aT);
+      boosted.Lorentz(theNeutron, aThermalNuc);
+      G4double theEkin = boosted.GetKineticEnergy();
+      aXsection = (*((*theCrossSections)(index))).GetValue(theEkin, outOfRange);
+      // velocity correction.
+      G4ThreeVector targetVelocity = 1./aThermalNuc.GetMass()*aThermalNuc.GetMomentum();
+      aXsection *= (targetVelocity+neutronVelocity).mag()/neutronVMag;
+      result += aXsection;
+    }
+    size += size;
+  }
+  result /= counter;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
index e6d8a8f29a..755364051e 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -89,6 +111,7 @@
       G4cout << "unusable number for repFlag: repFlag="<<repFlag<<G4endl;
       G4Exception("G4NeutronHPElasticFS::Init -- unusable number for repFlag");
     }
+    theData.close();
   }
   G4ParticleChange * G4NeutronHPElasticFS::ApplyYourself(const G4Track & theTrack)
   {  
@@ -106,7 +129,8 @@
     
     G4ReactionProduct theTarget; 
     G4Nucleus aNucleus;
-    theTarget = aNucleus.GetThermalNucleus( targetMass );
+    G4ThreeVector neuVelo = (1./incidentParticle->GetDefinition()->GetPDGMass())*theNeutron.GetMomentum();
+    theTarget = aNucleus.GetBiasedThermalNucleus( targetMass, neuVelo, theTrack.GetMaterial()->GetTemperature());
 //     G4cout << "Nucleus-test"<<" "<<targetMass<<" ";
 //     G4cout << theTarget.GetMomentum().x()<<" ";
 //     G4cout << theTarget.GetMomentum().y()<<" ";
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
index 6b21d368bb..5f402a983c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPElementData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -32,7 +54,7 @@
     // filename = ein data-set je isotope.
     count = 0;
     G4int nIso = theElement->GetNumberOfIsotopes();
-    G4int Z = theElement->GetZ();
+    G4int Z = static_cast<G4int> (theElement->GetZ());
     G4int i1;
     if(nIso!=0)
     {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
index 576e654d8b..682486798e 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPEnAngCorrelation.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
index 0863f9712a..9c619865b8 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFCFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
index eefc2c4114..d2a2d3decd 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFSFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -67,6 +89,7 @@
       }
     }
     targetMass = theFinalStateNeutrons.GetTargetMass();
+    theData.close();
   }
   
   
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre.cc
index 610304163b..4aaeb121e1 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_14.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_14.cc
index 588ad9b942..f72b57320f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_14.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_14.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_18.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_18.cc
index f901e95d66..de89d0f040 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_18.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_18.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_21.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_21.cc
index e44f5690e9..0e03498613 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_21.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_21.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_24.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_24.cc
index 9210c9223c..d802dc3ce5 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_24.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_24.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_26.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_26.cc
index 7fec66e195..614060e15b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_26.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_26.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_28.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_28.cc
index a234df423d..8c00bae50e 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_28.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_28.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_30.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_30.cc
index 5e9cf05b67..308a919b4f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_30.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFastLegendre_30.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
index a7c1273480..4cff99a024 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPField.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFieldPoint.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFieldPoint.cc
index 4975d7d2e3..b5fc89f0fe 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFieldPoint.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFieldPoint.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc
index 6761d22b44..ea59f858e9 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFission.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -31,32 +53,41 @@
     delete [] theFission;
   }
   
+  #include "G4NeutronHPThermalBoost.hh"
+  
   G4VParticleChange * G4NeutronHPFission::ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus)
   {
     G4Material * theMaterial = aTrack.GetMaterial();
     G4int n = theMaterial->GetNumberOfElements();
-    xSec = new G4double[n];
-    G4double sum=0;
-    G4int i, it, index;
-    const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
-    G4double rWeight;    
-    for (i=0; i<n; i++)
+    G4int index = theMaterial->GetElement(0)->GetIndex();
+    if(n!=1)
     {
-      index = theMaterial->GetElement(i)->GetIndex();
-      rWeight = NumAtomsPerVolume[i];
-      xSec[i] = theFission[index].GetXsec(aTrack.GetKineticEnergy());
-      xSec[i] *= rWeight;
-      sum+=xSec[i];
+      xSec = new G4double[n];
+      G4double sum=0;
+      G4int i, it, index;
+      const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
+      G4double rWeight;    
+      G4NeutronHPThermalBoost aThermalE;
+      for (i=0; i<n; i++)
+      {
+        index = theMaterial->GetElement(i)->GetIndex();
+        rWeight = NumAtomsPerVolume[i];
+        xSec[i] = theFission[index].GetXsec(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+  		                                                      theMaterial->GetElement(i),
+  								      theMaterial->GetTemperature()));
+        xSec[i] *= rWeight;
+        sum+=xSec[i];
+      }
+      G4double random = G4UniformRand();
+      G4double running = 0;
+      for (i=0; i<n; i++)
+      {
+        running += xSec[i];
+        index = theMaterial->GetElement(i)->GetIndex();
+        if(random<=running/sum) break;
+      }
+      delete [] xSec;
     }
-    G4double random = G4UniformRand();
-    G4double running = 0;
-    for (i=0; i<n; i++)
-    {
-      running += xSec[i];
-      index = theMaterial->GetElement(i)->GetIndex();
-      if(random<=running/sum) break;
-    }
-    delete [] xSec;
     return theFission[index].ApplyYourself(aTrack);
   }
 
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
index cbc3c6f25c..7b4c201c87 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionBaseFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -21,7 +43,7 @@
     G4String filename = aFile.GetName();
     theBaseA = aFile.GetA();
     theBaseZ = aFile.GetZ();
-    if(!dbool) 
+    if(!dbool  || ( Z<2.5 && ( abs(theBaseZ - Z)>0.0001 || abs(theBaseA - A)>0.0001) ) )
     {
       hasAnyData = false;
       hasFSData = false; 
@@ -37,6 +59,7 @@
     G4double dumm;
     if(!(theData))
     {
+      theData.close();
       hasFSData = false;
       hasXsec = false;
       hasAnyData = false;
@@ -49,6 +72,7 @@
     if (!(theData >> dummy))
     {
       hasFSData = false;
+      theData.close();
       return;
     }
     theData >> dummy;
@@ -58,6 +82,7 @@
     theData >> dummy >> dummy;
 
     theEnergyDistribution.Init(theData);
+    theData.close();
     
   }
   
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
index 34e6c03d9b..3376f77f37 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -51,16 +73,58 @@ void G4NeutronHPFissionData::DumpPhysicsTable(const G4ParticleDefinition& aP)
   G4cout << "G4NeutronHPFissionData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
-G4double G4NeutronHPFissionData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
+#include "G4NucleiPropertiesTable.hh"
+
+G4double G4NeutronHPFissionData::
+GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE, G4double aT)
 {
   G4double result = 0;
+  if(anE->GetZ()<90) return result;
   G4bool outOfRange;
   G4int index = anE->GetIndex();
-    
-  if(anE->GetZ()<90) return result;
-  result = (*((*theCrossSections)(index))).GetValue(
-                             aP->GetKineticEnergy(), outOfRange);
-//   cout << "Element "<<anE->GetZ()<<endl;
-//   cout << "FissionHPCrossSection = "<<result<<endl;
+
+  // prepare neutron
+  G4double eKinetic = aP->GetKineticEnergy();
+  G4ReactionProduct theNeutron( aP->GetDefinition() );
+  theNeutron.SetMomentum( aP->GetMomentum() );
+  theNeutron.SetKineticEnergy( eKinetic );
+
+  // prepare thermal nucleus
+  G4Nucleus aNuc;
+  G4double eps = 0.0001;
+  G4double theA = anE->GetN();
+  G4double theZ = anE->GetZ();
+  G4double eleMass; 
+  eleMass = ( G4NucleiPropertiesTable::GetAtomicMass(theZ+eps, theA+eps)-
+              theZ*G4Electron::ElectronDefinition()->GetPDGMass() 
+	     ) / G4Neutron::Neutron()->GetPDGMass();
+  
+  G4ReactionProduct boosted;
+  G4double aXsection;
+  
+  // MC integration loop
+  G4int counter = 0;
+  G4double buffer = 0;
+  G4int size = G4int(G4std::max(10., aT/60*kelvin));
+  G4ThreeVector neutronVelocity = 1./G4Neutron::Neutron()->GetPDGMass()*theNeutron.GetMomentum();
+  G4double neutronVMag = neutronVelocity.mag();
+  while(counter == 0 || abs(buffer-result/counter) > 0.01*buffer)
+  {
+    if(counter) buffer = result/counter;
+    while (counter<size)
+    {
+      counter ++;
+      G4ReactionProduct aThermalNuc = aNuc.GetThermalNucleus(eleMass, aT);
+      boosted.Lorentz(theNeutron, aThermalNuc);
+      G4double theEkin = boosted.GetKineticEnergy();
+      aXsection = (*((*theCrossSections)(index))).GetValue(theEkin, outOfRange);
+      // velocity correction.
+      G4ThreeVector targetVelocity = 1./aThermalNuc.GetMass()*aThermalNuc.GetMomentum();
+      aXsection *= (targetVelocity+neutronVelocity).mag()/neutronVMag;
+      result += aXsection;
+    }
+    size += size;
+  }
+  result /= counter;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
index 6ae501e343..9a30e61da9 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -29,7 +51,8 @@
     G4Nucleus aNucleus;
     G4ReactionProduct theTarget; 
     G4double targetMass = theFS.GetMass();
-    theTarget = aNucleus.GetThermalNucleus(targetMass);
+    G4ThreeVector neuVelo = (1./incidentParticle->GetDefinition()->GetPDGMass())*theNeutron.GetMomentum();
+    theTarget = aNucleus.GetBiasedThermalNucleus( targetMass, neuVelo, theTrack.GetMaterial()->GetTemperature());
     
 // set neutron and target in the FS classes 
    theFS.SetNeutron(theNeutron);
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
index b4e0fb9a94..ba5563c82d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPGamma.cc
@@ -1,9 +1,31 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
 //
 #include "G4NeutronHPGamma.hh"
-
+int G4NeutronHPGamma::instancecount = 0;
 G4bool G4NeutronHPGamma::Init(G4std::ifstream & aDataFile)
 {
   G4bool theResult = true;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPHe3InelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPHe3InelasticFS.cc
index d756cffb41..7fcc02aa85 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPHe3InelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPHe3InelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
index 8b7b2dc1ff..765bb525b2 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // this code implementation is the intellectual property of
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
@@ -7,8 +29,8 @@
 // based on the Program) you indicate your acceptance of this statement,
 // and all its terms.
 //
-// $Id: G4NeutronHPInelastic.cc,v 1.7 2000/11/09 16:14:22 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4NeutronHPInelastic.cc,v 1.8.2.1 2001/06/28 19:14:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4NeutronHPInelastic.hh"
 
@@ -79,32 +101,42 @@
     delete [] theInelastic;
   }
   
+  #include "G4NeutronHPThermalBoost.hh"
+  
   G4VParticleChange * G4NeutronHPInelastic::ApplyYourself(const G4Track& aTrack, G4Nucleus& aTargetNucleus)
   {
     G4Material * theMaterial = aTrack.GetMaterial();
     G4int n = theMaterial->GetNumberOfElements();
-    xSec = new G4double[n];
-    G4double sum=0;
-    G4int i, it, index;
-    const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
-    G4double rWeight;    
-    for (i=0; i<n; i++)
+    G4int index = theMaterial->GetElement(0)->GetIndex();
+    G4int it=0;
+    if(n!=1)
     {
-      index = theMaterial->GetElement(i)->GetIndex();
-      rWeight = NumAtomsPerVolume[i];
-      xSec[i] = theInelastic[index].GetXsec(aTrack.GetKineticEnergy());
-      xSec[i] *= rWeight;
-      sum+=xSec[i];
+      xSec = new G4double[n];
+      G4double sum=0;
+      G4int i;
+      const G4double * NumAtomsPerVolume = theMaterial->GetVecNbOfAtomsPerVolume();
+      G4double rWeight;    
+      G4NeutronHPThermalBoost aThermalE;
+      for (i=0; i<n; i++)
+      {
+        index = theMaterial->GetElement(i)->GetIndex();
+        rWeight = NumAtomsPerVolume[i];
+        xSec[i] = theInelastic[index].GetXsec(aThermalE.GetThermalEnergy(aTrack.GetDynamicParticle(),
+  		                                                         theMaterial->GetElement(i),
+    								         theMaterial->GetTemperature()));
+        xSec[i] *= rWeight;
+        sum+=xSec[i];
+      }
+      G4double random = G4UniformRand();
+      G4double running = 0;
+      for (i=0; i<n; i++)
+      {
+        running += xSec[i];
+        index = theMaterial->GetElement(i)->GetIndex();
+        it = i;
+        if(random<=running/sum) break;
+      }
+      delete [] xSec;
     }
-    G4double random = G4UniformRand();
-    G4double running = 0;
-    for (i=0; i<n; i++)
-    {
-      running += xSec[i];
-      index = theMaterial->GetElement(i)->GetIndex();
-      it = i;
-      if(random<=running/sum) break;
-    }
-    delete [] xSec;
     return theInelastic[index].ApplyYourself(theMaterial->GetElement(it), aTrack);
   }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
index a708158c77..2da8b9fbaa 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticBaseFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -45,13 +67,16 @@ void G4NeutronHPInelasticBaseFS::Init (G4double A, G4double Z, G4String & dirNam
   G4String filename = aFile.GetName();
   theBaseA = aFile.GetA();
   theBaseZ = aFile.GetZ();
-  if(!dbool)
+  if(!dbool || ( Z<2.5 && ( abs(theBaseZ - Z)>0.0001 || abs(theBaseA - A)>0.0001)))
   {
+    if(getenv("NeutronHPNamesLogging")) G4cout << "Skipped = "<< filename <<" "<<A<<" "<<Z<<G4endl;
     hasAnyData = false;
     hasFSData = false; 
     hasXsec = false;
     return;
   }
+    theBaseA = A;
+    theBaseZ = G4int(Z+.5);
 #ifdef G4USE_STD_NAMESPACE
   G4std::ifstream theData(filename, G4std::ios::in);
 #else
@@ -62,6 +87,7 @@ void G4NeutronHPInelasticBaseFS::Init (G4double A, G4double Z, G4String & dirNam
     hasAnyData = false;
     hasFSData = false; 
     hasXsec = false;
+    theData.close();
     return; // no data for exactly this isotope and FS
   }
   // here we go
@@ -122,6 +148,7 @@ void G4NeutronHPInelasticBaseFS::Init (G4double A, G4double Z, G4String & dirNam
       G4Exception("Data-type unknown to G4NeutronHPInelasticBaseFS");
     }
   }
+  theData.close();
 }
   
 void G4NeutronHPInelasticBaseFS::BaseApply(const G4Track & theTrack, 
@@ -149,7 +176,8 @@ void G4NeutronHPInelasticBaseFS::BaseApply(const G4Track & theTrack,
       targetMass = theAngularDistribution->GetTargetMass();
   G4Nucleus aNucleus;
   G4ReactionProduct theTarget; 
-  theTarget = aNucleus.GetThermalNucleus(targetMass);
+  G4ThreeVector neuVelo = (1./incidentParticle->GetDefinition()->GetPDGMass())*theNeutron.GetMomentum();
+  theTarget = aNucleus.GetBiasedThermalNucleus( targetMass, neuVelo, theTrack.GetMaterial()->GetTemperature());
 
 // prepare energy in target rest frame
   G4ReactionProduct boosted;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
index d7dd5767cb..bd649f73bb 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -42,13 +64,16 @@ void G4NeutronHPInelasticCompFS::Init (G4double A, G4double Z, G4String & dirNam
   G4String filename = aFile.GetName();
   theBaseA = aFile.GetA();
   theBaseZ = aFile.GetZ();
-  if(!dbool)
+  if(!dbool || ( Z<2.5 && ( abs(theBaseZ - Z)>0.0001 || abs(theBaseA - A)>0.0001)))
   {
+    if(getenv("NeutronHPNamesLogging")) G4cout << "Skipped = "<< filename <<" "<<A<<" "<<Z<<G4endl;
     hasAnyData = false;
     hasFSData = false; 
     hasXsec = false;
     return;
   }
+    theBaseA = A;
+    theBaseZ = G4int(Z+.5);
 #ifdef G4USE_STD_NAMESPACE
   G4std::ifstream theData(filename, G4std::ios::in);
 #else
@@ -59,6 +84,7 @@ void G4NeutronHPInelasticCompFS::Init (G4double A, G4double Z, G4String & dirNam
     hasAnyData = false;
     hasFSData = false; 
     hasXsec = false;
+    theData.close();
     return;
   }
   // here we go
@@ -118,6 +144,7 @@ void G4NeutronHPInelasticCompFS::Init (G4double A, G4double Z, G4String & dirNam
       G4Exception("Data-type unknown to G4NeutronHPInelasticCompFS");
     }
   }
+  theData.close();
 }
 
 G4int G4NeutronHPInelasticCompFS::SelectExitChannel(G4double eKinetic)
@@ -174,7 +201,8 @@ void G4NeutronHPInelasticCompFS::CompositeApply(const G4Track & theTrack, G4Part
 //        targetMass = theFinalStatePhotons[50]->GetTargetMass();
     G4Nucleus aNucleus;
     G4ReactionProduct theTarget; 
-    theTarget = aNucleus.GetThermalNucleus(targetMass);
+    G4ThreeVector neuVelo = (1./incidentParticle->GetDefinition()->GetPDGMass())*theNeutron.GetMomentum();
+    theTarget = aNucleus.GetBiasedThermalNucleus( targetMass, neuVelo, theTrack.GetMaterial()->GetTemperature());
 
 // prepare the residual mass
     G4double residualMass=0;
@@ -238,9 +266,18 @@ void G4NeutronHPInelasticCompFS::CompositeApply(const G4Track & theTrack, G4Part
       {
         G4double eExcitation = 0;
         if(iLevel>=0) eExcitation = theGammas.GetLevel(iLevel)->GetLevelEnergy();    
-        
-	aHadron.SetKineticEnergy(aHadron.GetKineticEnergy() - eExcitation);
-	// consistency of data assumed....@@@@@
+        while (eKinetic-eExcitation < 0 && iLevel>0)
+	{
+	  iLevel--;
+	  eExcitation = theGammas.GetLevel(iLevel)->GetLevelEnergy();    
+	}
+	
+	if(getenv("InelasticCompFSLogging") && eKinetic-eExcitation < 0) 
+	{
+	  G4Exception("SEVERE: InelasticCompFS: Consistency of data not good enough, please file report");
+	}
+	if(eKinetic-eExcitation < 0) eExcitation = 0;
+	if(iLevel!= -1) aHadron.SetKineticEnergy(eKinetic - eExcitation);
 	
       }
       theAngularDistribution[it]->SampleAndUpdate(aHadron);
@@ -440,7 +477,7 @@ void G4NeutronHPInelasticCompFS::CompositeApply(const G4Track & theTrack, G4Part
         delete theParticles->at(i); 
       } 
       delete theParticles;
-      if(needsSeparateRecoil)
+      if(needsSeparateRecoil && residualZ!=0)
       {
         G4ReactionProduct theResidual;   
         theResidual.SetDefinition(G4ParticleTable::GetParticleTable()->GetIon(residualZ, residualA, 0));  
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
index b319d83b82..6fd71fe6d5 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -50,13 +72,57 @@ void G4NeutronHPInelasticData::DumpPhysicsTable(const G4ParticleDefinition& aP)
   G4cout << "G4NeutronHPInelasticData::DumpPhysicsTable still to be implemented"<<G4endl;
 }
 
-G4double G4NeutronHPInelasticData::GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE)
+#include "G4NucleiPropertiesTable.hh"
+
+G4double G4NeutronHPInelasticData::
+GetCrossSection(const G4DynamicParticle* aP, const G4Element*anE, G4double aT)
 {
-  G4double result;
+  G4double result = 0;
   G4bool outOfRange;
   G4int index = anE->GetIndex();
-    
-  result = (*((*theCrossSections)(index))).GetValue(
-                             aP->GetKineticEnergy(), outOfRange);
+
+  // prepare neutron
+  G4double eKinetic = aP->GetKineticEnergy();
+  G4ReactionProduct theNeutron( aP->GetDefinition() );
+  theNeutron.SetMomentum( aP->GetMomentum() );
+  theNeutron.SetKineticEnergy( eKinetic );
+
+  // prepare thermal nucleus
+  G4Nucleus aNuc;
+  G4double eps = 0.0001;
+  G4double theA = anE->GetN();
+  G4double theZ = anE->GetZ();
+  G4double eleMass; 
+  eleMass = ( G4NucleiPropertiesTable::GetAtomicMass(theZ+eps, theA+eps)-
+              theZ*G4Electron::ElectronDefinition()->GetPDGMass() 
+	     ) / G4Neutron::Neutron()->GetPDGMass();
+  
+  G4ReactionProduct boosted;
+  G4double aXsection;
+  
+  // MC integration loop
+  G4int counter = 0;
+  G4double buffer = 0;
+  G4int size = G4int(G4std::max(10., aT/60*kelvin));
+  G4ThreeVector neutronVelocity = 1./G4Neutron::Neutron()->GetPDGMass()*theNeutron.GetMomentum();
+  G4double neutronVMag = neutronVelocity.mag();
+  while(counter == 0 || abs(buffer-result/counter) > 0.01*buffer)
+  {
+    if(counter) buffer = result/counter;
+    while (counter<size)
+    {
+      counter ++;
+      G4ReactionProduct aThermalNuc = aNuc.GetThermalNucleus(eleMass, aT);
+      boosted.Lorentz(theNeutron, aThermalNuc);
+      G4double theEkin = boosted.GetKineticEnergy();
+      aXsection = (*((*theCrossSections)(index))).GetValue(theEkin, outOfRange);
+      // velocity correction.
+      G4ThreeVector targetVelocity = 1./aThermalNuc.GetMass()*aThermalNuc.GetMomentum();
+      aXsection *= (targetVelocity+neutronVelocity).mag()/neutronVMag;
+      result += aXsection;
+    }
+    size += size;
+  }
+  result /= counter;
   return result;
 }
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInterpolator.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInterpolator.cc
index d71671d4b8..32c03ffa00 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInterpolator.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInterpolator.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
index 5a91023ae2..53b0561f47 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsoData.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -20,10 +42,16 @@
     ifstream theChannel(filename,ios::in|ios::nocreate);
 #endif
     
-    if(!theChannel) return false;
+    if(Z==1 && (aFile.GetZ()!=Z || abs(aFile.GetA()-A)>0.0001) )
+    {
+      if(getenv("NeutronHPNamesLogging")) G4cout << "Skipped = "<< filename <<" "<<A<<" "<<Z<<G4endl;
+      theChannel.close();
+      return false;
+    }
+    if(!theChannel) {theChannel.close(); return false;}
     // accommodating deficiencie of some compilers
-    if(theChannel.eof()) return false; 
-    if(!theChannel) return false;
+    if(theChannel.eof()) {theChannel.close(); return false;} 
+    if(!theChannel) {theChannel.close(); return false;}
     G4int count;
     G4int dummy; 
     theChannel >> dummy >> dummy;
@@ -36,6 +64,7 @@
 //     G4int hpw;
 //     G4cin >> hpw;
 //    theChannelData->Dump();
+    theChannel.close();
     return result;
   }
   
@@ -59,7 +88,7 @@
     dirName = baseName+"/Capture";
     Init(A, Z, abun, dirName, "/CrossSection/");
     theCaptureData = theChannelData;
-    theChannelData = NULL;
+     theChannelData = NULL;
     dirName = baseName+"/Elastic";
     Init(A, Z, abun, dirName, "/CrossSection/");
     theElasticData = theChannelData;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
index 45caca2794..5623269454 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPIsotropic.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -21,8 +43,8 @@ void G4NeutronHPIsotropic::Init(G4std::ifstream & aDataFile)
 G4ReactionProduct * G4NeutronHPIsotropic::Sample(G4double anEnergy, G4double massCode, G4double mass)
 {
    G4ReactionProduct * result = new G4ReactionProduct;
-   G4int Z = massCode/1000;
-   G4int A = massCode-1000*Z;
+   G4int Z = static_cast<G4int>(massCode/1000);
+   G4int A = static_cast<G4int>(massCode-1000*Z);
 
    if(massCode==0)
    {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
index e1a12ca8c8..0ebb76bf1e 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPKallbachMannSyst.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
index d8eaa8a659..17bb5e4e56 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLCFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
index 52811be3b8..00ec3d936c 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLabAngularEnergy.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -42,8 +64,8 @@ void G4NeutronHPLabAngularEnergy::Init(G4std::ifstream & aDataFile)
 G4ReactionProduct * G4NeutronHPLabAngularEnergy::Sample(G4double anEnergy, G4double massCode, G4double mass)
 {
    G4ReactionProduct * result = new G4ReactionProduct;
-   G4int Z = massCode/1000;
-   G4int A = massCode-1000*Z;
+   G4int Z = static_cast<G4int>(massCode/1000);
+   G4int A = static_cast<G4int>(massCode-1000*Z);
 
    if(massCode==0)
    {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
index 66b850993a..a3200bb12f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLegendreStore.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLevel.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLevel.cc
index 261db80a00..85f9b8470f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLevel.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPLevel.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
index 74d515b6b3..abb0de0119 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPList.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPMadlandNixSpectrum.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPMadlandNixSpectrum.cc
index ec127c4f5a..bc6540655a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPMadlandNixSpectrum.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPMadlandNixSpectrum.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2AInelasticFS.cc
index 7cca60bac9..dd025de13f 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2PInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2PInelasticFS.cc
index 1fe38087f8..6f253d2906 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2PInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN2PInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN3AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN3AInelasticFS.cc
index 950c47727a..f91f50eb1b 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN3AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPN3AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNAInelasticFS.cc
index 6347f277e9..67c15d557a 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
index 5f2590851c..8de344e4e9 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc
@@ -1,14 +1,28 @@
-// This code implementation is the intellectual property of
-// neutron_hp -- source file
-// J.P. Wellisch, Nov-1996
-// A prototype of the low energy neutron transport model.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.2 1999/07/02 10:01:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.3.2.1 2001/06/28 19:14:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4NeutronHPNBodyPhaseSpace.hh"
 #include "G4Gamma.hh"
@@ -26,8 +40,8 @@
 G4ReactionProduct * G4NeutronHPNBodyPhaseSpace::Sample(G4double anEnergy, G4double massCode, G4double mass)
 {
    G4ReactionProduct * result = new G4ReactionProduct;
-   G4int Z = massCode/1000;
-   G4int A = massCode-1000*Z;
+   G4int Z = static_cast<G4int>(massCode/1000);
+   G4int A = static_cast<G4int>(massCode-1000*Z);
 
    if(massCode==0)
    {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPND2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPND2AInelasticFS.cc
index c0fb9d3e71..41c7d8a406 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPND2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPND2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNDInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNDInelasticFS.cc
index 0c00ff890e..ce4e239e2e 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNDInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNDInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNHe3InelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNHe3InelasticFS.cc
index 03014486df..f192d147f2 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNHe3InelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNHe3InelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
index 032461c7d1..3d66f4fb13 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPAInelasticFS.cc
index 4549241f20..ae34cfdb06 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPInelasticFS.cc
index 6eef4c360b..bec3e7eced 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNPInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNT2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNT2AInelasticFS.cc
index 258b74e11d..30beb7efac 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNT2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNT2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNTInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNTInelasticFS.cc
index 9a75f44cb6..928b2317ed 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNTInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNTInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNXInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNXInelasticFS.cc
index f5d1b93219..acf7a72aed 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNXInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNXInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
index 0e12d24128..90bf866382 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNames.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPAInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPAInelasticFS.cc
index 4ca9b6b1df..dd7c0d3dbb 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPAInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPAInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPDInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPDInelasticFS.cc
index b12e358fcb..43b762b1a1 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPDInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPDInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPInelasticFS.cc
index a994693630..2795f63aba 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPTInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPTInelasticFS.cc
index 08b238a7c8..bcede79a10 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPTInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPTInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
index 93b70580f8..e4a26f2ce2 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPartial.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
index a0ba0cc63c..1388176ed8 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -192,7 +214,7 @@ G4ReactionProductVector * G4NeutronHPPhotonDist::GetPhotons(G4double anEnergy)
       actualMult[i] = RandPoisson::shoot(current); // max cut-off still missing @@@
       if(nDiscrete==1&&current<1.0001) 
       {
-        actualMult[i] = current;
+        actualMult[i] = static_cast<G4int>(current);
         if(current<1) 
         {
           actualMult[i] = 0;
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPProduct.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPProduct.cc
index 89e35c7888..b51655656d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPProduct.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPProduct.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -18,7 +40,7 @@ G4ReactionProductVector * G4NeutronHPProduct::Sample(G4double anEnergy)
   G4int i;
   G4double eMax = GetTarget()->GetMass()+GetNeutron()->GetMass()
                   - theActualStateQValue;
-  theCurrentMultiplicity = mean;
+  theCurrentMultiplicity = static_cast<G4int>(mean);
   G4ReactionProduct * tmp;
   for(i=0;i<multi;i++)
   {
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
index d2466f05e3..2dd42fd1d7 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPSCFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPT2AInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPT2AInelasticFS.cc
index 331ee0d071..2a0d31f312 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPT2AInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPT2AInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
index a2c1aadbce..789a47c623 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTCFissionFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTInelasticFS.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTInelasticFS.cc
index 9af72f9b43..0785a65622 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTInelasticFS.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPTInelasticFS.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
index fa8c99d6ba..23e3d7538d 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPVector.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
@@ -114,6 +136,7 @@
   
   G4double G4NeutronHPVector::GetXsec(G4double e) 
   {
+    if(nEntries == 0) return 0;
     if(!theHash.Prepared()) Hash();
     G4int min = theHash.GetMinIndex(e);
     G4int i;
@@ -173,7 +196,7 @@
     if(i>nEntries) G4Exception("Skipped some index numbers in G4NeutronHPVector");
     if(i==nPoints)
     {
-      nPoints *= 1.5;
+      nPoints = static_cast<G4int>(1.5*nPoints);
       G4NeutronHPDataPoint * buff = new G4NeutronHPDataPoint[nPoints];
       for (G4int j=0; j<nEntries; j++) buff[j] = theData[j];
       delete [] theData;
@@ -264,7 +287,8 @@
       for(G4int j=start; j<current; j++)
       {
 	x = theData[j].GetX();
-	y = theInt.Lin(x, x1, x2, y1, y2);
+	if(x1-x2 == 0) y = (y2+y1)/2.;
+	else y = theInt.Lin(x, x1, x2, y1, y2);
 	if (abs(y-theData[j].GetY())>precision*y)
 	{
 	  aBuff[++count] = theData[current-1]; // for this one, everything was fine
diff --git a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPWattSpectrum.cc b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPWattSpectrum.cc
index 8c7ba046ce..b990d806fd 100644
--- a/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPWattSpectrum.cc
+++ b/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPWattSpectrum.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // neutron_hp -- source file
 // J.P. Wellisch, Nov-1996
 // A prototype of the low energy neutron transport model.
diff --git a/source/processes/hadronic/models/radiative_decay/History b/source/processes/hadronic/models/radiative_decay/History
deleted file mode 100644
index 84dd3dbc09..0000000000
--- a/source/processes/hadronic/models/radiative_decay/History
+++ /dev/null
@@ -1,39 +0,0 @@
--------------------------------------------------------------------
-
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
-
-                 Radiative decay History file
-                 -------------------------------------
-This file should be used by responsible rdm developers to briefly
-summarize all major modifications introduced in the code and keep
-track of all tags.
-
-     ----------------------------------------------------------
-     * Reverse chronological order (last date on top), please *
-     ----------------------------------------------------------
-01 Nov 2000 Fan Lei (radiative_decay-V02-00-02)
-- added the missing line " ee = e0+1.; " to line 763 in 
-  G4RadioactiveDecay.cc
- 
-27th Oct 200   fan Lei  (radiative_decay-V02-00-01)
-- add a fast simulation mode for beta decays
-
-25th Oct 2000  fan lei  (radiative_decay-V02-00-00)
-- added 'const' to line 1185 of G4RadioactiveDecay.cc to cowork with 
-  tag Track-V02-00-00
-
-27th June 2000  Fan Lei  (radiative_decay-V01-01-04)
-- fix for DEC-cxx debug non-ISO.
-- update test log files.
-
-15th June 2000  Fan Lei (radiative_decay_V01-01-03)
-- Minor fix on Linux
-
-15th June 2000  Fan Lei (radiative_decay_V01-01-02)
-- ISO compliance.
-
-initial tag by Hans_Pete (radiative_decay_V01-01-00)
-
-
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4AlphaDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4AlphaDecayChannel.hh
index 69e1428efe..f39193042a 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4AlphaDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4AlphaDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4AlphaDecayChannel_h
 #define G4AlphaDecayChannel_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4BetaFermiFunction.hh b/source/processes/hadronic/models/radiative_decay/include/G4BetaFermiFunction.hh
index b549280098..e4d5014bd6 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4BetaFermiFunction.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4BetaFermiFunction.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4BetaFermiFunction_h
 #define G4BetaFermiFunction_h 1
 
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4BetaMinusDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4BetaMinusDecayChannel.hh
index 6ad717d2e6..59fc029400 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4BetaMinusDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4BetaMinusDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4BetaMinusDecayChannel_h
 #define G4BetaMinusDecayChannel_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4BetaPlusDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4BetaPlusDecayChannel.hh
index ed89f5c702..b59678cc56 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4BetaPlusDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4BetaPlusDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4BetaPlusDecayChannel_h
 #define G4BetaPlusDecayChannel_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4ITDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4ITDecayChannel.hh
index 070fb1be92..6606eb8807 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4ITDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4ITDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ITDecayChannel_h
 #define G4ITDecayChannel_h 1
 
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4KshellECDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4KshellECDecayChannel.hh
index 26b73e7234..423067c5bd 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4KshellECDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4KshellECDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4KshellECDecayChannel_h
 #define G4KshellECDecayChannel_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4LshellECDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4LshellECDecayChannel.hh
index 685c9f0bf7..53184531a7 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4LshellECDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4LshellECDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4LshellECDecayChannel_h
 #define G4LshellECDecayChannel_h 1
 
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4NuclearDecayChannel.hh b/source/processes/hadronic/models/radiative_decay/include/G4NuclearDecayChannel.hh
index 19f3c982e1..5550500273 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4NuclearDecayChannel.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4NuclearDecayChannel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NuclearDecayChannel_h
 #define G4NuclearDecayChannel_h 1
 
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4NucleusLimits.hh b/source/processes/hadronic/models/radiative_decay/include/G4NucleusLimits.hh
index 929d29ee25..af61c9cbbd 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4NucleusLimits.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4NucleusLimits.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4NucleusLimits_h
 #define G4NucleusLimits_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh b/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
index aaf5ca5161..220af71cb0 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4ParticleChangeForRadDecay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForRadDecay.hh,v 1.5 2000/06/14 17:51:32 flei Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForRadDecay.hh,v 1.5.8.2 2001/06/28 20:20:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 25 Jan. 2000  H.Kurahige
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RIsotopeTable.hh b/source/processes/hadronic/models/radiative_decay/include/G4RIsotopeTable.hh
index ef6e829cc0..1cb9e9100a 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RIsotopeTable.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RIsotopeTable.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RIsotopeTable_h
 #define G4RIsotopeTable_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecay.hh b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecay.hh
index 4302d3813b..e22237b61f 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecay.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecay.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RadioactiveDecay_h
 #define G4RadioactiveDecay_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayMode.hh b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayMode.hh
index c39ce4dca4..ecbadfa69a 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayMode.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayMode.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RadioactiveDecayMode_h
 #define G4RadioactiveDecayMode_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRate.hh b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRate.hh
index a9454d1466..7992117615 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRate.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRate.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RadioactiveDecayRate_h
 #define G4RadioactiveDecayRate_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRateVector.hh b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRateVector.hh
index c968306e96..2457f698b7 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRateVector.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecayRateVector.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RadioactiveDecayRateVector_h
 #define G4RadioactiveDecayRateVector_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecaymessenger.hh b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecaymessenger.hh
index 5ccad3b813..28c928a3cb 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecaymessenger.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4RadioactiveDecaymessenger.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4RadioactiveDecaymessenger_h
 #define G4RadioactiveDecaymessenger_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4UIcmdWithNucleusLimits.hh b/source/processes/hadronic/models/radiative_decay/include/G4UIcmdWithNucleusLimits.hh
index b22a5c4b22..e987800877 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4UIcmdWithNucleusLimits.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4UIcmdWithNucleusLimits.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4UIcmdWithNucleusLimits_h
 #define G4UIcmdWithNucleusLimits_h 1
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/source/processes/hadronic/models/radiative_decay/include/G4UserLimitsForRD.hh b/source/processes/hadronic/models/radiative_decay/include/G4UserLimitsForRD.hh
index fc1e671421..beb8802850 100644
--- a/source/processes/hadronic/models/radiative_decay/include/G4UserLimitsForRD.hh
+++ b/source/processes/hadronic/models/radiative_decay/include/G4UserLimitsForRD.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4UserLimitsForRD_h
 #define G4UserLimitsForRD_h 1
 
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4BetaFermiFunction.cc b/source/processes/hadronic/models/radiative_decay/src/G4BetaFermiFunction.cc
index 39555a1676..0b933dbcb9 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4BetaFermiFunction.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4BetaFermiFunction.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 #include "globals.hh"
 #include "G4BetaFermiFunction.hh"
 
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc b/source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc
index 8145dd4380..b97e1d9189 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4NuclearDecayChannel.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULES:              G4NuclearDecayChannel.cc
@@ -341,7 +363,7 @@ G4DecayProducts *G4NuclearDecayChannel::DecayIt (G4double theParentMass)
     //    if (gammas!=0) nGammas=gammas->entries();
     // in the case of BreakItUp(nucleus), the returned G4FragmentVector contains the residual nuclide
     // as its last entry.
-    if (gammas > 0) nGammas=gammas->entries()-1;
+    if (gammas > 0) nGammas=gammas->size()-1;
   //
   //
   // Go through each gamma and add it to the decay product.  The angular distribution
@@ -355,7 +377,7 @@ G4DecayProducts *G4NuclearDecayChannel::DecayIt (G4double theParentMass)
       G4double phi      = twopi * G4UniformRand();
       G4ParticleMomentum gDirection
         (sintheta*cos(phi),sintheta*sin(phi),costheta);
-      G4double gEnergy = gammas->at(ig)->GetMomentum().e();
+      G4double gEnergy = gammas->operator[](ig)->GetMomentum().e();
       G4DynamicParticle *theGammaRay = new
         G4DynamicParticle (G4Gamma::GammaDefinition(), gDirection, gEnergy);
       products->PushProducts (theGammaRay);
@@ -365,7 +387,11 @@ G4DecayProducts *G4NuclearDecayChannel::DecayIt (G4double theParentMass)
   // Delete/reset variables associated with the gammas.
   //
     //    if (nGammas != 0) gammas->clearAndDestroy();
-    gammas->clearAndDestroy();
+    while (!gammas->empty()) {
+      delete *(gammas->end()-1);
+      gammas->pop_back();
+   }
+//    gammas->clearAndDestroy();
     delete gammas;
     delete deexcitation;
   //
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4NucleusLimits.cc b/source/processes/hadronic/models/radiative_decay/src/G4NucleusLimits.cc
index 613cb2429a..5909ede923 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4NucleusLimits.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4NucleusLimits.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULE:              G4NucleusLimits.cc
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RIsotopeTable.cc b/source/processes/hadronic/models/radiative_decay/src/G4RIsotopeTable.cc
index 9219135b3e..b734270b35 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RIsotopeTable.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RIsotopeTable.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULE:              G4RIsotopeTable.cc
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc
index eb2fcee0ca..54245b2580 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecay.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //
 // MODULE:              G4RadioactiveDecay.cc
@@ -204,8 +226,8 @@ void G4RadioactiveDecay::SelectAVolume(const G4String aVolume)
   G4LogicalVolumeStore *theLogicalVolumes;
   G4LogicalVolume *volume;
   theLogicalVolumes=G4LogicalVolumeStore::GetInstance();
-  for (G4int i = 0; i < theLogicalVolumes->entries(); i++){
-    volume=theLogicalVolumes->operator()(i);
+  for (G4int i = 0; i < theLogicalVolumes->size(); i++){
+    volume=(*theLogicalVolumes)[i];
     if (volume->GetName() == aVolume) {
       ValidVolumes.push_back(aVolume);
       G4std::sort(ValidVolumes.begin(), ValidVolumes.end());
@@ -214,7 +236,7 @@ void G4RadioactiveDecay::SelectAVolume(const G4String aVolume)
       if (GetVerboseLevel()>0)
 	G4cout << " RDM Applies to : " << aVolume << G4endl; 
 #endif
-    }else if(i ==  theLogicalVolumes->entries())
+    }else if(i ==  theLogicalVolumes->size())
       {
 	G4cerr << "SelectAVolume: "<<aVolume << " is not a valid logical volume name"<< G4endl; 
       }
@@ -230,8 +252,8 @@ void G4RadioactiveDecay::DeselectAVolume(const G4String aVolume)
   G4LogicalVolumeStore *theLogicalVolumes;
   G4LogicalVolume *volume;
   theLogicalVolumes=G4LogicalVolumeStore::GetInstance();
-  for (G4int i = 0; i < theLogicalVolumes->entries(); i++){
-    volume=theLogicalVolumes->operator()(i);
+  for (G4int i = 0; i < theLogicalVolumes->size(); i++){
+    volume=(*theLogicalVolumes)[i];
     if (volume->GetName() == aVolume) {
       G4std::vector<G4String>::iterator location;
       location = G4std::find(ValidVolumes.begin(),ValidVolumes.end(),aVolume);
@@ -245,7 +267,7 @@ void G4RadioactiveDecay::DeselectAVolume(const G4String aVolume)
       if (GetVerboseLevel()>0)
 	G4cout << " DeselectVolume: " << aVolume << " is removed from list"<<G4endl; 
 #endif
-    }else if(i ==  theLogicalVolumes->entries())
+    }else if(i ==  theLogicalVolumes->size())
       {
 	G4cerr << " DeselectVolume:" << aVolume << "is not a valid logical volume name"<< G4endl; 
       }
@@ -266,8 +288,8 @@ void G4RadioactiveDecay::SelectAllVolumes()
   if (GetVerboseLevel()>0)
     G4cout << " RDM Applies to all Volumes"  << G4endl;
 #endif
-  for (G4int i = 0; i < theLogicalVolumes->entries(); i++){
-    volume=theLogicalVolumes->operator()(i);
+  for (G4int i = 0; i < theLogicalVolumes->size(); i++){
+    volume=(*theLogicalVolumes)[i];
     ValidVolumes.push_back(volume->GetName());    
 #ifdef G4VERBOSE
     if (GetVerboseLevel()>0)
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayMode.cc b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayMode.cc
index 30d0247ed1..5d12a1e060 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayMode.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayMode.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 #include "G4RadioactiveDecayMode.hh"
 
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRate.cc b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRate.cc
index a73298b6b9..11cf3d7e6f 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRate.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRate.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4RadioactiveDecayRate.cc
 
 #include "G4ParticleDefinition.hh"
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRateVector.cc b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRateVector.cc
index ce04ecc869..8e02aa3f6a 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRateVector.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecayRateVector.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 
 #include "G4RadioactiveDecayRateVector.hh"
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecaymessenger.cc b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecaymessenger.cc
index adf1a8874c..34697d2a7c 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecaymessenger.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4RadioactiveDecaymessenger.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
 //
 #include "G4RadioactiveDecaymessenger.hh"
diff --git a/source/processes/hadronic/models/radiative_decay/src/G4UIcmdWithNucleusLimits.cc b/source/processes/hadronic/models/radiative_decay/src/G4UIcmdWithNucleusLimits.cc
index 8fbaf689db..a1dabcf9c6 100644
--- a/source/processes/hadronic/models/radiative_decay/src/G4UIcmdWithNucleusLimits.cc
+++ b/source/processes/hadronic/models/radiative_decay/src/G4UIcmdWithNucleusLimits.cc
@@ -1,4 +1,26 @@
 //
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
 #include "G4UIcmdWithNucleusLimits.hh"
 #include "g4std/strstream"
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
index de278c49ac..00e8fd8888 100644
--- a/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AlphaInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AlphaInelasticProcess.hh,v 1.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AlphaInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Alpha Inelastic Process
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
index d3c226699a..24d10ec881 100644
--- a/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiLambdaInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiLambdaInelasticProcess.hh,v 1.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiLambdaInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiLambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
index 82e7d9c392..ae0f852471 100644
--- a/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiNeutronInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutronInelasticProcess.hh,v 1.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutronInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiNeutron Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
index fd7028ff57..b34ef03cf7 100644
--- a/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiOmegaMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiOmegaMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:19 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiOmegaMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiOmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
index 1a053e089b..e63604e738 100644
--- a/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiProtonInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiProtonInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiProtonInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiProton Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
index 759ad925a8..7f6fd21f61 100644
--- a/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiSigmaMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiSigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
index 2f1f874017..b0104909b5 100644
--- a/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiSigmaPlusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiSigmaPlusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiSigmaPlusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiSigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
index 10f6030443..1345c7587e 100644
--- a/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiXiMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiXiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh b/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
index 8ca8164048..2f1c1181c0 100644
--- a/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4AntiXiZeroInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiXiZeroInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiXiZeroInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: AntiXiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
index 3718b50c27..174749a630 100644
--- a/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4DeuteronInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DeuteronInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DeuteronInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Deuteron Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh b/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
index 1429fab3bf..95f97611bd 100644
--- a/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronCaptureProcess.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCaptureProcess.hh,v 1.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Neutron capture process -- header file
@@ -109,7 +122,8 @@ private:
    G4CrossSectionDataStore* theCrossSectionDataStore;
 
    G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                                       const G4Element* anElement);
+                                       const G4Element* anElement,
+				       G4double aTemp);
 
 };
 #endif
diff --git a/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh b/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
index 38364e905e..12d302bff7 100644
--- a/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronElasticProcess.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronElasticProcess.hh,v 1.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Hadron Elastic Scattering Process -- header file
@@ -116,7 +129,8 @@ private:
    G4CrossSectionDataStore* theCrossSectionDataStore;
 
    G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                                       const G4Element* anElement);
+                                       const G4Element* anElement,
+				       G4double aTemp);
 
 };
 #endif
diff --git a/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh b/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
index 0c83dfd683..c22ca6f68b 100644
--- a/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
+++ b/source/processes/hadronic/processes/include/G4HadronFissionProcess.hh
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronFissionProcess.hh,v 1.4 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Fission Process -- header file
@@ -114,6 +127,7 @@ private:
    G4CrossSectionDataStore* theCrossSectionDataStore;
 
    G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                                       const G4Element* anElement);
+                                       const G4Element* anElement, 
+				       G4double aTemp);
 };
 #endif
diff --git a/source/processes/hadronic/processes/include/G4IonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4IonInelasticProcess.hh
index cb238dba86..164bd525d3 100644
--- a/source/processes/hadronic/processes/include/G4IonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4IonInelasticProcess.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the RD44 GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: Ion Inelastic Process
diff --git a/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
index 3fbd4cff4e..8ca7b5cbf6 100644
--- a/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: KaonMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 12-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
index 16f42372e7..dd71f1ac07 100644
--- a/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonPlusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonPlusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonPlusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: KaonPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
index b769244b17..5c0f43183e 100644
--- a/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonZeroLInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroLInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroLInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: KaonZeroL Inelastic Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh b/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
index 7280063bea..c46a71bd3a 100644
--- a/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4KaonZeroSInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonZeroSInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonZeroSInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: KaonZeroS InelasticProcess Process
  // J.L. Chuma, TRIUMF, 11-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh b/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
index 1d716c8185..7c44d9ed41 100644
--- a/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4LambdaInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LambdaInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LambdaInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process : Lambda Inelastic Process
  // J.L. Chuma, TRIUMF, 18-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh b/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
index 5596af3ff5..899ececf05 100644
--- a/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4NeutronInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Neutron Inelastic Process
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
index 3e35dd07cf..0864900e3b 100644
--- a/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4OmegaMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OmegaMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OmegaMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: OmegaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
index 715d33f8bc..c5daff4a56 100644
--- a/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4PionMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // PionMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
index e40d7e015d..87246e072e 100644
--- a/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4PionPlusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionPlusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionPlusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // PionPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
index 157d9caa9b..ea25712283 100644
--- a/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4ProtonInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProtonInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProtonInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Proton Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
index db8dd42bc0..9fa2921056 100644
--- a/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4SigmaMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: SigmaMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
index a9859d130b..73e7f8fceb 100644
--- a/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4SigmaPlusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SigmaPlusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SigmaPlusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: SigmaPlus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh b/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
index c173c37d7c..aad4ebc2a0 100644
--- a/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4TritonInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TritonInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TritonInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Triton Inelastic Process
  // J.L. Chuma, TRIUMF, 25-Feb-1997
diff --git a/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh b/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
index f63ef15fd1..c5f84e870b 100644
--- a/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4XiMinusInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiMinusInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiMinusInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: XiMinus Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh b/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
index 7eebc4cf0b..924d01bf45 100644
--- a/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
+++ b/source/processes/hadronic/processes/include/G4XiZeroInelasticProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XiZeroInelasticProcess.hh,v 1.3 2000/12/14 08:47:20 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XiZeroInelasticProcess.hh,v 1.3.6.1 2001/06/28 19:14:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // G4 Process: XiZero Inelastic Process
  // J.L. Chuma, TRIUMF, 05-Nov-1996
diff --git a/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc b/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
index 350b346993..aa4622458c 100644
--- a/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronCaptureProcess.cc
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronCaptureProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Process: Low-energy Neutron Capture
@@ -56,54 +69,13 @@ BuildThePhysicsTable(G4ParticleDefinition& aParticleType)
    }
 
    theCrossSectionDataStore->BuildPhysicsTable(aParticleType);
-
-   //   G4double LowEdgeEnergy, Value;
-   //   G4bool isOutRange;
-   //
-   //   static const G4ElementTable* theElementTable;
-   //   theElementTable = G4Element::GetElementTable();
-   //   G4int numOfElements = G4Element::GetNumberOfElements();
-   //   if (verboseLevel > 1) {
-   //      G4cout << "BuildThePhysicsTable: numOfElements " << numOfElements << G4endl;
-   //      G4cout << "BuildThePhysicsTable: thePhysicsTable " << thePhysicsTable << G4endl;
-   //      G4cout << "  for particle: " << aParticleType.GetParticleName() << " " <<
-   //              aParticleType.GetPDGEncoding() << G4endl;
-   //   }
-   //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
-   //   if (verboseLevel > 1) {
-   //      G4cout << "exists=" << exists << G4endl;
-   //   }
-   //   if (exists) {
-   //      thePhysicsTable = thePhysicsDictionary.findValue(&aParticleType);
-   //      if (verboseLevel > 1) {
-   //         G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
-   //      }
-   //// Remove any previous items from table
-   //      thePhysicsTable->clearAndDestroy();
-   //      thePhysicsTable->resize(numOfElements);
-   //   }
-   //   else {
-   //      thePhysicsTable = new G4PhysicsTable(numOfElements);
-   //      if (verboseLevel > 1) {
-   //         G4cout << "  make new tPT=" << thePhysicsTable << G4endl;
-   //         G4cout << "  entries() = " << thePhysicsTable->entries() << G4endl;
-   //      }
-   //      thePhysicsDictionary.insertKeyAndValue(&aParticleType, thePhysicsTable);
-   //   }
-   //// Make a PhysicsVector for each element
-   //   for (G4int J = 0; J < numOfElements; J++) { 
-   //      (*thePhysicsTable)(J) =
-   //         theCrossSectionData.MakePhysicsVector(*this,
-   //                                               aParticleType,
-   //                                               (*theElementTable)[J]);
-   //   }
 }
 
 
 G4double 
 G4HadronCaptureProcess::
 GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                           const G4Element* anElement)
+                           const G4Element* anElement, G4double aTemp)
 {
    // gives the microscopic cross section in GEANT4 internal units
 
@@ -111,30 +83,7 @@ GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
       G4Exception("G4HadronCaptureProcess: no cross section data Store");
       return DBL_MIN;
    }
-   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement);
-
-   //   G4int J ;
-   //   G4bool isOutRange ;
-   //   G4double MicroscopicCrossSection ;
-   //
-   //   RWBoolean exists = 
-   //     thePhysicsDictionary.contains(aParticle->GetDefinition());
-   //   if (!exists) {
-   //      G4Exception("G4HadronCaptureProcess::GetMicroscopicCrossSection: "
-   //                  "no physics table for particle");
-   //      return G4double(0);
-   //   }
-   //   thePhysicsTable = 
-   //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
-   //   if (verboseLevel > 1) {
-   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
-   //   }
-   //
-   //   J = anElement->GetIndex();
-   //   MicroscopicCrossSection = (*((*thePhysicsTable)(J))).
-   //                              GetValue(aParticle->GetKineticEnergy()/GeV,
-   //                                       isOutRange);
-   //   return MicroscopicCrossSection;
+   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement, aTemp);
 }
 
 
@@ -152,12 +101,13 @@ GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
 
    theElementVector = aMaterial->GetElementVector();
    theAtomicNumDensityVector = aMaterial->GetAtomicNumDensityVector();
+   G4double aTemp = aMaterial->GetTemperature();
 
    G4double sigma = 0.;
 
    for (G4int i = 0; i < aMaterial->GetNumberOfElements(); i++) {
      sigma = sigma + theAtomicNumDensityVector[i] * 
-             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i));
+             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i), aTemp);
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronCaptureProcess::GetMeanFreePathBasic: sigma=" 
diff --git a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
index 97a3f82f0f..0f827f5959 100644
--- a/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronElasticProcess.cc
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronElasticProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // G4 Process: Low-energy Elastic scattering
@@ -64,56 +77,12 @@ BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
    }
 
    theCrossSectionDataStore->BuildPhysicsTable(aParticleType);
-
-  //   G4double LowEdgeEnergy, Value;
-  //   G4bool isOutRange;
-  //
-  //   static const G4ElementTable* theElementTable;
-  //   theElementTable = G4Element::GetElementTable();
-  //   G4int numOfElements = G4Element::GetNumberOfElements();
-  //   if (verboseLevel > 1) {
-  //      G4cout << "BuildPhysicsTable: numOfElements " << numOfElements << G4endl;
-  //      G4cout << "BuildPhysicsTable: thePhysicsTable " << thePhysicsTable << G4endl;
-  //      G4cout << "  for particle: " << aParticleType.GetParticleName() << " " <<
-  //              aParticleType.GetPDGEncoding() << G4endl;
-  //   }
-  //
-  //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
-  //   if (verboseLevel > 1) {
-  //      G4cout << "exists=" << exists << G4endl;
-  //   }
-  //   if (exists) {
-  //      thePhysicsTable = thePhysicsDictionary.findValue(&aParticleType);
-  //      if (verboseLevel > 1) {
-  //         G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
-  //      }
-// Remove any previous items from table
-  //      thePhysicsTable->clearAndDestroy();
-  //      thePhysicsTable->resize(numOfElements);
-  //   }
-  //   else {
-  //      thePhysicsTable = new G4PhysicsTable(numOfElements);
-  //      if (verboseLevel > 1) {
-  //         G4cout << "  make new tPT=" << thePhysicsTable << G4endl;
-  //         G4cout << "  entries() = " << thePhysicsTable->entries() << G4endl;
-  //      }
-  //      thePhysicsDictionary.insertKeyAndValue(&aParticleType, thePhysicsTable);
-  //   }
-// Make a PhysicsVector for each element
-  //   for (G4int J = 0; J < numOfElements; J++) { 
-     //      (*thePhysicsTable)(J) =
-     //         theCrossSectionData.MakePhysicsVector(*this,
-     //                                               aParticleType,
-     //                                               (*theElementTable)[J]);
-  //      if (verboseLevel > 1)
-  //         G4cout << "  added PhysicsVector " << (*thePhysicsTable)(J) << G4endl;
-  //   }
 }
 
 
 G4double 
 G4HadronElasticProcess::GetMicroscopicCrossSection(
-      const G4DynamicParticle* aParticle, const G4Element* anElement)
+      const G4DynamicParticle* aParticle, const G4Element* anElement, G4double aTemp)
 {
    // gives the microscopic cross section in GEANT4 internal units
 
@@ -121,30 +90,7 @@ G4HadronElasticProcess::GetMicroscopicCrossSection(
       G4Exception("G4HadronElasticProcess: no cross section data Store");
       return DBL_MIN;
    }
-   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement);
-
-  //   G4int J ;
-  //   G4bool isOutRange ;
-  //   G4double MicroscopicCrossSection ;
-  //
-  //   RWBoolean exists = 
-  //      thePhysicsDictionary.contains(aParticle->GetDefinition());
-  //   if (!exists) {
-  //      G4Exception("G4HadronElasticProcess::GetMicroscopicCrossSection: "
-  //                  "no physics table for particle");
-  //      return G4double(0);
-  //   }
-  //   thePhysicsTable = 
-  //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
-  //   if (verboseLevel > 1) {
-  //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
-  //   }
-  //
-  //   J = anElement->GetIndex();
-  //   MicroscopicCrossSection = (*((*thePhysicsTable)(J))).
-  //                              GetValue(aParticle->GetTotalMomentum()/GeV,
-  //                                       isOutRange);
-  //   return MicroscopicCrossSection;
+   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement, aTemp);
 }
 
 
@@ -166,12 +112,13 @@ GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
 
    theElementVector = aMaterial->GetElementVector();
    theAtomicNumDensityVector = aMaterial->GetAtomicNumDensityVector();
+   G4double aTemp = aMaterial->GetTemperature();
 
    G4double sigma = 0.;
 
    for (G4int i = 0; i < aMaterial->GetNumberOfElements(); i++) {
      sigma = sigma + theAtomicNumDensityVector[i] *
-             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i));
+             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i), aTemp);
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronElasticProcess::GetMeanFreePathBasic: sigma="
@@ -228,34 +175,4 @@ DumpPhysicsTable(const G4ParticleDefinition& aParticleType)
    }
 
    theCrossSectionDataStore->DumpPhysicsTable(aParticleType);
-
-  //   RWBoolean exists = thePhysicsDictionary.contains(&aParticleType);
-  //   if (verboseLevel > 1) {
-  //      G4cout << "DumpPhysicsTable: exists=" << exists << G4endl;
-  //   }
-  //   if (!exists) {
-  //      G4cout << "DumpPhysicsTable: no phyics table for " << 
-  //              aParticleType.GetParticleName() << G4endl;
-  //      return;
-  //   }
-  //   G4PhysicsTable* pt = thePhysicsDictionary.findValue(&aParticleType);
-  //   if (verboseLevel > 1) {
-  //      G4cout << "  found PhysicsTable pt=" << pt << G4endl;
-  //   }
-  //
-  //   const G4ElementTable* et = G4Element::GetElementTable();
-  //   G4int numOfElements = G4Element::GetNumberOfElements();
-  //   if (verboseLevel > 1)
-  //      G4cout << "DumpPhysicsTable: numOfElements=" << numOfElements << G4endl;
-  //   G4LPhysicsFreeVector* pv;
-  //   for (G4int J = 0; J < numOfElements; J++) { 
-  //      G4cout << G4endl << "Cross section data for " << 
-  //              aParticleType.GetParticleName() << " on " <<
-  //              ((*et)[J])->GetName() << G4endl << G4endl;
-  //      pv = (G4LPhysicsFreeVector*)(*thePhysicsTable)(J);
-  //      if (verboseLevel > 1) {
-  //         G4cout << "  found PhysicsVector pv=" << pv << G4endl;
-  //      }
-  //      pv->DumpValues();
-  //   }
 }
diff --git a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
index 9fbb2d9b25..cd79e68442 100644
--- a/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
+++ b/source/processes/hadronic/processes/src/G4HadronFissionProcess.cc
@@ -1,12 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HadronFissionProcess.cc,v 1.2 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
 //
 // F.W. Jones, TRIUMF, 03-DEC-96
@@ -102,7 +115,7 @@ G4HadronFissionProcess::BuildThePhysicsTable(G4ParticleDefinition& aParticleType
 
 G4double 
 G4HadronFissionProcess::GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                                       const G4Element* anElement)
+                                       const G4Element* anElement, G4double aTemp)
 {
    // gives the microscopic cross section in GEANT4 internal units
 
@@ -110,30 +123,7 @@ G4HadronFissionProcess::GetMicroscopicCrossSection(const G4DynamicParticle* aPar
       G4Exception("G4HadronFissionProcess: no cross section data Store");
       return DBL_MIN;
    }
-   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement);
-
-   //   G4int J ;
-   //   G4bool isOutRange ;
-   //   G4double MicroscopicCrossSection ;
-   //
-   //   RWBoolean exists = 
-   //     thePhysicsDictionary.contains(aParticle->GetDefinition());
-   //   if (!exists) {
-   //      G4Exception("G4HadronFissionProcess::GetMicroscopicCrossSection: "
-   //                  "no physics table for particle");
-   //      return G4double(0);
-   //   }
-   //   thePhysicsTable = 
-   //      thePhysicsDictionary.findValue(aParticle->GetDefinition());
-   //   if (verboseLevel > 1) {
-   //      G4cout << "  Retrieve tPT=" << thePhysicsTable << G4endl;
-   //   }
-   //
-   //   J = anElement->GetIndex();
-   //   MicroscopicCrossSection = (*((*thePhysicsTable)(J))).
-   //                              GetValue(aParticle->GetKineticEnergy()/GeV,
-   //                                       isOutRange);
-   //   return MicroscopicCrossSection;
+   return theCrossSectionDataStore->GetCrossSection(aParticle, anElement, aTemp);
 }
 
 
@@ -150,12 +140,13 @@ G4HadronFissionProcess::GetMeanFreePathBasic(const G4DynamicParticle* aParticle,
 
    theElementVector = aMaterial->GetElementVector();
    theAtomicNumDensityVector = aMaterial->GetAtomicNumDensityVector();
+   G4double aTemp = aMaterial->GetTemperature();
 
    G4double sigma = 0.;
 
    for (G4int i = 0; i < aMaterial->GetNumberOfElements(); i++) {
      sigma = sigma + theAtomicNumDensityVector[i] * 
-             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i));
+             GetMicroscopicCrossSection(aParticle, (*theElementVector)(i), aTemp);
    }
    if (verboseLevel > 1)
      G4cout << "G4HadronFissionProcess::GetMeanFreePathBasic: sigma=" 
diff --git a/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh b/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
index 4f41779c2f..c3e66ed0c5 100644
--- a/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4AntiNeutronAnnihilationAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutronAnnihilationAtRest.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutronAnnihilationAtRest.hh,v 1.3.6.2 2001/06/28 20:20:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4AntiNeutronAnnihilationAtRest physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh b/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
index 4c4e74ea7b..6b9305fc7d 100644
--- a/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4AntiProtonAnnihilationAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiProtonAnnihilationAtRest.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiProtonAnnihilationAtRest.hh,v 1.3.6.2 2001/06/28 20:20:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4AntiProtonAnnihilationAtRest physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh b/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
index 973c32698d..bd53956ee8 100644
--- a/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
+++ b/source/processes/hadronic/stopping/include/G4DistributionGenerator.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DistributionGenerator.hh,v 1.3 1999/12/15 14:53:35 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DistributionGenerator.hh,v 1.3.8.2 2001/06/28 20:20:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4DistributionGenerator.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
index 50c3401694..08fc8388cc 100644
--- a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
+++ b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorption.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinusAbsorption.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinusAbsorption.hh,v 1.3.6.2 2001/06/28 20:20:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4KaonMinusAbsorption physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
index 823d566ebd..0d7393f3b6 100644
--- a/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4KaonMinusAbsorptionAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinusAbsorptionAtRest.hh,v 1.4 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinusAbsorptionAtRest.hh,v 1.4.6.2 2001/06/28 20:20:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4KaonMinusAbsorptionAtRest.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh b/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh
index 4618228271..32af3cca0e 100644
--- a/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh
+++ b/source/processes/hadronic/stopping/include/G4MuMinusCaptureCascade.hh
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuMinusCaptureCascade physics process --------
diff --git a/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh b/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
index 50dedfc683..97a08ab708 100644
--- a/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4MuonMinusCaptureAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonMinusCaptureAtRest.hh,v 1.4 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonMinusCaptureAtRest.hh,v 1.4.6.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuonMinusCaptureAtRest physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh b/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
index e2a1433e63..e62755878c 100644
--- a/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4NeutronCaptureAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronCaptureAtRest.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronCaptureAtRest.hh,v 1.3.6.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4NeutronCaptureAtRest physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
index ce5fb9fd6e..3754216ed7 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusAbsorptionAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusAbsorptionAtRest.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusAbsorptionAtRest.hh,v 1.3.6.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusAbsorptionAtRest.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
index 1445fc669f..4c6a4d5d58 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopAbsorption.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopAbsorption.hh,v 1.4 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopAbsorption.hh,v 1.4.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopAbsorption.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
index a55c957672..a6bab33cc8 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopAl.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopAl.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopAl.hh,v 1.3.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopAl.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
index 178bc361e3..b3565b1be0 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopC.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopC.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopC.hh,v 1.3.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopC.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
index 483ed4fcc5..03e953ba78 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopCo.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopCo.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopCo.hh,v 1.3.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopCo.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
index 7f0fa7a5ac..4a211dcedc 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopCu.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopCu.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopCu.hh,v 1.3.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopCu.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
index 351b24b054..73be4bbefe 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopLi.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopLi.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopLi.hh,v 1.3.8.2 2001/06/28 20:20:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopLi.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
index 6a9ce91fe7..0e160ef3b2 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopMaterial.hh
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopMaterial.hh,v 1.4 2000/04/18 17:18:35 pia Exp $
+//
+// $Id: G4PiMinusStopMaterial.hh,v 1.4.8.2 2001/06/28 20:20:06 gunter Exp $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopMaterial.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
index 4a5194a6f3..08ecb96790 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopN.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopN.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopN.hh,v 1.3.8.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopN.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
index 35eabaaafd..0177fabe6c 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopO.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopO.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopO.hh,v 1.3.8.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopO.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
index ce18473827..cdac9806b2 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopPb.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopPb.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopPb.hh,v 1.3.8.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopPb.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh b/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
index 1a0cb0e189..2f6361086f 100644
--- a/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
+++ b/source/processes/hadronic/stopping/include/G4PiMinusStopTa.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopTa.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopTa.hh,v 1.3.8.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopTa.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh b/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
index 7722e33e01..ceb26eb0c9 100644
--- a/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
+++ b/source/processes/hadronic/stopping/include/G4PionMinusAbsorptionAtRest.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionMinusAbsorptionAtRest.hh,v 1.3 2000/12/14 08:53:15 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionMinusAbsorptionAtRest.hh,v 1.3.6.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4PionMinusAbsorptionAtRest physics process ------
diff --git a/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
index ad8863d61e..25d616b4a1 100644
--- a/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDeexcitation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopDeexcitation.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopDeexcitation.hh,v 1.3.8.2 2001/06/28 20:20:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopDeexcitation.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh b/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
index 088fdbff23..47f17da296 100644
--- a/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDeexcitationAlgorithm.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopDeexcitationAlgorithm.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopDeexcitationAlgorithm.hh,v 1.3.8.2 2001/06/28 20:20:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopDeexcitationAlgorithm.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
index 8b64613184..d320652b2d 100644
--- a/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopDummyDeexcitation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopDummyDeexcitation.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopDummyDeexcitation.hh,v 1.3.8.2 2001/06/28 20:20:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopDummyDeexcitation.hh 
 //
diff --git a/source/processes/hadronic/stopping/include/G4StopElementSelector.hh b/source/processes/hadronic/stopping/include/G4StopElementSelector.hh
index c5bc11a08b..a5caf1f5f7 100644
--- a/source/processes/hadronic/stopping/include/G4StopElementSelector.hh
+++ b/source/processes/hadronic/stopping/include/G4StopElementSelector.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // --------------------------------------------------------------
diff --git a/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh b/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
index 0f4c78ce97..a261ad10a2 100644
--- a/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
+++ b/source/processes/hadronic/stopping/include/G4StopTheoDeexcitation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopTheoDeexcitation.hh,v 1.3 1999/12/15 14:53:36 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopTheoDeexcitation.hh,v 1.3.8.2 2001/06/28 20:20:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopTheoDeexcitation.hh 
 //
diff --git a/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc b/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
index 2a74240300..4da849a68e 100644
--- a/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiNeutronAnnihilationAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiNeutronAnnihilationAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiNeutronAnnihilationAtRest.cc,v 1.2.8.2 2001/06/28 20:20:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4AntiNeutronAnnihilationAtRest physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
index 29204cbe93..731367f243 100644
--- a/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4AntiProtonAnnihilationAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4AntiProtonAnnihilationAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4AntiProtonAnnihilationAtRest.cc,v 1.2.8.2 2001/06/28 20:20:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4AntiProtonAnnihilationAtRest physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
index f53e317358..096be83366 100644
--- a/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
+++ b/source/processes/hadronic/stopping/src/G4DistributionGenerator.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DistributionGenerator.cc,v 1.4 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DistributionGenerator.cc,v 1.4.8.2 2001/06/28 20:20:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4DistributionGenerator
 //
diff --git a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
index 2e598c35a5..823337c995 100644
--- a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorption.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4KaonMinusAbsorption.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4KaonMinusAbsorption.cc,v 1.2.8.2 2001/06/28 20:20:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4KaonMinusAbsorption physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
index c2198ca716..d2454c7ce7 100644
--- a/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4KaonMinusAbsorptionAtRest.cc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1997
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4KaonMinusAbsorptionAtRest.cc 
 //
diff --git a/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc b/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc
index ab7d622701..86dcfedd89 100644
--- a/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc
+++ b/source/processes/hadronic/stopping/src/G4MuMinusCaptureCascade.cc
@@ -1,23 +1,41 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuonMinusCaptureAtRest physics process --------
-//                   by Vladimir Ivanchenko
+//                   
 //                     E-mail: Vladimir.Ivantchenko@cern.ch
-//                            April 2000
+//
+//   Created:   02.04.00 V.Ivanchenko
+//
+//   Modified:  06.04.01 V.Ivanchenko Bug in theta distribution fixed
+//
 // **************************************************************
 //-----------------------------------------------------------------------------
 
@@ -105,12 +123,12 @@ G4ThreeVector G4MuMinusCaptureCascade::GetRandomVec()
    // generate uniform vector
    //
 
-   G4double Theta = (2.0 * G4UniformRand() - 1.0) * pi ;
-   G4double Phi  = twopi * G4UniformRand() ;
-   G4double sinTheta = sin(Theta);
+   G4double cosTheta = 2.0 * G4UniformRand() - 1.0;
+   G4double sinTheta = sqrt(1.0 - cosTheta*cosTheta);
+   G4double Phi  = twopi * G4UniformRand();
    G4double dirx = sinTheta * cos(Phi); 
    G4double diry = sinTheta * sin(Phi); 
-   G4double dirz = cos(Theta); 
+   G4double dirz = cosTheta; 
 
    return G4ThreeVector(dirx, diry, dirz);
 }
diff --git a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
index ab7ff12e8e..9b00265a15 100644
--- a/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4MuonMinusCaptureAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonMinusCaptureAtRest.cc,v 1.5 2000/07/12 09:19:53 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonMinusCaptureAtRest.cc,v 1.5.8.2 2001/06/28 20:20:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4MuonMinusCaptureAtRest physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
index f4b621766e..05fdc0e380 100644
--- a/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4NeutronCaptureAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NeutronCaptureAtRest.cc,v 1.2 1999/12/15 14:53:37 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NeutronCaptureAtRest.cc,v 1.2.8.2 2001/06/28 20:20:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4NeutronCaptureAtRest physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
index 9237b10d73..fc08f8d045 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusAbsorptionAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusAbsorptionAtRest.cc,v 1.4 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusAbsorptionAtRest.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusAbsorptionAtRest.hh 
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
index 4f96c0aaf6..9f9045113b 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopAbsorption.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopAbsorption.cc,v 1.6 1999/12/15 17:51:30 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopAbsorption.cc,v 1.6.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopAbsorption
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
index 4d24df3993..01b8debed1 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopAl.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopAl.cc,v 1.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopAl.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopAl
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
index e908fc147d..cf410b66e6 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopC.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopC.cc,v 1.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopC.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopC
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
index e09996e59f..0d3659b15a 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopCo.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopCo.cc,v 1.4 2000/04/18 17:18:36 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopCo.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopCo
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
index baeffa8dc4..63cb7152fc 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopCu.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopCu.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopCu.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopCu
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
index 7d4f1851a1..7b480e8f3b 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopLi.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopLi.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopLi.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopLi
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
index be851e3e94..5f0cdc084c 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopMaterial.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopMaterial.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopMaterial.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopMaterial
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
index 88e972cda4..de6485f08e 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopN.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopN.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopN.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopN
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
index ff07f61322..a76fe68ff1 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopO.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopO.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopO.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopO
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
index 1abad6d28c..30091c16be 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopPb.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopPb.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopPb.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopPb
 //
diff --git a/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc b/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
index 8621652ba6..48fb0ab811 100644
--- a/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
+++ b/source/processes/hadronic/stopping/src/G4PiMinusStopTa.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PiMinusStopTa.cc,v 1.4 2000/04/18 17:18:37 pia Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PiMinusStopTa.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4PiMinusStopTa
 //
diff --git a/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc b/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
index a047b27140..56fa8c0d80 100644
--- a/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
+++ b/source/processes/hadronic/stopping/src/G4PionMinusAbsorptionAtRest.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PionMinusAbsorptionAtRest.cc,v 1.2 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PionMinusAbsorptionAtRest.cc,v 1.2.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4PionMinusAbsorptionAtRest physics process --------
diff --git a/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
index 22e3e39718..11661b9abd 100644
--- a/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopDeexcitation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopDeexcitation.cc,v 1.4 1999/12/15 14:53:38 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopDeexcitation.cc,v 1.4.8.2 2001/06/28 20:20:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopDeexcitation
 //
diff --git a/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
index 9e09ae2548..8b2c570a22 100644
--- a/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopDummyDeexcitation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopDummyDeexcitation.cc,v 1.4 1999/12/15 14:53:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopDummyDeexcitation.cc,v 1.4.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopDummyDeexcitation
 //
diff --git a/source/processes/hadronic/stopping/src/G4StopElementSelector.cc b/source/processes/hadronic/stopping/src/G4StopElementSelector.cc
index a9d1172ba7..9cd6581b89 100644
--- a/source/processes/hadronic/stopping/src/G4StopElementSelector.cc
+++ b/source/processes/hadronic/stopping/src/G4StopElementSelector.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
 // --------------------------------------------------------------
diff --git a/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc b/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
index b6b8efc955..d4691f3be7 100644
--- a/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
+++ b/source/processes/hadronic/stopping/src/G4StopTheoDeexcitation.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StopTheoDeexcitation.cc,v 1.4 1999/12/15 14:53:39 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StopTheoDeexcitation.cc,v 1.4.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
 //      GEANT 4 class file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //
 //      File name:     G4StopTheoDeexcitation
 //
diff --git a/source/processes/hadronic/util/include/DumpFrame.hh b/source/processes/hadronic/util/include/DumpFrame.hh
index 2eb5889f10..cfce860fe3 100644
--- a/source/processes/hadronic/util/include/DumpFrame.hh
+++ b/source/processes/hadronic/util/include/DumpFrame.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef DumpFrame_h
 #define DumpFrame_h
 
diff --git a/source/processes/hadronic/util/include/G4DynamicParticleVector.hh b/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
index e7ec8f789d..1bdf889ad5 100644
--- a/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
+++ b/source/processes/hadronic/util/include/G4DynamicParticleVector.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4DynamicParticleVector.hh,v 1.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4DynamicParticleVector.hh,v 1.3.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, alternative to G4FastVector
 //               less fast, but it has variable array length and checks boundaries
 //	26th September, Chr. Voelcker
diff --git a/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh b/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
index 86be05e8b3..5639ad09fe 100644
--- a/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
+++ b/source/processes/hadronic/util/include/G4GHEKinematicsVector.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GHEKinematicsVector.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GHEKinematicsVector.hh,v 1.2.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1998
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      ------------ G4GHEKinematicsVector utility class ------
diff --git a/source/processes/hadronic/util/include/G4IsoResult.hh b/source/processes/hadronic/util/include/G4IsoResult.hh
index 68feaa26b9..31e53a5b13 100644
--- a/source/processes/hadronic/util/include/G4IsoResult.hh
+++ b/source/processes/hadronic/util/include/G4IsoResult.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4IsoResult_h
 #define G4IsoResult_h 
 
diff --git a/source/processes/hadronic/util/include/G4LightMedia.hh b/source/processes/hadronic/util/include/G4LightMedia.hh
index 4bd54f3b07..7cc44059c7 100644
--- a/source/processes/hadronic/util/include/G4LightMedia.hh
+++ b/source/processes/hadronic/util/include/G4LightMedia.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LightMedia.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LightMedia.hh,v 1.2.8.1 2001/06/28 19:15:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Light Media Charge and/or Strangeness Exchange
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/util/include/G4Nucleus.hh b/source/processes/hadronic/util/include/G4Nucleus.hh
index dd02cbaa08..21a48f21aa 100644
--- a/source/processes/hadronic/util/include/G4Nucleus.hh
+++ b/source/processes/hadronic/util/include/G4Nucleus.hh
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4Nucleus.hh,v 1.3 2000/12/14 08:56:46 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
  // original by H.P. Wellisch
  // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -102,7 +116,9 @@
     
     G4double GetThermalPz( const G4double mass, const G4double temp ) const;
     
-    G4ReactionProduct GetThermalNucleus(G4double aMass) const;
+    G4ReactionProduct GetThermalNucleus(G4double aMass, G4double temp=-1) const;
+    
+    G4ReactionProduct GetBiasedThermalNucleus(G4double aMass, G4ThreeVector aVelocity, G4double temp=-1) const;
 
     G4double Cinema( G4double kineticEnergy );
     
diff --git a/source/processes/hadronic/util/include/G4Pair.hh b/source/processes/hadronic/util/include/G4Pair.hh
index 912584adc9..bdd63669d3 100644
--- a/source/processes/hadronic/util/include/G4Pair.hh
+++ b/source/processes/hadronic/util/include/G4Pair.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4Pair_h
 #define G4Pair_h
 
diff --git a/source/processes/hadronic/util/include/G4ParticleVector.hh b/source/processes/hadronic/util/include/G4ParticleVector.hh
index 8e9e607a66..2eab8240ec 100644
--- a/source/processes/hadronic/util/include/G4ParticleVector.hh
+++ b/source/processes/hadronic/util/include/G4ParticleVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleVector.hh,v 1.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleVector.hh,v 1.3.8.1 2001/06/28 19:15:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 // HPW decoupling theo models from RW (Mon Mar 16 1998)
diff --git a/source/processes/hadronic/util/include/G4ReactionDynamics.hh b/source/processes/hadronic/util/include/G4ReactionDynamics.hh
index 9a092abd24..73341a1b73 100644
--- a/source/processes/hadronic/util/include/G4ReactionDynamics.hh
+++ b/source/processes/hadronic/util/include/G4ReactionDynamics.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReactionDynamics.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReactionDynamics.hh,v 1.2.8.1 2001/06/28 19:15:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Reaction Dynamics
  // original by H.P. Wellisch
diff --git a/source/processes/hadronic/util/include/G4ReactionKinematics.hh b/source/processes/hadronic/util/include/G4ReactionKinematics.hh
index 4540e9d6c3..ae9c6bbe7c 100644
--- a/source/processes/hadronic/util/include/G4ReactionKinematics.hh
+++ b/source/processes/hadronic/util/include/G4ReactionKinematics.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReactionKinematics.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReactionKinematics.hh,v 1.2.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ------------------------------------------------------------
 //      GEANT 4 class header file --- Copyright CERN 1995
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      ------------ G4ReactionDynamics::TwoBody ------
 //                   new inline method BreakupMomentum
 //                   new method TwoBodyScattering
diff --git a/source/processes/hadronic/util/include/G4ReactionProduct.hh b/source/processes/hadronic/util/include/G4ReactionProduct.hh
index 22bacb45a0..f05d6ca2c6 100644
--- a/source/processes/hadronic/util/include/G4ReactionProduct.hh
+++ b/source/processes/hadronic/util/include/G4ReactionProduct.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReactionProduct.hh,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReactionProduct.hh,v 1.2.8.1 2001/06/28 19:15:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // J.L. Chuma, TRIUMF, 31-Oct-1996
  // last modified: 19-Dec-1996
diff --git a/source/processes/hadronic/util/include/G4ReactionProductVector.hh b/source/processes/hadronic/util/include/G4ReactionProductVector.hh
index 4d99ea4b7d..0ade96beb0 100644
--- a/source/processes/hadronic/util/include/G4ReactionProductVector.hh
+++ b/source/processes/hadronic/util/include/G4ReactionProductVector.hh
@@ -1,16 +1,30 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4ReactionProductVector.hh,v 1.3 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ReactionProductVector.hh,v 1.3.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, alternative to G4FastVector
 //               less fast, but it has variable array length and checks boundaries
 //	26th September, Chr. Voelcker
diff --git a/source/processes/hadronic/util/include/G4StableIsotopes.hh b/source/processes/hadronic/util/include/G4StableIsotopes.hh
index 002150be1c..988548e410 100644
--- a/source/processes/hadronic/util/include/G4StableIsotopes.hh
+++ b/source/processes/hadronic/util/include/G4StableIsotopes.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StableIsotopes.hh,v 1.4 2000/12/14 08:56:46 hpw Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StableIsotopes.hh,v 1.4.6.1 2001/06/28 19:15:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4StableIsotopes_h
 #define G4StableIsotopes_h 1
diff --git a/source/processes/hadronic/util/src/G4LightMedia.cc b/source/processes/hadronic/util/src/G4LightMedia.cc
index 1773e45c79..f8fa8c0ae3 100644
--- a/source/processes/hadronic/util/src/G4LightMedia.cc
+++ b/source/processes/hadronic/util/src/G4LightMedia.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LightMedia.cc,v 1.2 1999/12/15 14:53:40 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LightMedia.cc,v 1.2.8.1 2001/06/28 19:15:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // Hadronic Process: Light Media Charge and/or Strangeness Exchange
  // J.L. Chuma, TRIUMF, 21-Feb-1997
diff --git a/source/processes/hadronic/util/src/G4Nucleus.cc b/source/processes/hadronic/util/src/G4Nucleus.cc
index 18f2fc312b..4473bb6117 100644
--- a/source/processes/hadronic/util/src/G4Nucleus.cc
+++ b/source/processes/hadronic/util/src/G4Nucleus.cc
@@ -1,12 +1,26 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
-// $Id: G4Nucleus.cc,v 1.5 2000/08/03 08:50:48 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
 //
  // original by H.P. Wellisch
  // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
@@ -24,14 +38,38 @@
 #include "G4Nucleus.hh"
 #include "Randomize.hh"
  
- G4ReactionProduct G4Nucleus::GetThermalNucleus(G4double targetMass) const
+G4ReactionProduct G4Nucleus::
+GetBiasedThermalNucleus(G4double aMass, G4ThreeVector aVelocity, G4double temp) const
+{
+  G4double velMag = aVelocity.mag();
+  G4ReactionProduct result;
+  G4double value = 0;
+  G4double random = 1;
+  G4double norm = 3.*sqrt(k_Boltzmann*temp*aMass*G4Neutron::Neutron()->GetPDGMass());
+  norm /= G4Neutron::Neutron()->GetPDGMass();
+  norm *= 5.;
+  norm += velMag;
+  norm /= velMag;
+  while(value/norm<random)
   {
+     result = GetThermalNucleus(aMass, temp);
+     G4ThreeVector targetVelocity = 1./result.GetMass()*result.GetMomentum();
+     value = (targetVelocity+aVelocity).mag()/velMag;
+     random = G4UniformRand();
+  }
+  return result;
+}
+
+G4ReactionProduct G4Nucleus::GetThermalNucleus(G4double targetMass, G4double temp) const
+  {
+    G4double currentTemp = temp;
+    if(currentTemp < 0) currentTemp = theTemp;
     G4ReactionProduct theTarget;    
     theTarget.SetMass(targetMass*G4Neutron::Neutron()->GetPDGMass());
     G4double px, py, pz;
-    px = GetThermalPz(theTarget.GetMass(), theTemp);
-    py = GetThermalPz(theTarget.GetMass(), theTemp);
-    pz = GetThermalPz(theTarget.GetMass(), theTemp);
+    px = GetThermalPz(theTarget.GetMass(), currentTemp);
+    py = GetThermalPz(theTarget.GetMass(), currentTemp);
+    pz = GetThermalPz(theTarget.GetMass(), currentTemp);
     theTarget.SetMomentum(px, py, pz);
     G4double tMom = sqrt(px*px+py*py+pz*pz);
     G4double tEtot = sqrt((tMom+theTarget.GetMass())*
diff --git a/source/processes/hadronic/util/src/G4ReactionDynamics.cc b/source/processes/hadronic/util/src/G4ReactionDynamics.cc
index dda91ec04c..14ff24d2b6 100644
--- a/source/processes/hadronic/util/src/G4ReactionDynamics.cc
+++ b/source/processes/hadronic/util/src/G4ReactionDynamics.cc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 //
  // Hadronic Process: Reaction Dynamics
@@ -98,6 +114,10 @@
       currentParticle = *vec[0];
       targetParticle = *vec[1];
       for( i=0; i<(vecLen-2); ++i )*vec[i] = *vec[i+2];
+      G4ReactionProduct *temp = vec[vecLen-1];
+      delete temp;
+      temp = vec[vecLen-2];
+      delete temp;
       vecLen -= 2;
       currentMass = currentParticle.GetMass()/GeV;
       incidentHasChanged = true;
@@ -233,9 +253,9 @@
             forwardEnergy += vec[i]->GetMass()/GeV;
             for( G4int j=i; j<(vecLen-1); j++ )*vec[j] = *vec[j+1];    // shift up
             --forwardCount;
-            forwardParticlesLeft = 1;
-            //G4ReactionProduct *temp = vec[vecLen];
-            //delete temp;
+            forwardParticlesLeft = 1;  
+            G4ReactionProduct *temp = vec[vecLen-1];
+            delete temp;
             if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
             break;  // --+
           }         //   |
@@ -250,8 +270,8 @@
         // above two lines modified 20-oct-97: were just simple equalities
         --forwardCount;
         for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];
-        //G4ReactionProduct *temp = vec[vecLen];
-        //delete temp;
+        G4ReactionProduct *temp = vec[vecLen-1];
+        delete temp;
         if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
         break;
       }
@@ -278,8 +298,8 @@
             for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];   // shift up
             --backwardCount;
             backwardParticlesLeft = 1;
-            //G4ReactionProduct *temp = vec[vecLen];
-            //delete temp;
+            G4ReactionProduct *temp = vec[vecLen-1];
+            delete temp;
             if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
             break;
           }
@@ -292,8 +312,8 @@
         targetParticle = *vec[0];
         --backwardCount;
         for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];
-        //G4ReactionProduct *temp = vec[vecLen];
-        //delete temp;
+        G4ReactionProduct *temp = vec[vecLen-1];
+        delete temp;
         if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
         break;
       }
@@ -345,6 +365,7 @@
                          1.43,1.67,2.0,2.5,3.33,5.00,10.00};
     G4int backwardNucleonCount = 0;       // number of nucleons in backward hemisphere
     G4double totalEnergy, kineticEnergy, vecMass;
+
     for( i=(vecLen-1); i>=0; --i )
     {
       if( vec[i]->GetNewlyAdded() )           // added from intranuclear cascade
@@ -581,8 +602,8 @@
           backwardEnergy += vecMass;
         }
         for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-        //G4ReactionProduct *temp = vec[vecLen];
-        //delete temp;
+        G4ReactionProduct *temp = vec[vecLen-1];
+        delete temp;
         // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
         if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
         pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
@@ -594,6 +615,7 @@
         if( phi < 0.0 )phi = twopi - phi;
       }
     }   // closes main for loop
+
     //
     //  for the incident particle:  it was placed in the forward hemisphere
     //   set pt and phi values, they are changed somewhat in the iteration loop
@@ -1197,7 +1219,7 @@
       G4double spall = numberofFinalStateNucleons;
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
       AddBlackTrackParticles( epnb, npnb, edta, ndta, sprob, kineticMinimum, kineticFactor,
-                              modifiedOriginal, spall, targetNucleus,
+                             modifiedOriginal, spall, targetNucleus,
                               vec, vecLen );
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
     }
@@ -1469,6 +1491,8 @@
       }           // breaks go down to here
       if( secondaryDeleted )
       {      
+        G4ReactionProduct *temp = vec[vecLen-1];
+        delete temp;
         --vecLen;
         // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
       }
@@ -1500,6 +1524,8 @@
         }
         if( secondaryDeleted )
         {
+          G4ReactionProduct *temp = vec[vecLen-1];
+          delete temp;
           --vecLen;
           // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
         }
@@ -1527,6 +1553,8 @@
           }
           if( secondaryDeleted )
           {
+            G4ReactionProduct *temp = vec[vecLen-1];
+            delete temp;
             --vecLen;
             // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
           }
@@ -3075,7 +3103,11 @@
         else
           p2->SetDefinition( anAlpha );
         spall += p2->GetMass()/GeV * sp1;
-        if( spall > atomicWeight )break;
+        if( spall > atomicWeight )
+	{
+	  delete p2;
+	  break;
+	}
         vec.SetElement( vecLen, p2 );
         vec[vecLen]->SetNewlyAdded( true );
         vec[vecLen]->SetKineticEnergy( kinetic*GeV );
@@ -3484,6 +3516,8 @@
       if( energyCheck < 0.0 )      // chop off the secondary List
       {
         vecLen = G4std::max( 0, --i ); // looks like a memory leak @@@@@@@@@@@@
+	G4int j;
+	for(j=i; j<vecLen; j++) delete vec[j];
         break;
       }
     }
@@ -3761,6 +3795,8 @@
       else
         v[2]->SetMomentum( v[2]->GetMomentum() * (p/pp) );
     }
+    G4int del;
+    for(del=0; del<vecLen; del++) delete vec[del];
     vecLen = 0;
     if( particleIsDefined )
     {
diff --git a/source/processes/hadronic/util/src/G4ReactionKinematics.cc b/source/processes/hadronic/util/src/G4ReactionKinematics.cc
index b8297faed2..64ac540e89 100644
--- a/source/processes/hadronic/util/src/G4ReactionKinematics.cc
+++ b/source/processes/hadronic/util/src/G4ReactionKinematics.cc
@@ -1,17 +1,31 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReactionKinematics.cc,v 1.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReactionKinematics.cc,v 1.2.8.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //      CERN Geneva Switzerland
 //
-//      For information related to this code contact:
-//      CERN, IT Division, ASD group
 //      ------------ G4ReactionDynamics::TwoBody ------
 //                     new method TwoBodyScattering
 //                   by Christian V"olcker (CERN-Munich), September 1997
diff --git a/source/processes/hadronic/util/src/G4ReactionProduct.cc b/source/processes/hadronic/util/src/G4ReactionProduct.cc
index 8a576639a8..0e193028e3 100644
--- a/source/processes/hadronic/util/src/G4ReactionProduct.cc
+++ b/source/processes/hadronic/util/src/G4ReactionProduct.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ReactionProduct.cc,v 1.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ReactionProduct.cc,v 1.2.8.1 2001/06/28 19:15:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
  // J.L. Chuma, TRIUMF, 31-Oct-1996
  // last modified: 19-Dec-1996
diff --git a/source/processes/hadronic/util/src/G4StableIsotopes.cc b/source/processes/hadronic/util/src/G4StableIsotopes.cc
index 13855fcee3..2e74a30f57 100644
--- a/source/processes/hadronic/util/src/G4StableIsotopes.cc
+++ b/source/processes/hadronic/util/src/G4StableIsotopes.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StableIsotopes.cc,v 1.2 1999/12/15 14:53:41 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StableIsotopes.cc,v 1.2.8.1 2001/06/28 19:15:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4StableIsotopes.hh"
 
diff --git a/source/processes/management/History b/source/processes/management/History
index 5c34bbc06d..364f9cf4ca 100644
--- a/source/processes/management/History
+++ b/source/processes/management/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.16 2001/03/12 06:39:21 kurasige Exp $
+$Id: History,v 1.17 2001/05/22 17:32:10 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,7 +16,11 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
-- Mar. 12, 01  H.Kurashige (procman-V03-00-00)
+
+- May 22, 01  G.Cosmo (procman-V03-01-00)
+- Cleared pedantic warnings from Linux-g++ ISO/ANSI setup.
+
+- Mar 12, 01  H.Kurashige (procman-V03-00-00)
 - Modify Store/RetrievePhysicsTable methods 
   (add a bool argument to specify ascii/binary mode)  
 
diff --git a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
index 27b53a1920..3efe30c309 100644
--- a/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVContinuousDiscreteProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the Geant4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IVContinuousDiscreteProcess.hh,v 1.6 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IVContinuousDiscreteProcess.hh,v 1.6.4.2 2001/06/28 20:20:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // Class Description 
 //  Abstract class which defines the public behavior of
diff --git a/source/processes/management/include/G4IVRestDiscreteProcess.hh b/source/processes/management/include/G4IVRestDiscreteProcess.hh
index cfe38ca708..bf5c543da1 100644
--- a/source/processes/management/include/G4IVRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4IVRestDiscreteProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IVRestDiscreteProcess.hh,v 1.6 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IVRestDiscreteProcess.hh,v 1.6.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //
 // Class Description  
 //  Abstract class which defines the public behavior of
diff --git a/source/processes/management/include/G4ParticleTypes.hh b/source/processes/management/include/G4ParticleTypes.hh
index cc4fd76de6..e126d88648 100644
--- a/source/processes/management/include/G4ParticleTypes.hh
+++ b/source/processes/management/include/G4ParticleTypes.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleTypes.hh,v 1.4 2000/02/25 10:11:18 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleTypes.hh,v 1.4.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //      GEANT 4 class header file
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      4-th April 1996, G.Cosmo
 //     ----------------- G4ParticleTypes.hh -----------------
diff --git a/source/processes/management/include/G4ProcTblElement.hh b/source/processes/management/include/G4ProcTblElement.hh
index 85b370477a..58f3c0875f 100644
--- a/source/processes/management/include/G4ProcTblElement.hh
+++ b/source/processes/management/include/G4ProcTblElement.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcTblElement.hh,v 1.8 2000/11/03 03:44:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcTblElement.hh,v 1.8.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	4th Aug 1998, H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcTblElement.icc b/source/processes/management/include/G4ProcTblElement.icc
index 6ab0957cec..b188c0890e 100644
--- a/source/processes/management/include/G4ProcTblElement.icc
+++ b/source/processes/management/include/G4ProcTblElement.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcTblElement.icc,v 1.5 2000/03/02 01:45:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcTblElement.icc,v 1.6.2.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	4th Aug 1998, H.Kurashige
 // ------------------------------------------------------------
@@ -55,7 +69,7 @@ inline
 inline 
  G4ProcessManager* G4ProcTblElement::GetProcessManager(G4int index) const
 {
-  if ((index < pProcMgrVector->size()) && (index>=0)){
+  if ((index < G4int(pProcMgrVector->size())) && (index>=0)){
     return (*pProcMgrVector)[index];
   } else {
     return 0;
diff --git a/source/processes/management/include/G4ProcessAttribute.hh b/source/processes/management/include/G4ProcessAttribute.hh
index a7bf6d0e81..be3298a9b5 100644
--- a/source/processes/management/include/G4ProcessAttribute.hh
+++ b/source/processes/management/include/G4ProcessAttribute.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessAttribute.hh,v 1.3 1999/11/07 17:11:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessAttribute.hh,v 1.3.10.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1997, H.Kurashige
 //   ----------------  G4ProcessAttribute -----------------
diff --git a/source/processes/management/include/G4ProcessManager.hh b/source/processes/management/include/G4ProcessManager.hh
index ddaeea61b6..9b1c8b81e7 100644
--- a/source/processes/management/include/G4ProcessManager.hh
+++ b/source/processes/management/include/G4ProcessManager.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessManager.hh,v 1.7 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessManager.hh,v 1.7.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //   ----------------  G4ProcessManager  -----------------
diff --git a/source/processes/management/include/G4ProcessManager.icc b/source/processes/management/include/G4ProcessManager.icc
index b25a8eda9a..fd07e2a9f9 100644
--- a/source/processes/management/include/G4ProcessManager.icc
+++ b/source/processes/management/include/G4ProcessManager.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessManager.icc,v 1.2 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessManager.icc,v 1.2.4.1 2001/06/28 19:15:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/processes/management/include/G4ProcessManagerMessenger.hh b/source/processes/management/include/G4ProcessManagerMessenger.hh
index 7efce5bed5..a18683b756 100644
--- a/source/processes/management/include/G4ProcessManagerMessenger.hh
+++ b/source/processes/management/include/G4ProcessManagerMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessManagerMessenger.hh,v 1.4 1999/11/07 17:11:44 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessManagerMessenger.hh,v 1.4.10.1 2001/06/28 19:15:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessTable.hh b/source/processes/management/include/G4ProcessTable.hh
index baf06d93c9..01f7ba1d38 100644
--- a/source/processes/management/include/G4ProcessTable.hh
+++ b/source/processes/management/include/G4ProcessTable.hh
@@ -1,20 +1,34 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4ProcessTable.hh,v 1.6 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4ProcessTable.hh,v 1.6.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	4th Aug 1998, H.Kurashige
 //
diff --git a/source/processes/management/include/G4ProcessTable.icc b/source/processes/management/include/G4ProcessTable.icc
index f6950e5cba..91cece7285 100644
--- a/source/processes/management/include/G4ProcessTable.icc
+++ b/source/processes/management/include/G4ProcessTable.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessTable.icc,v 1.3 2000/03/02 01:16:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessTable.icc,v 1.3.4.1 2001/06/28 19:15:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  History:
 //   Use STL vector instead of RW vector    1. Mar 00 H.Kurashige
diff --git a/source/processes/management/include/G4ProcessTableMessenger.hh b/source/processes/management/include/G4ProcessTableMessenger.hh
index 6f48e7262f..b7c7805691 100644
--- a/source/processes/management/include/G4ProcessTableMessenger.hh
+++ b/source/processes/management/include/G4ProcessTableMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessTableMessenger.hh,v 1.3 1999/11/07 17:11:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessTableMessenger.hh,v 1.3.10.1 2001/06/28 19:15:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessType.hh b/source/processes/management/include/G4ProcessType.hh
index 2562fe0aac..a7bca2307c 100644
--- a/source/processes/management/include/G4ProcessType.hh
+++ b/source/processes/management/include/G4ProcessType.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessType.hh,v 1.3 1999/11/07 17:11:45 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessType.hh,v 1.3.10.1 2001/06/28 19:15:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessVector.hh b/source/processes/management/include/G4ProcessVector.hh
index 985d3758d3..a443b83991 100644
--- a/source/processes/management/include/G4ProcessVector.hh
+++ b/source/processes/management/include/G4ProcessVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessVector.hh,v 1.6 2000/11/03 03:44:51 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessVector.hh,v 1.6.4.1 2001/06/28 19:15:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/include/G4ProcessVector.icc b/source/processes/management/include/G4ProcessVector.icc
index 49fe960adb..f9a282132d 100644
--- a/source/processes/management/include/G4ProcessVector.icc
+++ b/source/processes/management/include/G4ProcessVector.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessVector.icc,v 1.1 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessVector.icc,v 1.2.2.1 2001/06/28 19:15:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 inline G4bool G4ProcessVector::operator==(const G4ProcessVector &right) const
 {
@@ -50,8 +66,8 @@ inline G4bool G4ProcessVector::insert(G4VProcess* aProcess)
 
 inline G4bool G4ProcessVector::insertAt(G4int i,G4VProcess* aProcess)
 {
-  if ( (i<0) || (i>pProcVector->size()) ) return false;
-  if (i==pProcVector->size()) {
+  if ( (i<0) || (i>G4int(pProcVector->size())) ) return false;
+  if (i==G4int(pProcVector->size())) {
     pProcVector->push_back(aProcess);
   } else {
     G4ProcVector::iterator it=pProcVector->begin();
@@ -65,8 +81,7 @@ inline G4bool G4ProcessVector::insertAt(G4int i,G4VProcess* aProcess)
 inline G4VProcess* G4ProcessVector::removeAt(G4int i)
 {
   G4ProcVector::iterator it=pProcVector->begin();
-  int j;
-  for(j=0;j<pProcVector->size() && j<i;++j) it++;
+  for(size_t j=0;j<pProcVector->size() && G4int(j)<i;++j) it++;
   G4VProcess* rValue = *it;
   pProcVector->erase(it);
   return rValue;
diff --git a/source/processes/management/include/G4VContinuousDiscreteProcess.hh b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
index 4cbdec7975..eb1220163b 100644
--- a/source/processes/management/include/G4VContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VContinuousDiscreteProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VContinuousDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VContinuousDiscreteProcess.hh,v 1.4.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //  Abstract class which defines the public behavior of
 // 
 // Class Description 
diff --git a/source/processes/management/include/G4VContinuousProcess.hh b/source/processes/management/include/G4VContinuousProcess.hh
index d0fee7adb3..bcda8f01f8 100644
--- a/source/processes/management/include/G4VContinuousProcess.hh
+++ b/source/processes/management/include/G4VContinuousProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VContinuousProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VContinuousProcess.hh,v 1.4.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //	add G4VContinuousProcess(const G4String&) 24 Jul 1996, Hisaya kurashige
diff --git a/source/processes/management/include/G4VDiscreteProcess.hh b/source/processes/management/include/G4VDiscreteProcess.hh
index 1974d276f8..a14e177893 100644
--- a/source/processes/management/include/G4VDiscreteProcess.hh
+++ b/source/processes/management/include/G4VDiscreteProcess.hh
@@ -1,20 +1,34 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+// $Id: G4VDiscreteProcess.hh,v 1.4.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //	add G4VDiscreteProcess(const G4String&) 24 Jul 1996, Hisaya kurashige
diff --git a/source/processes/management/include/G4VProcess.hh b/source/processes/management/include/G4VProcess.hh
index f69364ef09..52e357471d 100644
--- a/source/processes/management/include/G4VProcess.hh
+++ b/source/processes/management/include/G4VProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VProcess.hh,v 1.8 2001/03/12 06:39:22 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VProcess.hh,v 1.8.2.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 //
diff --git a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
index 673d394cf2..d7a0b28ea5 100644
--- a/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousDiscreteProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestContinuousDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestContinuousDiscreteProcess.hh,v 1.4.4.2 2001/06/28 20:20:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //
 // Class Description  
 //  Abstract class which defines the public behavior of
diff --git a/source/processes/management/include/G4VRestContinuousProcess.hh b/source/processes/management/include/G4VRestContinuousProcess.hh
index 63da0f24f4..c1e18edf1a 100644
--- a/source/processes/management/include/G4VRestContinuousProcess.hh
+++ b/source/processes/management/include/G4VRestContinuousProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestContinuousProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestContinuousProcess.hh,v 1.4.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // Class Description 
 //  Abstract class which defines the public behavior of
diff --git a/source/processes/management/include/G4VRestDiscreteProcess.hh b/source/processes/management/include/G4VRestDiscreteProcess.hh
index cd0e2dae9e..8520a27ec7 100644
--- a/source/processes/management/include/G4VRestDiscreteProcess.hh
+++ b/source/processes/management/include/G4VRestDiscreteProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestDiscreteProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestDiscreteProcess.hh,v 1.4.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //
 // Class Description
 //  Abstract class which defines the public behavior of
diff --git a/source/processes/management/include/G4VRestProcess.hh b/source/processes/management/include/G4VRestProcess.hh
index 5f6d3f1164..f63a5305c5 100644
--- a/source/processes/management/include/G4VRestProcess.hh
+++ b/source/processes/management/include/G4VRestProcess.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestProcess.hh,v 1.4 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestProcess.hh,v 1.4.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // 
diff --git a/source/processes/management/src/G4IVContinuousDiscreteProcess.cc b/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
index fa25ae659a..d6fee56e6c 100644
--- a/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4IVContinuousDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IVContinuousDiscreteProcess.cc,v 1.5 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IVContinuousDiscreteProcess.cc,v 1.5.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4IVRestDiscreteProcess.cc b/source/processes/management/src/G4IVRestDiscreteProcess.cc
index f30a962fe5..f46063a478 100644
--- a/source/processes/management/src/G4IVRestDiscreteProcess.cc
+++ b/source/processes/management/src/G4IVRestDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4IVRestDiscreteProcess.cc,v 1.5 1999/12/15 14:53:42 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4IVRestDiscreteProcess.cc,v 1.5.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcTblElement.cc b/source/processes/management/src/G4ProcTblElement.cc
index b10f2dca4e..9d34431269 100644
--- a/source/processes/management/src/G4ProcTblElement.cc
+++ b/source/processes/management/src/G4ProcTblElement.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcTblElement.cc,v 1.5 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcTblElement.cc,v 1.5.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	4th Aug 1998, H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessAttribute.cc b/source/processes/management/src/G4ProcessAttribute.cc
index ee0d4960bc..0f24d0d4f5 100644
--- a/source/processes/management/src/G4ProcessAttribute.cc
+++ b/source/processes/management/src/G4ProcessAttribute.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessAttribute.cc,v 1.3 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessAttribute.cc,v 1.3.4.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	2nd December 1997, H.Kurashige
 //   ----------------  G4ProcessAttribute -----------------
diff --git a/source/processes/management/src/G4ProcessManager.cc b/source/processes/management/src/G4ProcessManager.cc
index ac977f46d5..003d0e14b7 100644
--- a/source/processes/management/src/G4ProcessManager.cc
+++ b/source/processes/management/src/G4ProcessManager.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessManager.cc,v 1.16 2000/06/15 15:34:12 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessManager.cc,v 1.17.2.2 2001/06/28 20:20:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:  public:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // ------------------------------------------------------------
@@ -211,7 +225,8 @@ G4int G4ProcessManager::GetProcessVectorIndex(
 	G4cout << " is not registered yet ";
       }
       if (ivec <0) {
-	G4cout << " illegal DoIt Index [= " << idx << "," << typ << "]";
+	G4cout << " illegal DoIt Index [= " << G4int(idx) << ","
+	                                    << G4int(typ) << "]";
       }
       G4cout << G4endl;
     }
@@ -432,7 +447,7 @@ G4int G4ProcessManager::AddProcess(
 
     } else {
       //add aProcess in ordering of ordProcVector
-      G4ProcessVector* pVector = theProcVector[ivec];
+      // G4ProcessVector* pVector = theProcVector[ivec];
       // find insert position
       G4int ip = FindInsertPosition(pAttr->ordProcVector[ivec], ivec);
       // insert 
@@ -593,7 +608,7 @@ void G4ProcessManager::SetProcessOrdering(
       G4cout <<  aErrorMessage << G4endl;
       G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
       G4cout << "process[" + aProcess->GetProcessName() + "]"<<  G4endl;
-      G4cout << " illegal DoIt Index [= " << idDoIt << "]";
+      G4cout << " illegal DoIt Index [= " << G4int(idDoIt) << "]";
       G4cout << G4endl;
     }
 #endif
@@ -657,7 +672,7 @@ void G4ProcessManager::SetProcessOrderingToFirst(
 #ifdef G4VERBOSE
     if (verboseLevel>0) {
       G4cout << "G4ProcessManager::SetProcessOrdering: ";
-      G4cout << " illegal DoIt Index [= " << idDoIt << "]";
+      G4cout << " illegal DoIt Index [= " << G4int(idDoIt) << "]";
       G4cout << G4endl;
     }
 #endif
diff --git a/source/processes/management/src/G4ProcessManagerMessenger.cc b/source/processes/management/src/G4ProcessManagerMessenger.cc
index 4edc8a6b34..30fc0ca243 100644
--- a/source/processes/management/src/G4ProcessManagerMessenger.cc
+++ b/source/processes/management/src/G4ProcessManagerMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessManagerMessenger.cc,v 1.4 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessManagerMessenger.cc,v 1.4.4.1 2001/06/28 19:15:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/management/src/G4ProcessTable.cc b/source/processes/management/src/G4ProcessTable.cc
index 9b9f247576..48bde1668f 100644
--- a/source/processes/management/src/G4ProcessTable.cc
+++ b/source/processes/management/src/G4ProcessTable.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessTable.cc,v 1.6 2000/11/03 03:44:52 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessTable.cc,v 1.7.2.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, IT Division, ASD group
 //	History: first implementation, based on object model of
 //	4th Aug 1998, H.Kurashige
 // ------------------------------------------------------------
@@ -63,7 +77,7 @@ G4ProcessTable::~G4ProcessTable()
   }
 
   if ( fProcTblVector != 0) {
-    G4ProcTableVector::iterator idx;
+    // G4ProcTableVector::iterator idx;
     
     // destruction of processes has moved to G4VUserPhysicsList
     // for (idx=fProcTblVector->begin(); idx!=fProcTblVector->end(); ++idx) {
@@ -229,12 +243,12 @@ G4int  G4ProcessTable::Remove( G4VProcess* aProcess,
 
   G4ProcTableVector::iterator itr; 
   G4int idxTbl=0;
-  G4ProcTblElement* anElement;
+  G4ProcTblElement* anElement=0;
   G4bool isFound = false;
   // loop over all elements
   for (itr=fProcTblVector->begin(); itr!=fProcTblVector->end(); ++itr, ++idxTbl) {
     anElement = (*itr);
-    G4int idx;
+
     // check if this process is included
     if (aProcess == anElement->GetProcess()) {
       isFound = anElement->Contains(aProcMgr);
@@ -297,7 +311,7 @@ G4VProcess* G4ProcessTable::FindProcess(const G4String& processName,
   G4ProcTableVector::iterator itr;   
   G4int idxTbl = 0;
   G4bool isFound = false;
-  G4ProcTblElement* anElement;
+  G4ProcTblElement* anElement=0;
   for (itr=fProcTblVector->begin(); itr!=fProcTblVector->end(); ++itr, ++idxTbl) {
     anElement = (*itr);
     // check name
@@ -485,7 +499,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType   processType,
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The ProcessType[" << processType << "] "<< G4endl;
+    G4cout << " The ProcessType[" << G4int(processType) << "] "<< G4endl;
   }
 #endif
 
@@ -523,7 +537,7 @@ void G4ProcessTable::SetProcessActivation(
 #ifdef G4VERBOSE
   if (verboseLevel>1){
     G4cout << " G4ProcessTable::SetProcessActivation:" ;
-    G4cout << " The ProcessType[" << processType << "] "<< G4endl;
+    G4cout << " The ProcessType[" << G4int(processType) << "] "<< G4endl;
   }
 #endif
   
@@ -550,9 +564,9 @@ void G4ProcessTable::DumpInfo(G4VProcess* process,
 {
   G4ProcTableVector::iterator itr; 
   G4int idxTbl=0;
-  G4ProcTblElement* anElement;
+  G4ProcTblElement* anElement=0;
   G4bool isFoundInTbl = false;
-  G4ProcessManager* manager;
+  G4ProcessManager* manager=0;
   G4int idx;
   // loop over all elements
   for (itr=fProcTblVector->begin(); itr!=fProcTblVector->end(); ++itr, ++idxTbl) {
diff --git a/source/processes/management/src/G4ProcessTableMessenger.cc b/source/processes/management/src/G4ProcessTableMessenger.cc
index fed9bc2b9a..4e555ea9d2 100644
--- a/source/processes/management/src/G4ProcessTableMessenger.cc
+++ b/source/processes/management/src/G4ProcessTableMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessTableMessenger.cc,v 1.7 2000/03/02 01:16:06 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessTableMessenger.cc,v 1.8.2.1 2001/06/28 19:15:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
@@ -142,11 +158,9 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
 {
   G4ProcessTable::G4ProcNameVector* procNameVector 
                          = theProcessTable->GetNameList(); 
-  G4ProcessTable::G4ProcTableVector* pTblVector 
-                         = theProcessTable->GetProcTableVector();
   G4int idx;
 
-  G4ProcessVector* tmpVector;
+  G4ProcessVector* tmpVector=0;
   G4int type = -1;
 
   if( command == listCmd ){
diff --git a/source/processes/management/src/G4ProcessVector.cc b/source/processes/management/src/G4ProcessVector.cc
index 5d4f7c2b0e..7f80900d09 100644
--- a/source/processes/management/src/G4ProcessVector.cc
+++ b/source/processes/management/src/G4ProcessVector.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ProcessVector.cc,v 1.2 2000/11/03 06:15:34 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ProcessVector.cc,v 1.2.4.1 2001/06/28 19:15:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/processes/management/src/G4VContinuousDiscreteProcess.cc b/source/processes/management/src/G4VContinuousDiscreteProcess.cc
index b17d4b05d8..cc3a291d16 100644
--- a/source/processes/management/src/G4VContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4VContinuousDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VContinuousDiscreteProcess.cc,v 1.2 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VContinuousDiscreteProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VContinuousProcess.cc b/source/processes/management/src/G4VContinuousProcess.cc
index 6734181267..65e9dbc790 100644
--- a/source/processes/management/src/G4VContinuousProcess.cc
+++ b/source/processes/management/src/G4VContinuousProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VContinuousProcess.cc,v 1.2 1999/12/15 14:53:43 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VContinuousProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VDiscreteProcess.cc b/source/processes/management/src/G4VDiscreteProcess.cc
index bb2a9c9125..c2e5ff9c83 100644
--- a/source/processes/management/src/G4VDiscreteProcess.cc
+++ b/source/processes/management/src/G4VDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDiscreteProcess.cc,v 1.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDiscreteProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VProcess.cc b/source/processes/management/src/G4VProcess.cc
index 9d8461fb07..d2216fa007 100644
--- a/source/processes/management/src/G4VProcess.cc
+++ b/source/processes/management/src/G4VProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VProcess.cc,v 1.5 2000/11/03 07:09:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VProcess.cc,v 1.6.2.1 2001/06/28 19:15:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
@@ -29,11 +43,11 @@
 #include "G4VProcess.hh"
 
 G4VProcess::G4VProcess(const G4String& aName, G4ProcessType   aType )
-                  : theProcessName(aName),
-		    theProcessType(aType),
-		    pParticleChange(0),
+                  : pParticleChange(0),
                     theNumberOfInteractionLengthLeft(-1.0),
                     currentInteractionLength(-1.0),
+                    theProcessName(aName),
+		    theProcessType(aType),
                     thePILfactor(1.0),
                     verboseLevel(0)
 {
@@ -44,13 +58,14 @@ G4VProcess::~G4VProcess()
 {
 }
 
-G4VProcess::G4VProcess(G4VProcess& right):
-	    pParticleChange(0),
+G4VProcess::G4VProcess(G4VProcess& right)
+          : pParticleChange(0),
+            theNumberOfInteractionLengthLeft(-1.0),
+            currentInteractionLength(-1.0),
             theProcessName(right.theProcessName),
             theProcessType(right.theProcessType),
-            theNumberOfInteractionLengthLeft(-1.0),
             thePILfactor(1.0),
-            currentInteractionLength(-1.0)
+            verboseLevel(right.verboseLevel)
 {
 }
 
diff --git a/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc b/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
index 9e087fb11a..21013d38a9 100644
--- a/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
+++ b/source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestContinuousProcess.cc b/source/processes/management/src/G4VRestContinuousProcess.cc
index dce8559a57..7dce84ced9 100644
--- a/source/processes/management/src/G4VRestContinuousProcess.cc
+++ b/source/processes/management/src/G4VRestContinuousProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestContinuousProcess.cc,v 1.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestContinuousProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestDiscreteProcess.cc b/source/processes/management/src/G4VRestDiscreteProcess.cc
index 5fea695642..1eb995afff 100644
--- a/source/processes/management/src/G4VRestDiscreteProcess.cc
+++ b/source/processes/management/src/G4VRestDiscreteProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestDiscreteProcess.cc,v 1.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestDiscreteProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/management/src/G4VRestProcess.cc b/source/processes/management/src/G4VRestProcess.cc
index 646909f3dd..46ca59aee5 100644
--- a/source/processes/management/src/G4VRestProcess.cc
+++ b/source/processes/management/src/G4VRestProcess.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRestProcess.cc,v 1.2 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRestProcess.cc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	History: first implementation, based on object model of
 //	2nd December 1995, G.Cosmo
 // --------------------------------------------------------------
diff --git a/source/processes/optical/include/G4OpAbsorption.hh b/source/processes/optical/include/G4OpAbsorption.hh
index 3d32f35a5f..5b45a1a0dd 100644
--- a/source/processes/optical/include/G4OpAbsorption.hh
+++ b/source/processes/optical/include/G4OpAbsorption.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpAbsorption.hh,v 1.5 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpAbsorption.hh,v 1.5.4.1 2001/06/28 19:15:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Definition
diff --git a/source/processes/optical/include/G4OpBoundaryProcess.hh b/source/processes/optical/include/G4OpBoundaryProcess.hh
index 2052b5f4da..9c0fdd32f8 100644
--- a/source/processes/optical/include/G4OpBoundaryProcess.hh
+++ b/source/processes/optical/include/G4OpBoundaryProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpBoundaryProcess.hh,v 1.5 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpBoundaryProcess.hh,v 1.5.4.1 2001/06/28 19:15:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/include/G4OpRayleigh.hh b/source/processes/optical/include/G4OpRayleigh.hh
index fc2070ae5a..8fe11dc147 100644
--- a/source/processes/optical/include/G4OpRayleigh.hh
+++ b/source/processes/optical/include/G4OpRayleigh.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpRayleigh.hh,v 1.4 1999/12/15 14:53:44 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpRayleigh.hh,v 1.4.4.1 2001/06/28 19:15:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/src/G4OpAbsorption.cc b/source/processes/optical/src/G4OpAbsorption.cc
index 4ce15194a0..264685cbba 100644
--- a/source/processes/optical/src/G4OpAbsorption.cc
+++ b/source/processes/optical/src/G4OpAbsorption.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpAbsorption.cc,v 1.3 2000/09/19 03:19:17 gum Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpAbsorption.cc,v 1.3.4.1 2001/06/28 19:15:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Absorption Class Implementation
diff --git a/source/processes/optical/src/G4OpBoundaryProcess.cc b/source/processes/optical/src/G4OpBoundaryProcess.cc
index dfd505cd55..b948ed65f4 100644
--- a/source/processes/optical/src/G4OpBoundaryProcess.cc
+++ b/source/processes/optical/src/G4OpBoundaryProcess.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 ////////////////////////////////////////////////////////////////////////
 // Optical Photon Boundary Process Class Implementation
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/optical/src/G4OpRayleigh.cc b/source/processes/optical/src/G4OpRayleigh.cc
index 1c8d80c85b..41c786beef 100644
--- a/source/processes/optical/src/G4OpRayleigh.cc
+++ b/source/processes/optical/src/G4OpRayleigh.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpRayleigh.cc,v 1.5 2001/01/31 04:08:12 gum Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpRayleigh.cc,v 1.5.2.1 2001/06/28 19:15:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 ////////////////////////////////////////////////////////////////////////
diff --git a/source/processes/parameterisation/include/G4FastSimulationManager.hh b/source/processes/parameterisation/include/G4FastSimulationManager.hh
index fbf1e280fb..9c127f9c0f 100644
--- a/source/processes/parameterisation/include/G4FastSimulationManager.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationManager.hh,v 1.6 2000/05/30 08:30:31 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationManager.hh,v 1.6.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
index b2a9127731..ede17cf8c2 100644
--- a/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationManagerProcess.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationManagerProcess.hh,v 1.7 2000/05/30 08:30:32 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationManagerProcess.hh,v 1.7.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
index 14da16a74b..6438009705 100644
--- a/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationMessenger.hh,v 1.3 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationMessenger.hh,v 1.3.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/processes/parameterisation/include/G4FastSimulationVector.hh b/source/processes/parameterisation/include/G4FastSimulationVector.hh
index e381d2436d..f9505f82c8 100644
--- a/source/processes/parameterisation/include/G4FastSimulationVector.hh
+++ b/source/processes/parameterisation/include/G4FastSimulationVector.hh
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // $Id: 
 // GEANT4 tag $Name: 
diff --git a/source/processes/parameterisation/include/G4FastSimulationVector.icc b/source/processes/parameterisation/include/G4FastSimulationVector.icc
index 3a2e30f61c..11a3bcbf70 100644
--- a/source/processes/parameterisation/include/G4FastSimulationVector.icc
+++ b/source/processes/parameterisation/include/G4FastSimulationVector.icc
@@ -1,9 +1,25 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 //
 // $Id: 
 // GEANT4 tag $Name: 
diff --git a/source/processes/parameterisation/include/G4FastStep.hh b/source/processes/parameterisation/include/G4FastStep.hh
index 4e41de1523..c329decacc 100644
--- a/source/processes/parameterisation/include/G4FastStep.hh
+++ b/source/processes/parameterisation/include/G4FastStep.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastStep.hh,v 1.5 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastStep.hh,v 1.5.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FastStep.icc b/source/processes/parameterisation/include/G4FastStep.icc
index 328b05d797..3d6bf51754 100644
--- a/source/processes/parameterisation/include/G4FastStep.icc
+++ b/source/processes/parameterisation/include/G4FastStep.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastStep.icc,v 1.2 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastStep.icc,v 1.2.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $id: G4ParticleChange.icc,v 1.6 1998/04/14 02:25:54 kurasige Exp $
 
diff --git a/source/processes/parameterisation/include/G4FastTrack.hh b/source/processes/parameterisation/include/G4FastTrack.hh
index 924694106a..e7f25e9a4b 100644
--- a/source/processes/parameterisation/include/G4FastTrack.hh
+++ b/source/processes/parameterisation/include/G4FastTrack.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastTrack.hh,v 1.4 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastTrack.hh,v 1.4.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id:
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
index b0734db810..4366068315 100644
--- a/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
+++ b/source/processes/parameterisation/include/G4FlavoredParallelWorld.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FlavoredParallelWorld.hh,v 1.4 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FlavoredParallelWorld.hh,v 1.4.4.1 2001/06/28 19:15:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
index b45d9b1ed9..d35c37e033 100644
--- a/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
+++ b/source/processes/parameterisation/include/G4GlobalFastSimulationManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GlobalFastSimulationManager.hh,v 1.7 2000/05/30 08:30:35 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GlobalFastSimulationManager.hh,v 1.7.4.1 2001/06/28 19:15:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/include/G4VFastSimulationModel.hh b/source/processes/parameterisation/include/G4VFastSimulationModel.hh
index e7515d040a..8be21d29ac 100644
--- a/source/processes/parameterisation/include/G4VFastSimulationModel.hh
+++ b/source/processes/parameterisation/include/G4VFastSimulationModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFastSimulationModel.hh,v 1.3 1999/12/15 14:53:45 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFastSimulationModel.hh,v 1.3.4.1 2001/06/28 19:15:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4FastSimulationManager.cc b/source/processes/parameterisation/src/G4FastSimulationManager.cc
index 1da30b43a1..cd18e70ed9 100644
--- a/source/processes/parameterisation/src/G4FastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationManager.cc,v 1.4 2000/05/30 08:30:35 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationManager.cc,v 1.4.4.1 2001/06/28 19:15:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
index bd3f53a793..4e783ec254 100644
--- a/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationManagerProcess.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationManagerProcess.cc,v 1.5 2001/04/03 15:24:14 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationManagerProcess.cc,v 1.5.2.1 2001/06/28 19:15:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
index ec3e55ecd1..cbc623ee15 100644
--- a/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
+++ b/source/processes/parameterisation/src/G4FastSimulationMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastSimulationMessenger.cc,v 1.3 1999/12/15 14:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastSimulationMessenger.cc,v 1.3.4.1 2001/06/28 19:15:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4FastSimulationMessenger.hh"
diff --git a/source/processes/parameterisation/src/G4FastStep.cc b/source/processes/parameterisation/src/G4FastStep.cc
index af3197f629..3889cb8565 100644
--- a/source/processes/parameterisation/src/G4FastStep.cc
+++ b/source/processes/parameterisation/src/G4FastStep.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastStep.cc,v 1.7 2000/05/30 08:30:36 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastStep.cc,v 1.7.4.1 2001/06/28 19:15:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4FastTrack.cc b/source/processes/parameterisation/src/G4FastTrack.cc
index b05ff774bb..0af431db20 100644
--- a/source/processes/parameterisation/src/G4FastTrack.cc
+++ b/source/processes/parameterisation/src/G4FastTrack.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FastTrack.cc,v 1.4 2000/05/30 08:30:37 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FastTrack.cc,v 1.4.4.1 2001/06/28 19:15:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
index b62d82224c..78ae2680c1 100644
--- a/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
+++ b/source/processes/parameterisation/src/G4GlobalFastSimulationManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GlobalFastSimulationManager.cc,v 1.6 2000/05/30 08:30:38 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GlobalFastSimulationManager.cc,v 1.6.4.1 2001/06/28 19:15:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/processes/parameterisation/src/G4VFastSimulationModel.cc b/source/processes/parameterisation/src/G4VFastSimulationModel.cc
index 916cb61421..477e603b6a 100644
--- a/source/processes/parameterisation/src/G4VFastSimulationModel.cc
+++ b/source/processes/parameterisation/src/G4VFastSimulationModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFastSimulationModel.cc,v 1.4 2000/05/30 08:30:39 mora Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFastSimulationModel.cc,v 1.4.4.1 2001/06/28 19:15:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //---------------------------------------------------------------
 //
diff --git a/source/processes/photolepton_hadron/include/G4LeptonHadronInteractionModel.hh b/source/processes/photolepton_hadron/include/G4LeptonHadronInteractionModel.hh
index d44678bf08..99993d0c36 100644
--- a/source/processes/photolepton_hadron/include/G4LeptonHadronInteractionModel.hh
+++ b/source/processes/photolepton_hadron/include/G4LeptonHadronInteractionModel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4LeptonHadronInteractionModel.hh
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/include/G4LeptonHadronProcess.hh b/source/processes/photolepton_hadron/include/G4LeptonHadronProcess.hh
index 6c2a867b14..55830f6db3 100644
--- a/source/processes/photolepton_hadron/include/G4LeptonHadronProcess.hh
+++ b/source/processes/photolepton_hadron/include/G4LeptonHadronProcess.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4LeptonHadronProcess.hh
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
index fd0ef92c31..605e18d41f 100644
--- a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
+++ b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuNuclearInteraction.hh,v 1.3 2000/06/11 10:35:12 jwellisc Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuNuclearInteraction.hh,v 1.3.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ------------------------------------------------------------
 //      GEANT 4 class header file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuNuclearInteraction physics process ---------
diff --git a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
index a03db272cf..0263caa990 100644
--- a/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
+++ b/source/processes/photolepton_hadron/include/G4MuNuclearInteraction.icc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuNuclearInteraction.icc,v 1.2 1999/12/15 14:53:46 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuNuclearInteraction.icc,v 1.2.4.2 2001/06/28 20:20:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // ---------------------------------------------------------------
 //      GEANT 4 class inlined methods file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuNuclearInteraction physics process ---------
diff --git a/source/processes/photolepton_hadron/include/G4MuonNucleusInteractionModel.hh b/source/processes/photolepton_hadron/include/G4MuonNucleusInteractionModel.hh
index 2a19613424..791c6d755e 100644
--- a/source/processes/photolepton_hadron/include/G4MuonNucleusInteractionModel.hh
+++ b/source/processes/photolepton_hadron/include/G4MuonNucleusInteractionModel.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4MuonNucleusInteractionModel.hh
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/include/G4MuonNucleusProcess.hh b/source/processes/photolepton_hadron/include/G4MuonNucleusProcess.hh
index f20508db24..043545a4ba 100644
--- a/source/processes/photolepton_hadron/include/G4MuonNucleusProcess.hh
+++ b/source/processes/photolepton_hadron/include/G4MuonNucleusProcess.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4MuonNucleusProcess.hh
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/include/G4ParametrizedHadronicVertex.hh b/source/processes/photolepton_hadron/include/G4ParametrizedHadronicVertex.hh
index 2b6b7734ad..c6cb0f9f41 100644
--- a/source/processes/photolepton_hadron/include/G4ParametrizedHadronicVertex.hh
+++ b/source/processes/photolepton_hadron/include/G4ParametrizedHadronicVertex.hh
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 #ifndef G4ParametrizedHadronicVertex_h
 #define G4ParametrizedHadronicVertex_h 1
 
diff --git a/source/processes/photolepton_hadron/src/G4LeptonHadronInteractionModel.cc b/source/processes/photolepton_hadron/src/G4LeptonHadronInteractionModel.cc
index f3e45dca46..053b102b80 100644
--- a/source/processes/photolepton_hadron/src/G4LeptonHadronInteractionModel.cc
+++ b/source/processes/photolepton_hadron/src/G4LeptonHadronInteractionModel.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4LeptonHadronInteractionModel.cc
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/src/G4LeptonHadronProcess.cc b/source/processes/photolepton_hadron/src/G4LeptonHadronProcess.cc
index dea9e9fc80..c77c7aa5dd 100644
--- a/source/processes/photolepton_hadron/src/G4LeptonHadronProcess.cc
+++ b/source/processes/photolepton_hadron/src/G4LeptonHadronProcess.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4LeptonHadronProcess.cc
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc b/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
index edfc49d5ed..903705e425 100644
--- a/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
+++ b/source/processes/photolepton_hadron/src/G4MuNuclearInteraction.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuNuclearInteraction.cc,v 1.8 2001/02/05 18:02:12 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuNuclearInteraction.cc,v 1.8.2.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // $Id: 
 // --------------------------------------------------------------
 //      GEANT 4 class implementation file 
 //
-//      For information related to this code contact:
-//      CERN, CN Division, ASD group
 //      History: first implementation, based on object model of
 //      2nd December 1995, G.Cosmo
 //      -------- G4MuNuclearInteraction physics process ---------
diff --git a/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc b/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
index 55f410050a..40f500f072 100644
--- a/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
+++ b/source/processes/photolepton_hadron/src/G4MuonNucleusInteractionModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4MuonNucleusInteractionModel.cc,v 1.3 2000/08/03 09:06:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4MuonNucleusInteractionModel.cc,v 1.3.4.1 2001/06/28 19:15:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 // G4MuonNucleusInteractionModel.cc
diff --git a/source/processes/photolepton_hadron/src/G4MuonNucleusProcess.cc b/source/processes/photolepton_hadron/src/G4MuonNucleusProcess.cc
index 887a7c6c6e..92e53a6823 100644
--- a/source/processes/photolepton_hadron/src/G4MuonNucleusProcess.cc
+++ b/source/processes/photolepton_hadron/src/G4MuonNucleusProcess.cc
@@ -1,3 +1,25 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
 // G4MuonNucleusProcess.cc
 //
 //     M.Takahata (Makoto.Takahata@cern.ch)
diff --git a/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc b/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
index 335263660b..ce89ddf916 100644
--- a/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
+++ b/source/processes/photolepton_hadron/src/G4ParametrizedHadronicVertex.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParametrizedHadronicVertex.cc,v 1.3 2000/08/03 09:06:33 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParametrizedHadronicVertex.cc,v 1.3.4.1 2001/06/28 19:15:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // --------------------------------------------------------------
 #include "G4ParametrizedHadronicVertex.hh"
diff --git a/source/processes/transportation/History b/source/processes/transportation/History
index b5906c3506..c99dfd11aa 100644
--- a/source/processes/transportation/History
+++ b/source/processes/transportation/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.8 2001/03/19 12:13:38 japost Exp $
+$Id: History,v 1.11 2001/06/01 13:38:41 japost Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,24 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Apr  11, 2001   J. Apostolakis   transport-V03-01-02
+------------------------------
+Corrected the last update of G4Transportation.cc, which overwrote the 
+value of the spin in the cases where a particle was not charged (eg photon) or
+a charged particle was not in a field. 
+
+Apr  11, 2001   P. Gumplinger   transport-V03-01-01
+-----------------------------
+Updated G4Transportation.cc to make spin tracking work correctly:
+- Replaced the line originally commented out:
+    // fTransportEndPolarization= aFieldTrack.GetSpin() ; // Not yet possible
+  with: 
+    fTransportEndSpin = aFieldTrack.GetSpin();
+- Added to the AlongStepDoIt() the following call:
+    fParticleChange.SetPolarizationChange(fTransportEndSpin);
+
+
 Mar  19, 2001   J. Apostolakis  transport-V03-00-01
 ------------------------------
 G4Transportation modified to use new FieldTrack, and get Kinetic Energy from it. 
diff --git a/source/processes/transportation/include/G4Transportation.hh b/source/processes/transportation/include/G4Transportation.hh
index f6851c2699..5f12befb72 100644
--- a/source/processes/transportation/include/G4Transportation.hh
+++ b/source/processes/transportation/include/G4Transportation.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Transportation.hh,v 1.2 1999/12/15 14:53:49 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Transportation.hh,v 1.2.4.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4  include file implementation
 //
-//	For information related to this code contact:
-//	CERN, IT Division (formely CN), ASD group
 // ------------------------------------------------------------
 //
 //   This class' object is a process responsible for the transportation of 
diff --git a/source/processes/transportation/include/G4Transportation.icc b/source/processes/transportation/include/G4Transportation.icc
index aed2fcfe12..9645af011d 100644
--- a/source/processes/transportation/include/G4Transportation.icc
+++ b/source/processes/transportation/include/G4Transportation.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Transportation.icc,v 1.2 1999/12/15 14:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Transportation.icc,v 1.2.4.1 2001/06/28 19:15:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // 
diff --git a/source/processes/transportation/include/G4UserSpecialCuts.hh b/source/processes/transportation/include/G4UserSpecialCuts.hh
index 79f7e86f2f..18d9ea275b 100644
--- a/source/processes/transportation/include/G4UserSpecialCuts.hh
+++ b/source/processes/transportation/include/G4UserSpecialCuts.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserSpecialCuts.hh,v 1.3 1999/12/15 14:53:50 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserSpecialCuts.hh,v 1.3.4.1 2001/06/28 19:15:17 gunter Exp $
+// GEANT4 tag $Name:  $
 // ------------------------------------------------------------
 //                  15 April 1998  M.Maire
 // ------------------------------------------------------------
diff --git a/source/processes/transportation/src/G4Transportation.cc b/source/processes/transportation/src/G4Transportation.cc
index e6a8d2fb53..8022722454 100644
--- a/source/processes/transportation/src/G4Transportation.cc
+++ b/source/processes/transportation/src/G4Transportation.cc
@@ -1,18 +1,32 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Transportation.cc,v 1.14 2001/02/20 14:41:35 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Transportation.cc,v 1.16.2.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // ------------------------------------------------------------
 //	GEANT 4  include file implementation
 //
-//	For information related to this code contact:
-//	CERN, IT Division
 // ------------------------------------------------------------
 //
 // This class is a process responsible for the transportation of 
@@ -22,7 +36,8 @@
 // It is also tasked with part of updating the "safety".
 //
 // =======================================================================
-// Modified:   
+// Modified:
+//            11 Aprl 2001, P. Gumplinger: correction for spin tracking   
 //            20 Febr 2001, J. Apostolakis:  update for new FieldTrack
 //            22 Sept 2000, V. Grichine:     update of Kinetic Energy
 //             9 June 1999, J. Apostolakis & S.Giani: protect full relocation
@@ -207,10 +222,11 @@ AlongStepGetPhysicalInteractionLength(  const G4Track&  track,
 
      fTransportEndPosition = startPosition + geometryStepLength*startMomentumDir ;
 
-     // Momentum (& its direction) is unchanged
+     // Momentum direction, energy and polarisation are unchanged by transport
 
      fTransportEndMomentumDir   = startMomentumDir ; 
      fTransportEndKineticEnergy = track.GetKineticEnergy() ;
+     fTransportEndSpin          = track.GetPolarization();
      fParticleIsLooping         = false ;
      fMomentumChanged           = false ; 
   }
@@ -289,7 +305,8 @@ AlongStepGetPhysicalInteractionLength(  const G4Track&  track,
      fTransportEndKineticEnergy  = aFieldTrack.GetKineticEnergy() ; 
 
      //   fTransportEndKineticEnergy = track.GetKineticEnergy() ;
-     // fTransportEndPolarization= aFieldTrack.GetSpin() ; // Not yet possible
+
+     fTransportEndSpin = aFieldTrack.GetSpin();
 
      fParticleIsLooping = fFieldPropagator->IsParticleLooping() ;
      endpointDistance   = (fTransportEndPosition - startPosition).mag() ;
@@ -353,6 +370,8 @@ G4VParticleChange* G4Transportation::AlongStepDoIt( const G4Track& track,
   fParticleChange.SetEnergyChange(fTransportEndKineticEnergy) ;
   fParticleChange.SetMomentumChanged(fMomentumChanged) ;
 
+  fParticleChange.SetPolarizationChange(fTransportEndSpin);
+
   G4double deltaTime = 0.0 ;
 
 #if HARMONIC_MEAN_VELOCITY
diff --git a/source/processes/transportation/src/G4UserSpecialCuts.cc b/source/processes/transportation/src/G4UserSpecialCuts.cc
index 6f8484e41c..5de1d3c67c 100644
--- a/source/processes/transportation/src/G4UserSpecialCuts.cc
+++ b/source/processes/transportation/src/G4UserSpecialCuts.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserSpecialCuts.cc,v 1.3 1999/12/15 14:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserSpecialCuts.cc,v 1.3.6.1 2001/06/28 19:15:17 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 // --------------------------------------------------------------
 // History
diff --git a/source/readout/include/G4DCtable.hh b/source/readout/include/G4DCtable.hh
index 2339f4d8c4..ec01581348 100644
--- a/source/readout/include/G4DCtable.hh
+++ b/source/readout/include/G4DCtable.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DCtable.hh,v 1.5 2001/02/08 06:07:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DCtable.hh,v 1.5.2.1 2001/06/28 19:15:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4DCtable_H
diff --git a/source/readout/include/G4DMmessenger.hh b/source/readout/include/G4DMmessenger.hh
index 5b7fd847a8..fcb32b26ec 100644
--- a/source/readout/include/G4DMmessenger.hh
+++ b/source/readout/include/G4DMmessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMmessenger.hh,v 1.3 1999/12/15 14:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMmessenger.hh,v 1.3.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4DMmessenger_h
diff --git a/source/readout/include/G4DigiManager.hh b/source/readout/include/G4DigiManager.hh
index 40c2c87caf..79617e023c 100644
--- a/source/readout/include/G4DigiManager.hh
+++ b/source/readout/include/G4DigiManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DigiManager.hh,v 1.5 2001/02/08 06:07:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DigiManager.hh,v 1.5.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4DigiManager_h
diff --git a/source/readout/include/G4VDigitizerModule.hh b/source/readout/include/G4VDigitizerModule.hh
index f66062ded3..8fd8f8dfbd 100644
--- a/source/readout/include/G4VDigitizerModule.hh
+++ b/source/readout/include/G4VDigitizerModule.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigitizerModule.hh,v 1.5 2001/02/08 06:07:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigitizerModule.hh,v 1.5.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VDigitizerModule_H
diff --git a/source/readout/src/G4DCtable.cc b/source/readout/src/G4DCtable.cc
index 7165a28cfa..190674d608 100644
--- a/source/readout/src/G4DCtable.cc
+++ b/source/readout/src/G4DCtable.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DCtable.cc,v 1.4 2001/02/08 06:07:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DCtable.cc,v 1.4.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4DCtable.hh"
diff --git a/source/readout/src/G4DMmessenger.cc b/source/readout/src/G4DMmessenger.cc
index 1e662e3866..baad7453f8 100644
--- a/source/readout/src/G4DMmessenger.cc
+++ b/source/readout/src/G4DMmessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DMmessenger.cc,v 1.2 1999/12/15 14:53:51 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DMmessenger.cc,v 1.2.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // ---------------------------------------------------------------------
 
diff --git a/source/readout/src/G4DigiManager.cc b/source/readout/src/G4DigiManager.cc
index f98d0481b8..833738d776 100644
--- a/source/readout/src/G4DigiManager.cc
+++ b/source/readout/src/G4DigiManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DigiManager.cc,v 1.4 2001/02/08 06:07:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DigiManager.cc,v 1.4.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4DigiManager.hh"
diff --git a/source/readout/src/G4VDigitizerModule.cc b/source/readout/src/G4VDigitizerModule.cc
index d50dfe4350..d281c76394 100644
--- a/source/readout/src/G4VDigitizerModule.cc
+++ b/source/readout/src/G4VDigitizerModule.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VDigitizerModule.cc,v 1.2 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VDigitizerModule.cc,v 1.2.2.1 2001/06/28 19:15:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VDigitizerModule.hh"
diff --git a/source/run/History b/source/run/History
index 4765bceaab..b38157e830 100644
--- a/source/run/History
+++ b/source/run/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.29 2001/02/08 06:20:18 asaim Exp $
+$Id: History,v 1.31 2001/06/22 07:57:39 asaim Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -17,6 +17,16 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+Jun 22, 2001, M.Asai (run-V03-01-00)
+- Tagging for the release
+
+Mar. 12 2001, H.Kurashige
+- add binary mode for G4VUserPhysicsList::Retrieve/StorePhysicsTable
+- add G4VUserPhysicsList::RetrieveCutValues and related
+- add G4VUserPhysicsList::Set/ResetStoredInAscii() 
+  to switch on ascii mode for Retrieve/StorePhysicsTable
+- add setStoredInAscii command in G4UserPhysicsList
+
 Feb 8 2001, M.Asai (run-V03-00-01)
 - Migration to STL vector classes
   affected files :
diff --git a/source/run/include/G4Run.hh b/source/run/include/G4Run.hh
index 804b51fd76..954cebb9df 100644
--- a/source/run/include/G4Run.hh
+++ b/source/run/include/G4Run.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Run.hh,v 1.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Run.hh,v 1.3.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4Run_h
diff --git a/source/run/include/G4RunManager.hh b/source/run/include/G4RunManager.hh
index 4a5dffd1c1..e20a9837a9 100644
--- a/source/run/include/G4RunManager.hh
+++ b/source/run/include/G4RunManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RunManager.hh,v 1.15 2001/02/08 06:07:22 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RunManager.hh,v 1.15.2.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/run/include/G4RunMessenger.hh b/source/run/include/G4RunMessenger.hh
index b2e09ddfaa..3b53fc34d1 100644
--- a/source/run/include/G4RunMessenger.hh
+++ b/source/run/include/G4RunMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RunMessenger.hh,v 1.6 2000/11/13 01:24:20 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RunMessenger.hh,v 1.6.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //	GEANT 4 class header file 
diff --git a/source/run/include/G4UserPhysicsListMessenger.hh b/source/run/include/G4UserPhysicsListMessenger.hh
index bf206c0ac0..71221aabe6 100644
--- a/source/run/include/G4UserPhysicsListMessenger.hh
+++ b/source/run/include/G4UserPhysicsListMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserPhysicsListMessenger.hh,v 1.6 2000/11/08 10:01:59 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserPhysicsListMessenger.hh,v 1.7.2.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
@@ -29,13 +45,14 @@
 //    buildPhysicsTable * build physics table
 //    storePhysicsTable * store physics table into files
 //    retreivePhysicsTable * retreive physics table from files
-//    
+//    setStoredInAscii * Switch on/off ascii mode in store/retreive Physics Table
 // ------------------------------------------------------------
 //	History
 //        first version                   09 Jan. 1998 by H.Kurashige 
 //        second version                  24 Jan. 1998 by H.Kurashige 
 //        add buildPhysicsTable command   13 Apr. 1999 by H.Kurashige
 //        add store/retreivePhysicsTable  08 Nov. 2000 by H.Kurashige
+//        add setStoredInAscii command    12 Mar. 2001 by H.Kurashige
 // ------------------------------------------------------------
 
 #ifndef G4UserPhysicsListMessenger_h
@@ -80,6 +97,7 @@ public: // with description
     G4UIcmdWithAString *        buildPTCmd;
     G4UIcmdWithAString *        storeCmd;
     G4UIcmdWithAString *        retrieveCmd;
+    G4UIcmdWithAnInteger *      asciiCmd;
 };
 
 #endif
diff --git a/source/run/include/G4UserRunAction.hh b/source/run/include/G4UserRunAction.hh
index 284048652f..cbc551de90 100644
--- a/source/run/include/G4UserRunAction.hh
+++ b/source/run/include/G4UserRunAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserRunAction.hh,v 1.4 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserRunAction.hh,v 1.4.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4UserRunAction_h
diff --git a/source/run/include/G4VModularPhysicsList.hh b/source/run/include/G4VModularPhysicsList.hh
index 1fd8e3e80c..e96ea7060b 100644
--- a/source/run/include/G4VModularPhysicsList.hh
+++ b/source/run/include/G4VModularPhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VModularPhysicsList.hh,v 1.1 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VModularPhysicsList.hh,v 1.1.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/include/G4VPersistencyManager.hh b/source/run/include/G4VPersistencyManager.hh
index 08ceb4eb50..503ef0f7f9 100644
--- a/source/run/include/G4VPersistencyManager.hh
+++ b/source/run/include/G4VPersistencyManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistencyManager.hh,v 1.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistencyManager.hh,v 1.3.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VPersistencyManager_h
diff --git a/source/run/include/G4VPhysicsConstructor.hh b/source/run/include/G4VPhysicsConstructor.hh
index adbdae0656..7ff8cc5638 100644
--- a/source/run/include/G4VPhysicsConstructor.hh
+++ b/source/run/include/G4VPhysicsConstructor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPhysicsConstructor.hh,v 1.1 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPhysicsConstructor.hh,v 1.1.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
diff --git a/source/run/include/G4VUserDetectorConstruction.hh b/source/run/include/G4VUserDetectorConstruction.hh
index 782e51df40..246f05d8e9 100644
--- a/source/run/include/G4VUserDetectorConstruction.hh
+++ b/source/run/include/G4VUserDetectorConstruction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserDetectorConstruction.hh,v 1.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserDetectorConstruction.hh,v 1.3.4.1 2001/06/28 19:15:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VUserDetectorConstruction_h
diff --git a/source/run/include/G4VUserPhysicsList.hh b/source/run/include/G4VUserPhysicsList.hh
index f6abcb1cf1..6edafe44a4 100644
--- a/source/run/include/G4VUserPhysicsList.hh
+++ b/source/run/include/G4VUserPhysicsList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserPhysicsList.hh,v 1.8 2000/11/14 23:53:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserPhysicsList.hh,v 1.9.2.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
@@ -44,6 +60,11 @@
 //          changed SetCuts method argument
 //       modified                           08, Nov 2000 by H.Kurashige
 //          added   Retrieve/StorePhysicsTable and related methods
+//       modified                           08, Mar 2001 by H.Kurashige
+//          added   binary mode for Retrieve/StorePhysicsTable
+//          added   RetrieveCutValues and related
+//          added   Set/ResetStoredInAscii() to switch on ascii mode 
+//                  for Retrieve/StorePhysicsTable
 // ------------------------------------------------------------
 #ifndef G4VUserPhysicsList_h
 #define G4VUserPhysicsList_h 1
@@ -69,47 +90,53 @@ class G4VUserPhysicsList
  
 
   protected: // with description
-    // These two methods of  ConstructParticle() and ConstructProcess()
-    // will be invoked in the Construct() method. 
+   // These two methods of  ConstructParticle() and ConstructProcess()
+   // will be invoked in the Construct() method. 
 
-    // each particle type will be instantiated
-    virtual void ConstructParticle() = 0;
+   // each particle type will be instantiated
+   virtual void ConstructParticle() = 0;
  
-    // each physics process will be instantiated and
-    // registered to the process manager of each particle type 
-    virtual void ConstructProcess() = 0;
+   // each physics process will be instantiated and
+   // registered to the process manager of each particle type 
+   virtual void ConstructProcess() = 0;
 
   protected: // with description
    //  User must invoke this method in his ConstructProcess() 
    //  implementation in order to insures particle transportation.
    //  !! Caution: this class must not be overriden !!
-    void AddTransportation();
+   void AddTransportation();
 
-  /////////////////////////////////////
+  /////////////////////////////////////////////////////////////////
   public: // with description 
    //  "SetCuts" method sets a cut value for all particle types 
    //   in the particle table
    virtual void SetCuts() = 0; 
 
-  protected: // with description
-   //  "SetCutsWithDefault" method sets a cut value with the default
-   //   cut values for all particle types in the particle table
-   void SetCutsWithDefault();   
+  public:  // with description
+   //  set/get the default cut value
+   //  Calling SetDefaultCutValue causes re-calcuration of cut values
+   //  and physics tables just before the next event loop
+   void     SetDefaultCutValue(G4double newCutValue);
+   G4double GetDefaultCutValue() const;
 
+  /////////////////////////////////////////////////////////////////////  
   public: // with description
-    // Invoke BuildPhysicsTable for all processes for each particle
+    // Invoke BuildPhysicsTable for all processes for specified particle
     // In case of "Retrieve" flag is ON, PhysicsTable will be
     // retrieved from files
     void BuildPhysicsTable(G4ParticleDefinition* );    
+
  
     // Store PhysicsTable together with both material and cut value 
     // information in files under the specified directory.
     //  (return true if files are sucessfully created)
     G4bool  StorePhysicsTable(const G4String& directory = ".");
-
+ 
     // Return true if "Retrieve" flag is ON. 
     // (i.e. PhysicsTable will be retrieved from files)
     G4bool  IsPhysicsTableRetrieved() const;
+    G4bool  IsStoredInAscii() const;
+
     // Get directory path for physics table files.
     const G4String& GetPhysicsTableDirectory() const;
 
@@ -118,90 +145,114 @@ class G4VUserPhysicsList
     // Null string (default) means directory is not changed 
     // from the current value 
     void    SetPhysicsTableRetrieved(const G4String& directory = "");
-   
+    void    SetStoredInAscii();
+  
     // Reset "Retrieve" flag
     void    ResetPhysicsTableRetrieved();
-  
-  protected:  // with description
-    // do BuildPhysicsTable for make the integral schema
-    void BuildIntegralPhysicsTable(G4VProcess* ,G4ParticleDefinition*  );   
+    void    ResetStoredInAscii();
 
-  protected: // with description
-    // Retrieve PhysicsTable from files for proccess belongng the particle.
-    // Normal BuildPhysics procedure of processes will be invoked, 
-    // if it fails (in case of Process's RetrievePhysicsTable returns false)
-    virtual void  RetrievePhysicsTable(G4ParticleDefinition* );
-
-    // Store material information in files under the specified directory.
-    virtual G4bool  StoreMaterialInfo(const G4String& directory);
-    // Store cut values information in files under the specified directory.
-    virtual G4bool  StoreCutValues(const G4String& directory);
-
-    // check stored material and cut values
-    virtual G4bool CheckForRetrievePhysicsTable(const G4String& directory);
-    // check stored material is consistent with the current detector setup. 
-    virtual G4bool  CheckMaterialInfo(const G4String& directory);
-    // check stored cuvalue is consistent with the current detector setup. 
-    virtual G4bool  CheckCutValues(const G4String& directory);
-
-  protected: // with description
-    // Following are utility methods for SetCuts/reCalcCuts  
-
-    // Reset cut values in energy for all particle types
-    // By calling this methods, the run manager will invoke
-    // SetCuts() just before event loop  
-    void ResetCuts();
-
-    // SetCutValue sets a cut value for a particle type
-    void SetCutValue(G4double aCut, const G4String& name); 
-    void ReCalcCutValue(const G4String& name); 
-
-    //  "setCutsForOthers" method sets a cut value to all particle types 
-    //  which have not be called SetCuts() methods yet.
-    //  (i.e. particles which have no definit cut values)
-    void SetCutValueForOthers(G4double cutValue);
-
-    // "setCutsForOtherThan"  sets a cut value to all particle types
-    // other than particle types specified in arguments
-    void SetCutValueForOtherThan(G4double cutValue,
-                                 G4ParticleDefinition* first,
-                                 G4ParticleDefinition* second  = NULL,
-				 G4ParticleDefinition* third   = NULL,
-                                 G4ParticleDefinition* fourth  = NULL,
-				 G4ParticleDefinition* fifth   = NULL,
-                                 G4ParticleDefinition* sixth   = NULL,
-				 G4ParticleDefinition* seventh = NULL,
-                                 G4ParticleDefinition* eighth  = NULL,
-				 G4ParticleDefinition* nineth  = NULL,
-                                 G4ParticleDefinition* tenth   = NULL  );
-
-    //  "reCalcCutsForOthers" method re-calculates a cut value 
-    //  to all particle types which have not be called SetCuts() methods yet.
-    void ReCalcCutValueForOthers();
-
-  public:  // with description
-    //  set/get the default cut value
-    //  Calling SetDefaultCutValue causes re-calcuration of cut values
-    //  and physics tables just before the next event loop
-    void     SetDefaultCutValue(G4double newCutValue);
-    G4double GetDefaultCutValue() const;
-
-  protected:
-    // this is the default cut value for all particles
-    G4double defaultCutValue;
-
-  /////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////
   public: // with description
     // Print out the List of registered particles types
     void DumpList() const;
 
   public: // with description
-  // Print out information of cut values
+    // Print out information of cut values
     void DumpCutValuesTable() const;
     void DumpCutValues(const G4String &particle_name = "ALL") const;
     void DumpCutValues(G4ParticleDefinition* ) const;
 
+  public: // with description
+    void  SetVerboseLevel(G4int value);
+    G4int GetVerboseLevel() const;
+    // set/get controle flag for output message
+    //  0: Silent
+    //  1: Warning message
+    //  2: More
+
+  ///////////////////////////////////////////////////////////////////////////
   protected: // with description
+   //  "SetCutsWithDefault" method sets a cut value with the default
+   //   cut values for all particle types in the particle table
+   void SetCutsWithDefault();   
+
+
+   // Following are utility methods for SetCuts/reCalcCuts  
+  
+   // Reset cut values in energy for all particle types
+   // By calling this methods, the run manager will invoke
+   // SetCuts() just before event loop  
+   void ResetCuts();
+
+   // SetCutValue sets a cut value for a particle type
+   void SetCutValue(G4double aCut, const G4String& name); 
+   void ReCalcCutValue(const G4String& name); 
+
+   //  "setCutsForOthers" method sets a cut value to all particle types 
+   //  which have not be called SetCuts() methods yet.
+   //  (i.e. particles which have no definit cut values)
+   void SetCutValueForOthers(G4double cutValue);
+
+   // "setCutsForOtherThan"  sets a cut value to all particle types
+   // other than particle types specified in arguments
+   void SetCutValueForOtherThan(G4double cutValue,
+				G4ParticleDefinition* first,
+				G4ParticleDefinition* second  = NULL,
+				G4ParticleDefinition* third   = NULL,
+				G4ParticleDefinition* fourth  = NULL,
+				G4ParticleDefinition* fifth   = NULL,
+				G4ParticleDefinition* sixth   = NULL,
+				G4ParticleDefinition* seventh = NULL,
+				G4ParticleDefinition* eighth  = NULL,
+				G4ParticleDefinition* nineth  = NULL,
+				G4ParticleDefinition* tenth   = NULL  );
+
+   //  "reCalcCutsForOthers" method re-calculates a cut value 
+   //  to all particle types which have not be called SetCuts() methods yet.
+   void ReCalcCutValueForOthers();
+
+   // Invoke SetCuts for specified particle
+   // In case of "Retrieve" flag is ON, 
+   // Cut values will be retrieved from files
+   void SetParticleCuts( G4double cut, G4ParticleDefinition* );    
+
+  
+  ///////////////////////////////////////////////////////////////////////////////
+  protected:  
+    // do BuildPhysicsTable for make the integral schema
+    void BuildIntegralPhysicsTable(G4VProcess* ,G4ParticleDefinition*  );   
+
+  protected: 
+    // Retrieve PhysicsTable from files for proccess belongng the particle.
+    // Normal BuildPhysics procedure of processes will be invoked, 
+    // if it fails (in case of Process's RetrievePhysicsTable returns false)
+    virtual void  RetrievePhysicsTable(G4ParticleDefinition* ,	
+				       const G4String& directory, 
+				       G4bool          ascii = false);
+
+    // Store material information in files under the specified directory.
+    virtual G4bool  StoreMaterialInfo(const G4String& directory, 
+				      G4bool          ascii = false);
+    // Store cut values information in files under the specified directory.
+    virtual G4bool  StoreCutValues(const G4String& directory, 
+				   G4bool          ascii = false);
+
+    // Retrieve cut values information in files under the specified directory.
+    virtual G4bool  RetrieveCutValues(const G4String& directory,
+				      G4bool          ascii = false);
+
+
+     // check stored material and cut values
+    virtual G4bool CheckForRetrievePhysicsTable(const G4String& directory, 
+						G4bool          ascii = false);
+    // check stored material is consistent with the current detector setup. 
+    virtual G4bool  CheckMaterialInfo(const G4String& directory, 
+				      G4bool          ascii = false);
+    // check stored cut value is consistent with the current detector setup. 
+    virtual G4bool  CheckCutValues(const G4String& directory, 
+				   G4bool          ascii = false);
+  /////////////////////////////////////////////////////////////////
+  protected: 
     // adds new ProcessManager to all particles in the Particle Table
     //   this routine is used in Construct()
     void InitializeProcessManager();
@@ -216,6 +267,8 @@ class G4VUserPhysicsList
     void AddProcessManager(G4ParticleDefinition* newParticle,
 			   G4ProcessManager*    newManager = NULL );
  
+ 
+  ////////////////////////////////////////////////////////////////////////
   protected:
     // the particle table has the complete List of existing particle types
     G4ParticleTable* theParticleTable;
@@ -225,29 +278,31 @@ class G4VUserPhysicsList
   // pointer to G4UserPhysicsListMessenger
     G4UserPhysicsListMessenger* theMessenger;
 
- public: // with description
-   void  SetVerboseLevel(G4int value);
-   G4int GetVerboseLevel() const;
-   // set/get controle flag for output message
-   //  0: Silent
-   //  1: Warning message
-   //  2: More
-
- protected:
+  protected:
    G4int verboseLevel;
 
- protected:
+  protected:
+    // this is the default cut value for all particles
+    G4double defaultCutValue;
+
+  protected:
    // flag to determine physics table will be build from file or not
    G4bool fRetrievePhysicsTable;  
+   G4bool fStoredInAscii;
  
    G4bool fIsCheckedForRetrievePhysicsTable;
-   
+   G4bool fIsRestoredCutValues;
+
    // directory name for physics table files 
    G4String directoryPhysicsTable;   
 
    // number of materials in G4MaterialTable
    // (this member is used by store/restore physics table)
    G4int numberOfMaterial;   
+
+  private:
+   enum { FixedStringLengthForStore = 32 }; 
+
 };
 
 
@@ -295,6 +350,12 @@ inline
   return fRetrievePhysicsTable;  
 }
 
+inline  
+ G4bool  G4VUserPhysicsList::IsStoredInAscii() const
+{
+  return fStoredInAscii;
+}
+
 inline 
   const G4String& G4VUserPhysicsList::GetPhysicsTableDirectory() const
 {
@@ -302,21 +363,26 @@ inline
 }
 
 inline 
-void  G4VUserPhysicsList::SetPhysicsTableRetrieved(const G4String& directory)
+ void  G4VUserPhysicsList::SetStoredInAscii()
 {
-  fRetrievePhysicsTable = true;
-  if(!directory.isNull()) {
-    directoryPhysicsTable = directory;
-  }
-  fIsCheckedForRetrievePhysicsTable=false;
+  fStoredInAscii = true;
 }
-   
+    
+    
 inline 
  void  G4VUserPhysicsList::ResetPhysicsTableRetrieved()
 {
   fRetrievePhysicsTable = false;
+  fIsRestoredCutValues = false;
   fIsCheckedForRetrievePhysicsTable=false;
 }
+
+
+inline 
+ void  G4VUserPhysicsList::ResetStoredInAscii()
+{
+  fStoredInAscii = false;
+}
 #endif
 
 
diff --git a/source/run/include/G4VUserPrimaryGeneratorAction.hh b/source/run/include/G4VUserPrimaryGeneratorAction.hh
index 730acb2c13..dd1ea13759 100644
--- a/source/run/include/G4VUserPrimaryGeneratorAction.hh
+++ b/source/run/include/G4VUserPrimaryGeneratorAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserPrimaryGeneratorAction.hh,v 1.3 1999/12/15 14:53:52 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserPrimaryGeneratorAction.hh,v 1.3.4.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #ifndef G4VUserPrimaryGeneratorAction_h
diff --git a/source/run/src/G4Run.cc b/source/run/src/G4Run.cc
index 91371fd224..916119ebf9 100644
--- a/source/run/src/G4Run.cc
+++ b/source/run/src/G4Run.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Run.cc,v 1.2 1999/12/15 14:53:53 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Run.cc,v 1.2.4.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4Run.hh"
diff --git a/source/run/src/G4RunManager.cc b/source/run/src/G4RunManager.cc
index 4fa9892e04..102a6f5860 100644
--- a/source/run/src/G4RunManager.cc
+++ b/source/run/src/G4RunManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RunManager.cc,v 1.23 2001/04/05 09:18:13 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RunManager.cc,v 1.25.2.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -69,8 +85,8 @@ G4RunManager::G4RunManager()
   randomNumberStatusDir = "./";
   G4cout 
   << "**********************************************" << G4endl
-  << " Geant4 version $Name: geant4-03-01 $" << G4endl
-  << "                                (06-Apr-2001)" << G4endl
+  << " Geant4 version $Name:  $" << G4endl
+  << "                                (29-Jun-2001)" << G4endl
   << "             Copyright : Geant4 Collaboration" << G4endl
   << "**********************************************" << G4endl;
 }
diff --git a/source/run/src/G4RunMessenger.cc b/source/run/src/G4RunMessenger.cc
index 9e904f6849..9564a00c54 100644
--- a/source/run/src/G4RunMessenger.cc
+++ b/source/run/src/G4RunMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RunMessenger.cc,v 1.7 2000/11/13 01:24:21 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RunMessenger.cc,v 1.7.4.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4RunMessenger.hh"
diff --git a/source/run/src/G4UserPhysicsListMessenger.cc b/source/run/src/G4UserPhysicsListMessenger.cc
index 04f3124160..80b5d591f8 100644
--- a/source/run/src/G4UserPhysicsListMessenger.cc
+++ b/source/run/src/G4UserPhysicsListMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserPhysicsListMessenger.cc,v 1.5 2000/11/08 12:40:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserPhysicsListMessenger.cc,v 1.6.2.1 2001/06/28 19:15:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //---------------------------------------------------------------
@@ -16,6 +32,7 @@
 //	History
 //        first version                   09 Jan. 1998 by H.Kurashige 
 //        add buildPhysicsTable command   13 Apr. 1999 by H.Kurashige
+//        add setStoredInAscii command    12 Mar. 2001 by H.Kurashige
 // ------------------------------------------------------------
 
 #include "G4UserPhysicsListMessenger.hh"
@@ -97,6 +114,16 @@ G4UserPhysicsListMessenger::G4UserPhysicsListMessenger(G4VUserPhysicsList* pPart
   retrieveCmd->SetParameterName("dirName",true);
   retrieveCmd->SetDefaultValue("");
   retrieveCmd->AvailableForStates(PreInit,Idle);
+
+  //  /run/particle/setStoredInAscii command
+  asciiCmd = new G4UIcmdWithAnInteger("/run/particle/setStoredInAscii",this);
+  asciiCmd->SetGuidance("Switch on/off ascii mode in store/retreive Physics Table");
+  asciiCmd->SetGuidance("  Enter 0(binary) or 1(ascii)");
+  asciiCmd->SetParameterName("ascii",true);
+  asciiCmd->SetDefaultValue(0);
+  asciiCmd->AvailableForStates(PreInit,Idle);
+  asciiCmd->SetRange("ascii ==0 || ascii ==1");
+
 }
 
 G4UserPhysicsListMessenger::~G4UserPhysicsListMessenger()
@@ -109,7 +136,8 @@ G4UserPhysicsListMessenger::~G4UserPhysicsListMessenger()
   delete buildPTCmd;
   delete storeCmd;  
   delete retrieveCmd;
-  delete theDirectory;  
+  delete theDirectory;
+  delete asciiCmd;  
 }
 
 void G4UserPhysicsListMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
@@ -151,7 +179,16 @@ void G4UserPhysicsListMessenger::SetNewValue(G4UIcommand * command,G4String newV
     } else {
       thePhysicsList->SetPhysicsTableRetrieved(newValue);
     }
+
+  } else if( command == asciiCmd ) {
+    if (asciiCmd->GetNewIntValue(newValue) == 0) {
+      thePhysicsList->ResetStoredInAscii();
+    } else {
+      thePhysicsList->SetStoredInAscii();
+    }
+
   }
+
 } 
 
 G4String G4UserPhysicsListMessenger::GetCurrentValue(G4UIcommand * command)
@@ -195,6 +232,14 @@ G4String G4UserPhysicsListMessenger::GetCurrentValue(G4UIcommand * command)
     } else {
       cv = "OFF";
     }
+
+  } else if( command==asciiCmd ){
+    if (thePhysicsList->IsStoredInAscii()){
+      cv = "1";
+    } else {
+      cv = "0";
+    }
+
   }
    
   return cv;
diff --git a/source/run/src/G4UserRunAction.cc b/source/run/src/G4UserRunAction.cc
index b2545fe586..a966abf161 100644
--- a/source/run/src/G4UserRunAction.cc
+++ b/source/run/src/G4UserRunAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserRunAction.cc,v 1.3 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserRunAction.cc,v 1.3.4.1 2001/06/28 19:15:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4UserRunAction.hh"
diff --git a/source/run/src/G4VPersistencyManager.cc b/source/run/src/G4VPersistencyManager.cc
index 74f1ea0b17..0e061ed3a9 100644
--- a/source/run/src/G4VPersistencyManager.cc
+++ b/source/run/src/G4VPersistencyManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VPersistencyManager.cc,v 1.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VPersistencyManager.cc,v 1.2.4.1 2001/06/28 19:15:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VPersistencyManager.hh"
diff --git a/source/run/src/G4VUserDetectorConstruction.cc b/source/run/src/G4VUserDetectorConstruction.cc
index b04faa78ae..8569b84bdd 100644
--- a/source/run/src/G4VUserDetectorConstruction.cc
+++ b/source/run/src/G4VUserDetectorConstruction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserDetectorConstruction.cc,v 1.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserDetectorConstruction.cc,v 1.2.4.1 2001/06/28 19:15:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VUserDetectorConstruction.hh"
diff --git a/source/run/src/G4VUserPhysicsList.cc b/source/run/src/G4VUserPhysicsList.cc
index 38033343a2..da842c1518 100644
--- a/source/run/src/G4VUserPhysicsList.cc
+++ b/source/run/src/G4VUserPhysicsList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserPhysicsList.cc,v 1.12 2000/11/16 14:46:48 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserPhysicsList.cc,v 1.13.2.1 2001/06/28 19:15:21 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
@@ -24,6 +40,7 @@
 //       Added RemoveProcessManager        9 Feb. 1999 by H.Kurashige
 //       Fixed RemoveProcessManager       15 Apr. 1999 by H.Kurashige
 //       Removed ConstructAllParticles()  15 Apr. 1999 by H.Kurashige
+//       modified                         08, Mar 2001 by H.Kurashige
 // ------------------------------------------------------------
 
 #include "globals.hh"
@@ -35,17 +52,22 @@
 #include "G4Material.hh"
 #include "G4UserPhysicsListMessenger.hh"
 #include "G4UImanager.hh"
-#include "G4ios.hh"
 #include "G4UnitsTable.hh"
+
+#include "G4ios.hh"
 #include "g4std/iomanip"                
+#include "g4std/fstream"                
 
-
+////////////////////////////////////////////////////////
 G4VUserPhysicsList::G4VUserPhysicsList()
                    :verboseLevel(1), 
 		    numberOfMaterial(0),
 		    fRetrievePhysicsTable(false),
                     directoryPhysicsTable("."),
-		    fIsCheckedForRetrievePhysicsTable(false)
+		    fIsCheckedForRetrievePhysicsTable(false),
+		    fStoredInAscii(true),
+		    fIsRestoredCutValues(false)
+
 {
   // default cut value  (1.0mm) 
   defaultCutValue = 1.0*mm;
@@ -61,6 +83,7 @@ G4VUserPhysicsList::G4VUserPhysicsList()
   theMessenger = new G4UserPhysicsListMessenger(this);
 }
 
+////////////////////////////////////////////////////////
 G4VUserPhysicsList::~G4VUserPhysicsList()
 {
   if (theMessenger != 0) {
@@ -69,6 +92,7 @@ G4VUserPhysicsList::~G4VUserPhysicsList()
   }
 }
 
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::AddProcessManager(G4ParticleDefinition* newParticle,
 					   G4ProcessManager*     newManager)
 {
@@ -129,6 +153,7 @@ void G4VUserPhysicsList::AddProcessManager(G4ParticleDefinition* newParticle,
 }
 
 
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::InitializeProcessManager()
 {
   // loop over all particles in G4ParticleTable 
@@ -144,6 +169,7 @@ void G4VUserPhysicsList::InitializeProcessManager()
   }
 }
 
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::RemoveProcessManager()
 {
   // loop over all particles in G4ParticleTable 
@@ -164,6 +190,7 @@ void G4VUserPhysicsList::RemoveProcessManager()
 }
 
 
+////////////////////////////////////////////////////////
 #include "G4Transportation.hh"
 void G4VUserPhysicsList::AddTransportation()
 {
@@ -192,6 +219,7 @@ void G4VUserPhysicsList::AddTransportation()
 }
 
 
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::SetDefaultCutValue(G4double value)
 {
    if (value<=0.0) {
@@ -214,6 +242,7 @@ void G4VUserPhysicsList::SetDefaultCutValue(G4double value)
    }
 }
 
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::ResetCuts()
 {
 #ifdef G4VERBOSE    
@@ -242,8 +271,11 @@ void G4VUserPhysicsList::ResetCuts()
   G4UImanager::GetUIpointer()->ApplyCommand("/run/cutoffModified");
   //   retreive  /control/verbose 
   G4UImanager::GetUIpointer()->SetVerboseLevel(tempVerboseLevel);
+
 }
 
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
                                  G4ParticleDefinition* first,
                                  G4ParticleDefinition* second,
@@ -329,7 +361,7 @@ void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
     }
     if ( (!isSpecified) && (!particle->IsShortLived()) ){
       // set cut value
-      particle->SetCuts(cutValue);
+      SetParticleCuts( cutValue ,particle );
       // build physics table
       BuildPhysicsTable(particle);
 
@@ -340,32 +372,42 @@ void G4VUserPhysicsList::SetCutValueForOtherThan(G4double cutValue,
   }
 }
 
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::SetCutValue(G4double aCut, const G4String& name)
 {
   G4ParticleDefinition* particle = theParticleTable->FindParticle(name);
+#ifdef G4VERBOSE    
+  if (particle != 0){
+    if (verboseLevel >1) {
+      G4cout << "G4VUserPhysicsList::SetCutValue       :";
+      G4cout << "Set cuts for " << name << G4endl;
+    }
+  } else {
+    if (verboseLevel >0) {
+      G4cout << "G4VUserPhysicsList::SetCutValue       :";
+      G4cout << name << " is not found in ParticleTable" << G4endl;
+    }
+  }
+#endif
+
   if (particle != 0){
     if (!particle->IsShortLived()) {
       //set cut value
-      particle->SetCuts( aCut );
+      SetParticleCuts( aCut ,particle );
       // build physics table
       BuildPhysicsTable(particle);
     }
   } 
-
-#ifdef G4VERBOSE    
-  if (particle != 0){
-    if (verboseLevel >1) G4cout << "Set cuts for " << name << G4endl;
-  } else {
-    if (verboseLevel >0) 
-      G4cout << name << " is not found in ParticleTable" << G4endl;
-  }
-#endif
 }
 
+
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::SetCutsWithDefault()
 {
   // default cut value
-   G4double cut = defaultCutValue;
+  G4double cut = defaultCutValue;
 
 #ifdef G4VERBOSE    
   if (verboseLevel >1){
@@ -392,6 +434,8 @@ void G4VUserPhysicsList::SetCutsWithDefault()
   }
 }  
 
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
 {
  // check cut value is positive
@@ -421,7 +465,7 @@ void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
       // check if the cut value has already been set
       if ((particle->GetLengthCuts()<0.0) ||(particle->GetEnergyCuts()==0)) {
 	// set cut value
-	particle->SetCuts(cutValue);
+	SetParticleCuts( cutValue ,particle );
 	// build physics table 
 	BuildPhysicsTable(particle);
 
@@ -435,6 +479,8 @@ void G4VUserPhysicsList::SetCutValueForOthers(G4double cutValue)
   }
 }
 
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::ReCalcCutValue(const G4String& name)
 {
   G4ParticleDefinition* particle = theParticleTable->FindParticle(name);
@@ -457,6 +503,8 @@ void G4VUserPhysicsList::ReCalcCutValue(const G4String& name)
 
 }
 
+
+////////////////////////////////////////////////////////
 void G4VUserPhysicsList::ReCalcCutValueForOthers()
 {
 #ifdef G4VERBOSE    
@@ -486,6 +534,29 @@ void G4VUserPhysicsList::ReCalcCutValueForOthers()
   }
 }
 
+
+////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////
+void G4VUserPhysicsList::SetParticleCuts( G4double cut, G4ParticleDefinition* particle)
+{
+  if (fRetrievePhysicsTable && !fIsRestoredCutValues) {
+#ifdef G4VERBOSE  
+    if (verboseLevel>2){
+      G4cout << "G4VUserPhysicsList::SetParticleCuts  ";
+      G4cout << " Retrieve Cut Values for ";
+      G4cout << particle->GetParticleName() << G4endl;
+    }
+#endif
+    RetrieveCutValues(directoryPhysicsTable, fStoredInAscii);
+    fIsRestoredCutValues = true;
+  }
+
+  if (particle->GetEnergyCuts() == 0) {
+    particle->SetCuts(cut);
+  } 
+}    
+
+///////////////////////////////////////////////////////////////
 void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
 {
   if (fRetrievePhysicsTable) {
@@ -496,9 +567,10 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
       G4cout << particle->GetParticleName() << G4endl;
     }
 #endif
-    if (CheckForRetrievePhysicsTable(directoryPhysicsTable)) {
+    if (CheckForRetrievePhysicsTable(directoryPhysicsTable, fStoredInAscii)) {
       //  Retrieve PhysicsTable from files for proccesses
-      RetrievePhysicsTable(particle);
+      RetrievePhysicsTable(particle, directoryPhysicsTable, fStoredInAscii);
+
       return;
     } else {
 #ifdef G4VERBOSE  
@@ -506,7 +578,6 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
 	G4cout << "CheckForRetrievePhysicsTable failed " << G4endl;
       }
 #endif
-      fRetrievePhysicsTable = false;
     }
   }
 
@@ -528,6 +599,7 @@ void G4VUserPhysicsList::BuildPhysicsTable(G4ParticleDefinition* particle)
   }
 }
 
+///////////////////////////////////////////////////////////////
 void  G4VUserPhysicsList::BuildIntegralPhysicsTable(G4VProcess* process,
 						    G4ParticleDefinition* particle) 
 {
@@ -556,6 +628,7 @@ void  G4VUserPhysicsList::BuildIntegralPhysicsTable(G4VProcess* process,
   }
 }
 
+///////////////////////////////////////////////////////////////
 void G4VUserPhysicsList::DumpList() const
 {
   theParticleIterator->reset();
@@ -572,6 +645,7 @@ void G4VUserPhysicsList::DumpList() const
   G4cout << G4endl;
 }
 
+///////////////////////////////////////////////////////////////
 void G4VUserPhysicsList::DumpCutValues(const G4String &particle_name) const
 {
   G4ParticleDefinition* particle;
@@ -587,6 +661,7 @@ void G4VUserPhysicsList::DumpCutValues(const G4String &particle_name) const
   }
 }
 
+///////////////////////////////////////////////////////////////
 void G4VUserPhysicsList::DumpCutValues( G4ParticleDefinition* particle) const
 {
   if (particle == 0) return;
@@ -624,6 +699,7 @@ void G4VUserPhysicsList::DumpCutValues( G4ParticleDefinition* particle) const
   G4cout.precision(prec);
 }
 
+///////////////////////////////////////////////////////////////
 void G4VUserPhysicsList::DumpCutValuesTable() const
 {
   // This methods Print out a table of cut value information
@@ -697,12 +773,19 @@ void G4VUserPhysicsList::DumpCutValuesTable() const
   G4cout.precision(prec);
 }
 
+
+///////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////
 G4bool G4VUserPhysicsList::StorePhysicsTable(const G4String& directory)
 {
-  G4String dir = directory;
+  const G4MaterialTable* matTable = G4Material::GetMaterialTable(); 
+  numberOfMaterial = matTable->entries();
+
+  G4bool   ascii = fStoredInAscii;
+  G4String dir   = directory;
   if (dir.isNull()) dir = directoryPhysicsTable;  
-  if (!StoreMaterialInfo(dir)) return false;
-  if (!StoreCutValues(dir)) return false;
+  if (!StoreMaterialInfo(dir, ascii)) return false;
+  if (!StoreCutValues(dir,ascii)) return false;
 #ifdef G4VERBOSE  
   if (verboseLevel>2){
     G4cout << "G4VUserPhysicsList::StorePhysicsTable   ";
@@ -710,18 +793,52 @@ G4bool G4VUserPhysicsList::StorePhysicsTable(const G4String& directory)
   }
 #endif
 
-  return true;
+  G4bool success= true;  
+
+  // loop over all particles in G4ParticleTable 
+  theParticleIterator->reset();
+  while( (*theParticleIterator)() ){
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    // Store physics tables for every process for this particle type
+    G4ProcessVector* pVector = (particle->GetProcessManager())->GetProcessList();
+    G4int  j;
+    for ( j=0; j < pVector->entries(); ++j) {
+      if (!(*pVector)[j]->StorePhysicsTable(directoryPhysicsTable,ascii)){   
+#ifdef G4VERBOSE  
+	if (verboseLevel>2){
+	  G4cout << "G4VUserPhysicsList::StorePhysicsTable   ";
+	  G4cout << " Fail to retrieve for ";
+	  G4cout << (*pVector)[j]->GetProcessName();
+	  G4cout << "(" << particle->GetParticleName() <<")" << G4endl;
+	}
+#endif
+	success = false;
+      }
+    }
+    // end loop over processes
+  }
+  // end loop over particles
+  return success;
 }
 
-G4bool G4VUserPhysicsList::StoreMaterialInfo(const G4String& directory)
+
+///////////////////////////////////////////////////////////////
+G4bool G4VUserPhysicsList::StoreMaterialInfo(const G4String& directory, 
+					     G4bool          ascii)
 {
   const G4String fileName = directory + "/" + "material.dat";
   const G4String key = "MATERIAL";
   G4std::ofstream fOut;  
 
   // open output file //
-  fOut.open(fileName,G4std::ios::out);
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii ) 
+    fOut.open(fileName,G4std::ios::out|G4std::ios::binary);
+  else 
+#endif
+    fOut.open(fileName,G4std::ios::out);
 
+  
   // check if the file has been opened successfully 
   if (!fOut) {
 #ifdef G4VERBOSE  
@@ -730,38 +847,72 @@ G4bool G4VUserPhysicsList::StoreMaterialInfo(const G4String& directory)
 #endif
     return false;
   }
-
-  // key word
-  fOut << key << G4endl;
- 
+  
   const G4MaterialTable* matTable = G4Material::GetMaterialTable(); 
-
   // number of materials in the table
   numberOfMaterial = matTable->entries();
-  fOut << numberOfMaterial << G4endl;
 
-  fOut.setf(G4std::ios::scientific);
+  if (ascii) {
+    /////////////// ASCII mode  /////////////////
+    // key word
+    fOut << key << G4endl;
+    
+    // number of materials in the table
+    fOut << numberOfMaterial << G4endl;
+    
+    fOut.setf(G4std::ios::scientific);
+  
+    // material name and density
+    for (size_t idx=0; idx<matTable->entries(); ++idx){
+      fOut << G4std::setw(FixedStringLengthForStore) << ((*matTable)[idx])->GetName();
+      fOut << G4std::setw(FixedStringLengthForStore) << ((*matTable)[idx])->GetDensity()/(g/cm3) << G4endl;
+    }
+    
+    fOut.unsetf(G4std::ios::scientific);
 
-  // material name and density
-  for (G4int idx=0; idx<matTable->entries(); ++idx){
-    fOut << G4std::setw(20) << ((*matTable)[idx])->GetName();
-    fOut << G4std::setw(20) << ((*matTable)[idx])->GetDensity()/(g/cm3) << G4endl;
-  }
+  } else {
+    /////////////// Binary mode  /////////////////
+    char temp[FixedStringLengthForStore];
+    size_t i;
 
-  fOut.unsetf(G4std::ios::scientific);
+    // key word
+    for (i=0; i<FixedStringLengthForStore; ++i) temp[i] = '\0'; 
+    for (i=0; i<key.length() && i<FixedStringLengthForStore-1; ++i) temp[i]=key[i];
+    fOut.write(temp, FixedStringLengthForStore);
+
+    // number of materials in the table
+    fOut.write( (char*)(&numberOfMaterial), sizeof (G4int));
+    
+    // material name and density
+    for (size_t imat=0; imat<matTable->entries(); ++imat){
+      G4String name =  ((*matTable)[imat])->GetName();
+      G4double density = ((*matTable)[imat])->GetDensity();
+      for (i=0; i<FixedStringLengthForStore; ++i) temp[i] = '\0'; 
+      for (i=0; i<name.length() && i<FixedStringLengthForStore-1; ++i) temp[i]=name[i];
+      fOut.write(temp, FixedStringLengthForStore);
+      fOut.write( (char*)(&density), sizeof (G4double));
+    }    
+  }    
 
   fOut.close();
   return true;
 }
 
-G4bool G4VUserPhysicsList::StoreCutValues(const G4String& directory)
+///////////////////////////////////////////////////////////////
+G4bool G4VUserPhysicsList::StoreCutValues(const G4String& directory, 
+					  G4bool          ascii)
 {
   const G4String fileName = directory + "/" + "cut_value.dat";
   const G4String key = "CUT_VALUE";
   G4std::ofstream fOut;  
 
   // open output file //
-  fOut.open(fileName,G4std::ios::out);
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii ) 
+    fOut.open(fileName,G4std::ios::out|G4std::ios::binary);
+  else 
+#endif
+    fOut.open(fileName,G4std::ios::out);
 
   // check if the file has been opened successfully 
   if (!fOut) {
@@ -772,17 +923,33 @@ G4bool G4VUserPhysicsList::StoreCutValues(const G4String& directory)
     return false;
   }
 
-  // key word
-  fOut << key << G4endl;
- 
-  fOut.setf(G4std::ios::scientific);
-  // default cut value
-  fOut << "Default " <<  G4std::setw(20) << defaultCutValue/mm  << G4endl;
+  char temp[FixedStringLengthForStore];
+  size_t i;
+  if (ascii) {
+    /////////////// ASCII mode  /////////////////
+    // key word
+    fOut << key << G4endl;
+    
+    fOut.setf(G4std::ios::scientific);
+    // default cut value
+    fOut << "Default " <<  G4std::setw(20) << defaultCutValue/mm  << G4endl;
+    fOut.unsetf(G4std::ios::scientific);
+  } else {
+    /////////////// Binary mode  /////////////////
+    // key word
+    for (i=0; i<FixedStringLengthForStore; ++i) temp[i] = '\0'; 
+    for (i=0; i<key.length() && i<FixedStringLengthForStore-1; ++i) temp[i]=key[i];
+    fOut.write(temp, FixedStringLengthForStore);
+
+    // default cut value
+    fOut.write( (char*)(&defaultCutValue), sizeof (G4double));
+  }
 
  // loop over all particles in G4ParticleTable 
   theParticleIterator->reset();
   while( (*theParticleIterator)() ){
     G4ParticleDefinition* particle = theParticleIterator->value();
+    // Only following particles are concerned
     if ( (particle->GetParticleName() == "gamma" ) ||
 	 (particle->GetParticleName() == "e-"    ) ||
 	 (particle->GetParticleName() == "e+"    ) ||
@@ -790,31 +957,80 @@ G4bool G4VUserPhysicsList::StoreCutValues(const G4String& directory)
 	 (particle->GetParticleName() == "mu+"   ) ||
 	 (particle->GetParticleName() == "proton" ) ||
 	 (particle->GetParticleName() == "anti_proton" ) ||
-	 ((particle->GetPDGCharge()==0.0)&&(!particle->IsShortLived())) ) {
- 
+	 (particle->GetParticleName() == "neutron" ) ||
+	 (particle->GetParticleName() == "anti_neutron" ) ){
+      
+      
       // particle name and cut in length
-      fOut << G4std::setw(40) << particle->GetParticleName();
-      fOut << G4std::setw(20) << particle->GetLengthCuts()/mm  << G4endl;
-      G4double*  cutArray =  particle->GetEnergyCuts(); 
-      // cut energy for each material
-      G4int jj =0;
-      for(G4int idx=0; idx<numberOfMaterial; ++idx, ++jj) {
-	if (jj==4) {
-	  fOut << G4endl;
-	  jj =0;
-	}
-	fOut << G4std::setw(20) << cutArray[idx]/keV;
+      if (ascii) {
+	/////////////// ASCII mode  /////////////////
+	fOut.setf(G4std::ios::scientific);
+	fOut << G4std::setw(FixedStringLengthForStore) << particle->GetParticleName();
+	fOut << G4std::setw(20) << particle->GetLengthCuts()/mm  << G4endl;
+	fOut.unsetf(G4std::ios::scientific);
+      } else {
+	/////////////// Binary mode  /////////////////
+	G4String name =  particle->GetParticleName();
+	G4double cutLength = particle->GetLengthCuts();
+	for (i=0; i<FixedStringLengthForStore; ++i) temp[i] = '\0'; 
+	for (i=0; i<name.length() && i<FixedStringLengthForStore-1; ++i) temp[i]=name[i];
+	fOut.write(temp, FixedStringLengthForStore);
+	fOut.write((char*)(&cutLength), sizeof (G4double));
+      }
+
+      G4double*  cutArray =  particle->GetEnergyCuts(); 
+      if (cutArray ==0) {
+#ifdef G4VERBOSE  
+	if (verboseLevel>0){
+	  G4cout << "G4VUserPhysicsList::StoreCutValues        " ;
+	  G4cout << ":  Energy Cut Values have not be calculated  for";
+	  G4cout << particle->GetParticleName() << G4endl;
+	}
+#endif
+	return false;
+      }
+
+      // cut energy for each material
+      if (ascii) {
+	/////////////// ASCII mode  /////////////////
+	fOut.setf(G4std::ios::scientific);
+	G4int jj =0;
+	for(size_t idx=0; idx<numberOfMaterial; ++idx, ++jj) {
+	  if (jj==4) {
+	    fOut << G4endl;
+	    jj =0;
+	  }
+	  fOut << G4std::setw(20) << cutArray[idx]/keV;
+	}
+	fOut << G4endl;
+	fOut.unsetf(G4std::ios::scientific);
+      } else { 
+	/////////////// Binary mode  /////////////////
+	fOut.write( (char*)(cutArray), numberOfMaterial*(sizeof (G4double)) );
       }
-      fOut << G4endl;
     }
   }
-  fOut.unsetf(G4std::ios::scientific);
-
+ 
   fOut.close();
   return true;
 }
 
-void G4VUserPhysicsList::RetrievePhysicsTable(G4ParticleDefinition* particle)
+///////////////////////////////////////////////////////////////
+ void  G4VUserPhysicsList::SetPhysicsTableRetrieved(const G4String& directory)
+{
+  fRetrievePhysicsTable = true;
+  if(!directory.isNull()) {
+    directoryPhysicsTable = directory;
+  }
+  fIsCheckedForRetrievePhysicsTable=false;
+  fIsRestoredCutValues = false;
+  ResetCuts();
+}
+
+///////////////////////////////////////////////////////////////
+void G4VUserPhysicsList::RetrievePhysicsTable(G4ParticleDefinition* particle, 
+					      const G4String& directory,
+					      G4bool          ascii)
 {
   G4int  j;
   G4bool success[100];  
@@ -822,7 +1038,7 @@ void G4VUserPhysicsList::RetrievePhysicsTable(G4ParticleDefinition* particle)
   G4ProcessVector* pVector = (particle->GetProcessManager())->GetProcessList();
   for ( j=0; j < pVector->entries(); ++j) {
     success[j] = 
-       (*pVector)[j]->RetrievePhysicsTable(directoryPhysicsTable);
+       (*pVector)[j]->RetrievePhysicsTable(directory,ascii);
 
     if (!success[j]) {
 #ifdef G4VERBOSE  
@@ -842,26 +1058,37 @@ void G4VUserPhysicsList::RetrievePhysicsTable(G4ParticleDefinition* particle)
   }
 }
 
-G4bool  G4VUserPhysicsList::CheckForRetrievePhysicsTable(const G4String& directory)
+///////////////////////////////////////////////////////////////
+G4bool  G4VUserPhysicsList::CheckForRetrievePhysicsTable(const G4String& directory, 
+							 G4bool          ascii)
 {
+  const G4MaterialTable* matTable = G4Material::GetMaterialTable(); 
+  numberOfMaterial = matTable->entries();
+
   if (!fIsCheckedForRetrievePhysicsTable) {
-    if (CheckMaterialInfo(directory)) {
-      if (CheckCutValues(directory)) {
+    if (CheckMaterialInfo(directory, ascii)) {
+      if (CheckCutValues(directory,ascii)) 
 	fIsCheckedForRetrievePhysicsTable = true;
-      } 
     }
   }
   return fIsCheckedForRetrievePhysicsTable;
 }
 
-G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory)
+///////////////////////////////////////////////////////////////
+G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory, 
+					     G4bool          ascii)
 {
   const G4String fileName = directory + "/" + "material.dat";
   const G4String key = "MATERIAL";
   G4std::ifstream fIn;  
 
   // open input file //
-  fIn.open(fileName,G4std::ios::in);
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii )
+    fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
+  else
+#endif
+    fIn.open(fileName,G4std::ios::in);
 
   // check if the file has been opened successfully 
   if (!fIn) {
@@ -872,9 +1099,17 @@ G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory)
     return false;
   }
   
+  char temp[FixedStringLengthForStore];
+  size_t i;
+
   // key word
   G4String keyword;    
-  fIn >> keyword;
+  if (ascii) {
+    fIn >> keyword;
+  } else {
+    fIn.read(temp, FixedStringLengthForStore);
+    keyword = (const char*)(temp);
+  }
   if (key!=keyword) {
 #ifdef G4VERBOSE  
     if (verboseLevel>0){
@@ -884,12 +1119,16 @@ G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory)
 #endif
     return false;
   }
-    
+
   const G4MaterialTable* matTable = G4Material::GetMaterialTable(); 
   numberOfMaterial = matTable->entries();
   // number of materials in the table
   G4int nmat;
-  fIn >> nmat;
+  if (ascii) {
+    fIn >> nmat;
+  } else {
+    fIn.read( (char*)(&nmat), sizeof (G4int));
+  }
   if (nmat!=numberOfMaterial) {
 #ifdef G4VERBOSE  
     if (verboseLevel>0){
@@ -915,9 +1154,14 @@ G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory)
     }
 
     // check material name and density
-    char name[40];
+    char name[FixedStringLengthForStore];
     double density;
-    fIn >> name >> density;
+    if (ascii) {
+      fIn >> name >> density;
+    } else {
+      fIn.read(name, FixedStringLengthForStore);
+      fIn.read((char*)(&density), sizeof (G4double));
+    }
     if (fIn.fail()) {
 #ifdef G4VERBOSE  
      if (verboseLevel>0){
@@ -947,14 +1191,21 @@ G4bool G4VUserPhysicsList::CheckMaterialInfo(const G4String& directory)
   return true;
 }
 
-G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
+///////////////////////////////////////////////////////////////
+G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory, 
+					  G4bool          ascii)
 {
   const G4String fileName = directory + "/" + "cut_value.dat";
   const G4String key = "CUT_VALUE";
   G4std::ifstream fIn;  
 
-  // open output file //
-  fIn.open(fileName,G4std::ios::in);
+  // open input file //
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii ) 
+    fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
+  else
+#endif 
+    fIn.open(fileName,G4std::ios::in);
 
   // check if the file has been opened successfully 
   if (!fIn) {
@@ -965,9 +1216,17 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
     return false;
   }
 
+  char temp[FixedStringLengthForStore];
+  size_t i;
+
   // key word
   G4String keyword;    
-  fIn >> keyword;
+  if (ascii) {
+    fIn >> keyword;
+  } else {
+    fIn.read(temp, FixedStringLengthForStore);
+    keyword = (const char*)(temp);
+  }
   if (key!=keyword) {
 #ifdef G4VERBOSE  
     if (verboseLevel>0){
@@ -979,7 +1238,11 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
 
   // default cut value
   G4double defaultCut;
-  fIn >> keyword >> defaultCut;
+  if (ascii) {
+    fIn >> keyword >> defaultCut;
+  } else {
+    fIn.read( (char*)(&defaultCut), sizeof (G4double));
+  }
   if (fIn.fail()) {
 #ifdef G4VERBOSE  
     if (verboseLevel>0){
@@ -990,13 +1253,6 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
     fIn.close();
     return false;
   } 
-#ifdef G4VERBOSE  
-    if (verboseLevel>2){
-      G4cout.setf(G4std::ios::scientific);
-      G4cout << "Default " <<  G4std::setw(20) << defaultCutValue/mm  << G4endl;
-      G4cout.unsetf(G4std::ios::scientific);
-    }
-#endif
 
   // check default value
   G4double ratio =   abs(defaultCut / (defaultCutValue/mm) );
@@ -1014,9 +1270,14 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
   // loop over all particles 
   while(!fIn.eof()){
     // read in particle name and cut in length
-    G4String name;
+    char name[FixedStringLengthForStore];
     G4double cutLength;
-    fIn >> name >> cutLength; 
+    if (ascii) {
+      fIn >> name >> cutLength; 
+    } else {
+     fIn.read(name, FixedStringLengthForStore);
+     fIn.read((char*)(&cutLength), sizeof (G4double));
+    }
     if (fIn.eof()) break;
     if (fIn.fail()) {
 #ifdef G4VERBOSE  
@@ -1028,13 +1289,6 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
       fIn.close();
       return false;
     }
-#ifdef G4VERBOSE  
-    if (verboseLevel>2){
-      G4cout.setf(G4std::ios::scientific);
-      G4cout << name << G4std::setw(20) << cutLength << G4endl;
-      G4cout.unsetf(G4std::ios::scientific);
-    }
-#endif
 
     // Search particle
     G4ParticleDefinition* particle = theParticleTable->FindParticle(name);
@@ -1049,7 +1303,7 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
 #endif     
     } 
 
-    // check cut in length
+    // chech cut value in length
     ratio = abs(cutLength/ (particle->GetLengthCuts()/mm) );
     if ((ratio<0.999) ||(ratio>1.001) ){
 #ifdef G4VERBOSE  
@@ -1060,37 +1314,208 @@ G4bool G4VUserPhysicsList::CheckCutValues(const G4String& directory)
 #endif   
       fIn.close();
       return false;
-    }
+    }  
 
-    // read in energy cut for all materials (not used)
-    G4int jj; 
-    for(G4int idx=0; idx<numberOfMaterial; ++idx) {
-#ifdef G4VERBOSE  
-      if (verboseLevel>2){
-	if(jj==4) G4cout << G4endl; 
+    G4double* cutArray = new G4double[numberOfMaterial];
+    // read in energy cut for all materials 
+    if (ascii) {
+      /////////////// ASCII mode  /////////////////
+      G4int jj; 
+      for(size_t idx=0; idx<numberOfMaterial; ++idx) {
+	G4double value;
+	fIn >> value;
+	cutArray[idx] = value;
       }
-#endif
-      G4double value;
-      fIn >> value;
-#ifdef G4VERBOSE  
-      if (verboseLevel>2){
-	G4cout.setf(G4std::ios::scientific);
-	G4cout << G4std::setw(20) << value;
-	G4cout.unsetf(G4std::ios::scientific);
-	++jj;
-      }
-#endif
+    } else {
+      /////////////// Binary mode  /////////////////
+      fIn.read( (char*)(cutArray), numberOfMaterial*(sizeof (G4double)) );
     }
-#ifdef G4VERBOSE  
-    if (verboseLevel>2){
-      G4cout << G4endl; 
-    }
-#endif
-  } 
-  
+ 
+  }
+
   fIn.close();
   return true;
 }
   
 
+///////////////////////////////////////////////////////////////
+G4bool  G4VUserPhysicsList::RetrieveCutValues(const G4String&  directory,
+					      G4bool           ascii     )
+{
+  if (!CheckMaterialInfo(directory, ascii)) {
+#ifdef G4VERBOSE  
+    G4cout << "G4VUserPhysicsList::RetrieveCutValues  ";
+    G4cout << " Can not retrieve cut values " << G4endl;
+#endif
+  }
+
+  //  file name
+  const G4String fileName = directory + "/" + "cut_value.dat";
+  
+  G4std::ifstream fIn;  
+  // open input file //
+#ifdef G4USE_STD_NAMESPACE
+  if (!ascii )
+    fIn.open(fileName,G4std::ios::in|G4std::ios::binary);
+  else 
+#endif
+    fIn.open(fileName,G4std::ios::in);
+
+  // check if the file has been opened successfully 
+  if (!fIn) {
+#ifdef G4VERBOSE  
+    G4cerr << "G4VUserPhysicsList::RetrieveCutValues  ";
+    G4cerr << " Can not open file " << fileName << G4endl;
+#endif
+    return false;
+  }
+
+  char temp[FixedStringLengthForStore];
+  size_t i;
+
+  // key word
+  const G4String key = "CUT_VALUE";
+  G4String keyword;    
+  if (ascii) {
+    fIn >> keyword;
+  } else {
+    fIn.read(temp, FixedStringLengthForStore);
+    keyword = (const char*)(temp);
+  }
+  if (key!=keyword) {
+#ifdef G4VERBOSE  
+    if (verboseLevel>0){
+      G4cout << "G4VUserPhysicsList::RetrieveCutValues ";
+      G4cout << " Can not find key word " << keyword << G4endl;
+    }
+#endif
+  }
+
+  // default cut value
+  G4double defaultCut;
+  if (ascii) {
+    fIn >> keyword >> defaultCut;
+  } else {
+    fIn.read( (char*)(&defaultCut), sizeof (G4double));
+  }
+  if (fIn.fail()) {
+#ifdef G4VERBOSE  
+    if (verboseLevel>0){
+      G4cout << "G4VUserPhysicsList::RetrieveCutValues  ";
+      G4cout << " Bad data format " << G4endl;
+    }
+#endif   
+    fIn.close();
+    return false;
+  } 
+
+   // set default value
+  defaultCutValue = defaultCut;
+#ifdef G4VERBOSE  
+  if (verboseLevel>2){
+    G4cout.setf(G4std::ios::scientific);
+    G4cout << "Default " <<  G4std::setw(20) << defaultCutValue/mm  << G4endl;
+    G4cout.unsetf(G4std::ios::scientific);
+  }
+#endif
+
+  // Reset cut values for other particles
+  // loop over all particles in G4ParticleTable 
+  theParticleIterator->reset();
+  while( (*theParticleIterator)() ){
+    G4ParticleDefinition* particle = theParticleIterator->value();
+    if (!particle->IsShortLived()) particle->ResetCuts();
+  } 
+
+  // number of materials in the table
+  const G4MaterialTable* matTable = G4Material::GetMaterialTable(); 
+  numberOfMaterial = matTable->entries();
+
+  // loop over all particles 
+  while(!fIn.eof()){
+    // read in particle name and cut in length
+    char name[FixedStringLengthForStore];
+    G4double cutLength;
+    if (ascii) {
+      fIn >> name >> cutLength; 
+    } else {
+     fIn.read(name, FixedStringLengthForStore);
+     fIn.read((char*)(&cutLength), sizeof (G4double));
+    }
+
+    if (fIn.eof()) break;
+    if (fIn.fail()) {
+#ifdef G4VERBOSE  
+      if (verboseLevel>0){
+	G4cout << "G4VUserPhysicsList::RetrieveCutValues  ";
+	G4cout << " Bad data format " << G4endl;
+      }
+#endif
+      fIn.close();
+      return false;
+    }
+
+#ifdef G4VERBOSE  
+    if (verboseLevel>2){
+      G4cout.setf(G4std::ios::scientific);
+      G4cout << name << G4std::setw(20) << cutLength << G4endl;
+      G4cout.unsetf(G4std::ios::scientific);
+    }
+#endif
+
+    // Search particle
+    G4ParticleDefinition* particle = theParticleTable->FindParticle(name);
+    if (particle==0) {
+#ifdef G4VERBOSE  
+      if (verboseLevel>0){
+	G4cout << "G4VUserPhysicsList::RetrieveCutValues  ";
+	G4cout << " Particle " << name <<" is not found "<< G4endl;
+      } 
+      fIn.close();
+      return false;
+#endif     
+    } 
+
+    G4double* cutArray = new G4double[numberOfMaterial];
+
+    // read in energy cut for all materials 
+    if (ascii) {
+      /////////////// ASCII mode  /////////////////
+      G4int jj; 
+      for(size_t idx=0; idx<numberOfMaterial; ++idx) {
+	G4double value;
+	fIn >> value;
+	cutArray[idx] = value;
+      }
+    } else {
+      /////////////// Binary mode  /////////////////
+      fIn.read( (char*)(cutArray), numberOfMaterial*(sizeof (G4double)) );
+    }
+ 
+  
+    // restore cut values
+    particle->RestoreCuts( cutLength , cutArray) ; 
+#ifdef G4VERBOSE    
+    if (verboseLevel >2)DumpCutValues(particle); 
+#endif
+   }
+  
+#ifdef G4VERBOSE    
+  if (verboseLevel >1){
+    G4cout << "G4VUserPhysicsList::RetrieveCutValues: Cut Values are successfully restored ";
+    G4cout << "CutLength : " << defaultCutValue/mm << " (mm)" << G4endl;
+  }  
+#endif
+
+  fIsRestoredCutValues = true;
+  fIn.close();
+  return true;
+}
+
+
+
+
+
+
+
 
diff --git a/source/run/src/G4VUserPrimaryGeneratorAction.cc b/source/run/src/G4VUserPrimaryGeneratorAction.cc
index fd357186c5..8a00dc0850 100644
--- a/source/run/src/G4VUserPrimaryGeneratorAction.cc
+++ b/source/run/src/G4VUserPrimaryGeneratorAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserPrimaryGeneratorAction.cc,v 1.2 1999/12/15 14:53:54 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserPrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:15:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4VUserPrimaryGeneratorAction.hh"
diff --git a/source/track/include/G4EvtBiasMechanism.hh b/source/track/include/G4EvtBiasMechanism.hh
index 756f9599d9..43daab7459 100644
--- a/source/track/include/G4EvtBiasMechanism.hh
+++ b/source/track/include/G4EvtBiasMechanism.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EvtBiasMechanism.hh,v 1.3 1999/11/07 16:31:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EvtBiasMechanism.hh,v 1.3.10.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //  Class Description
diff --git a/source/track/include/G4ForceCondition.hh b/source/track/include/G4ForceCondition.hh
index 98339a787c..c713505079 100644
--- a/source/track/include/G4ForceCondition.hh
+++ b/source/track/include/G4ForceCondition.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ForceCondition.hh,v 1.2 1999/11/07 16:31:57 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ForceCondition.hh,v 1.2.10.1 2001/06/28 19:15:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4GPILSelection.hh b/source/track/include/G4GPILSelection.hh
index 5d37a4bbac..4ec34f7392 100644
--- a/source/track/include/G4GPILSelection.hh
+++ b/source/track/include/G4GPILSelection.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GPILSelection.hh,v 1.2 1999/11/07 16:31:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GPILSelection.hh,v 1.2.10.1 2001/06/28 19:15:22 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Mars5GeVMechanism.hh b/source/track/include/G4Mars5GeVMechanism.hh
index 9865a801d9..818106cfac 100644
--- a/source/track/include/G4Mars5GeVMechanism.hh
+++ b/source/track/include/G4Mars5GeVMechanism.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mars5GeVMechanism.hh,v 1.3 1999/11/07 16:31:58 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mars5GeVMechanism.hh,v 1.3.10.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   First Implemention    17 Nov. 1998  M.Asai, H.Kurahige
diff --git a/source/track/include/G4ParticleChange.hh b/source/track/include/G4ParticleChange.hh
index 26d1998bfe..cc4ae2ed6f 100644
--- a/source/track/include/G4ParticleChange.hh
+++ b/source/track/include/G4ParticleChange.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChange.hh,v 1.6 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChange.hh,v 1.6.4.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 23 Mar. 1998  H.Kurahige
diff --git a/source/track/include/G4ParticleChange.icc b/source/track/include/G4ParticleChange.icc
index 3800f7ba40..d81b4b06e8 100644
--- a/source/track/include/G4ParticleChange.icc
+++ b/source/track/include/G4ParticleChange.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChange.icc,v 1.7 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChange.icc,v 1.7.4.1 2001/06/28 19:15:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 inline
diff --git a/source/track/include/G4ParticleChangeForDecay.hh b/source/track/include/G4ParticleChangeForDecay.hh
index afe5cad1b7..d280d5e655 100644
--- a/source/track/include/G4ParticleChangeForDecay.hh
+++ b/source/track/include/G4ParticleChangeForDecay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForDecay.hh,v 1.4 1999/11/07 16:31:59 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForDecay.hh,v 1.4.10.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 23 Mar. 1998  H.Kurahige
diff --git a/source/track/include/G4ParticleChangeForLoss.hh b/source/track/include/G4ParticleChangeForLoss.hh
index b1959d571d..ba83d1e840 100644
--- a/source/track/include/G4ParticleChangeForLoss.hh
+++ b/source/track/include/G4ParticleChangeForLoss.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForLoss.hh,v 1.3 1999/11/07 16:32:00 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForLoss.hh,v 1.3.10.2 2001/06/28 20:20:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 23 Mar. 1998  H.Kurahige
diff --git a/source/track/include/G4ParticleChangeForMSC.hh b/source/track/include/G4ParticleChangeForMSC.hh
index 8ed2031709..2b72a0aab6 100644
--- a/source/track/include/G4ParticleChangeForMSC.hh
+++ b/source/track/include/G4ParticleChangeForMSC.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForMSC.hh,v 1.4 1999/11/07 16:32:00 kurasige Exp $
+//
+// $Id: G4ParticleChangeForMSC.hh,v 1.4.10.2 2001/06/28 20:20:14 gunter Exp $
 // GEANT4 tag $ $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // Class Description
 //   This class is special "Particle Change" for Multiple Scattering process
diff --git a/source/track/include/G4ParticleChangeForMSC.icc b/source/track/include/G4ParticleChangeForMSC.icc
index 43350bf2b4..5c9908f8a1 100644
--- a/source/track/include/G4ParticleChangeForMSC.icc
+++ b/source/track/include/G4ParticleChangeForMSC.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForMSC.icc,v 1.3 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForMSC.icc,v 1.3.4.1 2001/06/28 19:15:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/track/include/G4ParticleChangeForRadDecay.hh b/source/track/include/G4ParticleChangeForRadDecay.hh
index 122600b596..ac004b5f12 100644
--- a/source/track/include/G4ParticleChangeForRadDecay.hh
+++ b/source/track/include/G4ParticleChangeForRadDecay.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForRadDecay.hh,v 1.2 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForRadDecay.hh,v 1.2.4.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 25 Jan. 2000  H.Kurahige
diff --git a/source/track/include/G4ParticleChangeForTransport.hh b/source/track/include/G4ParticleChangeForTransport.hh
index 06d53076c1..16eb093c5f 100644
--- a/source/track/include/G4ParticleChangeForTransport.hh
+++ b/source/track/include/G4ParticleChangeForTransport.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForTransport.hh,v 1.6 2001/02/12 07:56:32 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForTransport.hh,v 1.6.2.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 10 May. 1998  H.Kurahige
diff --git a/source/track/include/G4ParticleChangeForTransport.icc b/source/track/include/G4ParticleChangeForTransport.icc
index 8a3d2e6e53..58d9b925a5 100644
--- a/source/track/include/G4ParticleChangeForTransport.icc
+++ b/source/track/include/G4ParticleChangeForTransport.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForTransport.icc,v 1.5 2000/05/16 00:34:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForTransport.icc,v 1.5.4.1 2001/06/28 19:15:23 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/track/include/G4Step.hh b/source/track/include/G4Step.hh
index 78f8d1de57..cef037787e 100644
--- a/source/track/include/G4Step.hh
+++ b/source/track/include/G4Step.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Step.hh,v 1.7 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Step.hh,v 1.7.4.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Step.icc b/source/track/include/G4Step.icc
index 737153c8f4..b661b97290 100644
--- a/source/track/include/G4Step.icc
+++ b/source/track/include/G4Step.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Step.icc,v 1.4 2001/02/17 11:25:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Step.icc,v 1.4.2.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4StepPoint.hh b/source/track/include/G4StepPoint.hh
index aecc14e08a..e3cd119180 100644
--- a/source/track/include/G4StepPoint.hh
+++ b/source/track/include/G4StepPoint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StepPoint.hh,v 1.7 2001/02/17 11:25:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StepPoint.hh,v 1.7.2.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4StepPoint.icc b/source/track/include/G4StepPoint.icc
index e05e53841f..2ec8a3d81f 100644
--- a/source/track/include/G4StepPoint.icc
+++ b/source/track/include/G4StepPoint.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StepPoint.icc,v 1.3 2001/02/17 11:25:10 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StepPoint.icc,v 1.3.2.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
    inline const G4ThreeVector& G4StepPoint::GetPosition() const
diff --git a/source/track/include/G4StepStatus.hh b/source/track/include/G4StepStatus.hh
index 186d880050..e5c3b0cb2f 100644
--- a/source/track/include/G4StepStatus.hh
+++ b/source/track/include/G4StepStatus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StepStatus.hh,v 1.2 1999/11/07 16:32:02 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StepStatus.hh,v 1.2.10.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4SteppingControl.hh b/source/track/include/G4SteppingControl.hh
index 003f205ee4..5353fb7a08 100644
--- a/source/track/include/G4SteppingControl.hh
+++ b/source/track/include/G4SteppingControl.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingControl.hh,v 1.2 1999/11/07 16:32:03 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingControl.hh,v 1.2.10.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Track.hh b/source/track/include/G4Track.hh
index d06f0d8520..aaec1c71af 100644
--- a/source/track/include/G4Track.hh
+++ b/source/track/include/G4Track.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Track.hh,v 1.10 2001/01/18 12:25:08 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Track.hh,v 1.10.2.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4Track.icc b/source/track/include/G4Track.icc
index 80956a8288..eddc4090a5 100644
--- a/source/track/include/G4Track.icc
+++ b/source/track/include/G4Track.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the  GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Track.icc,v 1.6 2000/10/18 15:00:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Track.icc,v 1.6.4.1 2001/06/28 19:15:24 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //-----------------------------------------------------------------
 // Definitions of inline functions
diff --git a/source/track/include/G4TrackFastVector.hh b/source/track/include/G4TrackFastVector.hh
index 262fa7ec17..cb7d16e8e1 100644
--- a/source/track/include/G4TrackFastVector.hh
+++ b/source/track/include/G4TrackFastVector.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackFastVector.hh,v 1.3 1999/11/07 16:32:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackFastVector.hh,v 1.3.10.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //	History: first implementation, based on object model of
 //	8 Mar 1997, H.Kurashige
 // ------------------------------------------------------------
diff --git a/source/track/include/G4TrackStatus.hh b/source/track/include/G4TrackStatus.hh
index f922acb7f0..1733020097 100644
--- a/source/track/include/G4TrackStatus.hh
+++ b/source/track/include/G4TrackStatus.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackStatus.hh,v 1.2 1999/11/07 16:32:04 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackStatus.hh,v 1.2.10.1 2001/06/28 19:15:25 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/include/G4VEvtBiasMechanism.hh b/source/track/include/G4VEvtBiasMechanism.hh
index bedf03a1c6..336f025fa5 100644
--- a/source/track/include/G4VEvtBiasMechanism.hh
+++ b/source/track/include/G4VEvtBiasMechanism.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VEvtBiasMechanism.hh,v 1.3 1999/11/07 16:32:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VEvtBiasMechanism.hh,v 1.3.10.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //   
 // -------------------------------------------------------
 //  Class Description   
diff --git a/source/track/include/G4VParticleChange.hh b/source/track/include/G4VParticleChange.hh
index 0a6a52c507..9482cd9413 100644
--- a/source/track/include/G4VParticleChange.hh
+++ b/source/track/include/G4VParticleChange.hh
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VParticleChange.hh,v 1.4 1999/11/07 16:32:05 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VParticleChange.hh,v 1.4.10.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 //
 // ------------------------------------------------------------
 //   Implemented for the new scheme                23 Mar. 1998  H.Kurahige
diff --git a/source/track/include/G4VParticleChange.icc b/source/track/include/G4VParticleChange.icc
index 88a89a152a..ccb895730d 100644
--- a/source/track/include/G4VParticleChange.icc
+++ b/source/track/include/G4VParticleChange.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VParticleChange.icc,v 1.5 2000/02/13 15:08:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VParticleChange.icc,v 1.5.4.1 2001/06/28 19:15:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //----------------------------------------------------------------
 // Virtual methods for updating G4Step 
diff --git a/source/track/include/G4VUserTrackInformation.hh b/source/track/include/G4VUserTrackInformation.hh
index 04406ba0cc..4df4a829cd 100644
--- a/source/track/include/G4VUserTrackInformation.hh
+++ b/source/track/include/G4VUserTrackInformation.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VUserTrackInformation.hh,v 1.2 2000/06/02 09:09:47 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VUserTrackInformation.hh,v 1.2.4.1 2001/06/28 19:15:26 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4EvtBiasMechanism.cc b/source/track/src/G4EvtBiasMechanism.cc
index 6bc052309a..20fdc0157f 100644
--- a/source/track/src/G4EvtBiasMechanism.cc
+++ b/source/track/src/G4EvtBiasMechanism.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4EvtBiasMechanism.cc,v 1.3 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4EvtBiasMechanism.cc,v 1.3.4.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4Mars5GeVMechanism.cc b/source/track/src/G4Mars5GeVMechanism.cc
index d2569049a4..d11bcef28c 100644
--- a/source/track/src/G4Mars5GeVMechanism.cc
+++ b/source/track/src/G4Mars5GeVMechanism.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Mars5GeVMechanism.cc,v 1.4 1999/12/15 14:53:55 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Mars5GeVMechanism.cc,v 1.4.4.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // ------------------------------------------------------------
 //	GEANT 4 class header file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD group
 // 
 // ------------------------------------------------------------
 //   First Implemention    17 Nov. 1998  M.Asai, H.Kurahige
diff --git a/source/track/src/G4ParticleChange.cc b/source/track/src/G4ParticleChange.cc
index b31c57f5a8..340f6763b1 100644
--- a/source/track/src/G4ParticleChange.cc
+++ b/source/track/src/G4ParticleChange.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChange.cc,v 1.12 2001/03/05 12:20:46 japost Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChange.cc,v 1.12.2.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForDecay.cc b/source/track/src/G4ParticleChangeForDecay.cc
index ca5525afb7..4c5758f8d8 100644
--- a/source/track/src/G4ParticleChangeForDecay.cc
+++ b/source/track/src/G4ParticleChangeForDecay.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForDecay.cc,v 1.5 2000/02/13 15:08:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForDecay.cc,v 1.5.4.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForLoss.cc b/source/track/src/G4ParticleChangeForLoss.cc
index 492aac2cff..8790e505fe 100644
--- a/source/track/src/G4ParticleChangeForLoss.cc
+++ b/source/track/src/G4ParticleChangeForLoss.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForLoss.cc,v 1.5 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForLoss.cc,v 1.5.4.2 2001/06/28 20:20:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForMSC.cc b/source/track/src/G4ParticleChangeForMSC.cc
index 2d322757b9..234ed2f4f6 100644
--- a/source/track/src/G4ParticleChangeForMSC.cc
+++ b/source/track/src/G4ParticleChangeForMSC.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForMSC.cc,v 1.6 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForMSC.cc,v 1.6.4.2 2001/06/28 20:20:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4ParticleChangeForTransport.cc b/source/track/src/G4ParticleChangeForTransport.cc
index 8e457752ba..ef37e50354 100644
--- a/source/track/src/G4ParticleChangeForTransport.cc
+++ b/source/track/src/G4ParticleChangeForTransport.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ParticleChangeForTransport.cc,v 1.8 2001/03/06 09:59:23 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ParticleChangeForTransport.cc,v 1.8.2.2 2001/06/28 20:20:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4Step.cc b/source/track/src/G4Step.cc
index 538058f031..293e2d69f2 100644
--- a/source/track/src/G4Step.cc
+++ b/source/track/src/G4Step.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Step.cc,v 1.4 1999/12/15 14:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Step.cc,v 1.4.4.1 2001/06/28 19:15:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4StepPoint.cc b/source/track/src/G4StepPoint.cc
index 4b843ba3b2..dc58a4c601 100644
--- a/source/track/src/G4StepPoint.cc
+++ b/source/track/src/G4StepPoint.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4StepPoint.cc,v 1.5 2001/02/17 11:27:13 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4StepPoint.cc,v 1.5.2.1 2001/06/28 19:15:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4Track.cc b/source/track/src/G4Track.cc
index 9ae9f350b7..bf0a8e4ecf 100644
--- a/source/track/src/G4Track.cc
+++ b/source/track/src/G4Track.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Track.cc,v 1.11 2001/02/17 10:51:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Track.cc,v 1.11.2.1 2001/06/28 19:15:28 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/track/src/G4VEvtBiasMechanism.cc b/source/track/src/G4VEvtBiasMechanism.cc
index e940d71450..c9f72bcd48 100644
--- a/source/track/src/G4VEvtBiasMechanism.cc
+++ b/source/track/src/G4VEvtBiasMechanism.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VEvtBiasMechanism.cc,v 1.2 1999/12/15 14:53:56 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VEvtBiasMechanism.cc,v 1.2.4.2 2001/06/28 20:20:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //	
 //	
 // ------------------------------------------------------------
diff --git a/source/track/src/G4VParticleChange.cc b/source/track/src/G4VParticleChange.cc
index d149d66360..a34060fa5d 100644
--- a/source/track/src/G4VParticleChange.cc
+++ b/source/track/src/G4VParticleChange.cc
@@ -1,19 +1,33 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VParticleChange.cc,v 1.5 2000/02/13 15:08:28 kurasige Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VParticleChange.cc,v 1.5.4.2 2001/06/28 20:20:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // --------------------------------------------------------------
 //	GEANT 4 class implementation file 
 //
-//	For information related to this code contact:
-//	CERN, CN Division, ASD Group
 //
 // ------------------------------------------------------------
 //   Implemented for the new scheme                 23 Mar. 1998  H.Kurahige
diff --git a/source/tracking/History b/source/tracking/History
index 42d2346671..52955d5e55 100644
--- a/source/tracking/History
+++ b/source/tracking/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.18 2001/02/09 01:35:04 tsasaki Exp $
+$Id: History,v 1.21 2001/06/06 08:37:11 gcosmo Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,10 +16,26 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Jun 06, 01 G.Cosmo (tracking-V03-01-02)
+- G4SteppingManager.cc: explicitly initialise values to zero in STL
+  collections fSelectedAtRestDoItVector, fSelectedAlongStepDoItVector, and
+  fSelectedPostStepDoItVector in G4SteppingManager default constructor.
+  This overcomes warnings detected on HP-aCC.
+
+May 10, 01 T.Sasaki (tracking-V03-01-01) 
+- fix for a suspneded track's vertex info.
+
+May 03, 01 T.Sasaki/J.Allison (tracking-V03-01-00)
+- G4TrackingMessenger* messenger moved to the class scope in G4TrackingManager.
+- Changes for greps-V03-01-01 (elimination of RW) in G4Trajectory.cc.
+
 Feb 09, 01 T.Sasaki (tracking-V03-00-05)
 - Fix for linux etc.
+
 Feb 08, 01 T.Sasaki (tracking-V03-00-03)
 - STL migration: get rid of most of RW vectors
+
 Feb 05, 01 G.Cosmo (tracking-V03-00-02)
 - STL migration for G4OrderedTable and G4DataVector.
   Modified files: G4VSteppingVerbose.hh.
diff --git a/source/tracking/include/G4SteppingManager.hh b/source/tracking/include/G4SteppingManager.hh
index 3b6bdfe342..156f0f8221 100644
--- a/source/tracking/include/G4SteppingManager.hh
+++ b/source/tracking/include/G4SteppingManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingManager.hh,v 1.16 2001/02/09 01:35:05 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingManager.hh,v 1.16.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 // 
 //---------------------------------------------------------------
 //
diff --git a/source/tracking/include/G4SteppingVerbose.hh b/source/tracking/include/G4SteppingVerbose.hh
index a9181559fc..aa7a9cb529 100644
--- a/source/tracking/include/G4SteppingVerbose.hh
+++ b/source/tracking/include/G4SteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingVerbose.hh,v 1.8 2000/11/11 06:34:09 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingVerbose.hh,v 1.8.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4TrackVector.hh b/source/tracking/include/G4TrackVector.hh
index ad2c70e351..1dbc3dd6e0 100644
--- a/source/tracking/include/G4TrackVector.hh
+++ b/source/tracking/include/G4TrackVector.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackVector.hh,v 1.7 2001/02/08 07:39:51 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackVector.hh,v 1.7.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4TrackingManager.hh b/source/tracking/include/G4TrackingManager.hh
index b6da364bc8..10c7f456c1 100644
--- a/source/tracking/include/G4TrackingManager.hh
+++ b/source/tracking/include/G4TrackingManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackingManager.hh,v 1.11 2001/01/12 05:55:28 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackingManager.hh,v 1.12.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
@@ -38,6 +54,7 @@ class G4TrackingManager;
 /////#include "G4Hit.hh"               // Include from 'Hit/dig'
 #include "G4SteppingManager.hh"        // Include from 'tracking'
 #include "G4Track.hh"                  // Include from 'tracking'
+#include "G4TrackingMessenger.hh"
 #include "G4TrackVector.hh"            // Include from 'tracking'
 #include "G4TrackStatus.hh"            // Include from 'tracking'
 #include "G4StepStatus.hh"             // Include from 'tracking'
@@ -128,7 +145,7 @@ public: // without description
    G4VTrajectory* fpTrajectory;
    G4bool StoreTrajectory;
    G4int verboseLevel;
-
+   G4TrackingMessenger* messenger;
 };
 
 
diff --git a/source/tracking/include/G4TrackingMessenger.hh b/source/tracking/include/G4TrackingMessenger.hh
index ebaee7fb3d..b8885283bb 100644
--- a/source/tracking/include/G4TrackingMessenger.hh
+++ b/source/tracking/include/G4TrackingMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackingMessenger.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackingMessenger.hh,v 1.6.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4Trajectory.hh b/source/tracking/include/G4Trajectory.hh
index e830a7e365..3d13ca3592 100644
--- a/source/tracking/include/G4Trajectory.hh
+++ b/source/tracking/include/G4Trajectory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trajectory.hh,v 1.12 2001/02/09 01:35:05 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trajectory.hh,v 1.12.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4TrajectoryPoint.hh b/source/tracking/include/G4TrajectoryPoint.hh
index 3af1d76d87..1629279b0e 100644
--- a/source/tracking/include/G4TrajectoryPoint.hh
+++ b/source/tracking/include/G4TrajectoryPoint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoryPoint.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoryPoint.hh,v 1.6.2.1 2001/06/28 19:15:29 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4UserSteppingAction.hh b/source/tracking/include/G4UserSteppingAction.hh
index 233bffca55..f1b0194a98 100644
--- a/source/tracking/include/G4UserSteppingAction.hh
+++ b/source/tracking/include/G4UserSteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserSteppingAction.hh,v 1.6 2000/11/11 06:34:10 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserSteppingAction.hh,v 1.6.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4UserTrackingAction.hh b/source/tracking/include/G4UserTrackingAction.hh
index b02854a88a..b870217ae4 100644
--- a/source/tracking/include/G4UserTrackingAction.hh
+++ b/source/tracking/include/G4UserTrackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserTrackingAction.hh,v 1.7 2001/01/12 05:55:28 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserTrackingAction.hh,v 1.7.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4VSteppingVerbose.hh b/source/tracking/include/G4VSteppingVerbose.hh
index cdc79c71b8..3a4eae08f0 100644
--- a/source/tracking/include/G4VSteppingVerbose.hh
+++ b/source/tracking/include/G4VSteppingVerbose.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSteppingVerbose.hh,v 1.9 2001/02/08 07:39:52 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSteppingVerbose.hh,v 1.9.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4VTrajectory.hh b/source/tracking/include/G4VTrajectory.hh
index 71f889d709..cddc83d6f3 100644
--- a/source/tracking/include/G4VTrajectory.hh
+++ b/source/tracking/include/G4VTrajectory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VTrajectory.hh,v 1.5 2000/11/11 06:34:11 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VTrajectory.hh,v 1.5.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/include/G4VTrajectoryPoint.hh b/source/tracking/include/G4VTrajectoryPoint.hh
index bf4fb24d1e..75ad3dd762 100644
--- a/source/tracking/include/G4VTrajectoryPoint.hh
+++ b/source/tracking/include/G4VTrajectoryPoint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VTrajectoryPoint.hh,v 1.4 2000/11/11 06:34:11 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VTrajectoryPoint.hh,v 1.4.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description
diff --git a/source/tracking/src/G4SteppingManager.cc b/source/tracking/src/G4SteppingManager.cc
index a0f2836296..c7d76fb7d1 100644
--- a/source/tracking/src/G4SteppingManager.cc
+++ b/source/tracking/src/G4SteppingManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingManager.cc,v 1.12 2001/02/08 07:48:39 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingManager.cc,v 1.14.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
@@ -62,11 +78,11 @@ G4SteppingManager::G4SteppingManager()
 		   ->GetNavigatorForTracking());
 
    fSelectedAtRestDoItVector
-      = new G4SelectedAtRestDoItVector(SizeOfSelectedDoItVector);
+      = new G4SelectedAtRestDoItVector(SizeOfSelectedDoItVector,0);
    fSelectedAlongStepDoItVector
-      = new G4SelectedAlongStepDoItVector(SizeOfSelectedDoItVector);
+      = new G4SelectedAlongStepDoItVector(SizeOfSelectedDoItVector,0);
    fSelectedPostStepDoItVector
-      = new G4SelectedPostStepDoItVector(SizeOfSelectedDoItVector);
+      = new G4SelectedPostStepDoItVector(SizeOfSelectedDoItVector,0);
 
    SetNavigator(G4TransportationManager::GetTransportationManager()
      ->GetNavigatorForTracking());
@@ -267,10 +283,12 @@ void G4SteppingManager::SetInitialStep(G4Track* valueTrack)
    fTrack->SetNextTouchable( pTouchableFree );
 
 // Set vertex information of G4Track at here
-   fTrack->SetVertexPosition( fTrack->GetPosition() );
-   fTrack->SetVertexMomentumDirection( fTrack->GetMomentumDirection() );
-   fTrack->SetVertexKineticEnergy( fTrack->GetKineticEnergy() );
-
+//corrected on 10APR2001/TS
+   if ( fTrack->GetCurrentStepNumber() == 0 ) {
+     fTrack->SetVertexPosition( fTrack->GetPosition() );
+     fTrack->SetVertexMomentumDirection( fTrack->GetMomentumDirection() );
+     fTrack->SetVertexKineticEnergy( fTrack->GetKineticEnergy() );
+   }
 // Initial set up for attributes of 'G4SteppingManager'
    fCurrentVolume = pTouchableFree->GetVolume();
 
diff --git a/source/tracking/src/G4SteppingManager2.cc b/source/tracking/src/G4SteppingManager2.cc
index bf04c3c045..48a39d3bd5 100644
--- a/source/tracking/src/G4SteppingManager2.cc
+++ b/source/tracking/src/G4SteppingManager2.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingManager2.cc,v 1.1 2001/02/08 07:56:40 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingManager2.cc,v 1.1.2.1 2001/06/28 19:15:30 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/src/G4SteppingVerbose.cc b/source/tracking/src/G4SteppingVerbose.cc
index f2583ad99c..3de5fab578 100644
--- a/source/tracking/src/G4SteppingVerbose.cc
+++ b/source/tracking/src/G4SteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SteppingVerbose.cc,v 1.7 2001/02/08 07:39:52 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SteppingVerbose.cc,v 1.7.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/src/G4TrackingManager.cc b/source/tracking/src/G4TrackingManager.cc
index e6e5503d20..c7270c1851 100644
--- a/source/tracking/src/G4TrackingManager.cc
+++ b/source/tracking/src/G4TrackingManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackingManager.cc,v 1.7 2001/02/09 01:35:06 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackingManager.cc,v 1.8.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
@@ -21,11 +37,9 @@
 //---------------------------------------------------------------
 
 #include "G4TrackingManager.hh"
-#include "G4TrackingMessenger.hh"
 #include "G4Trajectory.hh"
 #include "G4ios.hh"
 
-G4TrackingMessenger * messenger;
 //////////////////////////////////////
 G4TrackingManager::G4TrackingManager()
 //////////////////////////////////////
diff --git a/source/tracking/src/G4TrackingMessenger.cc b/source/tracking/src/G4TrackingMessenger.cc
index 9de4caab59..ed97664d69 100644
--- a/source/tracking/src/G4TrackingMessenger.cc
+++ b/source/tracking/src/G4TrackingMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrackingMessenger.cc,v 1.7 2001/02/08 07:39:53 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrackingMessenger.cc,v 1.7.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //---------------------------------------------------------------
diff --git a/source/tracking/src/G4Trajectory.cc b/source/tracking/src/G4Trajectory.cc
index 0ac8237b40..ddd5b328a6 100644
--- a/source/tracking/src/G4Trajectory.cc
+++ b/source/tracking/src/G4Trajectory.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Trajectory.cc,v 1.11 2001/02/09 01:38:14 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Trajectory.cc,v 1.12.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
@@ -75,7 +91,7 @@ G4Trajectory::G4Trajectory(G4Trajectory & right)
   //  G4std::vector<G4VTrajectoryPoint*> *positionRecord;
   positionRecord = new TrajectoryPointContainer();
 
-  for(int i=0;i<right.positionRecord->size();i++)
+  for(size_t i=0;i<right.positionRecord->size();i++)
   {
     G4TrajectoryPoint* rightPoint = (G4TrajectoryPoint*)((*(right.positionRecord))[i]);
     positionRecord->push_back(new G4TrajectoryPoint(*rightPoint));
@@ -88,7 +104,7 @@ G4Trajectory::~G4Trajectory()
 /////////////////////////////
 {
   //  positionRecord->clearAndDestroy();
-  G4int i;
+  size_t i;
   for(i=0;i<positionRecord->size();i++){
     delete  (*positionRecord)[i];
   }
@@ -126,10 +142,10 @@ void G4Trajectory::DrawTrajectory(G4int i_mode) const
    if(i_mode>=0)
    {
      G4Polyline pPolyline;
-     for (int i = 0; i < positionRecord->size() ; i++) {
+     for (size_t i = 0; i < positionRecord->size() ; i++) {
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[i]);
        pos = aTrajectoryPoint->GetPosition();
-       pPolyline.append( pos );
+       pPolyline.push_back( pos );
      }
 
      G4Colour colour;
@@ -147,7 +163,7 @@ void G4Trajectory::DrawTrajectory(G4int i_mode) const
 
    if(i_mode!=0)
    {
-     for(int j=0; j<positionRecord->size(); j++) {
+     for(size_t j=0; j<positionRecord->size(); j++) {
        G4TrajectoryPoint* aTrajectoryPoint = (G4TrajectoryPoint*)((*positionRecord)[j]);
        pos = aTrajectoryPoint->GetPosition();
        G4Circle circle( pos );
diff --git a/source/tracking/src/G4TrajectoryPoint.cc b/source/tracking/src/G4TrajectoryPoint.cc
index 17a21c8666..f8954973bd 100644
--- a/source/tracking/src/G4TrajectoryPoint.cc
+++ b/source/tracking/src/G4TrajectoryPoint.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoryPoint.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoryPoint.cc,v 1.5.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserSteppingAction.cc b/source/tracking/src/G4UserSteppingAction.cc
index 6927b98b13..acbbb2e823 100644
--- a/source/tracking/src/G4UserSteppingAction.cc
+++ b/source/tracking/src/G4UserSteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserSteppingAction.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserSteppingAction.cc,v 1.5.2.1 2001/06/28 19:15:31 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4UserTrackingAction.cc b/source/tracking/src/G4UserTrackingAction.cc
index 6b3f0543d4..753fd8ffbc 100644
--- a/source/tracking/src/G4UserTrackingAction.cc
+++ b/source/tracking/src/G4UserTrackingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4UserTrackingAction.cc,v 1.5 2001/02/08 07:39:53 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4UserTrackingAction.cc,v 1.5.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // ---------------------------------------------------------------
diff --git a/source/tracking/src/G4VSteppingVerbose.cc b/source/tracking/src/G4VSteppingVerbose.cc
index 54b74bb0cf..2ea167c783 100644
--- a/source/tracking/src/G4VSteppingVerbose.cc
+++ b/source/tracking/src/G4VSteppingVerbose.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSteppingVerbose.cc,v 1.5 2001/02/08 07:39:54 tsasaki Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSteppingVerbose.cc,v 1.5.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //  
 //---------------------------------------------------------------
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
index fcf2264fd8..9348ec71e2 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILE.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILE.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILE.hh,v 1.6.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 // DAWNFILE driver factory.
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
index 94d9503ec5..b9c5735482 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILESceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILESceneHandler.hh,v 1.5 1999/12/16 17:24:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILESceneHandler.hh,v 1.6.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 
diff --git a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
index 7a86e1a2a5..0ff326b0f2 100644
--- a/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4DAWNFILEViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILEViewer.hh,v 1.5 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILEViewer.hh,v 1.6.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 // DAWNFILE viewer - opens window, hard copy, etc.
diff --git a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
index 29aede7363..5572a53edd 100644
--- a/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRClientServer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRClientServer.hh,v 1.4 2000/02/29 09:54:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRClientServer.hh,v 1.5.2.1 2001/06/28 19:15:32 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA, Wed Jul  3 14:13:52 JST 1996
 ////////////////////////////////
diff --git a/source/visualization/FukuiRenderer/include/G4FRConst.hh b/source/visualization/FukuiRenderer/include/G4FRConst.hh
index bdb4df4944..db3748eac1 100644
--- a/source/visualization/FukuiRenderer/include/G4FRConst.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRConst.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRConst.hh,v 1.4 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRConst.hh,v 1.5.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA, Tue Jul  2 15:30:49 JST 1996
 ///////////////////////////////////
diff --git a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
index 558b0273d8..7f315e71ec 100644
--- a/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRFeatures.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRFeatures.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRFeatures.hh,v 1.4.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #if !defined G4_FR_FEATURES_HH
 #define      G4_FR_FEATURES_HH
diff --git a/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh b/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
deleted file mode 100644
index d91e67cdf1..0000000000
--- a/source/visualization/FukuiRenderer/include/G4FRSocketConfig.hh
+++ /dev/null
@@ -1,40 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4FRSocketConfig.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-////////////////////////////////
-///// G4FRSocketConfig.h   /////
-////////////////////////////////
-
-//=================//
-#ifdef G4VIS_BUILD_DAWN_DRIVER
-//=================//
-
-
-#if !defined SOCKET_CONFIG_H
-#define SOCKET_CONFIG_H
-
-//----------------------------------//
-// Select one from the List below ////
-//----------------------------------//
-
-#if defined SOCKET_IRIX_SOLARIS
- #define     FR_SOCKET_IRIX_SOLARIS
-#else 
- #define     FR_SOCKET_DEFAULT
-#endif
-
-
-///// NOT IMPLEMENTED //////////
-//#define     SOCKET_NT       
-                      
-
-
-#endif
-#endif // G4VIS_BUILD_DAWN_DRIVER
diff --git a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh b/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
deleted file mode 100644
index ed7932813a..0000000000
--- a/source/visualization/FukuiRenderer/include/G4FRSocketMacro.hh
+++ /dev/null
@@ -1,33 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4FRSocketMacro.hh,v 1.3 1999/12/15 14:54:00 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-///////////////////////////////
-///// G4FRSocketMacro.hh  /////
-///////////////////////////////
-//----- MACRO for portability -----//
-
-//=================//
-#ifdef G4VIS_BUILD_DAWN_DRIVER
-//=================//
-
-#if !defined FR_SOCKET_MACRO_H
-#define FR_SOCKET_MACRO_H
-
-
-	//----- gethostname
-#if defined FR_SOCKET_IRIX_SOLARIS
- #include <sys/systeminfo.h>
- #define  GET_HOSTNAME( hostname, length )  sysinfo( SI_HOSTNAME, hostname, length ) 
-#else 
- #define  GET_HOSTNAME( hostname, length )  gethostname( hostname, length ) 
-#endif			
-
-#endif
-#endif //G4VIS_BUILD_DAWN_DRIVER
diff --git a/source/visualization/FukuiRenderer/include/G4FRofstream.hh b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
index 57affe1f20..33f8452b8f 100644
--- a/source/visualization/FukuiRenderer/include/G4FRofstream.hh
+++ b/source/visualization/FukuiRenderer/include/G4FRofstream.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRofstream.hh,v 1.3 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRofstream.hh,v 1.4.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include"g4std/fstream"
 
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
index 292888d797..fe1464caa7 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRenderer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRenderer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRenderer.hh,v 1.6.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
index bc9609fda8..f56dff7fdf 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRendererSceneHandler.hh,v 1.5 1999/12/16 17:24:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRendererSceneHandler.hh,v 1.6.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:19:19 JST 1996
diff --git a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
index 4f178e8c99..ab6ad0a636 100644
--- a/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
+++ b/source/visualization/FukuiRenderer/include/G4FukuiRendererViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRendererViewer.hh,v 1.5 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRendererViewer.hh,v 1.6.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 12:10:14 JST 1996
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
index c45780d16e..a99ddb3d9d 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILE.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILE.cc,v 1.6 2000/08/19 18:34:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILE.cc,v 1.7.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 // DAWNFILE factory.
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
index 5706fc2d0f..00d3370008 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILESceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILESceneHandler.cc,v 1.5 2000/05/16 15:56:43 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILESceneHandler.cc,v 1.6.2.1 2001/06/28 19:15:33 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 // DAWNFILE scene.
diff --git a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
index e975b9bd75..d1d8ae4d7a 100644
--- a/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4DAWNFILEViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4DAWNFILEViewer.cc,v 1.9 2000/05/15 07:48:27 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4DAWNFILEViewer.cc,v 1.10.2.1 2001/06/28 19:15:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA
 // DAWNFILE view - opens window, hard copy, etc.
diff --git a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
index d817cf0f4e..8e8d89c9ac 100644
--- a/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FRClientServer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRClientServer.cc,v 1.3 1999/12/15 14:54:01 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRClientServer.cc,v 1.4.2.1 2001/06/28 19:15:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Satoshi TANAKA, Wed Jul  3 14:14:29 JST 1996
 ////////////////////////////////
@@ -18,8 +34,6 @@
 #ifdef G4VIS_BUILD_DAWN_DRIVER
 //=================//
 
-#include "G4FRSocketConfig.hh"
-#include "G4FRSocketMacro.hh"
 #include "G4FRClientServer.hh"
 
 // #define DEBUG_CLIENT_SERVER
@@ -33,7 +47,7 @@ const  int	DEFAULT_PORT_NUMBER		= 40701            ;
 const  int	MAX_BINDING_TRIAL		= 10               ;
 const  int	BINDING_TRIAL_INTERVAL		= 5                ;
 const  int	MAX_CONNECT_TRIAL		= 10               ;
-
+const  char     FR_DEFAULT_HOST_NAME[]          = "localhost"      ;      
 
 	//----- G4FRClientServer::G4FRClientServer ()
 G4FRClientServer::G4FRClientServer ( char terminator , char end_line ) :  
@@ -227,27 +241,11 @@ int G4FRClientServer::ConnectINET()
 #if defined DEBUG_CLIENT_SERVER
 			Err("G4FRClientServer::ConnectINET(), gethostbyname");
 #endif
-				//----- get server name
-			if( GET_HOSTNAME( server_hostname, sizeof( server_hostname ) ) < 0 )
-			{ Err("G4FRClientServer::ConnectNET(), GET_HOSTNAME");}
-
-				//----- get IP address of server from its name
-			if( !(server_host_p = gethostbyname( server_hostname ) ) )
-			{ Err("G4FRClientServer::ConnectINET(), gethostbyname");}
+			server_host_p = gethostbyname( FR_DEFAULT_HOST_NAME ) ;
 		}
 
 	} else {
-			//----- If FR_ENV_SERVER_HOST_NAME is not set, 
-			//...... server host is set to the same as the
-			//...... client host.
-
-			//----- get server name
-		if( GET_HOSTNAME( server_hostname, sizeof( server_hostname ) ) < 0 )
-		{ Err("G4FRClientServer::ConnectNET(), GET_HOSTNAME");}
-
-			//----- get IP address of server from its name
-		if( !(server_host_p = gethostbyname( server_hostname ) ) )
-		{ Err("G4FRClientServer::ConnectINET(), gethostbyname");}
+			server_host_p = gethostbyname( FR_DEFAULT_HOST_NAME ) ;
 	}
 
 
diff --git a/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc b/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
index 2f0d46902a..9fb432a1f8 100644
--- a/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
+++ b/source/visualization/FukuiRenderer/src/G4FRSceneFunc.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRSceneFunc.icc,v 1.11 2001/01/25 15:28:07 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRSceneFunc.icc,v 1.13.2.1 2001/06/28 19:15:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 
@@ -22,7 +38,7 @@ void G4FRSCENE::AddPrimitive (const G4Polyline& polyline)
      FRBeginModeling();
 
           //----- local working variables
-     G4int            nPoints = polyline.entries ();
+     G4int            nPoints = polyline.size ();
      G4int            i ;  
      const            G4VisAttributes*  pVA =
        fpViewer->GetApplicableVisAttributes ( polyline.GetVisAttributes() ); 
@@ -46,9 +62,9 @@ void G4FRSCENE::AddPrimitive (const G4Polyline& polyline)
 	//----- vertices on polyline
      for ( i = 0; i < nPoints; i++ ) {
 	  SendStrDouble3( FR_PL_VERTEX   , \
-			  polyline(i).x(), \
-			  polyline(i).y(), \
-			  polyline(i).z()   );
+			  polyline[i].x(), \
+			  polyline[i].y(), \
+			  polyline[i].z()   );
      }
 
 	//----- send ending of polyline
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
index 5905c961b0..60335b9412 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRenderer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRenderer.cc,v 1.5 2000/08/19 18:34:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRenderer.cc,v 1.6.2.1 2001/06/28 19:15:34 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
index 9280749603..2e1a83368b 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRendererSceneHandler.cc,v 1.4 2000/04/12 13:08:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRendererSceneHandler.cc,v 1.5.2.1 2001/06/28 19:15:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 11:34:24 JST 1996
diff --git a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
index b35fbee459..c29ce9d4b4 100644
--- a/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
+++ b/source/visualization/FukuiRenderer/src/G4FukuiRendererViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FukuiRendererViewer.cc,v 1.5 2000/05/13 10:57:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FukuiRendererViewer.cc,v 1.6.2.1 2001/06/28 19:15:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Satoshi TANAKA, Fri Jun 28 12:09:11 JST 1996
diff --git a/source/visualization/GNUmakefile b/source/visualization/GNUmakefile
index c2a5c9bcb1..e41d20bb16 100644
--- a/source/visualization/GNUmakefile
+++ b/source/visualization/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.7 2000/11/03 16:41:10 gunter Exp $
+# $Id: GNUmakefile,v 1.8 2001/04/10 15:11:05 johna Exp $
 # -----------------------------------------------------------------------
 # GNUmakefile for visualization and modeling.  John Allison, 5/7/95.
 # Modeling is always made.  Others by environment.  John Allison  4/7/98.
@@ -71,6 +71,11 @@ ifdef      G4VIS_BUILD_VRMLFILE_DRIVER
 endif
 # End of VRML and VRMLFILE drivers
 
+ifdef G4VIS_BUILD_ASCIITREE_DRIVER
+  SUBDIRS += Tree
+  SUBLIBS += G4Tree
+endif
+
 .PHONY: granular glob global clean
 
 granular:
@@ -84,4 +89,3 @@ glob global:
 
 clean clean_libs:
 	@for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@); done
-	
diff --git a/source/visualization/History b/source/visualization/History
index 9bdcb96a72..2086116e27 100644
--- a/source/visualization/History
+++ b/source/visualization/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.110 2001/04/02 10:08:43 johna Exp $
+$Id: History,v 1.133 2001/06/19 11:24:09 stanaka Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -24,6 +24,86 @@ committal in the CVS repository !
 History file for visualization category
 ---------------------------------------
 
+19th June 2001  Satoshi Tanaka (vis-V03-01-07)
+-OS dependence is removed from the DAWN-network driver.
+ * gethostname() removed
+ * G4SocketConfig.hh and G4SocketMacro.hh are removed.
+- Now "setenv G4DAWN_HOST_NAME hostname" is mandatory to use 
+  the DAWN-network driver.
+
+15th June 2001  John Allison
+- Added GAGTree to G4VisManager.cc, MyVisManager.cc.  Need corresponding
+  changes in config.
+
+15th June 2001  John Allison (vis-V03-01-06)
+- Added 2nd template argument (less) to sets in G4ASCIITreeSceneHandler and
+  G4GAGTreeSceneHandler.
+
+15th June 2001  Satoshi Tanaka (vis-V03-01-05)
+- The  first committing of GAGTree driver.
+- Other files in ./Tree/ are the same as vis-V03-01-04.
+
+5th June 2001  John Allison (vis-V03-01-04)
+- Moved re-useable code from G4ASCIITree to G4VTree.
+- Made sure all pointers in G4VisManager are initialised on construction.
+
+4th June 2001  John Allison
+- G4ASCIITree: Added logical volume name and solid name and type under
+  verbosity control.
+- G4ASCIITree: Forced culling off so that all volumes are seen, even if
+  "invisible".
+
+29th May 2001  John Allison
+- Small clean up in test directory.
+
+25th May 2001  John Allison
+- Bug fix in G4ASCIITree.cc: initialise fVerbosity(0).
+
+24th May 2001  John Allison  (vis-V03-01-03)
+- Added missing files G4ASCIITreeMessenger.hh/cc.
+- Bug fix in G4ASCIITreeMessenger.cc: currentAsDefault = true.
+- Drivers in alphabetical order in MyVisManager.cc.
+
+23rd May 2001  John Allison
+- Eliminated Linux pedantic warnings, except FukuiRenderer, VRML and OPACS.
+
+22nd May 2001  John Allison
+- Refined ASCIITree.
+
+21st May 2001  John Allison (vis-V03-01-02)
+- Minor bug corrections (mostly to fix things that used to work with the
+  old /vis~/ commands but ceased to work with the new /vis/commands:
+  o If a scene is empty at drawing time, the "world" is added.
+  o Window size hint now works for OpenGL.
+- Fixed some minor warnings for strict C++ (size_t, etc.).
+
+18th May 2001 John Allison
+- Removed unnecessary virtual inheritance of G4VViewer in G4RayTracerViewer.
+- Introduced verbosity to ASCIITree.
+- Proper deletion of directories in G4VisManagerRegisterMessengers.
+
+15th May 2001 John Allison
+- Fixed bug in name of /vis/viewer/set/sectionPlane command.
+
+3rd May 2001 John Allison (vis-V03-01-01)
+- Changes for greps-V03-01-01 (elimination of RW).
+- Improvements in /vis/scene/add/volume.
+- Added /vis/drawTree.
+
+10th April 2001  John Allison (vis-V03-01-00)
+- Added two new commands:
+    /vis/scene/add/text
+    /vis/scene/add/axes
+- Added first version of ASCIITree to dump geometry hierarchy to
+  standard output as ASCII stream.
+  This requires two new environment variables:
+    G4VIS_BUILD_ASCIITREE_DRIVER
+    G4VIS_USE_ASCIITREE
+  and config-V03-01-00.
+
+2nd April 2001  John Allison
+- Tidied OpenGL (opengl-V03-00-01) - see OpenGL/History.
+
 2nd April 2001  John Allison  (vis-V03-00-09)
 - Fixed some warnings from DEC cxx.
 
diff --git a/source/visualization/OPACS/include/G4GoSceneHandler.hh b/source/visualization/OPACS/include/G4GoSceneHandler.hh
index a955df42c1..3697297b15 100644
--- a/source/visualization/OPACS/include/G4GoSceneHandler.hh
+++ b/source/visualization/OPACS/include/G4GoSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GoSceneHandler.hh,v 1.6 2000/08/19 18:34:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GoSceneHandler.hh,v 1.6.4.1 2001/06/28 19:15:35 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4Wo.hh b/source/visualization/OPACS/include/G4Wo.hh
index 657e9d3cb0..26dfa0e891 100644
--- a/source/visualization/OPACS/include/G4Wo.hh
+++ b/source/visualization/OPACS/include/G4Wo.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Wo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Wo.hh,v 1.5.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4WoViewer.hh b/source/visualization/OPACS/include/G4WoViewer.hh
index 2f2d16865f..f865bccaf6 100644
--- a/source/visualization/OPACS/include/G4WoViewer.hh
+++ b/source/visualization/OPACS/include/G4WoViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4WoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4WoViewer.hh,v 1.4.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4Xo.hh b/source/visualization/OPACS/include/G4Xo.hh
index cd9da75ab7..7c9a149cc0 100644
--- a/source/visualization/OPACS/include/G4Xo.hh
+++ b/source/visualization/OPACS/include/G4Xo.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Xo.hh,v 1.5 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Xo.hh,v 1.5.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/include/G4XoViewer.hh b/source/visualization/OPACS/include/G4XoViewer.hh
index 9e65093da2..a55e56c0da 100644
--- a/source/visualization/OPACS/include/G4XoViewer.hh
+++ b/source/visualization/OPACS/include/G4XoViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XoViewer.hh,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XoViewer.hh,v 1.4.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4GoSceneHandler.cc b/source/visualization/OPACS/src/G4GoSceneHandler.cc
index 8523b73a89..6ffc758e29 100644
--- a/source/visualization/OPACS/src/G4GoSceneHandler.cc
+++ b/source/visualization/OPACS/src/G4GoSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GoSceneHandler.cc,v 1.10 2001/01/25 15:28:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GoSceneHandler.cc,v 1.11.2.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
@@ -87,17 +103,17 @@ void G4GoSceneHandler::AddPrimitive (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyline&) " << line.entries () << G4endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polyline&) " << line.size () << G4endl;
 #endif
   SetColour        (GetColour(line));
-  int              nPoints = line.entries ();
+  int              nPoints = line.size ();
   OPointList       points;
   points           = OPointListCreate(nPoints);
   for (int iPoint = 0; iPoint < nPoints; iPoint++) {
     OPointListSetIthEntry   (points,iPoint,
-			     line(iPoint).x(), 
-			     line(iPoint).y(),
-			     line(iPoint).z());
+			     line[iPoint].x(), 
+			     line[iPoint].y(),
+			     line[iPoint].z());
   }
   GoAddLinesToNode (fGoNode,points);
   OPointListDelete (points);
@@ -111,17 +127,17 @@ void G4GoSceneHandler::AddPrimitive (
 /*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 {
 #ifdef DEBUG
-  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polymarker&) " << line.entries () << G4endl;
+  G4cout << "G4GoSceneHandler::AddPrimitive(G4Polymarker&) " << line.size () << G4endl;
 #endif
   SetColour  (GetColour(line));
-  int        nPoints = line.entries ();
+  int        nPoints = line.size ();
   OPointList points;
   points     = OPointListCreate(nPoints);
   for (int iPoint = 0; iPoint < nPoints; iPoint++) {
     OPointListSetIthEntry   (points,iPoint,
-			     line(iPoint).x(), 
-			     line(iPoint).y(),
-			     line(iPoint).z());
+			     line[iPoint].x(), 
+			     line[iPoint].y(),
+			     line[iPoint].z());
   }
   GoAddMarkersToNode (fGoNode,points);
   OPointListDelete   (points);
diff --git a/source/visualization/OPACS/src/G4Wo.cc b/source/visualization/OPACS/src/G4Wo.cc
index 9cb2562554..d14f7c88ce 100644
--- a/source/visualization/OPACS/src/G4Wo.cc
+++ b/source/visualization/OPACS/src/G4Wo.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Wo.cc,v 1.4 1999/12/15 14:54:02 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Wo.cc,v 1.4.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4WoViewer.cc b/source/visualization/OPACS/src/G4WoViewer.cc
index 8edd9f711b..b87a2f3306 100644
--- a/source/visualization/OPACS/src/G4WoViewer.cc
+++ b/source/visualization/OPACS/src/G4WoViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4WoViewer.cc,v 1.6 2000/05/28 13:35:14 barrand Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4WoViewer.cc,v 1.6.4.1 2001/06/28 19:15:36 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4Xo.cc b/source/visualization/OPACS/src/G4Xo.cc
index 9ad4a5b717..a20d903391 100644
--- a/source/visualization/OPACS/src/G4Xo.cc
+++ b/source/visualization/OPACS/src/G4Xo.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Xo.cc,v 1.5 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Xo.cc,v 1.5.4.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OPACS/src/G4XoViewer.cc b/source/visualization/OPACS/src/G4XoViewer.cc
index 78d7eed996..95f37769f2 100644
--- a/source/visualization/OPACS/src/G4XoViewer.cc
+++ b/source/visualization/OPACS/src/G4XoViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4XoViewer.cc,v 1.7 2000/05/13 10:57:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4XoViewer.cc,v 1.7.4.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Guy Barrand 04 November 1996
diff --git a/source/visualization/OpenGL/History b/source/visualization/OpenGL/History
index 1509006994..81f6180d4e 100644
--- a/source/visualization/OpenGL/History
+++ b/source/visualization/OpenGL/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.4 2001/03/07 15:29:49 johna Exp $
+$Id: History,v 1.6 2001/04/02 14:05:54 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -20,6 +20,9 @@ committal in the CVS repository !
 History file for visualization/OpenGL
 -------------------------------------
 
+2nd April 2001  John Allison (opengl-V03-00-01 wrt vis-V03-00-09)
+- Tidied G4OpenGLXmViewer callback code.  Removed superfluous header files.
+
 7th March 2001  John Allison
 - Changed char* to const char* in many places and that gave problems in
   calls to Xt and Xm.  Hope all's OK.  Differences:
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
index 8a3506f9a0..1e2d4ec0e2 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.4 2000/08/19 18:34:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateSceneHandler.hh,v 1.4.4.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
index 8f35193bb7..c33abdc9c1 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateViewer.hh,v 1.5 2001/02/23 15:43:07 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateViewer.hh,v 1.5.2.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
index b674dd3f45..38c64c235d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateWin32.hh,v 1.4 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateWin32.hh,v 1.4.4.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
index f20d8fa648..11e29b70e3 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateWin32Viewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.4 2001/02/23 15:43:07 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateWin32Viewer.hh,v 1.4.2.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
index 3e9302ad3d..5c76ba4c22 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateX.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateX.hh,v 1.5 1999/12/15 14:54:03 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateX.hh,v 1.5.4.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
index 6674248714..11495c396e 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXViewer.hh,v 1.5 2001/02/23 15:43:08 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXViewer.hh,v 1.5.2.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
index 69579bd795..5c8f306bc9 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXm.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXm.hh,v 1.5 2001/02/03 18:39:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXm.hh,v 1.5.2.1 2001/06/28 19:15:37 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
index f011891a2d..372fb889d9 100644
--- a/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLImmediateXmViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXmViewer.hh,v 1.5 2001/02/23 15:43:08 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXmViewer.hh,v 1.5.2.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
index 3a27e83b5b..3aff81b4fe 100644
--- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLSceneHandler.hh,v 1.7 2001/01/18 11:59:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLSceneHandler.hh,v 1.7.2.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
index 088c244b5c..402510069f 100644
--- a/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
+++ b/source/visualization/OpenGL/include/G4OpenGLSceneHandler.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLSceneHandler.icc,v 1.3 1999/12/16 17:25:06 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLSceneHandler.icc,v 1.3.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  20th January 1998
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
index abb609cf81..3c2aa7ca8a 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredSceneHandler.hh,v 1.10 2001/02/23 15:43:08 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredSceneHandler.hh,v 1.10.2.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
index fd21987e5b..db79d4cf64 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredViewer.hh,v 1.6 2001/02/23 15:43:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredViewer.hh,v 1.6.2.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
index 0e74d843be..54fc1ccabc 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredWin32.hh,v 1.4 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredWin32.hh,v 1.4.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
index b592369c14..b3bd6ef5a7 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredWin32Viewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.2 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredWin32Viewer.hh,v 1.2.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
index b19d053a97..e69ab9405c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredX.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredX.hh,v 1.5 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredX.hh,v 1.5.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
index 1f6fc2c299..9dd5330379 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXViewer.hh,v 1.3 1999/12/15 14:54:04 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXViewer.hh,v 1.3.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
index 4e11773f0d..42a9a791dc 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXm.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXm.hh,v 1.4 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXm.hh,v 1.4.4.1 2001/06/28 19:15:38 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
index 1eafbdbf03..59577265fd 100644
--- a/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLStoredXmViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXmViewer.hh,v 1.3 2001/02/03 18:39:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXmViewer.hh,v 1.3.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
index 7008fa53e0..5ba614e673 100644
--- a/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLTransform3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLTransform3D.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLTransform3D.hh,v 1.3.4.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLViewer.hh b/source/visualization/OpenGL/include/G4OpenGLViewer.hh
index 05cf0e3e2e..50be0a3d8d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLViewer.hh,v 1.6 2001/02/23 15:43:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLViewer.hh,v 1.6.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
index 2d3ea78912..7718c79fd5 100644
--- a/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLWin32Viewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLWin32Viewer.hh,v 1.4 2001/02/23 15:43:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLWin32Viewer.hh,v 1.4.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
diff --git a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
index 2e6bce8374..e9cf7d3dfa 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXViewer.hh,v 1.10 2001/02/23 15:43:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXViewer.hh,v 1.11.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -106,36 +122,6 @@ private:
   G4OpenGLXViewer& operator = (const G4OpenGLXViewer&);
 };
 
-static const char* gouraudtriangleEPS[] =
-{
-  "/bd{bind def}bind def /triangle { aload pop   setrgbcolor  aload pop 5 3",
-  "roll 4 2 roll 3 2 roll exch moveto lineto lineto closepath fill } bd",
-  "/computediff1 { 2 copy sub abs threshold ge {pop pop pop true} { exch 2",
-  "index sub abs threshold ge { pop pop true} { sub abs threshold ge } ifelse",
-  "} ifelse } bd /computediff3 { 3 copy 0 get 3 1 roll 0 get 3 1 roll 0 get",
-  "computediff1 {true} { 3 copy 1 get 3 1 roll 1 get 3 1 roll 1 get",
-  "computediff1 {true} { 3 copy 2 get 3 1 roll  2 get 3 1 roll 2 get",
-  "computediff1 } ifelse } ifelse } bd /middlecolor { aload pop 4 -1 roll",
-  "aload pop 4 -1 roll add 2 div 5 1 roll 3 -1 roll add 2 div 3 1 roll add 2",
-  "div 3 1 roll exch 3 array astore } bd /gouraudtriangle { computediff3 { 4",
-  "-1 roll aload 7 1 roll 6 -1 roll pop 3 -1 roll pop add 2 div 3 1 roll add",
-  "2 div exch 3 -1 roll aload 7 1 roll exch pop 4 -1 roll pop add 2 div 3 1",
-  "roll add 2 div exch 3 -1 roll aload 7 1 roll pop 3 -1 roll pop add 2 div 3",
-  "1 roll add 2 div exch 7 3 roll 10 -3 roll dup 3 index middlecolor 4 1 roll",
-  "2 copy middlecolor 4 1 roll 3 copy pop middlecolor 4 1 roll 13 -1 roll",
-  "aload pop 17 index 6 index 15 index 19 index 6 index 17 index 6 array",
-  "astore 10 index 10 index 14 index gouraudtriangle 17 index 5 index 17",
-  "index 19 index 5 index 19 index 6 array astore 10 index 9 index 13 index",
-  "gouraudtriangle 13 index 16 index 5 index 15 index 18 index 5 index 6",
-  "array astore 12 index 12 index 9 index gouraudtriangle 17 index 16 index",
-  "15 index 19 index 18 index 17 index 6 array astore 10 index 12 index 14",
-  "index gouraudtriangle 18 {pop} repeat } { aload pop 5 3 roll aload pop 7 3",
-  "roll aload pop 9 3 roll 4 index 6 index 4 index add add 3 div 10 1 roll 7",
-  "index 5 index 3 index add add 3 div 10 1 roll 6 index 4 index 2 index add",
-  "add 3 div 10 1 roll 9 {pop} repeat 3 array astore triangle } ifelse } bd",
-  NULL
-};
-
 typedef struct _Feedback3Dcolor {
   GLfloat x;
   GLfloat y;
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
index e964e515cc..42fd2448f3 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmBox.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmBox.hh,v 1.5 2001/03/07 14:56:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmBox.hh,v 1.5.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Box container class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh b/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
deleted file mode 100644
index fe7c7dbec7..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmConvenienceRoutines.hh
+++ /dev/null
@@ -1,155 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmConvenienceRoutines.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMCONVENIENCEROUTINES_HH
-#define G4OPENGLXMCONVENIENCEROUTINES_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-// Methods contained in G4OpenGLXmConvenienceRoutines:
-//
-// 1) Add_four_arrow_buttons
-// 2) Add_radio_box
-// 3) Add_set_field
-// 4) Add_slider_box
-// 5) get_float_value_callback
-//
-// Description of methods in G4OpenGLXmConvenienceRoutines:
-//
-// 1) Add_four_arrow_buttons (G4OpenGLXmViewer* pView,
-//			      XtCallbackProc* arrow_callbacks,
-//			      Widget* parent_widget)
-//
-//    Adds a form widget containing four arrows (up, down, left, right)
-//    to the row column parent_widget which is passed in the arguments 
-//    List. The XtCallbackProc* is an array containing four callback
-//    proceedures to be registered with the up, down, left and right arrow
-//    widgets respectively.
-//
-// 2) Add_radio_box (char* label_string,
-//                  Widget* parent_widget, 
-//      	    XtCallbackProc radio_box_callback, 
-//	            G4int num_buttons, 
-//	            G4int default_button, 
-//	            char* radio_box_name, 
-//	            char** button_names, 
-//	            G4OpenGLXmViewer* pView);
-//
-//    Adds a row column widget containing num_buttons toggle buttons, to the
-//    row column parent_widget passed in the arguments List. label_string is
-//    the title that gets written above the radio buttons, and radio_box_name
-//    is used by the compiler, to give the radio_box a name to refer to, e.g.
-//    for resource setting, or error information. default_button is the button
-//    which appears `clicked' when the radio_box first appears. The first char*
-//    object in the button_names array, gets written next to the first button, 
-//    the second next to the second, etc. radio_box_callback is the 
-//    XtCallbackProc callback proceedure, which is registered with all of the 
-//    buttons. XmNuserData is set to the index (0, 1,.., (num_buttons -1)) of 
-//    the calling button so that radio_box_callback can tell which button was
-//    clicked, and what to do as a consequence.
-//
-// 3) Add_set_field (char* widget, 
-//                   char* widget_text, 
-//                   Widget* row_col_box, 
-//		     Widget* wid, 
-//		     G4float* val, 
-//		     G4OpenGLXmViewer* pView);
-//
-//    Adds a text field widget to the row_col_box supplied in the arguments
-//    List. widget goes towards giving the widgets created within Add_set_field
-//    names for reference (e.g. to set resources) and widget_text gets printed
-//    above the text field box. val is the variable into which a number typed
-//    into the text field widget, will get placed. Add_set_field uses the 
-//    get_float_value also in this file.
-//
-// 4) Add_slider_box (char* label_string,
-//		      G4int num_sliders,
-//		      char** slider_names,
-//		      G4OpenGLXmViewer* pView,
-//		      G4float* min_array,
-//		      G4float* max_array,
-//		      G4float* value_array,
-//		      G4bool* show,
-//		      short* decimals,
-//		      unsigned char* orientation,
-//		      unsigned char* direction,
-//		      XtCallbackProc* slider_box_callbacks,
-//		      Widget* parent_widget);
-//
-//    Adds a row column widget containing num_sliders scale widgets, to the
-//    row column widget specified by parent_widget. Each of the arrays, 
-//    slider_names, min_array, max_array, value_array, show, decimals, 
-//    orientation, direction and slider_box_callbacks contains num_sliders
-//    elements, and govern the properties of each scale widget placed within
-//    the slider box individually. The relevance of most of the arrays is self
-//    explanatory. 
-//    - value_array contains the initial value for each scale widget. 
-//    - show determines whether or not the current numerical value represented 
-//    by the position of the slider bar on the scale widget is displayed. 
-//    - decimals indicates the Power of ten, by which to divide the current 
-//    scale widget value, before displaying it (if show is set) above the 
-//    slider bar. Scale widgets can only have integer values, but the use 
-//    of decimals and show can give the appearance of the scale widget having
-//    a floating point value. 
-//    - The XtCallbackProc specified in slider_box_callbacks is registered for
-//    both XmNvalueChanged and XmNdrag events generated by the scale widget.
-//
-// 5) get_float_value_callback (Widget w, 
-//			       XtPointer clientData, 
-//			       XtPointer callData);
-//
-//    This XtCallbackProc reads a character string from a text field widget, 
-//    and converts it to a floating point number.
-
-void Add_four_arrow_buttons (G4OpenGLXmViewer* pView,
-			     XtCallbackProc* arrow_callbacks,
-			     Widget* parent_widget);
-
-void Add_radio_box (char* label_string,
-		    Widget* parent_widget, 
-		    XtCallbackProc radio_box_callback, 
-		    G4int num_buttons, 
-		    G4int default_button, 
-		    char* radio_box_name, 
-		    char** button_names, 
-		    G4OpenGLXmViewer* pView);
-		    
-void Add_set_field (char* widget, 
-		    char* widget_text, 
-		    Widget* row_col_box, 
-		    Widget* wid, 
-		    G4float* val, 
-		    G4OpenGLXmViewer* pView);
-
-void Add_slider_box (char* label_string,
-		     G4int num_sliders,
-		     char** slider_names,
-		     G4OpenGLXmViewer* pView,
-		     G4float* min_array,
-		     G4float* max_array,
-		     G4float* value_array,
-		     G4bool* show,
-		     short* decimals,
-		     unsigned char* orientation,
-		     unsigned char* direction,
-		     XtCallbackProc* slider_box_callbacks,
-		     Widget* parent_widget);
-		    
-void get_float_value_callback (Widget w, 
-			       XtPointer clientData, 
-			       XtPointer callData);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
index 771332dc7a..5cdf6a018e 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmFourArrowButtons.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.4 2001/02/03 18:39:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmFourArrowButtons.hh,v 1.4.2.1 2001/06/28 19:15:39 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
index d7529ae76d..dd39d9018c 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmFramedBox.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmFramedBox.hh,v 1.5 2001/03/07 14:56:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmFramedBox.hh,v 1.5.2.1 2001/06/28 19:15:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Framed box container class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
deleted file mode 100644
index 1c687edcc1..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmMainMenubarCallbacks.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmMainMenubarCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMMAINMENUBARCALLBACKS_HH
-#define G4OPENGLXMMAINMENUBARCALLBACKS_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-void misc_callback (Widget w, XtPointer clientData, XtPointer callData);
-void actions_callback (Widget w, XtPointer clientData, XtPointer callData);
-void update_panels_callback (Widget w, XtPointer clientData, XtPointer callData);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
deleted file mode 100644
index d594c93ca2..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmPanningCallbacks.hh
+++ /dev/null
@@ -1,44 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmPanningCallbacks.hh,v 1.3 1999/12/15 14:54:05 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMPANNINGCALLBACKS_HH
-#define G4OPENGLXMPANNINGCALLBACKS_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-void zoom_callback (Widget w, 
-		    XtPointer clientData, 
-		    XtPointer callData);
-
-void dolly_callback (Widget w, 
-		     XtPointer clientData, 
-		     XtPointer callData);
-
-void pan_left_right_callback (Widget w, 
-			      XtPointer clientData, 
-			      XtPointer callData);
-
-void pan_up_down_callback (Widget w, 
-			   XtPointer clientData, 
-			   XtPointer callData);
-
-void left_right_pan_callback (XtPointer clientData, 
-			      XtIntervalId timer_id);
-
-void up_down_pan_callback (XtPointer clientData, 
-			   XtIntervalId timer_id);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
index 7e52ec3e63..09d0b763b7 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmPushButton.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmPushButton.hh,v 1.5 2001/03/07 15:16:27 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmPushButton.hh,v 1.5.2.1 2001/06/28 19:15:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
index 0697f581f8..dd8660df38 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmRadioButton.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmRadioButton.hh,v 1.5 2001/03/07 14:56:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmRadioButton.hh,v 1.5.2.1 2001/06/28 19:15:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
index 6c23145e27..322851881b 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmResources.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmResources.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmResources.hh,v 1.3.4.1 2001/06/28 19:15:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 // Default resources file for GEANT4 OpenGL Motif windows.
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
deleted file mode 100644
index 9409d52633..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmRotationCallbacks.hh
+++ /dev/null
@@ -1,44 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmRotationCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMROTATIONCALLBACKS_HH
-#define G4OPENGLXMROTATIONCALLBACKS_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-void theta_rotation_callback (Widget w, 
-			      XtPointer clientData, 
-			      XtPointer callData);
-
-void rotate_in_theta (XtPointer clientData, 
-		      XtIntervalId timer_id);
-
-void phi_rotation_callback (Widget w, 
-			    XtPointer clientData, 
-			    XtPointer callData);
-
-void rotate_in_phi (XtPointer clientData, 
-		    XtIntervalId timer_id);
-
-void set_rot_sens_callback (Widget w, 
-			    XtPointer clientData, 
-			    XtPointer callData);
-
-void set_rot_subject_callback (Widget w, 
-			       XtPointer clientData, 
-			       XtPointer callData);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
index a38bd8ee90..e72ec74d04 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmSeparator.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmSeparator.hh,v 1.4 2001/02/03 18:39:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmSeparator.hh,v 1.4.2.1 2001/06/28 19:15:40 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
index f29d46bff3..dd920b448d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmSliderBar.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmSliderBar.hh,v 1.5 2001/03/07 14:56:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmSliderBar.hh,v 1.5.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
deleted file mode 100644
index df6c299915..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmStyleCallbacks.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmStyleCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMSTYLECALLBACKS_HH
-#define G4OPENGLXMSTYLECALLBACKS_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-void drawing_style_callback (Widget w, 
-			     XtPointer clientData, 
-			     XtPointer callData);
-
-void rep_style_callback (Widget w, 
-			 XtPointer clientData, 
-			 XtPointer callData);
-
-void background_color_callback (Widget w, 
-				XtPointer clientData, 
-				XtPointer callData);
-
-void projection_callback (Widget w, 
-			  XtPointer clientData, 
-			  XtPointer callData);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
index 8908769aa5..82a0af0e7d 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmTextField.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmTextField.hh,v 1.5 2001/03/07 14:56:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmTextField.hh,v 1.5.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
index 2aefdbf49f..0362a3eb59 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmTopLevelShell.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmTopLevelShell.hh,v 1.4 2001/02/03 18:39:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmTopLevelShell.hh,v 1.4.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Top level shell class
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
index e0b34d274e..d458b84846 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetComponent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.4 2001/02/03 18:39:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetComponent.hh,v 1.4.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Base class for all Motif component widgets
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
index 7b639c87f2..2f89619d1b 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetContainer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.4 2001/02/03 18:39:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetContainer.hh,v 1.4.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Base class for all Motif container widgets
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
index 65ff8928fa..85ce1a0e0f 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetObject.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetObject.hh,v 1.4 2001/02/03 18:39:23 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetObject.hh,v 1.4.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Virtual base class for all Motif widgets.
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
index e7cecc766d..276fd3b32a 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmVWidgetShell.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetShell.hh,v 1.4 2001/02/03 18:39:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetShell.hh,v 1.4.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 //Base class for all Motif window widgets (shells)
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
index 4a64cb7688..caa101ca36 100644
--- a/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
+++ b/source/visualization/OpenGL/include/G4OpenGLXmViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmViewer.hh,v 1.5 2001/02/23 15:43:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmViewer.hh,v 1.5.2.1 2001/06/28 19:15:41 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh b/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
deleted file mode 100644
index 945987bfc5..0000000000
--- a/source/visualization/OpenGL/include/G4OpenGLXmWindowHandlingCallbacks.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4OpenGLXmWindowHandlingCallbacks.hh,v 1.3 1999/12/15 14:54:06 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-//
-
-#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
-
-#ifndef G4OPENGLXMWINDOWHANDLINGCALLBACKS_HH
-#define G4OPENGLXMWINDOWHANDLINGCALLBACKS_HH
-
-#include "G4OpenGLXmViewer.hh"
-
-void expose_callback (Widget w, XtPointer clientData, XtPointer callData);
-void resize_callback (Widget w, XtPointer clientData, XtPointer callData);
-
-#endif
-
-#endif
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
index 91564b1c11..010f920d33 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateSceneHandler.cc,v 1.3.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
index bae34cc75a..06b49b45cf 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateViewer.cc,v 1.3 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateViewer.cc,v 1.3.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
index b7f9a928bb..303645b718 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateWin32.cc,v 1.5 2000/08/19 18:34:26 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateWin32.cc,v 1.5.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // OpenGLImmediateWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
index 468a577880..0465cd3eb8 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateWin32Viewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.2 1999/12/15 14:54:07 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateWin32Viewer.cc,v 1.2.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4OpenGLImmediateWin32Viewer : a class derived from G4OpenGLWin32Viewer and
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
index 7edabac1c3..e821cd0e28 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateX.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateX.cc,v 1.6 2000/08/19 18:34:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateX.cc,v 1.6.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
index f815b6bba5..d241ca92b5 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXViewer.cc,v 1.4 2000/05/22 08:16:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXViewer.cc,v 1.4.4.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
index 4c222791b1..b570554efe 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXm.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXm.cc,v 1.6 2001/02/03 18:39:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXm.cc,v 1.6.2.1 2001/06/28 19:15:42 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
index 04d55997e5..fd5d387a33 100644
--- a/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLImmediateXmViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLImmediateXmViewer.cc,v 1.4 2001/02/03 18:39:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLImmediateXmViewer.cc,v 1.4.2.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
index ea6a717508..07e0af8440 100644
--- a/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLSceneHandler.cc,v 1.8 2001/01/25 15:28:09 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLSceneHandler.cc,v 1.10.2.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -88,12 +104,12 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Polyline& line)
   glDisable (GL_LIGHTING);
   glBegin (GL_LINE_STRIP);
 
-  G4int nPoints = line.entries ();
+  G4int nPoints = line.size ();
   for (G4int iPoint = 0; iPoint < nPoints; iPoint++) {
   G4double x, y, z;
-    x = line(iPoint).x(); 
-    y = line(iPoint).y();
-    z = line(iPoint).z();
+    x = line[iPoint].x(); 
+    y = line[iPoint].y();
+    z = line[iPoint].z();
     glVertex3d (x, y, z);
   }
   glEnd ();
@@ -108,7 +124,7 @@ void G4OpenGLSceneHandler::AddPrimitive (const G4Text& text) {
     << "\" at " << text.GetPosition ()
     << ", size " << size
     << ", offsets " << text.GetXOffset () << ", " << text.GetYOffset ()
-    << ", type " << sizeType
+    << ", type " << G4int(sizeType)
     << G4endl;
 }
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
index 421086f33c..013b1c407b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredSceneHandler.cc,v 1.9 2001/02/23 15:43:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredSceneHandler.cc,v 1.10.2.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -111,7 +127,7 @@ void G4OpenGLStoredSceneHandler::ClearStore () {
 
   G4VSceneHandler::ClearStore ();  // Sets need kernel visit, etc.
 
-  int i;
+  size_t i;
 
   // Delete OpenGL display lists.
   for (i = 0; i < fPODLList.size (); i++) {
@@ -158,7 +174,7 @@ void G4OpenGLStoredSceneHandler::EndModeling () {
 //  }
 
   glNewList (fTopPODL, GL_COMPILE); {
-    for (int i = 0; i < fPODLList.size (); i++) {
+    for (size_t i = 0; i < fPODLList.size (); i++) {
       glPushMatrix();
       G4OpenGLTransform3D oglt (fPODLTransformList [i]);
       glMultMatrixd (oglt.GetGLMatrix ());
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
index ec331964e7..2d40e4412a 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredViewer.cc,v 1.5 2001/02/23 15:43:12 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredViewer.cc,v 1.5.2.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
index d5a948dd98..b0a6770e52 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredWin32.cc,v 1.5 2000/08/19 18:34:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredWin32.cc,v 1.5.4.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // OpenGLStoredWin32 graphics system factory.
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
index 60e78759e1..6deb6ae984 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.2 1999/12/15 14:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.2.4.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Class G4OpenGLStoredWin32Viewer : a class derived from G4OpenGLWin32Viewer and
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
index d80b6ff246..951cf180b9 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredX.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredX.cc,v 1.6 2000/08/19 18:34:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredX.cc,v 1.6.4.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
index 1c0e1a9f67..a599639d32 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXViewer.cc,v 1.4 2000/05/22 08:16:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXViewer.cc,v 1.4.4.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
index 84bdc3b64e..c25e16b0a4 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXm.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXm.cc,v 1.5 2000/08/19 18:34:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXm.cc,v 1.5.4.1 2001/06/28 19:15:43 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
index 6de1bfc61f..4ef5cd3b05 100644
--- a/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLStoredXmViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLStoredXmViewer.cc,v 1.4 2001/02/03 18:39:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLStoredXmViewer.cc,v 1.4.2.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
diff --git a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
index fa0a2122fc..e994d7f297 100644
--- a/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLTransform3D.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLTransform3D.cc,v 1.3 1999/12/15 14:54:08 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLTransform3D.cc,v 1.3.4.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  24th October 1996
diff --git a/source/visualization/OpenGL/src/G4OpenGLViewer.cc b/source/visualization/OpenGL/src/G4OpenGLViewer.cc
index 6b81c4712e..82d3d6c08b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLViewer.cc,v 1.10 2001/02/04 20:24:38 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLViewer.cc,v 1.11.2.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
@@ -43,11 +59,11 @@ int G4OpenGLViewer::dblBuf_RGBA[11] =
 
 G4OpenGLViewer::G4OpenGLViewer (G4OpenGLSceneHandler& scene):
 G4VViewer (scene, -1),
-fSceneHandler (scene),
 white_background (False),
 transparency_enabled (False),
 antialiasing_enabled (False),
-haloing_enabled (False)
+haloing_enabled (False),
+fSceneHandler (scene)
 {
   // Make changes to view parameters for OpenGL...
   fVP.SetAutoRefresh(true);
diff --git a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
index a710683c5f..d40e028c36 100644
--- a/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLWin32Viewer.cc,v 1.2 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLWin32Viewer.cc,v 1.2.4.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4OpenGLWin32Viewer : Class to provide WindowsNT specific
diff --git a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
index 4ae6f56319..0603ea6cfa 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXViewer.cc,v 1.9 2001/02/03 18:39:37 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXViewer.cc,v 1.10.2.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  7th February 1997
@@ -44,6 +60,36 @@
 #define USE_DEFAULT_COLORMAP 1
 #define USE_STANDARD_COLORMAP 0
 
+static const char* gouraudtriangleEPS[] =
+{
+  "/bd{bind def}bind def /triangle { aload pop   setrgbcolor  aload pop 5 3",
+  "roll 4 2 roll 3 2 roll exch moveto lineto lineto closepath fill } bd",
+  "/computediff1 { 2 copy sub abs threshold ge {pop pop pop true} { exch 2",
+  "index sub abs threshold ge { pop pop true} { sub abs threshold ge } ifelse",
+  "} ifelse } bd /computediff3 { 3 copy 0 get 3 1 roll 0 get 3 1 roll 0 get",
+  "computediff1 {true} { 3 copy 1 get 3 1 roll 1 get 3 1 roll 1 get",
+  "computediff1 {true} { 3 copy 2 get 3 1 roll  2 get 3 1 roll 2 get",
+  "computediff1 } ifelse } ifelse } bd /middlecolor { aload pop 4 -1 roll",
+  "aload pop 4 -1 roll add 2 div 5 1 roll 3 -1 roll add 2 div 3 1 roll add 2",
+  "div 3 1 roll exch 3 array astore } bd /gouraudtriangle { computediff3 { 4",
+  "-1 roll aload 7 1 roll 6 -1 roll pop 3 -1 roll pop add 2 div 3 1 roll add",
+  "2 div exch 3 -1 roll aload 7 1 roll exch pop 4 -1 roll pop add 2 div 3 1",
+  "roll add 2 div exch 3 -1 roll aload 7 1 roll pop 3 -1 roll pop add 2 div 3",
+  "1 roll add 2 div exch 7 3 roll 10 -3 roll dup 3 index middlecolor 4 1 roll",
+  "2 copy middlecolor 4 1 roll 3 copy pop middlecolor 4 1 roll 13 -1 roll",
+  "aload pop 17 index 6 index 15 index 19 index 6 index 17 index 6 array",
+  "astore 10 index 10 index 14 index gouraudtriangle 17 index 5 index 17",
+  "index 19 index 5 index 19 index 6 array astore 10 index 9 index 13 index",
+  "gouraudtriangle 13 index 16 index 5 index 15 index 18 index 5 index 6",
+  "array astore 12 index 12 index 9 index gouraudtriangle 17 index 16 index",
+  "15 index 19 index 18 index 17 index 6 array astore 10 index 12 index 14",
+  "index gouraudtriangle 18 {pop} repeat } { aload pop 5 3 roll aload pop 7 3",
+  "roll aload pop 9 3 roll 4 index 6 index 4 index add add 3 div 10 1 roll 7",
+  "index 5 index 3 index add add 3 div 10 1 roll 6 index 4 index 2 index add",
+  "add 3 div 10 1 roll 9 {pop} repeat 3 array astore triangle } ifelse } bd",
+  NULL
+};
+
 XVisualInfo*  G4OpenGLXViewer::vi_single_buffer = 0;
 XVisualInfo*  G4OpenGLXViewer::vi_double_buffer = 0;
 
@@ -184,7 +230,7 @@ void G4OpenGLXViewer::CreateMainWindow () {
   strncpy (charViewName, fName, 100);
   char *window_name = charViewName;
   char *icon_name = charViewName;
-  char tmpatom[] = "XA_WM_NORMAL_HINTS"; 
+  //char tmpatom[] = "XA_WM_NORMAL_HINTS"; 
   size_hints = XAllocSizeHints();
   wm_hints = XAllocWMHints();
   class_hints = XAllocClassHint();
@@ -226,11 +272,11 @@ void G4OpenGLXViewer::CreateMainWindow () {
 
 G4OpenGLXViewer::G4OpenGLXViewer (G4OpenGLSceneHandler& scene):
 G4VViewer (scene, -1),
-G4OpenGLViewer (scene), //ajw
-vi_immediate (0),
-vi_stored (0),
+G4OpenGLViewer (scene),
 print_colour (true),
-vectored_ps (true)
+vectored_ps (true),
+vi_immediate (0),
+vi_stored (0)
 {
 
   strcpy (print_string, "G4OpenGL.eps");
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
index 85d8d0f1ca..821438ae2c 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmBox.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmBox.cc,v 1.4 2001/03/07 14:56:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmBox.cc,v 1.4.2.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Box container class
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
index f4510e9adc..da54d1e732 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmConvenienceRoutines.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmConvenienceRoutines.cc,v 1.5.2.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -19,7 +35,6 @@
 
 #ifdef G4VIS_BUILD_OPENGLXM_DRIVER
 
-//#include "G4OpenGLXmConvenienceRoutines.hh"
 #include "G4OpenGLXmViewer.hh"
 
 void G4OpenGLXmViewer::Add_four_arrow_buttons (G4OpenGLXmViewer* pView,
@@ -216,17 +231,20 @@ void G4OpenGLXmViewer::Add_radio_box (char* label_string,
 				       NULL);
 
   XmString lab = XmStringCreateLocalized (label_string);
-  Widget label = XtVaCreateManagedWidget ("radio_label",
-					  xmLabelWidgetClass,
-					  radio_box,
-					  XmNalignment, XmALIGNMENT_CENTER,
-					  XmNlabelString, lab,
-					  XtNvisual, pView->vi->visual,
-					  XtNdepth, pView->vi->depth,
-					  XtNcolormap, pView->cmap,
-					  XtNborderColor, pView->borcol,
-					  XtNbackground, pView->bgnd,
-					  NULL);
+
+  // Unused!
+  //Widget label = XtVaCreateManagedWidget ("radio_label",
+  //				  xmLabelWidgetClass,
+  //				  radio_box,
+  //				  XmNalignment, XmALIGNMENT_CENTER,
+  //				  XmNlabelString, lab,
+  //				  XtNvisual, pView->vi->visual,
+  //				  XtNdepth, pView->vi->depth,
+  //				  XtNcolormap, pView->cmap,
+  //				  XtNborderColor, pView->borcol,
+  //				  XtNbackground, pView->bgnd,
+  //				  NULL);
+
   XmStringFree (lab);
 
   for (i = 0; i < num_buttons; i++) {
@@ -277,20 +295,23 @@ void G4OpenGLXmViewer::Add_set_field (char* w_name,
   strcat (text_field_name, "_text_field");
   
   XmString local_text = XmStringCreateLocalized (local_w_text);
-  Widget label = XtVaCreateManagedWidget (label_name, 
-					  xmLabelWidgetClass,
-					  *row_col_box,
-					  XmNlabelString, local_text,
-					  XtNvisual, pView->vi->visual, 
-					  XtNdepth, pView->vi->depth, 
-					  XtNcolormap, pView->cmap, 
-					  XtNborderColor, pView->borcol,
-					  XtNbackground, pView->bgnd,
-					  NULL);
+
+  // Unused!
+  //  Widget label = XtVaCreateManagedWidget (label_name, 
+  //				  xmLabelWidgetClass,
+  //				  *row_col_box,
+  //				  XmNlabelString, local_text,
+  //				  XtNvisual, pView->vi->visual, 
+  //				  XtNdepth, pView->vi->depth, 
+  //				  XtNcolormap, pView->cmap, 
+  //				  XtNborderColor, pView->borcol,
+  //				  XtNbackground, pView->bgnd,
+  //				  NULL);
+
   XmStringFree (local_text);
 
   char initial[50];
-  sprintf (initial, "%6.2f\0", *val);
+  sprintf (initial, "%6.2f", *val);
   
   *wid = XtVaCreateManagedWidget (text_field_name,
 				  xmTextFieldWidgetClass,
@@ -305,7 +326,7 @@ void G4OpenGLXmViewer::Add_set_field (char* w_name,
 
   XtAddCallback (*wid, 
 		 XmNvalueChangedCallback,
-		 G4OpenGLXmViewer::get_double_value_callback,
+		 get_double_value_callback,
 		 val);
 
   Widget sep = XtVaCreateManagedWidget ("sep",
@@ -405,17 +426,19 @@ void G4OpenGLXmViewer::Add_slider_box (char* label_string,
 
   XmString lab = XmStringCreateLocalized (label_string);
 
-  Widget label = XtVaCreateManagedWidget ("slider_label",
-					  xmLabelWidgetClass,
-					  slider_box,
-					  XmNlabelString, lab,
-					  XmNalignment, XmALIGNMENT_CENTER,
-					  XtNvisual, pView->vi->visual,
-					  XtNdepth, pView->vi->depth,
-					  XtNcolormap, pView->cmap,
-					  XtNborderColor, pView->borcol,
-					  XtNbackground, pView->bgnd,
-					  NULL);
+  // Unused!
+  //Widget label = XtVaCreateManagedWidget ("slider_label",
+  //				  xmLabelWidgetClass,
+  //				  slider_box,
+  //				  XmNlabelString, lab,
+  //				  XmNalignment, XmALIGNMENT_CENTER,
+  //				  XtNvisual, pView->vi->visual,
+  //				  XtNdepth, pView->vi->depth,
+  //				  XtNcolormap, pView->cmap,
+  //				  XtNborderColor, pView->borcol,
+  //				  XtNbackground, pView->bgnd,
+  //				  NULL);
+
   XmStringFree (lab);
   
   for (i = 0; i < num_sliders; i++) {
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
index d78f17ba87..bc180d830f 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmFourArrowButtons.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.3 1999/12/15 14:54:09 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmFourArrowButtons.cc,v 1.3.4.1 2001/06/28 19:15:44 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Four arrow buttons class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
index 7dc9712961..1c9e5eab82 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmFramedBox.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmFramedBox.cc,v 1.4 2001/03/07 14:56:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmFramedBox.cc,v 1.4.2.1 2001/06/28 19:15:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Framed box container class
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
index 8b218ac231..ab96bbef8e 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmMainMenubarCallbacks.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.7 2001/01/25 12:09:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmMainMenubarCallbacks.cc,v 1.8.2.1 2001/06/28 19:15:45 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -71,7 +87,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	pView->fprotation_top->AddChild (pView->fprotation_button_box);
 	
 	XtCallbackRec* rot_cb_list = new XtCallbackRec[2];
-	rot_cb_list[0].callback = G4OpenGLXmViewer::set_rot_subject_callback;
+	rot_cb_list[0].callback = set_rot_subject_callback;
 	rot_cb_list[0].closure = pView; 
 	rot_cb_list[1].callback = NULL;
 	
@@ -94,7 +110,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	pView->fprotation_top->AddChild (pView->fprotation_slider_box);
 	
 	XtCallbackRec* rot_slider_list = new XtCallbackRec[2];
-	rot_slider_list[0].callback = G4OpenGLXmViewer::set_rot_sens_callback;
+	rot_slider_list[0].callback = set_rot_sens_callback;
 	rot_slider_list[0].closure = pView; 
 	rot_slider_list[1].callback = NULL;
 	
@@ -114,19 +130,19 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	for (G4int i = 0; i < 4; i++) {
 	  rotation_callbacks[i] = new XtCallbackRec[2];
 	}
-	rotation_callbacks[0][0].callback = G4OpenGLXmViewer::phi_rotation_callback;
+	rotation_callbacks[0][0].callback = phi_rotation_callback;
 	rotation_callbacks[0][0].closure =  pView;
 	rotation_callbacks[0][1].callback	= NULL;
 	
-	rotation_callbacks[1][0].callback = G4OpenGLXmViewer::phi_rotation_callback;
+	rotation_callbacks[1][0].callback = phi_rotation_callback;
 	rotation_callbacks[1][0].closure =  pView;
 	rotation_callbacks[1][1].callback	= NULL;
 	
-	rotation_callbacks[2][0].callback = G4OpenGLXmViewer::theta_rotation_callback;
+	rotation_callbacks[2][0].callback = theta_rotation_callback;
 	rotation_callbacks[2][0].closure =  pView;
 	rotation_callbacks[2][1].callback	= NULL;
 	
-	rotation_callbacks[3][0].callback = G4OpenGLXmViewer::theta_rotation_callback;
+	rotation_callbacks[3][0].callback = theta_rotation_callback;
 	rotation_callbacks[3][0].closure =  pView;
 	rotation_callbacks[3][1].callback	= NULL;
 	
@@ -163,19 +179,19 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	for (G4int i = 0; i < 4; i++) {
 	  pan_callbacks[i] = new XtCallbackRec[2];
 	}
-	pan_callbacks[0][0].callback = G4OpenGLXmViewer::pan_up_down_callback;
+	pan_callbacks[0][0].callback = pan_up_down_callback;
 	pan_callbacks[0][0].closure = pView; 
 	pan_callbacks[0][1].callback = NULL;
 	
-	pan_callbacks[1][0].callback = G4OpenGLXmViewer::pan_up_down_callback;
+	pan_callbacks[1][0].callback = pan_up_down_callback;
 	pan_callbacks[1][0].closure = pView; 
 	pan_callbacks[1][1].callback = NULL;
 	
-	pan_callbacks[2][0].callback = G4OpenGLXmViewer::pan_left_right_callback;
+	pan_callbacks[2][0].callback = pan_left_right_callback;
 	pan_callbacks[2][0].closure = pView; 
 	pan_callbacks[2][1].callback = NULL;
 	
-	pan_callbacks[3][0].callback = G4OpenGLXmViewer::pan_left_right_callback;
+	pan_callbacks[3][0].callback = pan_left_right_callback;
 	pan_callbacks[3][0].closure = pView; 
 	pan_callbacks[3][1].callback = NULL;
 	
@@ -184,7 +200,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	pView->fppanning_box->AddChild (pView->fppanning_arrows);
 	
 	XtCallbackRec* pan_slider_list = new XtCallbackRec[2];
-	pan_slider_list[0].callback = G4OpenGLXmViewer::set_pan_sens_callback;
+	pan_slider_list[0].callback = set_pan_sens_callback;
 	pan_slider_list[0].closure = pView; 
 	pan_slider_list[1].callback = NULL;
 	
@@ -202,7 +218,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	pView->fppanning_top->AddChild (pView->fpzoom_box);
 	
 	XtCallbackRec* zoom_slider_list = new XtCallbackRec[2];
-	zoom_slider_list[0].callback = G4OpenGLXmViewer::zoom_callback;
+	zoom_slider_list[0].callback = zoom_callback;
 	zoom_slider_list[0].closure = pView; 
 	zoom_slider_list[1].callback = NULL;
 	
@@ -220,7 +236,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 	pView->fppanning_top->AddChild (pView->fpdolly_box);
 	
 	XtCallbackRec* dolly_slider_list = new XtCallbackRec[2];
-	dolly_slider_list[0].callback = G4OpenGLXmViewer::dolly_callback;
+	dolly_slider_list[0].callback = dolly_callback;
 	dolly_slider_list[0].closure = pView; 
 	dolly_slider_list[1].callback = NULL;
 	
@@ -277,7 +293,7 @@ void G4OpenGLXmViewer::actions_callback (Widget w,
 							&(pView->dolly_low));
 	
 	XtCallbackRec* ok_list = new XtCallbackRec[2];
-	ok_list[0].callback = G4OpenGLXmViewer::update_panels_callback;
+	ok_list[0].callback = update_panels_callback;
 	ok_list[0].closure = pView; 
 	ok_list[1].callback = NULL;
 	
@@ -339,7 +355,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpmiscellany_top->AddChild (pView->fpwobble_box);
 	
 	XtCallbackRec* wob_cb_list = new XtCallbackRec[2];
-	wob_cb_list[0].callback = G4OpenGLXmViewer::wobble_callback;
+	wob_cb_list[0].callback = wobble_callback;
 	wob_cb_list[0].closure = pView; 
 	wob_cb_list[1].callback = NULL;
 	
@@ -348,7 +364,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 							   wob_cb_list);
 	
 	XtCallbackRec* wobble_slider_list = new XtCallbackRec[2];
-	wobble_slider_list[0].callback = G4OpenGLXmViewer::set_wob_sens_callback;
+	wobble_slider_list[0].callback = set_wob_sens_callback;
 	wobble_slider_list[0].closure = pView; 
 	wobble_slider_list[1].callback = NULL;
 	
@@ -367,9 +383,9 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpmiscellany_top->AddChild (pView->fpreset_box);
 	
 	XtCallbackRec* rst_cb_list = new XtCallbackRec[3];
-	rst_cb_list[0].callback = G4OpenGLXmViewer::reset_callback;
+	rst_cb_list[0].callback = reset_callback;
 	rst_cb_list[0].closure = pView; 
-	rst_cb_list[1].callback = G4OpenGLXmViewer::update_panels_callback;
+	rst_cb_list[1].callback = update_panels_callback;
 	rst_cb_list[1].closure = pView; 
 	rst_cb_list[2].callback = NULL;
 	
@@ -383,7 +399,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpmiscellany_top->AddChild (pView->fpproj_style_box);
 	
 	XtCallbackRec* proj_cb_list = new XtCallbackRec[2];
-	proj_cb_list[0].callback = G4OpenGLXmViewer::projection_callback;
+	proj_cb_list[0].callback = projection_callback;
 	proj_cb_list[0].closure = pView; 
 	proj_cb_list[1].callback = NULL;
 	
@@ -440,7 +456,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpprint_top->AddChild (pView->fpprint_col_box);
 
 	XtCallbackRec* prcol_cb_list = new XtCallbackRec[2];
-	prcol_cb_list[0].callback = G4OpenGLXmViewer::set_print_colour_callback;
+	prcol_cb_list[0].callback = set_print_colour_callback;
 	prcol_cb_list[0].closure = pView; 
 	prcol_cb_list[1].callback = NULL;
 	
@@ -462,7 +478,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpprint_top->AddChild (pView->fpprint_style_box);
 
 	XtCallbackRec* prsty_cb_list = new XtCallbackRec[2];
-	prsty_cb_list[0].callback = G4OpenGLXmViewer::set_print_style_callback;
+	prsty_cb_list[0].callback = set_print_style_callback;
 	prsty_cb_list[0].closure = pView; 
 	prsty_cb_list[1].callback = NULL;
 	
@@ -487,7 +503,7 @@ void G4OpenGLXmViewer::misc_callback (Widget w,
 	pView->fpprint_box->AddChild (pView->fpprint_line);
 
 	XtCallbackRec* pri_cb_list = new XtCallbackRec[2];
-	pri_cb_list[0].callback = G4OpenGLXmViewer::print_callback;
+	pri_cb_list[0].callback = print_callback;
 	pri_cb_list[0].closure = pView; 
 	pri_cb_list[1].callback = NULL;
 	
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
index 4caed63575..6f191b22a5 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmPanningCallbacks.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.4 2000/05/13 10:47:52 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmPanningCallbacks.cc,v 1.5.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -98,7 +114,7 @@ void G4OpenGLXmViewer::pan_left_right_callback (Widget w,
   XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
-  pView->pan_right = G4OpenGLXmViewer::get_boolean_userData (w);
+  pView->pan_right = get_boolean_userData (w);
 
   if (cbs->reason == XmCR_ARM) {
     left_right_pan_callback (pView,NULL);
@@ -152,7 +168,7 @@ void G4OpenGLXmViewer::pan_up_down_callback (Widget w,
   XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
-  pView->pan_up = G4OpenGLXmViewer::get_boolean_userData (w);
+  pView->pan_up = get_boolean_userData (w);
 
   if (cbs->reason == XmCR_ARM) {
     up_down_pan_callback (pView,NULL);
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
index 77f0742949..419ddd0f04 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmPushButton.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmPushButton.cc,v 1.4 2001/03/07 15:16:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmPushButton.cc,v 1.4.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Push button class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
index 874e02dc75..c923461c0d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmRadioButton.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmRadioButton.cc,v 1.4 2001/03/07 14:56:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmRadioButton.cc,v 1.4.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Radio button class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
index 0234c67057..92fce57c6b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.8 2001/01/25 12:09:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.10.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -30,10 +46,10 @@ void G4OpenGLXmViewer::theta_rotation_callback (Widget w,
   XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
-  pView->rotate_right = G4OpenGLXmViewer::get_boolean_userData (w);
+  pView->rotate_right = get_boolean_userData (w);
 
   if (cbs->reason == XmCR_ARM) {
-    G4OpenGLXmViewer::rotate_in_theta (pView, NULL);
+    rotate_in_theta (pView, NULL);
   } else if (cbs->reason == XmCR_DISARM) {
     XtRemoveTimeOut (pView->rotation_timer);
   }
@@ -88,7 +104,7 @@ void G4OpenGLXmViewer::rotate_in_theta (XtPointer clientData,
   pView->rotation_timer = XtAppAddTimeOut 
     (pView->app,
      timer_id == NULL ? 500 : 1,
-     G4OpenGLXmViewer::rotate_in_theta,
+     rotate_in_theta,
      pView);
 }  
 
@@ -99,10 +115,10 @@ void G4OpenGLXmViewer::phi_rotation_callback (Widget w,
   XmArrowButtonCallbackStruct *cbs = (XmArrowButtonCallbackStruct*) callData;
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*) clientData;
 
-  pView->rotate_up = G4OpenGLXmViewer::get_boolean_userData (w);
+  pView->rotate_up = get_boolean_userData (w);
 
   if (cbs->reason == XmCR_ARM) {
-    G4OpenGLXmViewer::rotate_in_phi (pView, NULL);
+    rotate_in_phi (pView, NULL);
   } else if (cbs->reason == XmCR_DISARM) {
     XtRemoveTimeOut (pView->rotation_timer);
   }
@@ -154,7 +170,7 @@ void G4OpenGLXmViewer::rotate_in_phi (XtPointer clientData,
   pView->rotation_timer = XtAppAddTimeOut 
     (pView->app,
      timer_id == NULL ? 500 : 1,
-     G4OpenGLXmViewer::rotate_in_phi,
+     rotate_in_phi,
      pView);
 }
 
@@ -190,7 +206,7 @@ void G4OpenGLXmViewer::set_rot_subject_callback (Widget w,
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
   
-  G4int choice = G4OpenGLXmViewer::get_int_userData (w);
+  G4int choice = get_int_userData (w);
   
   switch (choice) {
   case 0: 
@@ -224,7 +240,7 @@ void G4OpenGLXmViewer::wobble_callback (Widget w,
   pView->wobble_timer = XtAppAddTimeOut
     (pView->app,
      (long unsigned int) (1000. * (1. / pView->wob_sens)),
-     G4OpenGLXmViewer::wobble_timer_callback,
+     wobble_timer_callback,
      pView);
 }  
 
@@ -233,7 +249,6 @@ void G4OpenGLXmViewer::wobble_timer_callback (XtPointer clientData,
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
   const G4Vector3D& up = pView->fVP.GetUpVector();
-  const G4Vector3D& vp = pView->fVP.GetViewpointDirection();
   G4Vector3D third_axis = up.cross(pView->original_vp);
   G4double pi_div_by_ten = M_PI / 10.0;
   G4Vector3D d_up = 0.1 * (sin ((G4double)pView->frameNo * pi_div_by_ten * 2.)) * up;
@@ -258,7 +273,7 @@ void G4OpenGLXmViewer::wobble_timer_callback (XtPointer clientData,
     pView->wobble_timer = XtAppAddTimeOut
       (pView->app,
        (long unsigned int) (1000. * (1. / pView->wob_sens)),
-       G4OpenGLXmViewer::wobble_timer_callback,
+       wobble_timer_callback,
        pView);
   }
 }
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
index e2c10c60d1..ed601b793b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmSeparator.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmSeparator.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmSeparator.cc,v 1.3.4.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Separator class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
index 014b97fbc3..bb7c7d52e9 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmSliderBar.cc,v 1.4 2001/03/07 14:56:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmSliderBar.cc,v 1.4.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
index 9ea47da687..74d446a26c 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmStyleCallbacks.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmStyleCallbacks.cc,v 1.4.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th April 1997
@@ -237,7 +253,7 @@ void G4OpenGLXmViewer::projection_callback (Widget w,
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
 
-  G4int choice = G4OpenGLXmViewer::get_int_userData (w);
+  G4int choice = get_int_userData (w);
 
   switch (choice) {
   case 0:
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
index 102d362649..4ad7106c0b 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmTextField.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmTextField.cc,v 1.4 2001/03/07 14:56:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmTextField.cc,v 1.5.2.1 2001/06/28 19:15:46 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Text field class. Inherits from G4OpenGLXmVWidgetComponent
 
@@ -23,7 +39,7 @@ G4OpenGLXmTextField::G4OpenGLXmTextField (const char* n,
 {
   name = n;
   initial = new char[50];
-  sprintf (initial, "%6.2f\0", *val);
+  sprintf (initial, "%6.2f", *val);
   value = (void*)val;
   text=false;
 }
@@ -61,7 +77,7 @@ const char* G4OpenGLXmTextField::GetName ()
 
 void G4OpenGLXmTextField::SetValue (G4double val)
 {
-  sprintf (initial, "%6.2f\0", val);
+  sprintf (initial, "%6.2f", val);
   
   XtVaSetValues (text_field,
 		 XmNvalue, (String)initial,
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
index 2130460483..683522f8ca 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmTopLevelShell.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmTopLevelShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmTopLevelShell.cc,v 1.3.4.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Top level shell class
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
index 17d645632b..35696335fd 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetComponent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetComponent.cc,v 1.3.4.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Base class for all Motif component widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
index 07f3a6c8cb..6baf95ce6d 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetContainer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetContainer.cc,v 1.3.4.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Base class for all Motif container widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
index fa54bf7002..770d97b937 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetObject.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetObject.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetObject.cc,v 1.3.4.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Virtual base class for all Motif widgets.
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
index c92ac4b156..7ef8644e19 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmVWidgetShell.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmVWidgetShell.cc,v 1.3 1999/12/15 14:54:10 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmVWidgetShell.cc,v 1.3.4.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //Base class for all Motif shell widgets
 
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
index d5f8df7ba0..fd5c62ea23 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmViewer.cc,v 1.6 2001/03/07 15:29:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmViewer.cc,v 1.8.2.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  10th February 1997
@@ -200,7 +216,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (style_cascade,
      (char*)"rep_style",
      0,
-     G4OpenGLXmViewer::rep_style_callback,
+     rep_style_callback,
      XmVaRADIOBUTTON, polyhedron_str, 'P', NULL, NULL,
      XmVaRADIOBUTTON, nurbs_str, 'N', NULL, NULL,
      XmNradioBehavior, True, 
@@ -219,11 +235,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   style = fVP.GetRepStyle();
   
   if (style == G4ViewParameters::polyhedron) {
-    if(special_widget = XtNameToWidget(rep_style_pullright, "button_0")) {
+    special_widget = XtNameToWidget(rep_style_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (style == G4ViewParameters::nurbs) {
-    if(special_widget = XtNameToWidget(rep_style_pullright, "button_1")) {
+    special_widget = XtNameToWidget(rep_style_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -244,7 +262,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (style_cascade,
      (char*)"drawing_style",
      1,
-     G4OpenGLXmViewer::drawing_style_callback,
+     drawing_style_callback,
      XmVaRADIOBUTTON, wireframe_str, 'W', NULL, NULL,
      XmVaRADIOBUTTON, hlr_str, 'L', NULL, NULL,
      XmVaRADIOBUTTON, hsr_str, 'S', NULL, NULL,
@@ -263,19 +281,23 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   d_style = fVP.GetDrawingStyle();
   
   if (d_style == G4ViewParameters::wireframe) {
-    if(special_widget = XtNameToWidget(drawing_style_pullright, "button_0")) {
+    special_widget = XtNameToWidget(drawing_style_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (d_style == G4ViewParameters::hlr) {
-    if(special_widget = XtNameToWidget(drawing_style_pullright, "button_1")) {
+    special_widget = XtNameToWidget(drawing_style_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (d_style == G4ViewParameters::hsr) {
-    if(special_widget = XtNameToWidget(drawing_style_pullright, "button_2")) {
+    special_widget = XtNameToWidget(drawing_style_pullright, "button_2");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (d_style == G4ViewParameters::hlhsr) {
-    if(special_widget = XtNameToWidget(drawing_style_pullright, "button_3")) {
+    special_widget = XtNameToWidget(drawing_style_pullright, "button_3");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -297,7 +319,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (style_cascade,
      (char*)"background_color",
      2,
-     G4OpenGLXmViewer::background_color_callback,
+     background_color_callback,
      XmVaRADIOBUTTON, white_str, 'W', NULL, NULL,
      XmVaRADIOBUTTON, black_str, 'B', NULL, NULL,
      XmNradioBehavior, True, 
@@ -311,13 +333,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
      NULL);
   
   if (white_background == true) {
-    if(special_widget = XtNameToWidget(background_color_pullright, 
-				       "button_0")) {
+    special_widget = XtNameToWidget(background_color_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (white_background == false) {
-    if(special_widget = XtNameToWidget(background_color_pullright,
-				       "button_1")) {
+    special_widget = XtNameToWidget(background_color_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -338,7 +360,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (menubar,
      (char*)"actions",
      1,
-     G4OpenGLXmViewer::actions_callback,
+     actions_callback,
      XmVaPUSHBUTTON, rot_str, 'R', NULL, NULL,
      XmVaPUSHBUTTON, pan_str, 'P', NULL, NULL,
      XmVaPUSHBUTTON, set_str, 'S', NULL, NULL,
@@ -364,7 +386,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (menubar,
      (char*)"miscellany",
      2,
-     G4OpenGLXmViewer::misc_callback,
+     misc_callback,
      XmVaPUSHBUTTON, misc_str, 'M', NULL, NULL,
      XmVaPUSHBUTTON, exit_str, 'E', NULL, NULL,
      XmVaPUSHBUTTON, print_str, 'P', NULL, NULL,
@@ -415,7 +437,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (spec_cascade,
      (char*)"transparency",
      0,
-     G4OpenGLXmViewer::transparency_callback,
+     transparency_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
      XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
      XmNradioBehavior, True, 
@@ -429,13 +451,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
      NULL);
   
   if (transparency_enabled == false) {
-    if(special_widget = XtNameToWidget(transparency_pullright, 
-				       "button_0")) {
+    special_widget = XtNameToWidget(transparency_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (transparency_enabled == true) {
-    if(special_widget = XtNameToWidget(transparency_pullright,
-				       "button_1")) {
+    special_widget = XtNameToWidget(transparency_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -447,7 +469,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (spec_cascade,
      (char*)"antialias",
      1,
-     G4OpenGLXmViewer::antialias_callback,
+     antialias_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
      XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
      XmNradioBehavior, True, 
@@ -461,13 +483,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
      NULL);
   
   if (antialiasing_enabled == false) {
-    if(special_widget = XtNameToWidget(antialias_pullright, 
-				       "button_0")) {
+    special_widget = XtNameToWidget(antialias_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (antialiasing_enabled == true) {
-    if(special_widget = XtNameToWidget(antialias_pullright,
-				       "button_1")) {
+    special_widget = XtNameToWidget(antialias_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -479,7 +501,7 @@ void G4OpenGLXmViewer::CreateMainWindow () {
     (spec_cascade,
      (char*)"haloing",
      2,
-     G4OpenGLXmViewer::haloing_callback,
+     haloing_callback,
      XmVaRADIOBUTTON, off_str, 'f', NULL, NULL,
      XmVaRADIOBUTTON, on_str, 'n', NULL, NULL,
      XmNradioBehavior, True, 
@@ -493,13 +515,13 @@ void G4OpenGLXmViewer::CreateMainWindow () {
      NULL);
   
   if (haloing_enabled == false) {
-    if(special_widget = XtNameToWidget(haloing_pullright, 
-				       "button_0")) {
+    special_widget = XtNameToWidget(haloing_pullright, "button_0");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else if (haloing_enabled == true) {
-    if(special_widget = XtNameToWidget(haloing_pullright,
-				       "button_1")) {
+    special_widget = XtNameToWidget(haloing_pullright, "button_1");
+    if(special_widget) {
       XtVaSetValues (special_widget, XmNset, True, NULL);
     }
   } else {
@@ -528,12 +550,12 @@ void G4OpenGLXmViewer::CreateMainWindow () {
   
   XtAddCallback (glxarea, 
 		 XmNexposeCallback, 
-		 G4OpenGLXmViewer::expose_callback, 
+		 expose_callback, 
 		 this);
 
   XtAddCallback (glxarea, 
 		 XmNresizeCallback, 
-		 G4OpenGLXmViewer::resize_callback, 
+		 resize_callback, 
 		 this);
 
   XmMainWindowSetAreas (main_win,  // main widget, children are specified 
@@ -564,26 +586,26 @@ G4OpenGLXmViewer::G4OpenGLXmViewer (G4OpenGLSceneHandler& scene):
 G4VViewer (scene, -1),
 G4OpenGLViewer (scene),
 G4OpenGLXViewer (scene),
-zoom_low (fVP.GetZoomFactor() / 10.0),
 zoom_high (fVP.GetZoomFactor() * 10.0),
+zoom_low (fVP.GetZoomFactor() / 10.0),
 dolly_low (fVP.GetDolly() - 1000.0),
 dolly_high (fVP.GetDolly() + 1000.0),
-rot_sens (4.),
-frameNo (0),
-wob_sens (20.),
+fov (0.0),
 rot_sens_limit (90.),
 pan_sens_limit (100.),
-fov (0.0),
+rot_sens (4.),
+wob_sens (20.),
 original_vp(fVP.GetViewpointDirection()),
-fppanning_top (NULL),
+frameNo (0),
 fprotation_top (NULL),
-fpmiscellany_top (NULL),
-fpsetting_top (NULL),
-fpprint_top (NULL),
-fppanning_slider (NULL),
 fprotation_slider (NULL),
+fppanning_top (NULL),
+fppanning_slider (NULL),
 fpzoom_slider (NULL),
-fpdolly_slider (NULL)
+fpdolly_slider (NULL),
+fpsetting_top (NULL),
+fpmiscellany_top (NULL),
+fpprint_top (NULL)
 {
 
   WinSize_x = 100;
diff --git a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
index ddb958f308..a078ab0083 100644
--- a/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
+++ b/source/visualization/OpenGL/src/G4OpenGLXmWindowHandlingCallbacks.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.3 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenGLXmWindowHandlingCallbacks.cc,v 1.4.2.1 2001/06/28 19:15:47 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  16th June 1997
@@ -72,7 +88,7 @@ void G4OpenGLXmViewer::set_print_colour_callback (Widget w,
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
   
-  G4int choice = G4OpenGLXmViewer::get_int_userData (w);
+  G4int choice = get_int_userData (w);
   
   pView->print_colour=(G4bool)choice;
   G4cout << "Print colour set to " << pView->print_colour;
@@ -85,7 +101,7 @@ void G4OpenGLXmViewer::set_print_style_callback (Widget w,
 {
   G4OpenGLXmViewer* pView = (G4OpenGLXmViewer*)clientData;
   
-  G4int choice = G4OpenGLXmViewer::get_int_userData (w);
+  G4int choice = get_int_userData (w);
   
   pView->vectored_ps=(G4bool)choice;
   G4cout << "`Produce vectored PostScript ?' set to : " << pView->print_colour;
diff --git a/source/visualization/OpenInventor/include/G4OpenInventor.hh b/source/visualization/OpenInventor/include/G4OpenInventor.hh
index 9046e64a8b..f98d7540f4 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventor.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventor.hh,v 1.5 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventor.hh,v 1.5.4.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // Guy Barrand 26 Mar 1998.
 // OpenInventor graphics system factory.
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
index ea7c87d371..a50f6ba062 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorSceneHandler.hh,v 1.9 2000/08/19 18:34:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorSceneHandler.hh,v 1.9.4.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // J Kallenbach  27th Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
index 9acdef0ac7..0d3f10e324 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
+++ b/source/visualization/OpenInventor/include/G4OpenInventorSceneHandler.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorSceneHandler.icc,v 1.3 1999/12/16 17:25:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorSceneHandler.icc,v 1.3.4.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // J Kallenbach  27th Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
index 477c92cb8c..486a194b40 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorTransform3D.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorTransform3D.hh,v 1.3 1999/12/15 14:54:11 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorTransform3D.hh,v 1.3.4.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // jck  17 Dec 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh b/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
index 981d540697..6ecb66dd47 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorViewer.hh,v 1.7 2001/02/23 15:43:12 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorViewer.hh,v 1.7.2.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
index 65c6e3679b..5408faa3d9 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorWin32.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorWin32.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorWin32.hh,v 1.4.4.1 2001/06/28 19:15:48 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/include/G4OpenInventorX.hh b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
index 3bd422d1a0..0fa2d8cb7d 100644
--- a/source/visualization/OpenInventor/include/G4OpenInventorX.hh
+++ b/source/visualization/OpenInventor/include/G4OpenInventorX.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorX.hh,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorX.hh,v 1.4.4.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Andrew Walkden  27th March 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventor.cc b/source/visualization/OpenInventor/src/G4OpenInventor.cc
index fd3c2c2af8..1a9975fe41 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventor.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventor.cc,v 1.7 2000/08/19 18:34:44 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventor.cc,v 1.7.4.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifdef G4VIS_BUILD_OI_DRIVER
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
index 300693fd3d..763736d7e7 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorSceneHandler.cc,v 1.9 2001/01/25 15:28:10 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorSceneHandler.cc,v 1.11.2.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
@@ -113,7 +129,7 @@ G4OpenInventorSceneHandler::~G4OpenInventorSceneHandler ()
 void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyline& line) {
   if(currentSeparator==NULL) return;
   
-  G4int nPoints = line.entries();
+  G4int nPoints = line.size();
   SbVec3f* pCoords = new SbVec3f[nPoints];
 
   SoCoordinate3 *polyCoords = new SoCoordinate3;
@@ -121,9 +137,9 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Polyline& line) {
   SoLineSet *pLine = new SoLineSet;
 
   for (G4int iPoint = 0; iPoint < nPoints ; iPoint++) {
-    pCoords[iPoint].setValue(line(iPoint).x(),
-			     line(iPoint).y(),
-			     line(iPoint).z());
+    pCoords[iPoint].setValue(line[iPoint].x(),
+			     line[iPoint].y(),
+			     line[iPoint].z());
   }
 
   //
@@ -212,9 +228,10 @@ void G4OpenInventorSceneHandler::AddPrimitive (const G4Circle& circle) {
   //
   // Dimensions
   //
-  G4double userSpecified = circle.GetWorldSize() || circle.GetScreenSize();
-  const G4VMarker& defaultMarker =
-     fpViewer -> GetViewParameters().GetDefaultMarker();
+  // (userSpecified and defaultMarker are unused - what was intended here?)
+  //G4double userSpecified = circle.GetWorldSize() || circle.GetScreenSize();
+  //const G4VMarker& defaultMarker =
+  //   fpViewer -> GetViewParameters().GetDefaultMarker();
 
   G4double size = GetMarkerSize ( circle );
 
@@ -738,12 +755,13 @@ G4double  G4OpenInventorSceneHandler::GetMarkerSize ( const G4VMarker& mark )
 	if ( extent_radius_3d <= 0.0 ) { extent_radius_3d = 1.0 ; } 
 
 	//----- get marker radius in 3D units
-	if        ( size = mark.GetWorldSize()  ) {
+	size = mark.GetWorldSize();
+	if        ( size  ) {
 
 		// get mark radius in 3D units
 		size = 0.5 * mark.GetWorldSize()  ; 
 
-	} else if ( size = mark.GetScreenSize() ) {
+	} else if ( (size = mark.GetScreenSize()) ) {
 
 		// local
 		double mark_radius_2d   = 0.5 * mark.GetScreenSize() ;
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
index 65717bb87c..f5fab41226 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorTransform3D.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorTransform3D.cc,v 1.3 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorTransform3D.cc,v 1.3.4.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // jck 17 Dec 1996
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
index d0ace1c801..b02ed0861c 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorViewer.cc,v 1.4 2001/02/23 15:43:13 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorViewer.cc,v 1.5.2.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 /*
  * jck 05 Feb 1997 - Initial Implementation
@@ -122,7 +138,7 @@ G4OpenInventorViewer::G4OpenInventorViewer (G4OpenInventorSceneHandler& scene,
   fInteractorManager = 
     ((G4OpenInventor*)fSceneHandler.GetGraphicsSystem())->
     GetInteractorManager();
-  Widget toplevel = (Widget)fInteractorManager->GetMainInteractor ();
+//Widget toplevel = (Widget)fInteractorManager->GetMainInteractor ();
 
 //fInteractorManager->
 //AddSecondaryLoopPostAction ((G4SecondaryLoopAction)SecondaryLoopPostAction);
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
index c1f97c2f53..d2e45db6e5 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorWin32.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorWin32.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorWin32.cc,v 1.4.4.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // OpenInventor graphics system factory.
 
diff --git a/source/visualization/OpenInventor/src/G4OpenInventorX.cc b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
index 8c238e6051..d1588a002e 100644
--- a/source/visualization/OpenInventor/src/G4OpenInventorX.cc
+++ b/source/visualization/OpenInventor/src/G4OpenInventorX.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4OpenInventorX.cc,v 1.4 1999/12/15 14:54:12 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4OpenInventorX.cc,v 1.4.4.1 2001/06/28 19:15:49 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Jeff Kallenbach 01 Aug 1996
diff --git a/source/visualization/README.adding_graphics_system b/source/visualization/README.adding_graphics_system
new file mode 100644
index 0000000000..34d6a4ae52
--- /dev/null
+++ b/source/visualization/README.adding_graphics_system
@@ -0,0 +1,319 @@
+To add a graphics system implement 3 new classes:
+ 
+  class G4XXX: public G4VGraphicsSystem
+  class G4XXXSceneHandler: public G4VSceneHandler
+  class G4XXXViewer: virtual public G4VViewer
+
+Introduce two new environment variables G4VIS_BUILD_XXX_DRIVER and GG4VIS_USE_XXX and make the attached modifications to:
+
+  source/visualization/management/include/MyVisManager.cc
+  (similarly all examples vis managers)
+  source/visualization/management/src/G4VisManager.cc
+  config/G4VIS_BUILD.gmk
+  config/G4VIS_USE.gmk
+
+===================================================================
+include/G4XXX.hh
+===================================================================
+#ifndef G4XXX_HH
+#define G4XXX_HH
+
+#include "G4VGraphicsSystem.hh"
+
+class G4XXX: public G4VGraphicsSystem {
+public:
+  G4XXX ();
+  virtual ~G4XXX ();
+  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
+  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
+};
+#include "G4XXX.hh"
+#include "G4XXXSceneHandler.hh"
+#include "G4XXXViewer.hh"
+
+#endif
+===================================================================
+
+===================================================================
+include/G4XXXSceneHandler.hh
+===================================================================
+#ifndef G4XXXSCENEHANDLER_HH
+#define G4XXXSCENEHANDLER_HH
+
+#include "G4VSceneHandler.hh"
+#include "G4Box.hh"
+#include "G4Cons.hh"
+#include "G4Tubs.hh"
+#include "G4Trd.hh"
+#include "G4Trap.hh"
+#include "G4Sphere.hh"
+#include "G4Para.hh"
+#include "G4Torus.hh"
+#include "G4Polycone.hh"
+#include "G4Polyhedra.hh"
+
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+
+class G4XXXSceneHandler: public G4VSceneHandler {
+
+public:
+  G4XXXSceneHandler(G4VGraphicsSystem& system,
+                      const G4String& name);
+  virtual ~G4XXXSceneHandler ();
+  void AddThis (const G4Box& s) {Dump (s);}
+  void AddThis (const G4Cons & s) {Dump (s);}
+  void AddThis (const G4Tubs& s) {Dump (s);}
+  void AddThis (const G4Trd& s) {Dump (s);}
+  void AddThis (const G4Trap& s) {Dump (s);}
+  void AddThis (const G4Sphere& s) {Dump (s);}
+  void AddThis (const G4Para& s) {Dump (s);}
+  void AddThis (const G4Torus& s) {Dump (s);}
+  void AddThis (const G4Polycone& s) {Dump (s);}
+  void AddThis (const G4Polyhedra& s) {Dump (s);}
+  void AddThis (const G4VSolid& s) {Dump (s);}
+  void PreAddThis (const G4Transform3D& objectTransformation,
+                   const G4VisAttributes&);
+  void PostAddThis ();
+  void EstablishSpecials (G4PhysicalVolumeModel&);
+  G4int                GetFoundDepth          () const;
+  G4VPhysicalVolume*   GetFoundVolume         () const;
+  const G4Transform3D& GetFoundTransformation () const;
+
+  ////////////////////////////////////////////////////////////////
+  // Functions not used but required by the abstract interface.
+
+  virtual void BeginPrimitives (const G4Transform3D& objectTransformation) {}
+  virtual void EndPrimitives () {}
+  virtual void AddPrimitive (const G4Polyline&)   {}
+  virtual void AddPrimitive (const G4Text&)       {}
+  virtual void AddPrimitive (const G4Circle&)     {}
+  virtual void AddPrimitive (const G4Square&)     {}
+  virtual void AddPrimitive (const G4Polymarker&) {}
+  virtual void AddPrimitive (const G4Polyhedron&) {}
+  virtual void AddPrimitive (const G4NURBS&)      {}
+
+  static G4int GetSceneCount();
+
+protected:
+  void                 Dump (const G4VSolid&);
+  static G4int         fSceneIdCount;  // Counter for Tree scene handlers.
+  static G4int         fSceneCount;    // No. of extanct scene handlers.
+  G4int                fCurrentDepth;  // Current depth of geom. hierarchy.
+  G4VPhysicalVolume*   fpCurrentPV;    // Current physical volume.
+  G4LogicalVolume*     fpCurrentLV;    // Current logical volume.
+  const G4Transform3D* fpCurrentObjectTransformation;
+};
+
+#include "G4XXXSceneHandler.icc"
+
+#endif
+===================================================================
+
+===================================================================
+include/G4XXXViewer.hh
+===================================================================
+#ifndef G4XXXVIEWER_HH
+#define G4XXXVIEWER_HH
+
+#include "G4VViewer.hh"
+
+class G4XXXViewer: virtual public G4VViewer {
+public:
+  G4XXXViewer(G4VSceneHandler&,const G4String& name);
+  virtual ~G4XXXViewer();
+  void SetView();
+  void ClearView();
+  void DrawView();
+private:
+  G4int fFileCount;
+};
+
+#endif
+===================================================================
+
+===================================================================
+src/G4XXX.cc
+===================================================================
+G4XXX::G4XXX ():
+  G4VGraphicsSystem ("Full Name",
+                     "Nickname",
+                     "A description - could run to many lines - "
+                     "\n advantages, disadvantages, etc.",
+                     G4VGraphicsSystem::<type>)  // See enum.
+  {}
+
+G4XXX::~G4XXX () {}
+
+G4VSceneHandler* G4XXX::CreateSceneHandler (const G4String& name) {
+  G4VSceneHandler* pScene = new G4XXXSceneHandler (*this, name);
+  G4cout << G4XXXSceneHandler::GetSceneCount ()
+         << ' ' << fName << " scene handlers extanct." << G4endl;
+  return  pScene;
+}
+
+G4VViewer* G4XXX::CreateViewer (G4VSceneHandler& scene,
+                                  const G4String& name) {
+  G4VViewer* pView =
+    new G4XXXViewer ((G4XXXSceneHandler&) scene, name);
+  if (pView) {
+    if (pView -> GetViewId () < 0) {
+      G4cerr << "G4XXX::CreateViewer: error flagged by negative"
+        " view id in G4XXXViewer creation."
+        "\n Destroying view and returning null pointer."
+           << G4endl;
+      delete pView;
+      pView = 0;
+    }
+  }
+  else {
+    G4cerr << "G4XXX::CreateViewer: null pointer on"
+      " new G4XXXViewer." << G4endl;
+  }
+  return pView;
+}
+===================================================================
+
+===================================================================
+src/G4XXXSceneHandler.cc
+===================================================================
+#include "G4XXXSceneHandler.hh"
+
+#include "G4VSolid.hh"
+#include "G4PhysicalVolumeModel.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4LogicalVolume.hh"
+
+G4int G4XXXSceneHandler::fSceneIdCount = 0;
+// Counter for XXX scene handlers.
+
+G4int G4XXXSceneHandler::fSceneCount = 0;
+// No. of extanct scene handlers.
+
+G4XXXSceneHandler::G4XXXSceneHandler(G4VGraphicsSystem& system,
+                                         const G4String& name):
+  G4VSceneHandler(system, fSceneIdCount++, name),
+  fCurrentDepth                 (0),
+  fpCurrentPV                   (0),
+  fpCurrentLV                   (0),
+  fpCurrentObjectTransformation (0)
+{
+  fSceneCount++;
+}
+
+G4XXXSceneHandler::~G4XXXSceneHandler () {}
+
+void G4XXXSceneHandler::EstablishSpecials
+(G4PhysicalVolumeModel& pvModel) {
+  pvModel.DefinePointersToWorkingSpace (&fCurrentDepth,
+                                        &fpCurrentPV,
+                                        &fpCurrentLV);
+}
+
+void G4XXXSceneHandler::Dump (const G4VSolid& solid) {
+  for (G4int i = 0; i < fCurrentDepth; i++ ) G4cout << "  ";
+  G4cout << "\"" << fpCurrentPV -> GetName ()
+         << "\", copy no. " << fpCurrentPV -> GetCopyNo ()
+         << G4endl;
+  return;
+}
+===================================================================
+
+===================================================================
+src/G4XXXViewer.cc
+===================================================================
+#include "G4XXXViewer.hh"
+
+#include "G4ios.hh"
+#include "g4std/strstream"
+
+#include "G4VSceneHandler.hh"
+
+G4XXXViewer::G4XXXViewer
+(G4VSceneHandler& sceneHandler, const G4String& name):
+  G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name) {}
+
+G4XXXViewer::~G4XXXViewer() {}
+
+void G4XXXViewer::SetView() {}
+
+void G4XXXViewer::ClearView() {}
+
+void G4XXXViewer::DrawView() {
+  NeedKernelVisit ();  // Always need to visit G4 kernel.
+  ProcessView ();
+}
+
+===================================================================
+Index: source/visualization/management/include/MyVisManager.cc
+===================================================================
+RCS file: /afs/cern.ch/sw/geant4/cvs/geant4/source/visualization/management/include/MyVisManager.cc,v
+retrieving revision 1.5
+diff -r1.5 MyVisManager.cc
+67a68,71
+> #ifdef G4VIS_USE_XXX
+> #include "G4XXX.hh"
+> #endif
+> 
+119a124,127
+> #endif
+> 
+> #ifdef G4VIS_USE_XXX
+>   RegisterGraphicsSystem (new G4XXX);
+
+===================================================================
+Index: source/visualization/management/src/G4VisManager.cc
+===================================================================
+RCS file: /afs/cern.ch/sw/geant4/cvs/geant4/source/visualization/management/src/G4VisManager.cc,v
+retrieving revision 1.21
+diff -r1.21 G4VisManager.cc
+142a143,145
+> #ifdef G4VIS_BUILD_XXX_DRIVER
+>       "\n    G4VIS_USE_XXX"
+> #endif
+877a881,883
+> #ifdef G4VIS_BUILD_XXX_DRIVER
+>        << "\n  Brief description)"
+> #endif
+1099a1106,1118
+> 		     G4VGraphicsSystem::noFunctionality) {}
+> 
+> #endif
+> 
+> #ifndef G4VIS_BUILD_XXX_DRIVER
+> 
+> class G4XXX: public G4VGraphicsSystem {
+> public:
+>   G4XXX ();
+> };
+> G4XXX::G4XXX ():
+>   G4VGraphicsSystem ("Full name",
+>                      "Mick name",
+
+===================================================================
+Index: config/G4VIS_BUILD.gmk
+===================================================================
+RCS file: /afs/cern.ch/sw/geant4/cvs/geant4/config/G4VIS_BUILD.gmk,v
+retrieving revision 1.3
+diff -r1.3 G4VIS_BUILD.gmk
+80a81,85
+> ifdef G4VIS_BUILD_XXX_DRIVER
+>   G4VIS_BUILD = 1
+>   CPPFLAGS += -DG4VIS_BUILD_XXX_DRIVER
+> endif
+>
+
+===================================================================
+Index: config/G4VIS_USE.gmk
+===================================================================
+RCS file: /afs/cern.ch/sw/geant4/cvs/geant4/config/G4VIS_USE.gmk,v
+retrieving revision 1.3
+diff -r1.3 G4VIS_USE.gmk
+93a94,100
+> ifdef G4VIS_USE_XXX
+>   G4VIS_USE = 1
+>   CPPFLAGS += -DG4VIS_USE_XXX
+>   CPPFLAGS += -I$(G4BASE)/visualization/XXX/include
+>   VISLIBS += -lG4Tree
+> endif
+> 
diff --git a/source/visualization/RayTracer/History b/source/visualization/RayTracer/History
index 5859a2bd5b..90e290ded7 100644
--- a/source/visualization/RayTracer/History
+++ b/source/visualization/RayTracer/History
@@ -1,4 +1,4 @@
-$Id: History,v 1.7 2000/05/02 10:07:08 johna Exp $
+$Id: History,v 1.8 2001/05/18 10:00:22 johna Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -24,6 +24,9 @@ committal in the CVS repository !
 History file for visualization category
 ---------------------------------------
 
+18th May 2001 John Allison (raytracer-V03-01-00)
+- Removed unnecessary virtual inheritance of G4VViewer in G4RayTracerViewer.
+
 2nd May 2000  John Allison
 - G4RayTracer: set out-of-world ray to black.
 - G4RayTracerViewer: corrected trapping of orthogonal projection.
diff --git a/source/visualization/RayTracer/include/G4RTJpeg.hh b/source/visualization/RayTracer/include/G4RTJpeg.hh
index 62a17dca77..36a2fc04fe 100644
--- a/source/visualization/RayTracer/include/G4RTJpeg.hh
+++ b/source/visualization/RayTracer/include/G4RTJpeg.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpeg.hh,v 1.4 2000/03/09 17:38:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpeg.hh,v 1.4.4.1 2001/06/28 19:15:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTJpegCoder.hh b/source/visualization/RayTracer/include/G4RTJpegCoder.hh
index 172fe356ca..76dfdfbc7a 100644
--- a/source/visualization/RayTracer/include/G4RTJpegCoder.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegCoder.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpegCoder.hh,v 1.4 2000/03/09 17:38:31 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpegCoder.hh,v 1.4.4.1 2001/06/28 19:15:50 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
index ec0f314263..878abc4115 100644
--- a/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegCoderTables.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpegCoderTables.hh,v 1.4 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpegCoderTables.hh,v 1.4.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/visualization/RayTracer/include/G4RTJpegMaker.hh b/source/visualization/RayTracer/include/G4RTJpegMaker.hh
index 6ccdfb7cb7..cde98a1d1b 100644
--- a/source/visualization/RayTracer/include/G4RTJpegMaker.hh
+++ b/source/visualization/RayTracer/include/G4RTJpegMaker.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpegMaker.hh,v 1.4 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpegMaker.hh,v 1.4.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTMessenger.hh b/source/visualization/RayTracer/include/G4RTMessenger.hh
index f10da94e88..b293f211ec 100644
--- a/source/visualization/RayTracer/include/G4RTMessenger.hh
+++ b/source/visualization/RayTracer/include/G4RTMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTMessenger.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTMessenger.hh,v 1.3.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTOutBitStream.hh b/source/visualization/RayTracer/include/G4RTOutBitStream.hh
index a1b2359940..4cccaf5781 100644
--- a/source/visualization/RayTracer/include/G4RTOutBitStream.hh
+++ b/source/visualization/RayTracer/include/G4RTOutBitStream.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTOutBitStream.hh,v 1.5 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTOutBitStream.hh,v 1.5.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTSteppingAction.hh b/source/visualization/RayTracer/include/G4RTSteppingAction.hh
index 45a3d2c628..312d49d772 100644
--- a/source/visualization/RayTracer/include/G4RTSteppingAction.hh
+++ b/source/visualization/RayTracer/include/G4RTSteppingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTSteppingAction.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTSteppingAction.hh,v 1.3.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RTTrackingAction.hh b/source/visualization/RayTracer/include/G4RTTrackingAction.hh
index 1210b93f78..d938e6dd49 100644
--- a/source/visualization/RayTracer/include/G4RTTrackingAction.hh
+++ b/source/visualization/RayTracer/include/G4RTTrackingAction.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTTrackingAction.hh,v 1.3 2000/03/09 17:38:32 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTTrackingAction.hh,v 1.3.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayShooter.hh b/source/visualization/RayTracer/include/G4RayShooter.hh
index f5c0b4cd17..668094c68b 100644
--- a/source/visualization/RayTracer/include/G4RayShooter.hh
+++ b/source/visualization/RayTracer/include/G4RayShooter.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayShooter.hh,v 1.2 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayShooter.hh,v 1.2.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 // class description:
diff --git a/source/visualization/RayTracer/include/G4RayTracer.hh b/source/visualization/RayTracer/include/G4RayTracer.hh
index b9d7979b38..154db10849 100644
--- a/source/visualization/RayTracer/include/G4RayTracer.hh
+++ b/source/visualization/RayTracer/include/G4RayTracer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracer.hh,v 1.5 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracer.hh,v 1.5.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
index e0899baade..20a81c5cde 100644
--- a/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerFeatures.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracerFeatures.hh,v 1.2 2000/03/09 15:36:35 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracerFeatures.hh,v 1.2.4.1 2001/06/28 19:15:51 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
index e33b0ca867..a81af4eae0 100644
--- a/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracerSceneHandler.hh,v 1.3 2000/08/19 18:34:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracerSceneHandler.hh,v 1.3.4.1 2001/06/28 19:15:52 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // John Allison  17th March 2000
 
diff --git a/source/visualization/RayTracer/include/G4RayTracerViewer.hh b/source/visualization/RayTracer/include/G4RayTracerViewer.hh
index a2fcf11126..c93f6d3758 100644
--- a/source/visualization/RayTracer/include/G4RayTracerViewer.hh
+++ b/source/visualization/RayTracer/include/G4RayTracerViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracerViewer.hh,v 1.2 2000/02/28 15:19:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracerViewer.hh,v 1.3.2.1 2001/06/28 19:15:52 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // John Allison  17th March 2000
 
@@ -15,7 +31,7 @@
 
 #include "G4VViewer.hh"
 
-class G4RayTracerViewer: virtual public G4VViewer {
+class G4RayTracerViewer: public G4VViewer {
 public:
   G4RayTracerViewer(G4VSceneHandler&,const G4String& name);
   virtual ~G4RayTracerViewer();
diff --git a/source/visualization/RayTracer/include/G4RayTrajectory.hh b/source/visualization/RayTracer/include/G4RayTrajectory.hh
index e8476cbee3..32330cad8a 100644
--- a/source/visualization/RayTracer/include/G4RayTrajectory.hh
+++ b/source/visualization/RayTracer/include/G4RayTrajectory.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTrajectory.hh,v 1.7 2001/02/23 15:43:13 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTrajectory.hh,v 1.7.2.1 2001/06/28 19:15:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
index d7e9e8a109..6e56e0db69 100644
--- a/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
+++ b/source/visualization/RayTracer/include/G4RayTrajectoryPoint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTrajectoryPoint.hh,v 1.3 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTrajectoryPoint.hh,v 1.3.4.1 2001/06/28 19:15:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
index 31204e1e40..9e6ef29f42 100644
--- a/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
+++ b/source/visualization/RayTracer/include/G4VFigureFileMaker.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VFigureFileMaker.hh,v 1.3 2000/03/09 17:38:33 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VFigureFileMaker.hh,v 1.3.4.1 2001/06/28 19:15:52 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 
diff --git a/source/visualization/RayTracer/src/G4RTJpegCoder.cc b/source/visualization/RayTracer/src/G4RTJpegCoder.cc
index a34d49025f..cdc16b0bf7 100644
--- a/source/visualization/RayTracer/src/G4RTJpegCoder.cc
+++ b/source/visualization/RayTracer/src/G4RTJpegCoder.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpegCoder.cc,v 1.3 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpegCoder.cc,v 1.3.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTJpegMaker.cc b/source/visualization/RayTracer/src/G4RTJpegMaker.cc
index 78d6aba063..96097d9970 100644
--- a/source/visualization/RayTracer/src/G4RTJpegMaker.cc
+++ b/source/visualization/RayTracer/src/G4RTJpegMaker.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTJpegMaker.cc,v 1.4 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTJpegMaker.cc,v 1.4.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTMessenger.cc b/source/visualization/RayTracer/src/G4RTMessenger.cc
index a68f23c037..f3b23b7b26 100644
--- a/source/visualization/RayTracer/src/G4RTMessenger.cc
+++ b/source/visualization/RayTracer/src/G4RTMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTMessenger.cc,v 1.4 2000/06/07 02:52:45 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTMessenger.cc,v 1.4.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTOutBitStream.cc b/source/visualization/RayTracer/src/G4RTOutBitStream.cc
index 739fdd55e9..7899650159 100644
--- a/source/visualization/RayTracer/src/G4RTOutBitStream.cc
+++ b/source/visualization/RayTracer/src/G4RTOutBitStream.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTOutBitStream.cc,v 1.3 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTOutBitStream.cc,v 1.3.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTSteppingAction.cc b/source/visualization/RayTracer/src/G4RTSteppingAction.cc
index c31ef3e23a..8dadfb46e6 100644
--- a/source/visualization/RayTracer/src/G4RTSteppingAction.cc
+++ b/source/visualization/RayTracer/src/G4RTSteppingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTSteppingAction.cc,v 1.5 2000/03/09 15:36:37 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTSteppingAction.cc,v 1.5.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RTTrackingAction.cc b/source/visualization/RayTracer/src/G4RTTrackingAction.cc
index 6fdc6ab068..0fe5cddd23 100644
--- a/source/visualization/RayTracer/src/G4RTTrackingAction.cc
+++ b/source/visualization/RayTracer/src/G4RTTrackingAction.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RTTrackingAction.cc,v 1.2 2000/03/09 15:36:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RTTrackingAction.cc,v 1.2.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RayShooter.cc b/source/visualization/RayTracer/src/G4RayShooter.cc
index 686e16cc4e..0f9231d4e9 100644
--- a/source/visualization/RayTracer/src/G4RayShooter.cc
+++ b/source/visualization/RayTracer/src/G4RayShooter.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayShooter.cc,v 1.1 2000/01/29 00:44:53 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayShooter.cc,v 1.1.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 
 #include "G4RayShooter.hh"
diff --git a/source/visualization/RayTracer/src/G4RayTracer.cc b/source/visualization/RayTracer/src/G4RayTracer.cc
index 95d7ce3ec6..000ca58316 100644
--- a/source/visualization/RayTracer/src/G4RayTracer.cc
+++ b/source/visualization/RayTracer/src/G4RayTracer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracer.cc,v 1.7 2000/08/19 18:34:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracer.cc,v 1.7.4.1 2001/06/28 19:15:53 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
index 6cf5f1aa52..8ac7874316 100644
--- a/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
+++ b/source/visualization/RayTracer/src/G4RayTracerSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracerSceneHandler.cc,v 1.1 2000/02/23 16:03:53 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracerSceneHandler.cc,v 1.1.4.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4RayTracerSceneHandler.hh"
 
diff --git a/source/visualization/RayTracer/src/G4RayTracerViewer.cc b/source/visualization/RayTracer/src/G4RayTracerViewer.cc
index a6736f6208..dcc2a97378 100644
--- a/source/visualization/RayTracer/src/G4RayTracerViewer.cc
+++ b/source/visualization/RayTracer/src/G4RayTracerViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTracerViewer.cc,v 1.6 2000/05/13 10:55:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTracerViewer.cc,v 1.7.2.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4RayTracerViewer.hh"
 
@@ -20,8 +36,8 @@
 
 G4RayTracerViewer::G4RayTracerViewer
 (G4VSceneHandler& sceneHandler, const G4String& name):
-  fFileCount(0),
-  G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name) {}
+  G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name),
+  fFileCount(0) {}
 
 G4RayTracerViewer::~G4RayTracerViewer() {}
 
diff --git a/source/visualization/RayTracer/src/G4RayTrajectory.cc b/source/visualization/RayTracer/src/G4RayTrajectory.cc
index 2e95aebffc..6473ef05da 100644
--- a/source/visualization/RayTracer/src/G4RayTrajectory.cc
+++ b/source/visualization/RayTracer/src/G4RayTrajectory.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTrajectory.cc,v 1.6 2001/02/23 15:43:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTrajectory.cc,v 1.7.2.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
@@ -37,7 +53,7 @@ G4RayTrajectory :: G4RayTrajectory()
 G4RayTrajectory :: G4RayTrajectory(G4RayTrajectory & right)
 {
   positionRecord = new G4std::vector<G4RayTrajectoryPoint*>;
-  for(int i=0;i<right.positionRecord->size();i++)
+  for(size_t i=0;i<right.positionRecord->size();i++)
   {
     G4RayTrajectoryPoint* rightPoint = (G4RayTrajectoryPoint*)
 				((*(right.positionRecord))[i]);
@@ -48,7 +64,7 @@ G4RayTrajectory :: G4RayTrajectory(G4RayTrajectory & right)
 G4RayTrajectory :: ~G4RayTrajectory()
 {
   //positionRecord->clearAndDestroy();
-  for(int i=0;i<positionRecord->size();i++)
+  for(size_t i=0;i<positionRecord->size();i++)
   { delete (*positionRecord)[i]; }
   positionRecord->clear();
   delete positionRecord;
diff --git a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
index ecc30f6147..b264384e7e 100644
--- a/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
+++ b/source/visualization/RayTracer/src/G4RayTrajectoryPoint.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4RayTrajectoryPoint.cc,v 1.2 2000/03/09 15:36:38 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4RayTrajectoryPoint.cc,v 1.2.4.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 //
 //
diff --git a/source/visualization/Tree/GNUmakefile b/source/visualization/Tree/GNUmakefile
new file mode 100644
index 0000000000..3c6291c7f1
--- /dev/null
+++ b/source/visualization/Tree/GNUmakefile
@@ -0,0 +1,24 @@
+# $Id: GNUmakefile,v 1.1 2001/04/10 15:08:02 johna Exp $
+
+name := G4Tree
+
+ifndef G4INSTALL
+  G4INSTALL = ../../..
+endif
+
+include $(G4INSTALL)/config/architecture.gmk
+include $(G4INSTALL)/config/G4VIS_BUILD.gmk
+include $(G4INSTALL)/config/interactivity.gmk
+
+CPPFLAGS += -I$(G4BASE)/visualization/management/include
+CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
+CPPFLAGS += -I$(G4BASE)/global/management/include
+CPPFLAGS += -I$(G4BASE)/global/HEPGeometry/include
+CPPFLAGS += -I$(G4BASE)/graphics_reps/include
+CPPFLAGS += -I$(G4BASE)/intercoms/include
+CPPFLAGS += -I$(G4BASE)/geometry/management/include
+CPPFLAGS += -I$(G4BASE)/geometry/solids/CSG/include
+CPPFLAGS += -I$(G4BASE)/geometry/volumes/include
+CPPFLAGS += -I$(G4BASE)/geometry/solids/specific/include
+
+include $(G4INSTALL)/config/common.gmk
diff --git a/source/visualization/Tree/History b/source/visualization/Tree/History
new file mode 100644
index 0000000000..93aa8f325c
--- /dev/null
+++ b/source/visualization/Tree/History
@@ -0,0 +1,63 @@
+$Id: History,v 1.6 2001/06/15 12:29:04 johna Exp $
+-------------------------------------------------------------------
+
+     =========================================================
+     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
+     =========================================================
+
+                      Category History file
+                      ---------------------
+This file should be used by G4 developers and category coordinators
+to briefly summarize all major modifications introduced in the code
+and keep track of all category-tags.
+It DOES NOT substitute the  CVS log-message one should put at every
+committal in the CVS repository !
+
+     *************************************************************
+     * Note that modeling and test have their own History files. *
+     *************************************************************
+
+     ----------------------------------------------------------
+     * Reverse chronological order (last date on top), please *
+     ----------------------------------------------------------
+
+History file for visualization/Tree sub-category
+------------------------------------------------
+
+15th June 2001  John Allison (vis-V03-01-06)
+- Changed char* to const char* in G4GAGTreeList.hh".
+- Added 2nd template argument (less) to sets in G4ASCIITreeSceneHandler and
+  G4GAGTreeSceneHandler.
+
+15th June 2001  Satoshi Tanaka (vis-V03-01-05)
+- The  first committing of GAGTree driver.
+- Other files are the same as vis-V03-01-04
+ 
+5th June 2001  John Allison (vis-V03-01-04)
+- Moved re-useable code from G4ASCIITree to G4VTree.
+
+4th June 2001  John Allison
+- G4ASCIITree: Added logical volume name and solid name and type under
+  verbosity control.
+- Forced culling off so that all volumes are seen, even if "invisible".
+
+25th May 2001  John Allison
+- Bug fix in G4ASCIITree.cc: initialise fVerbosity(0).
+
+24th May 2001  John Allison  (vis-V03-01-03)
+- Added missing files G4ASCIITreeMessenger.hh/cc.
+- Bug fix in G4ASCIITreeMessenger.cc: currentAsDefault = true.
+
+22nd May 2001  John Allison
+- Refined ASCIITree.
+
+10th April 2001  John Allison (vis-V03-01-00)
+- Added first version of ASCIITree to dump geometry hierarchy to
+  standard output as ASCII stream.
+  This requires two new environment variables:
+    G4VIS_BUILD_ASCIITREE_DRIVER
+    G4VIS_USE_ASCIITREE
+  and config-V03-01-00.
+
+5th April 2001  John Allison (vis-V03-01-00)
+- First version of G4VTree and G4ASCIITree.
diff --git a/source/visualization/Tree/include/G4ASCIITree.hh b/source/visualization/Tree/include/G4ASCIITree.hh
new file mode 100644
index 0000000000..70542b9500
--- /dev/null
+++ b/source/visualization/Tree/include/G4ASCIITree.hh
@@ -0,0 +1,52 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITree.hh,v 1.4.2.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A graphics system to dump geometry hierarchy to standard output as
+//   ASCII stream.
+
+#ifndef G4ASCIITREE_HH
+#define G4ASCIITREE_HH
+
+#include "G4VTree.hh"
+
+class G4ASCIITreeMessenger;
+
+class G4ASCIITree: public G4VTree {
+public:
+  G4ASCIITree ();
+  virtual ~G4ASCIITree ();
+  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
+  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
+  void SetVerbosity(G4int verbosity) {fVerbosity = verbosity;}
+  G4int GetVerbosity() const {return fVerbosity;}
+protected:
+  G4int fVerbosity;
+  G4ASCIITreeMessenger* fpMessenger;
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4ASCIITreeMessenger.hh b/source/visualization/Tree/include/G4ASCIITreeMessenger.hh
new file mode 100644
index 0000000000..c699116ba6
--- /dev/null
+++ b/source/visualization/Tree/include/G4ASCIITreeMessenger.hh
@@ -0,0 +1,54 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeMessenger.hh,v 1.3.2.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A scene handler to dump geometry hierarchy to standard output as
+//   ASCII stream.
+// Based on a provisional G4ASCIITreeGraphicsScene (was in modeling).
+
+#ifndef G4ASCIITREEMESSENGER_HH
+#define G4ASCIITREEMESSENGER_HH
+
+#include "G4UImessenger.hh"
+
+class G4UIcommand;
+class G4UIcmdWithAnInteger;
+class G4ASCIITree;
+
+class G4ASCIITreeMessenger: public G4UImessenger {
+public:
+  G4ASCIITreeMessenger(G4ASCIITree*);
+  virtual ~G4ASCIITreeMessenger();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4ASCIITree* fpASCIITree;
+  G4UIcommand* fpDirectory;
+  G4UIcmdWithAnInteger* fpCommandVerbose;
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh b/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh
new file mode 100644
index 0000000000..f6e4dd7a08
--- /dev/null
+++ b/source/visualization/Tree/include/G4ASCIITreeSceneHandler.hh
@@ -0,0 +1,61 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeSceneHandler.hh,v 1.8.2.1 2001/06/28 19:15:54 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A scene handler to dump geometry hierarchy to standard output as
+//   ASCII stream.
+// Based on a provisional G4ASCIITreeGraphicsScene (was in modeling).
+
+#ifndef G4ASCIITREESCENEHANDLER_HH
+#define G4ASCIITREESCENEHANDLER_HH
+
+#include "G4VTreeSceneHandler.hh"
+
+#include "g4std/set"
+
+class G4VPhysicalVolume;
+
+class G4ASCIITreeSceneHandler: public G4VTreeSceneHandler {
+public:
+  G4ASCIITreeSceneHandler(G4VGraphicsSystem& system,
+			  const G4String& name);
+  virtual ~G4ASCIITreeSceneHandler();
+  virtual void BeginModeling();
+  virtual void EndModeling();
+protected:
+  virtual void Dump(const G4VSolid&);
+  G4std::set<G4LogicalVolume*,G4std::less<G4LogicalVolume*> > fLVSet;
+  typedef
+  G4std::set<G4LogicalVolume*,G4std::less<G4LogicalVolume*> >::iterator
+  LVSetIterator;
+  G4std::set<G4VPhysicalVolume*,G4std::less<G4VPhysicalVolume*> > fReplicaSet;
+  typedef
+  G4std::set<G4VPhysicalVolume*,G4std::less<G4VPhysicalVolume*> >::iterator
+  ReplicaSetIterator;
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4ASCIITreeViewer.hh b/source/visualization/Tree/include/G4ASCIITreeViewer.hh
new file mode 100644
index 0000000000..01adf64605
--- /dev/null
+++ b/source/visualization/Tree/include/G4ASCIITreeViewer.hh
@@ -0,0 +1,42 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeViewer.hh,v 1.3.2.1 2001/06/28 19:15:55 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A dummy viewer for ASCIITreeSceneHandler.
+
+#ifndef G4ASCIITREEVIEWER_HH
+#define G4ASCIITREEVIEWER_HH
+
+#include "G4VTreeViewer.hh"
+
+class G4ASCIITreeViewer: public G4VTreeViewer {
+public:
+  G4ASCIITreeViewer(G4VSceneHandler&,const G4String& name);
+  virtual ~G4ASCIITreeViewer();
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4GAGTree.hh b/source/visualization/Tree/include/G4GAGTree.hh
new file mode 100644
index 0000000000..26d183baa5
--- /dev/null
+++ b/source/visualization/Tree/include/G4GAGTree.hh
@@ -0,0 +1,47 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka  31 May 2001
+// A graphics system to dump geometry hierarchy to GAG.
+//
+
+#ifndef G4GAGTREE_HH
+#define G4GAGTREE_HH
+
+#include "G4VTree.hh"
+
+class G4GAGTreeMessenger;
+
+class G4GAGTree: public G4VTree {
+public:
+  G4GAGTree ();
+  virtual ~G4GAGTree ();
+  G4VSceneHandler* CreateSceneHandler (const G4String& name = "");
+  G4VViewer*  CreateViewer  (G4VSceneHandler&, const G4String& name = "");
+  void SetVerbosity(G4int verbosity) {fVerbosity = verbosity;}
+  G4int GetVerbosity() const {return fVerbosity;}
+protected:
+  G4int fVerbosity;
+  G4GAGTreeMessenger* fpMessenger;
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4GAGTreeList.hh b/source/visualization/Tree/include/G4GAGTreeList.hh
new file mode 100644
index 0000000000..98b550ae77
--- /dev/null
+++ b/source/visualization/Tree/include/G4GAGTreeList.hh
@@ -0,0 +1,392 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//////////////////////////////////
+/////  G4GAGTreeList.hh  ///////
+/////   Satoshi Tanaka   ///////
+//////////////////////////////////
+
+#if !defined G4GAGTREELIST_HH
+#define G4GAGTREELIST_HH
+
+#include "g4std/iostream"	
+#include "globals.hh"
+
+/////////////////////////////////
+/////  class G4GAGTreeNode  /////
+/////////////////////////////////
+
+template <class Type> class G4GAGTreeNode {
+ public:
+	Type item ;		// item
+	G4GAGTreeNode<Type>* down ;	// address of neighboring node (downward)
+	G4GAGTreeNode<Type>* up ;	// address of neighboring node (upward)
+} ; // G4GAGTreeNode
+
+
+///////////////////////////////////////
+/////  class G4GAGTreeList<Type>  /////
+///////////////////////////////////////
+
+template <class Type> class G4GAGTreeList {
+ private:
+		//----- constants
+	enum { ERROR = 0, NORMAL = 1 };
+
+	G4GAGTreeNode<Type>*	head ;	// head of list
+	G4GAGTreeNode<Type>*	tail ;	// tail of list
+	G4GAGTreeNode<Type>*	cur ;	// current node
+
+		//----- number of items in list
+	int		nItem ; // number of stored items	
+
+ public:
+		//----- Constructor
+		//.....  Initialize head and current node of list to NULL.
+		//.....  Set name of list ( default name is "no_name")
+	G4GAGTreeList( const char* name_ = "no_name" ) ;
+
+		//----- Destructor
+	~G4GAGTreeList() { this->Clear() ; }
+	
+		//----- Add an item to list and make it a new head.
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROOR = 0  (error)
+	int	AddItem( const Type& item );	
+
+		//----- Delete an item of current node
+		//.....  Return: NORMAL = 1  if deleted.
+		//.....          ERROR  = 0  if not deleted ( cur = NULL or nItem = 1).
+		//.....  In case of NORMAL, cur moves to cur->down.
+	int	DeleteItem() ;
+
+
+		//----- Set current node to the head of list.
+	void	ToHead()    { cur = head ; }
+
+		//----- Set current node to the tail of list.
+	void	ToTail()    { cur = tail ; }
+
+		//----- Increment current node to downward direction by 1 step
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROOR = 0  (if cur = NULL)
+	int	Downward();		
+
+		//----- Increment current node to upward direction by 1 step
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROOR = 0  (if cur = NULL)
+	int	Upward();		
+
+
+		//----- Get current item
+		//.....  The obtained item is returned to the argument.
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROR = 0   (error)
+	int	GetItem( Type& item );
+
+		//----- Get position of current node counting from tail
+		//.....  Return: 0, 1, 2, ..... , nItem -1
+		//.....  If cur == tail, 0 is returned.
+		//.....  If cur == NULL, -1 is returned.
+		//.....  Current node is not modified after calling this function
+	int WhereIsCurrentNode() ;
+
+		//----- Check if current node is NULL
+		//.....  Return 1: if cur == NULL
+		//.....         0: if cur != NULL
+	int IsCurrentNodeNull() { return ( cur == NULL ) ; }
+
+		//----- Get number of stored items
+	int GetNumItem() const { return nItem ; }
+
+		//----- Get number of stored items minus one
+                //.....  Note: If the list is empty, -1 is returned
+	int GetHeadIndex() const { return (nItem - 1) ; }
+
+		//----- delete all items
+		//..... All nodes are deleted.
+		//..... head, tail, cur are reset to NULL.
+	void Clear();
+
+		//----- For use of STACK: Push
+		//.....  Added new node becomes a new current node.
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROOR = 0  (error)
+		//.....  Added new node becomes a new current node.
+	int	Push( const Type& item ) { return AddItem( item ) ; }
+
+		//----- For use of STACK
+		//.....  Get head->item and then delete it.
+		//.....  The obtained item is returned to the argument.
+		//.....  Return: NORMAL = 1  (normal)
+		//.....          ERROR = 0   (error)
+		//.....  In case of NORMAL, cur moves to cur->down.
+	int	Pop( Type& item ) ;
+
+		//----- For use of STACK: pop
+	void    Pop( void ) { this->ToHead(); this->DeleteItem(); }
+
+} ; // class G4GAGTreeList
+
+
+
+////////////////////////////////////////////////////////////////
+/////  Inline Member functions of class "G4GAGTreeList"  ///////
+////////////////////////////////////////////////////////////////
+
+//----- 
+template <class Type>
+inline G4GAGTreeList<Type>::G4GAGTreeList( const char* name_ )
+{
+	cur = head = tail = NULL ;
+	nItem = 0 ;
+
+} // G4GAGTreeList<Type>::G4GAGTreeList()
+
+
+//----- 
+template <class Type>
+inline int G4GAGTreeList<Type>::AddItem( const Type& item )
+{
+		//----- local
+	int		status ;
+	G4GAGTreeNode<Type>*	old_head = head ; // store old head
+
+		//----- allocate dynamical memory for added node
+	head = new G4GAGTreeNode<Type> ;		
+	if( !head ){
+			//----- failed to allocate dynamical memory
+		status = ERROR ;
+
+	} else {
+			//----- increment number of stored items
+		nItem++ ;				
+	
+			//----- set tail of list in the first push 
+		if( nItem == 1 ) { tail = head ; }
+	
+			//----- set current node to added node
+		cur = head ;
+	
+			//----- add an item
+		head->item = item ;	// add an item
+	
+			//----- make links
+			//.....          2          1
+			//.....  NULL <----- head -----> old_head
+			//.....                   <-----
+			//.....                     3
+		head->down = old_head ; // make link 1
+		head->up   = NULL ;	// make link 2
+		if( old_head != NULL ) {
+			old_head->up = head ; // make link 3
+		}
+			//----- set status	
+		status = NORMAL ;
+	} // if--else
+
+		//----- return status
+	return status ;		
+
+} 
+
+
+//----- 
+template <class Type>
+inline  int G4GAGTreeList<Type>::DeleteItem()
+{
+		//----- local variables
+	int status ;
+	G4GAGTreeNode<Type>* cur_old ;	// backup of current node
+
+		//----- ERROR if current node does not have an item
+		//...... or no item exist in list
+	if ( cur == NULL || nItem == 0 ) {
+		status = ERROR ;
+	} else {
+			//----- Below cur != NULL, nItem >= 1, 
+			//..... head != NULL, and tail != NULL
+	
+			//----- make backup of current node
+		cur_old  = cur ;
+	
+			//----- remake links
+		if( cur == head ) {
+			cur  = cur->down ;
+			head = cur ;
+			if ( head != NULL ) {
+				head->up = NULL ;
+				delete cur_old ;  nItem-- ;
+			} else {
+				//----- In case that head = NULL:
+				//.....  This case occurs in case that
+				//.....  head = tail i.e. nItem = 1.
+				//.....  At the end of this function,
+				//.....  head = tail = cur = NULL, nItem = 0
+				tail = NULL ;
+				delete cur_old ; 
+				nItem = 0 ;
+				// nItem-- ;
+			}
+	
+		} else if( cur == tail ){
+			//----- Here, cur != head && cur == tail.
+			//.....  So, tail != head.
+			//.....  It means, at least 2 items exist in the list.
+			//.....  So, tail->up is not NULL.
+			tail = tail->up ;
+			tail->down = NULL;
+			cur = NULL ;
+			delete cur_old ;  nItem-- ;
+	
+		} else {	 //----- In case that cur is neither head or tail.
+				 //.....  head --- .... --- cur ---... --- tail.
+			(cur->up)->down   = cur->down ;
+			(cur->down)->up   = cur->up   ;
+			cur = cur->down ;
+			delete cur_old ;  nItem-- ;
+		} // if-else_if-else
+		
+		status = NORMAL;
+
+	} // if--else
+
+		//----- return (successfully deleted)
+	return status ;
+
+} 
+
+
+//----- 
+template <class Type>
+inline  int G4GAGTreeList<Type>::Downward()
+{
+	int status ;
+	if( cur == NULL ) {
+		status = ERROR ; // do nothing
+
+	} else {
+		cur = cur->down ; // move dawnward
+		status = NORMAL ;
+	}
+	return status ;
+} 
+
+
+//----- 
+template <class Type>
+inline  int G4GAGTreeList<Type>::Upward()
+{
+	int status ;
+	if( cur == NULL ) {
+		status = ERROR ; // do nothing
+	} else {
+		cur = cur->up ; // move upward
+		status = NORMAL ;
+	}
+	return status ;
+} 
+
+
+//----- 
+template <class Type>
+inline  int G4GAGTreeList<Type>::GetItem( Type& item )
+{
+		//----- return value
+	int state ;
+
+		//----- get an item of current node
+	if ( cur == NULL ) {
+		state = ERROR ;
+	} else {
+		state = NORMAL ;
+		item = cur->item ;
+	}
+
+		//----- return
+	return state ;
+} 
+
+
+//----- 
+template <class Type>
+inline  int G4GAGTreeList<Type>::WhereIsCurrentNode()
+{
+	G4GAGTreeNode<Type>* tmp = cur ;// copy current node
+	int n = -1 ;			// counter
+
+		//----- count how many steps there are until tail.
+	while( tmp != NULL ) {	n++ ; tmp = tmp->down ;}
+
+		//----- return steps
+	return n ;
+
+} 
+
+
+//----- 
+template <class Type>
+inline  void G4GAGTreeList<Type>::Clear()
+{
+		//----- delete items
+	cur = head ;
+	while( cur != NULL )
+	{
+		G4GAGTreeNode<Type>* tmp = cur ;
+		cur = cur->down ;
+		delete tmp ;	// destructor called
+	}
+
+		//----- reset head and current node
+	cur = head  = tail = NULL ;
+
+		//----- reset number of stored items
+	nItem = 0 ;
+
+} 
+
+
+//----- Pop()
+template <class Type>
+inline  int G4GAGTreeList<Type>::Pop( Type& item )
+{
+		//----- local variables
+	int	status ;
+
+		//----- get head->item
+	ToHead() ;
+	status = GetItem( item ) ;
+
+		//----- delete head->item if it exists
+		//.....  and make cur move to cur->down
+	if( status ) { DeleteItem(); }
+
+		//----- RETURN
+	return status ;
+
+} 
+
+
+
+//////////////
+#endif
+////////////// end of list.h
diff --git a/source/visualization/Tree/include/G4GAGTreeMessenger.hh b/source/visualization/Tree/include/G4GAGTreeMessenger.hh
new file mode 100644
index 0000000000..831d3a1f2f
--- /dev/null
+++ b/source/visualization/Tree/include/G4GAGTreeMessenger.hh
@@ -0,0 +1,49 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka 31th May 2001
+//
+// A messenger for G4GAGTree driver.
+
+
+#ifndef G4GAGTREEMESSENGER_HH
+#define G4GAGTREEMESSENGER_HH
+
+#include "G4UImessenger.hh"
+
+class G4UIcommand;
+class G4UIcmdWithAnInteger;
+class G4GAGTree;
+
+class G4GAGTreeMessenger: public G4UImessenger {
+public:
+  G4GAGTreeMessenger(G4GAGTree*);
+  virtual ~G4GAGTreeMessenger();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4GAGTree* fpGAGTree;
+  G4UIcommand* fpDirectory;
+  G4UIcmdWithAnInteger* fpCommandVerbose;
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4GAGTreeSceneHandler.hh b/source/visualization/Tree/include/G4GAGTreeSceneHandler.hh
new file mode 100644
index 0000000000..2f2db0cc8d
--- /dev/null
+++ b/source/visualization/Tree/include/G4GAGTreeSceneHandler.hh
@@ -0,0 +1,105 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka  31th April 2001
+// A scene handler to dump geometry hierarchy GAG
+
+
+#ifndef G4GAGTREESCENEHANDLER_HH
+#define G4GAGTREESCENEHANDLER_HH
+
+#include "G4VTreeSceneHandler.hh"
+
+#include "g4std/set"
+
+class G4VPhysicalVolume;
+
+/////////////////////////////
+#include "G4GAGTreeList.hh"
+class G4String ;
+/////////////////////////////
+
+///////////////////////////////////////////////////////////////////
+// The algorithm of re-generating a geometry tree 
+//  of physical volumes (PV):
+// 
+// In each addition of the N-th PV with a given depth D, P(N;D) to
+// the tree, we use the following rules:
+// 
+//   R1. We can add P(N;D) to one of the previously-generated PV nodes,
+//       P(N_mother <N; D_mother), if D_mother = D - 1.  
+// 
+//   R2. The mother PV node P(N_mother, D_mother) of P(N,D)
+//       is searched in the direction to the root node 
+//       (the world volume), starting from P(N-1;*).
+// 
+//   R3. The first PV node found in R2 is adopted as the mother.
+// 
+// This rule can be easily implemented with a stack.
+// 
+///////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////
+// The output to G4cout becomes, for example, 
+//
+//  @@DTREEBegin
+//  /WORLD.0/PV1.1 
+//  /WORLD.0/PV1.1/PV2.2
+//  /WORLD.0/PV1.1/PV3.3
+//  /WORLD.0/PV1.1/PV3.3/PV4.4
+//  /WORLD.0/PV5.5
+//  ...
+//  @@DTREEBegin
+//
+//  where ".number" is the index label added by the 
+//  G4GAGTree driver.
+///////////////////////////////////////////////////////////////////
+
+class G4GAGTreeSceneHandler: public G4VTreeSceneHandler {
+public:
+  G4GAGTreeSceneHandler(G4VGraphicsSystem& system,
+			  const G4String& name);
+  virtual ~G4GAGTreeSceneHandler();
+  void BeginModeling();
+  void EndModeling();
+protected:
+  void Dump(const G4VSolid&);
+  G4std::set<G4LogicalVolume*,G4std::less<G4LogicalVolume*> > fLVSet;
+  typedef
+  G4std::set<G4LogicalVolume*,G4std::less<G4LogicalVolume*> >::iterator
+  LVSetIterator;
+  G4std::set<G4VPhysicalVolume*,G4std::less<G4VPhysicalVolume*> > fReplicaSet;
+  typedef
+  G4std::set<G4VPhysicalVolume*,G4std::less<G4VPhysicalVolume*> >::iterator
+  ReplicaSetIterator;
+
+/////////////////////////////
+  void ClearPVList(void);
+  void InitializePVList(void);
+  G4GAGTreeList<G4String>  fPVNameList ;
+  G4int                    fPrevDepth  ;
+  G4String                 fPrevAbsPVName ;
+  G4int                    fPVCounter ;
+/////////////////////////////
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4GAGTreeViewer.hh b/source/visualization/Tree/include/G4GAGTreeViewer.hh
new file mode 100644
index 0000000000..45c5acd55a
--- /dev/null
+++ b/source/visualization/Tree/include/G4GAGTreeViewer.hh
@@ -0,0 +1,37 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka  31th May 2001
+// A dummy viewer for GAGTreeSceneHandler.
+
+#ifndef G4GAGTREEVIEWER_HH
+#define G4GAGTREEVIEWER_HH
+
+#include "G4VTreeViewer.hh"
+
+class G4GAGTreeViewer: public G4VTreeViewer {
+public:
+  G4GAGTreeViewer(G4VSceneHandler&,const G4String& name);
+  virtual ~G4GAGTreeViewer();
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4VTree.hh b/source/visualization/Tree/include/G4VTree.hh
new file mode 100644
index 0000000000..622251eaf4
--- /dev/null
+++ b/source/visualization/Tree/include/G4VTree.hh
@@ -0,0 +1,45 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTree.hh,v 1.3.2.1 2001/06/28 19:15:55 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A graphics system to dump geometry hierarchy.
+
+#ifndef G4VTREE_HH
+#define G4VTREE_HH
+
+#include "G4VGraphicsSystem.hh"
+
+class G4VTree: public G4VGraphicsSystem {
+public:
+  G4VTree (const G4String& name,
+	   const G4String& nickname,
+	   const G4String& description,
+	   Functionality f);
+  virtual ~G4VTree ();
+};
+
+#endif
diff --git a/source/visualization/Tree/include/G4VTreeSceneHandler.hh b/source/visualization/Tree/include/G4VTreeSceneHandler.hh
new file mode 100644
index 0000000000..ea56e28468
--- /dev/null
+++ b/source/visualization/Tree/include/G4VTreeSceneHandler.hh
@@ -0,0 +1,107 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTreeSceneHandler.hh,v 1.4.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A base class for a scene handler to dump geometry hierarchy.
+
+#ifndef G4VTREESCENEHANDLER_HH
+#define G4VTREESCENEHANDLER_HH
+
+#include "G4VSceneHandler.hh"
+#include "G4Box.hh"
+#include "G4Cons.hh"
+#include "G4Tubs.hh"
+#include "G4Trd.hh"
+#include "G4Trap.hh"
+#include "G4Sphere.hh"
+#include "G4Para.hh"
+#include "G4Torus.hh"
+#include "G4Polycone.hh"
+#include "G4Polyhedra.hh"
+
+class G4VPhysicalVolume;
+class G4LogicalVolume;
+class G4ModelingParameters;
+
+class G4VTreeSceneHandler: public G4VSceneHandler {
+
+public:
+  G4VTreeSceneHandler(G4VGraphicsSystem& system,
+		      const G4String& name);
+  virtual ~G4VTreeSceneHandler ();
+  void AddThis (const G4Box& s) {Dump (s);}
+  void AddThis (const G4Cons & s) {Dump (s);}
+  void AddThis (const G4Tubs& s) {Dump (s);}
+  void AddThis (const G4Trd& s) {Dump (s);}
+  void AddThis (const G4Trap& s) {Dump (s);}
+  void AddThis (const G4Sphere& s) {Dump (s);}
+  void AddThis (const G4Para& s) {Dump (s);}
+  void AddThis (const G4Torus& s) {Dump (s);}
+  void AddThis (const G4Polycone& s) {Dump (s);}
+  void AddThis (const G4Polyhedra& s) {Dump (s);}
+  void AddThis (const G4VSolid& s) {Dump (s);}
+  void PreAddThis (const G4Transform3D& objectTransformation,
+		   const G4VisAttributes&);
+  void PostAddThis ();
+  void EstablishSpecials (G4PhysicalVolumeModel&);
+  G4int                GetFoundDepth          () const;
+  G4VPhysicalVolume*   GetFoundVolume         () const;
+  const G4Transform3D& GetFoundTransformation () const;
+
+  ////////////////////////////////////////////////////////////////
+  // Functions not used but required by the abstract interface.
+
+  virtual void BeginPrimitives (const G4Transform3D& objectTransformation) {}
+  virtual void EndPrimitives () {}
+  virtual void AddPrimitive (const G4Polyline&)   {}
+  virtual void AddPrimitive (const G4Text&)       {}
+  virtual void AddPrimitive (const G4Circle&)     {}
+  virtual void AddPrimitive (const G4Square&)     {}
+  virtual void AddPrimitive (const G4Polymarker&) {}
+  virtual void AddPrimitive (const G4Polyhedron&) {}
+  virtual void AddPrimitive (const G4NURBS&)      {}
+
+  virtual void BeginModeling();
+  virtual void EndModeling();
+
+  static G4int GetSceneCount();
+
+protected:
+  virtual void         Dump (const G4VSolid&) = 0;
+  static G4int         fSceneIdCount;  // Counter for Tree scene handlers.
+  static G4int         fSceneCount;    // No. of extanct scene handlers.
+  G4int                fCurrentDepth;  // Current depth of geom. hierarchy.
+  G4VPhysicalVolume*   fpCurrentPV;    // Current physical volume.
+  G4LogicalVolume*     fpCurrentLV;    // Current logical volume.
+  const G4Transform3D* fpCurrentObjectTransformation;
+  const G4ModelingParameters* fpOriginalMP;  // Keeps pointer to original.
+  G4ModelingParameters* fpNonCullingMP;      // For temporary non-culling.
+};
+
+#include "G4VTreeSceneHandler.icc"
+
+#endif
diff --git a/source/visualization/Tree/include/G4VTreeSceneHandler.icc b/source/visualization/Tree/include/G4VTreeSceneHandler.icc
new file mode 100644
index 0000000000..09c7be617b
--- /dev/null
+++ b/source/visualization/Tree/include/G4VTreeSceneHandler.icc
@@ -0,0 +1,41 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTreeSceneHandler.icc,v 1.3.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  18th May 2000
+// An artificial graphics scene to find dump geometry hierarchy.
+
+inline G4int G4VTreeSceneHandler::GetSceneCount() {
+  return fSceneCount;
+}
+
+inline void G4VTreeSceneHandler::PreAddThis
+(const G4Transform3D& objectTransformation,
+ const G4VisAttributes&) {
+  fpCurrentObjectTransformation = &objectTransformation;
+}
+
+inline void G4VTreeSceneHandler::PostAddThis () {}
diff --git a/source/visualization/Tree/include/G4VTreeViewer.hh b/source/visualization/Tree/include/G4VTreeViewer.hh
new file mode 100644
index 0000000000..cc8433b207
--- /dev/null
+++ b/source/visualization/Tree/include/G4VTreeViewer.hh
@@ -0,0 +1,45 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTreeViewer.hh,v 1.3.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A base class for a dummy viewer to dump geometry hierarchy.
+
+#ifndef G4VTREEVIEWER_HH
+#define G4VTREEVIEWER_HH
+
+#include "G4VViewer.hh"
+
+class G4VTreeViewer: public G4VViewer {
+public:
+  G4VTreeViewer(G4VSceneHandler&,const G4String& name);
+  virtual ~G4VTreeViewer();
+  void SetView();
+  void ClearView();
+  void DrawView();
+};
+
+#endif
diff --git a/source/visualization/Tree/src/G4ASCIITree.cc b/source/visualization/Tree/src/G4ASCIITree.cc
new file mode 100644
index 0000000000..6a83b85096
--- /dev/null
+++ b/source/visualization/Tree/src/G4ASCIITree.cc
@@ -0,0 +1,77 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITree.cc,v 1.5.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A graphics system to dump geometry hierarchy.
+
+#include "G4ASCIITree.hh"
+#include "G4ASCIITreeSceneHandler.hh"
+#include "G4ASCIITreeViewer.hh"
+#include "G4ASCIITreeMessenger.hh"
+
+G4ASCIITree::G4ASCIITree ():
+  G4VTree ("ASCIITree",
+	   "ATree",
+	   "A graphics system to dump geometry hierarchy"
+	   "\n  to standard output as an ASCII stream.",
+	   G4VGraphicsSystem::nonEuclidian),
+  fVerbosity(0)
+{
+  fpMessenger = new G4ASCIITreeMessenger(this);
+}
+
+G4ASCIITree::~G4ASCIITree () {
+  delete fpMessenger;
+}
+
+G4VSceneHandler* G4ASCIITree::CreateSceneHandler (const G4String& name) {
+  G4VSceneHandler* pScene = new G4ASCIITreeSceneHandler (*this, name);
+  G4cout << G4ASCIITreeSceneHandler::GetSceneCount ()
+	 << ' ' << fName << " scene handlers extanct." << G4endl;
+  return pScene;
+}
+
+G4VViewer* G4ASCIITree::CreateViewer (G4VSceneHandler& scene,
+				  const G4String& name) {
+  G4VViewer* pView =
+    new G4ASCIITreeViewer ((G4ASCIITreeSceneHandler&) scene, name);
+  if (pView) {
+    if (pView -> GetViewId () < 0) {
+      G4cerr << "G4ASCIITree::CreateViewer: error flagged by negative"
+        " view id in G4ASCIITreeViewer creation."
+        "\n Destroying view and returning null pointer."
+           << G4endl;
+      delete pView;
+      pView = 0;
+    }
+  }
+  else {
+    G4cerr << "G4ASCIITree::CreateViewer: null pointer on"
+      " new G4ASCIITreeViewer." << G4endl;
+  }
+  return pView;
+}
diff --git a/source/visualization/Tree/src/G4ASCIITreeMessenger.cc b/source/visualization/Tree/src/G4ASCIITreeMessenger.cc
new file mode 100644
index 0000000000..415470b32b
--- /dev/null
+++ b/source/visualization/Tree/src/G4ASCIITreeMessenger.cc
@@ -0,0 +1,71 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeMessenger.cc,v 1.4.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A scene handler to dump geometry hierarchy.
+// Based on a provisional G4ASCIITreeGraphicsScene (was in modeling).
+
+#include "G4ASCIITreeMessenger.hh"
+
+#include "G4ASCIITree.hh"
+#include "G4UIcommand.hh"
+#include "G4UIdirectory.hh"
+#include "G4UIcmdWithAnInteger.hh"
+
+G4ASCIITreeMessenger::G4ASCIITreeMessenger
+(G4ASCIITree* ASCIITree):
+  fpASCIITree(ASCIITree) {
+  G4bool omitable, currentAsDefault;
+  fpDirectory = new G4UIdirectory ("/vis/ASCIITree/");
+  fpDirectory -> SetGuidance ("Commands for ASCIITree control.");
+  fpCommandVerbose = new G4UIcmdWithAnInteger ("/vis/ASCIITree/verbose", this);
+  fpCommandVerbose -> SetGuidance ("/vis/ASCIITree/verbose [<verbosity>]");
+  fpCommandVerbose -> SetGuidance
+    ("0 (default) mimimum - 10 maximum printing.");
+  fpCommandVerbose -> SetParameterName ("verbosity",
+					omitable = true,
+					currentAsDefault = true);
+}
+
+G4ASCIITreeMessenger::~G4ASCIITreeMessenger() {
+  delete fpCommandVerbose;
+  delete fpDirectory;
+}
+
+G4String G4ASCIITreeMessenger::GetCurrentValue
+(G4UIcommand* command) {
+  return "0";
+}
+
+void G4ASCIITreeMessenger::SetNewValue
+(G4UIcommand* command, G4String newValue) {
+  fpASCIITree->SetVerbosity
+    (fpCommandVerbose->GetNewIntValue(newValue));
+  G4cout << "G4ASCIITree verbosity now "
+	 << fpASCIITree->GetVerbosity()
+	 << G4endl;  
+}
diff --git a/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc b/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc
new file mode 100644
index 0000000000..14757c6555
--- /dev/null
+++ b/source/visualization/Tree/src/G4ASCIITreeSceneHandler.cc
@@ -0,0 +1,145 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeSceneHandler.cc,v 1.8.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A scene handler to dump geometry hierarchy.
+// Based on a provisional G4ASCIITreeGraphicsScene (was in modeling).
+
+#include "G4ASCIITreeSceneHandler.hh"
+
+#include "G4ASCIITree.hh"
+#include "G4VSolid.hh"
+#include "G4PhysicalVolumeModel.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4LogicalVolume.hh"
+#include "G4VPVParameterisation.hh"
+
+G4ASCIITreeSceneHandler::G4ASCIITreeSceneHandler(G4VGraphicsSystem& system,
+						 const G4String& name):
+  G4VTreeSceneHandler(system, name) {}
+
+G4ASCIITreeSceneHandler::~G4ASCIITreeSceneHandler () {}
+
+void G4ASCIITreeSceneHandler::BeginModeling () {
+
+  G4VTreeSceneHandler::BeginModeling ();  // To re-use "culling off" code.
+
+  const G4ASCIITree* pSystem = (G4ASCIITree*)GetGraphicsSystem();
+  const G4int verbosity = pSystem->GetVerbosity();
+  G4cout << "\nG4ASCIITreeSceneHandler::BeginModeling:"
+    "\n  set verbosity with \"/vis/ASCIITree/verbose <verbosity>\":"
+    "\n  <  10: - does not print daughters of repeated logical volumes."
+    "\n         - does not repeat replicas."
+    "\n  >= 10: prints all physical volumes."
+    "\n  For level of detail add:"
+    "\n  >=  0: prints physical volume name."
+    "\n  >=  1: prints logical volume name."
+    "\n  >=  2: prints solid name and type."
+    "\n  Note: all culling, if any, is switched off so all volumes are seen."
+    "\n  Now printing with verbosity " << verbosity << G4endl;
+}
+
+void G4ASCIITreeSceneHandler::EndModeling () {
+  fLVSet.clear();
+  fReplicaSet.clear();
+  G4cout << "G4ASCIITreeSceneHandler::EndModeling" << G4endl;
+  G4VTreeSceneHandler::EndModeling ();  // To re-use "culling off" code.
+}
+
+void G4ASCIITreeSceneHandler::Dump (const G4VSolid& solid) {
+
+  const G4ASCIITree* pSystem = (G4ASCIITree*)GetGraphicsSystem();
+  const G4int verbosity = pSystem->GetVerbosity();
+  const G4int detail = verbosity % 10;
+
+  if (verbosity < 10 && fReplicaSet.find(fpCurrentPV) != fReplicaSet.end()) {
+    // Ignore if an already treated replica.  (Assumes that the model
+    // which has invoked this function is a G4PhysicalVolumeModel - we
+    // check this by testing fpCurrentPV.)
+    if (fpCurrentPV) {
+      ((G4PhysicalVolumeModel*)fpModel)->CurtailDescent();
+      return;
+    }
+  }
+
+  // Print indented text...
+  for (G4int i = 0; i < fCurrentDepth; i++ ) G4cout << "  ";
+  G4cout << "\"" << fpCurrentPV->GetName()
+	 << "\", copy no. " << fpCurrentPV->GetCopyNo();
+  if (detail >= 1) {
+    G4cout << ", belongs to logical volume \""
+	   << fpCurrentLV->GetName() << "\"";
+  }
+  if (detail >= 2) {
+    G4cout << " and is composed of solid \""
+           << fpCurrentLV->GetSolid()->GetName()
+	   << "\" of type \""
+	   << fpCurrentLV->GetSolid()->GetEntityType() << "\"";
+  }
+
+  if (fpCurrentPV->IsReplicated()) {
+    fReplicaSet.insert(fpCurrentPV);  // Record new replica volume.
+    if (verbosity < 10) {
+      // Add printing for replicas (when replicas are ignored)...
+      EAxis axis;
+      G4int nReplicas;
+      G4double width;
+      G4double offset;
+      G4bool consuming;
+      fpCurrentPV->GetReplicationData(axis,nReplicas,width,offset,consuming);
+      G4VPVParameterisation* pP = fpCurrentPV->GetParameterisation();
+      G4cout << " (" << nReplicas;
+      if (pP) {
+	G4cout << " parametrised volumes)";
+      }
+      else {
+	G4cout << " replicas)";
+      }
+    }
+  }
+  else {
+    if (fLVSet.find(fpCurrentLV) != fLVSet.end()) {
+      if (verbosity <  10) {
+	// Add printing for repeated logical volume...
+	G4cout << " (repeated logical volume)";
+	// Ignore if an already treated logical volume.
+	if (fpCurrentPV) {
+	  ((G4PhysicalVolumeModel*)fpModel)->CurtailDescent();
+	  G4cout << G4endl;
+	  return;
+	}
+      }
+    }
+  }
+
+  if (fLVSet.find(fpCurrentLV) == fLVSet.end()) {
+    fLVSet.insert(fpCurrentLV);  // Record new logical volume.
+  }
+
+  G4cout << G4endl;
+  return;
+}
diff --git a/source/visualization/Tree/src/G4ASCIITreeViewer.cc b/source/visualization/Tree/src/G4ASCIITreeViewer.cc
new file mode 100644
index 0000000000..bcaa6ce669
--- /dev/null
+++ b/source/visualization/Tree/src/G4ASCIITreeViewer.cc
@@ -0,0 +1,36 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4ASCIITreeViewer.cc,v 1.3.2.1 2001/06/28 19:15:56 gunter Exp $
+// GEANT4 tag $Name:  $
+
+#include "G4ASCIITreeViewer.hh"
+
+#include "G4ios.hh"
+#include "g4std/strstream"
+
+G4ASCIITreeViewer::G4ASCIITreeViewer
+(G4VSceneHandler& sceneHandler, const G4String& name):
+  G4VTreeViewer(sceneHandler, name) {}
+
+G4ASCIITreeViewer::~G4ASCIITreeViewer() {}
diff --git a/source/visualization/Tree/src/G4GAGTree.cc b/source/visualization/Tree/src/G4GAGTree.cc
new file mode 100644
index 0000000000..1a907a5381
--- /dev/null
+++ b/source/visualization/Tree/src/G4GAGTree.cc
@@ -0,0 +1,70 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka 31th May 2001
+// A graphics system to dump geometry hierarchy to GAG.
+
+#include "G4GAGTree.hh"
+#include "G4GAGTreeSceneHandler.hh"
+#include "G4GAGTreeViewer.hh"
+#include "G4GAGTreeMessenger.hh"
+
+G4GAGTree::G4GAGTree ():
+  G4VTree ("GAGTree",
+	   "GAGTree",
+	   "A graphics system to dump geometry hierarchy"
+	   "\n  to GAG.",
+	   G4VGraphicsSystem::nonEuclidian) {
+  fpMessenger = new G4GAGTreeMessenger(this);
+}
+
+G4GAGTree::~G4GAGTree () {
+  delete fpMessenger;
+}
+
+G4VSceneHandler* G4GAGTree::CreateSceneHandler (const G4String& name) {
+  G4VSceneHandler* pScene = new G4GAGTreeSceneHandler (*this, name);
+  G4cout << G4GAGTreeSceneHandler::GetSceneCount ()
+	 << ' ' << fName << " scene handlers extanct." << G4endl;
+  return pScene;
+}
+
+G4VViewer* G4GAGTree::CreateViewer (G4VSceneHandler& scene,
+				  const G4String& name) {
+  G4VViewer* pView =
+    new G4GAGTreeViewer ((G4GAGTreeSceneHandler&) scene, name);
+  if (pView) {
+    if (pView -> GetViewId () < 0) {
+      G4cerr << "G4GAGTree::CreateViewer: error flagged by negative"
+        " view id in G4GAGTreeViewer creation."
+        "\n Destroying view and returning null pointer."
+           << G4endl;
+      delete pView;
+      pView = 0;
+    }
+  }
+  else {
+    G4cerr << "G4GAGTree::CreateViewer: null pointer on"
+      " new G4GAGTreeViewer." << G4endl;
+  }
+  return pView;
+}
diff --git a/source/visualization/Tree/src/G4GAGTreeMessenger.cc b/source/visualization/Tree/src/G4GAGTreeMessenger.cc
new file mode 100644
index 0000000000..41f4ac514c
--- /dev/null
+++ b/source/visualization/Tree/src/G4GAGTreeMessenger.cc
@@ -0,0 +1,66 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka 31th May 2001
+//
+// A messenger for G4GAGTree driver.
+
+#include "G4GAGTreeMessenger.hh"
+
+#include "G4GAGTree.hh"
+#include "G4UIcommand.hh"
+#include "G4UIdirectory.hh"
+#include "G4UIcmdWithAnInteger.hh"
+
+G4GAGTreeMessenger::G4GAGTreeMessenger
+(G4GAGTree* GAGTree):
+  fpGAGTree(GAGTree) {
+  G4bool omitable, currentAsDefault;
+  fpDirectory = new G4UIdirectory ("/vis/GAGTree/");
+  fpDirectory -> SetGuidance ("Commands for GAGTree control.");
+  fpCommandVerbose = new G4UIcmdWithAnInteger ("/vis/GAGTree/verbose", this);
+  fpCommandVerbose -> SetGuidance ("/vis/GAGTree/verbose [<verbosity>]");
+  fpCommandVerbose -> SetGuidance
+    ("0 (default) mimimum - 10 maximum printing.");
+  fpCommandVerbose -> SetParameterName ("verbosity",
+					omitable = true,
+					currentAsDefault = true);
+}
+
+G4GAGTreeMessenger::~G4GAGTreeMessenger() {
+  delete fpCommandVerbose;
+  delete fpDirectory;
+}
+
+G4String G4GAGTreeMessenger::GetCurrentValue
+(G4UIcommand* command) {
+  return "0";
+}
+
+void G4GAGTreeMessenger::SetNewValue
+(G4UIcommand* command, G4String newValue) {
+  fpGAGTree->SetVerbosity
+    (fpCommandVerbose->GetNewIntValue(newValue));
+  G4cout << "G4GAGTree verbosity now "
+	 << fpGAGTree->GetVerbosity()
+	 << G4endl;  
+}
diff --git a/source/visualization/Tree/src/G4GAGTreeSceneHandler.cc b/source/visualization/Tree/src/G4GAGTreeSceneHandler.cc
new file mode 100644
index 0000000000..e6f12b956e
--- /dev/null
+++ b/source/visualization/Tree/src/G4GAGTreeSceneHandler.cc
@@ -0,0 +1,296 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka  31th May 2001
+// A scene handler to dump geometry hierarchy to GAG.
+
+#include "g4std/strstream"
+
+#include "G4GAGTreeSceneHandler.hh"
+
+#include "G4GAGTree.hh"
+#include "G4VSolid.hh"
+#include "G4PhysicalVolumeModel.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4LogicalVolume.hh"
+#include "G4VPVParameterisation.hh"
+
+// #define DEBUG_GAG_TREE
+
+const G4String  GAG_TREE_WORLD_VOLUME_NAME ( "WORLD" ); 
+const G4String  GAG_TREE_BEGIN_DTREE       ( "@@DTREEBegin" ); 
+const G4String  GAG_TREE_END_DTREE         ( "@@DTREEEnd" ); 
+
+
+//-----
+G4GAGTreeSceneHandler::G4GAGTreeSceneHandler(G4VGraphicsSystem& system,
+						 const G4String& name):
+  G4VTreeSceneHandler(system, name) 
+{
+  ClearPVList();
+}
+
+//-----
+G4GAGTreeSceneHandler::~G4GAGTreeSceneHandler () 
+{
+  ClearPVList();
+}
+
+//-----
+void G4GAGTreeSceneHandler::ClearPVList(void)
+{ 
+  fPVNameList.Clear() ;  
+
+  fPrevDepth = 0 ; 
+  fPrevAbsPVName = "";
+  fPVCounter = 0 ;
+} 
+
+//-----
+void G4GAGTreeSceneHandler::InitializePVList(void)
+{ 
+  fPVNameList.Clear(); 
+  fPVNameList.Push( GAG_TREE_WORLD_VOLUME_NAME ); 
+
+  fPrevDepth = 0 ; 
+  fPrevAbsPVName = ""; 
+  fPVCounter = 0 ;
+} 
+
+//-----
+void G4GAGTreeSceneHandler::BeginModeling () 
+{
+  // To re-use "culling off" code.
+  G4VTreeSceneHandler::BeginModeling ();  
+
+  // Initialize the stack the the tree generation
+  InitializePVList();
+
+  // Get the current verbosity level 
+  const G4GAGTree* pSystem = (G4GAGTree*)GetGraphicsSystem();
+  const G4int verbosity = pSystem->GetVerbosity();
+
+  // Beginning of the tree output
+  G4cout << "\nG4GAGTreeSceneHandler::BeginModeling:"
+    "\n  set verbosity with \"/vis/GAGTree/verbose <verbosity>\":"
+    "\n  <  10: - does not print daughters of repeated logical volumes."
+    "\n         - does not repeat replicas."
+    "\n  >= 10: prints all physical volumes."
+    "\n          FORMAT: PV_name.copy_no.index"
+    "\n  For level of detail add:"
+    "\n  >=  0: prints physical volume name and copy number."
+    "\n          FORMAT: PV_name.copy_no.index"
+    "\n  >=  1: prints logical volume name."
+    "\n          FORMAT: PV_name.copy_no.LV_name.index"
+    "\n  >=  2: prints solid name and type."
+    "\n          FORMAT: PV_name.copy_no.LV_name.solid_name.solid_type.index"
+    "\n  Note: all culling, if any, is switched off so all volumes are seen."
+    "\n  Now printing with verbosity " << verbosity << G4endl;
+
+  // Declare to start GAG tree
+  G4cout << GAG_TREE_BEGIN_DTREE << G4endl;
+
+}
+
+void G4GAGTreeSceneHandler::EndModeling () 
+{
+  // Dump the last PV node
+  if( fPrevAbsPVName != "" ) { G4cout << fPrevAbsPVName << G4endl; }
+
+  // Declare to end GAG tree
+  G4cout << GAG_TREE_END_DTREE << G4endl;
+  G4cout << "G4GAGTreeSceneHandler::EndModeling" << G4endl;
+
+  // Clear the sets
+  fLVSet.clear();
+  fReplicaSet.clear();
+
+  // Clear the stack for the tree generation
+  ClearPVList();
+
+  // To re-use "culling off" code.
+  G4VTreeSceneHandler::EndModeling ();  
+}
+
+void G4GAGTreeSceneHandler::Dump (const G4VSolid& solid) 
+{
+//////////////////////////////
+  G4String        cur_abs_pv_name ;
+  G4String        pv_name_tmp ;
+  G4String        cur_pv_name ( fpCurrentPV->GetName() ) ; 
+//////////////////////////////
+
+  const G4GAGTree* pSystem = (G4GAGTree*)GetGraphicsSystem();
+  const G4int verbosity = pSystem->GetVerbosity();
+  const G4int detail = verbosity % 10;
+
+  if (verbosity < 10 && fReplicaSet.find(fpCurrentPV) != fReplicaSet.end()) {
+    // Ignore if an already treated replica.  (Assumes that the model
+    // which has invoked this function is a G4PhysicalVolumeModel - we
+    // check this by testing fpCurrentPV.)
+    if (fpCurrentPV) {
+      ((G4PhysicalVolumeModel*)fpModel)->CurtailDescent();
+      return;
+    }
+  }
+
+
+///////////////////////////////////////////////////////////
+  // Add the extension ".details.index" to the current PV node
+
+    // Step 1: Initialize the extension
+  const int CHAR_LENGTH = 1024;
+  char pv_ext [CHAR_LENGTH];  pv_ext[0] = '\0';
+  G4std::ostrstream ost (pv_ext, CHAR_LENGTH);
+
+    // Step 2: Generate the extension
+      // copy number 
+  ost << "." << fpCurrentPV->GetCopyNo() ;
+  if (detail >= 1) {
+      // LV name
+    ost << "." << fpCurrentLV->GetName() ; 
+  }
+  if (detail >= 2) {
+      // Solid info
+    ost << "." << fpCurrentLV->GetSolid()->GetName();
+    ost	<< "." << fpCurrentLV->GetSolid()->GetEntityType() ;
+  }
+      // Tree index (0 for the world) 
+  ost << "." << fPVCounter << '\0' ; 
+
+    // Step 3: Add the extention to the current PV name
+  cur_pv_name += pv_ext ;            
+
+  // End of adding extension
+
+
+  // Search a mother PV node for the current PV
+  //  in the direction to the root node.
+  //  depth_mother = depth_current - 1 
+  if( fCurrentDepth >  fPrevDepth )
+  {
+    // Do nothing (The mother is the previous PV node)
+
+  } else { 
+
+    while (1) 
+    {
+      // Delete the head item of the list
+      fPVNameList.Pop();
+
+      // Is the right mother at the head of the list?
+      //  Note: The mother of the world has depth -1.
+      //        It happens when the current node is the world volume, 
+      //        and so the list becomes empty with the popping above.
+
+      G4int trial_mother_depth = fPVNameList.GetHeadIndex() ;
+      if ( fCurrentDepth > trial_mother_depth ) break ;
+    } 
+
+  } // if-else
+
+  // Add the curent PV to the tree as a new node/leaf
+  fPVNameList.Push( cur_pv_name );
+
+  // Make the absolute path name
+  fPVNameList.ToTail() ;
+  while ( fPVNameList.GetItem ( pv_name_tmp ) ) {
+        cur_abs_pv_name +=  "/" ;
+	cur_abs_pv_name += pv_name_tmp ;
+        fPVNameList.Upward();
+  }
+
+
+  // Add "/"  to the PREVIOUS PV node name if it is not a leaf.
+  if( fPrevAbsPVName != "" ) 
+  { 
+    // Add "/"
+    if( fCurrentDepth > fPrevDepth ) {fPrevAbsPVName += "/" ;}
+  } 
+
+  // Print the PREVIOUS node after node/leaf distiction 
+  //  is made clear by reading the current node.
+   if( fPrevAbsPVName != "" ) { G4cout << fPrevAbsPVName ; }
+///////////////////////////////////////////////////////////
+
+
+  if (fpCurrentPV->IsReplicated()) {
+    fReplicaSet.insert(fpCurrentPV);  // Record new replica volume.
+    if (verbosity < 10) {
+      // Add printing for replicas (when replicas are ignored)...
+      EAxis axis;
+      G4int nReplicas;
+      G4double width;
+      G4double offset;
+      G4bool consuming;
+      fpCurrentPV->GetReplicationData(axis,nReplicas,width,offset,consuming);
+      G4VPVParameterisation* pP = fpCurrentPV->GetParameterisation();
+#if defined DEBUG_GAG_TREE
+      G4cout << "_(" << nReplicas;
+#endif
+      if (pP) {
+#if defined DEBUG_GAG_TREE
+	G4cout << " parametrised volumes)";
+#endif
+      }
+      else {
+#if defined DEBUG_GAG_TREE
+	G4cout << " replicas)";
+#endif
+      }
+    }
+  }
+  else {
+    if (fLVSet.find(fpCurrentLV) != fLVSet.end()) {
+      if (verbosity <  10) {
+	// Add printing for repeated logical volume...
+#if defined DEBUG_GAG_TREE
+	G4cout << " (repeated logical volume)";
+#endif
+	// Ignore if an already treated logical volume.
+	if (fpCurrentPV) {
+	  ((G4PhysicalVolumeModel*)fpModel)->CurtailDescent();
+	  G4cout << G4endl;
+	  return;
+	}
+      }
+    }
+  }
+
+  if (fLVSet.find(fpCurrentLV) == fLVSet.end()) {
+    fLVSet.insert(fpCurrentLV);  // Record new logical volume.
+  }
+
+
+////////////////////////
+  // End of printing
+  if( fPrevAbsPVName != "" ) { G4cout << G4endl;}
+
+  // Prepare for the next call, i.e. the next PV.
+  fPrevDepth     = fCurrentDepth ;
+  fPrevAbsPVName = cur_abs_pv_name ;
+  fPVCounter++ ;
+////////////////////////
+
+
+  return;
+}
diff --git a/source/visualization/Tree/src/G4GAGTreeViewer.cc b/source/visualization/Tree/src/G4GAGTreeViewer.cc
new file mode 100644
index 0000000000..d9af8f3ae9
--- /dev/null
+++ b/source/visualization/Tree/src/G4GAGTreeViewer.cc
@@ -0,0 +1,35 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+// Satoshi Tanaka  31th May 2001
+// A dummy viewer for GAGTreeSceneHandler.
+
+#include "G4GAGTreeViewer.hh"
+
+#include "G4ios.hh"
+#include "g4std/strstream"
+
+G4GAGTreeViewer::G4GAGTreeViewer
+(G4VSceneHandler& sceneHandler, const G4String& name):
+  G4VTreeViewer(sceneHandler, name) {}
+
+G4GAGTreeViewer::~G4GAGTreeViewer() {}
diff --git a/source/visualization/Tree/src/G4VTree.cc b/source/visualization/Tree/src/G4VTree.cc
new file mode 100644
index 0000000000..ea753695f7
--- /dev/null
+++ b/source/visualization/Tree/src/G4VTree.cc
@@ -0,0 +1,44 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTree.cc,v 1.3.2.1 2001/06/28 19:15:57 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A graphics system to dump geometry hierarchy.
+
+#include "G4VTree.hh"
+#include "G4VTreeSceneHandler.hh"
+#include "G4VTreeViewer.hh"
+
+G4VTree::G4VTree (const G4String& name,
+		  const G4String& nickname,
+		  const G4String& description,
+		  Functionality f):
+  G4VGraphicsSystem (name,
+		     nickname,
+		     description,
+		     f) {}
+
+G4VTree::~G4VTree () {}
diff --git a/source/visualization/Tree/src/G4VTreeSceneHandler.cc b/source/visualization/Tree/src/G4VTreeSceneHandler.cc
new file mode 100644
index 0000000000..009a2f9ae8
--- /dev/null
+++ b/source/visualization/Tree/src/G4VTreeSceneHandler.cc
@@ -0,0 +1,86 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTreeSceneHandler.cc,v 1.4.2.1 2001/06/28 19:15:57 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  5th April 2001
+// A base class for a scene handler to dump geometry hierarchy.
+// Based on a provisional G4VTreeGraphicsScene (was in modeling).
+
+#include "G4VTreeSceneHandler.hh"
+
+#include "G4VSolid.hh"
+#include "G4PhysicalVolumeModel.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4LogicalVolume.hh"
+#include "G4ModelingParameters.hh"
+
+G4int G4VTreeSceneHandler::fSceneIdCount = 0;
+// Counter for Tree scene handlers.
+
+G4int G4VTreeSceneHandler::fSceneCount = 0;
+// No. of extanct scene handlers.
+
+G4VTreeSceneHandler::G4VTreeSceneHandler(G4VGraphicsSystem& system,
+					 const G4String& name):
+  G4VSceneHandler(system, fSceneIdCount++, name),
+  fCurrentDepth                 (0),
+  fpCurrentPV                   (0),
+  fpCurrentLV                   (0),
+  fpCurrentObjectTransformation (0)
+{
+  fSceneCount++;
+}
+
+G4VTreeSceneHandler::~G4VTreeSceneHandler () {}
+
+void G4VTreeSceneHandler::EstablishSpecials
+(G4PhysicalVolumeModel& pvModel) {
+  pvModel.DefinePointersToWorkingSpace (&fCurrentDepth,
+					&fpCurrentPV,
+					&fpCurrentLV);
+}
+
+void G4VTreeSceneHandler::BeginModeling() {
+  G4VSceneHandler::BeginModeling();  // Required: see G4VSceneHandler.hh.
+  // Force culling off...
+  if (fpModel) {
+    fpOriginalMP = fpModel->GetModelingParameters();
+    if (fpOriginalMP) {
+      fpNonCullingMP = new G4ModelingParameters(*fpOriginalMP);
+      fpNonCullingMP->SetCulling(false);
+      ((G4VModel*)fpModel)->SetModelingParameters(fpNonCullingMP);
+      // Note the deliberate casting away of const.
+    }
+  }
+}
+
+void G4VTreeSceneHandler::EndModeling() {
+  if (fpModel && fpOriginalMP) {
+    ((G4VModel*)fpModel)->SetModelingParameters(fpOriginalMP);
+    delete fpNonCullingMP;
+  }
+  G4VSceneHandler::EndModeling();  // Required: see G4VSceneHandler.hh.
+}
diff --git a/source/visualization/Tree/src/G4VTreeViewer.cc b/source/visualization/Tree/src/G4VTreeViewer.cc
new file mode 100644
index 0000000000..f5076877d4
--- /dev/null
+++ b/source/visualization/Tree/src/G4VTreeViewer.cc
@@ -0,0 +1,47 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4VTreeViewer.cc,v 1.3.2.1 2001/06/28 19:15:57 gunter Exp $
+// GEANT4 tag $Name:  $
+
+#include "G4VTreeViewer.hh"
+
+#include "G4ios.hh"
+#include "g4std/strstream"
+
+#include "G4VSceneHandler.hh"
+
+G4VTreeViewer::G4VTreeViewer
+(G4VSceneHandler& sceneHandler, const G4String& name):
+  G4VViewer(sceneHandler, sceneHandler.IncrementViewCount(), name) {}
+
+G4VTreeViewer::~G4VTreeViewer() {}
+
+void G4VTreeViewer::SetView() {}
+
+void G4VTreeViewer::ClearView() {}
+
+void G4VTreeViewer::DrawView() {
+  NeedKernelVisit ();  // Always need to visit G4 kernel.
+  ProcessView ();
+}
diff --git a/source/visualization/VRML/g4vrmlview/g4mini.java b/source/visualization/VRML/g4vrmlview/g4mini.java
index a8d06511c3..282d2d9fab 100644
--- a/source/visualization/VRML/g4vrmlview/g4mini.java
+++ b/source/visualization/VRML/g4vrmlview/g4mini.java
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: g4mini.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: g4mini.java,v 1.2.4.1 2001/06/28 19:15:57 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/g4vrmlview/g4vrmlview.java b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
index bc2e895839..fd7f0ea78a 100644
--- a/source/visualization/VRML/g4vrmlview/g4vrmlview.java
+++ b/source/visualization/VRML/g4vrmlview/g4vrmlview.java
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: g4vrmlview.java,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: g4vrmlview.java,v 1.2.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 import java.io.*;
 import java.net.*;
diff --git a/source/visualization/VRML/include/FRClient.h b/source/visualization/VRML/include/FRClient.h
index dcef4039e3..1483666d84 100644
--- a/source/visualization/VRML/include/FRClient.h
+++ b/source/visualization/VRML/include/FRClient.h
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: FRClient.h,v 1.2 1999/12/15 14:54:13 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: FRClient.h,v 1.2.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // FRClient.h
 // FukuiRenderer Client
diff --git a/source/visualization/VRML/include/G4FRClient.hh b/source/visualization/VRML/include/G4FRClient.hh
index 93bc547eb9..3803a5c410 100644
--- a/source/visualization/VRML/include/G4FRClient.hh
+++ b/source/visualization/VRML/include/G4FRClient.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRClient.hh,v 1.4 1999/12/27 07:49:11 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRClient.hh,v 1.4.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4FRClient.hh
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1.hh b/source/visualization/VRML/include/G4VRML1.hh
index cad292d0d2..534ad8ad2d 100644
--- a/source/visualization/VRML/include/G4VRML1.hh
+++ b/source/visualization/VRML/include/G4VRML1.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1.hh,v 1.6.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1.hh
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1File.hh b/source/visualization/VRML/include/G4VRML1File.hh
index 3e2e594cdc..c5eab25571 100644
--- a/source/visualization/VRML/include/G4VRML1File.hh
+++ b/source/visualization/VRML/include/G4VRML1File.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1File.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1File.hh,v 1.6.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
index 89548ac1d0..de71d7b72b 100644
--- a/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1FileSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1FileSceneHandler.hh,v 1.6 1999/12/16 17:25:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1FileSceneHandler.hh,v 1.6.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1FileViewer.hh b/source/visualization/VRML/include/G4VRML1FileViewer.hh
index db9602711e..2dc8ea5a0b 100644
--- a/source/visualization/VRML/include/G4VRML1FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML1FileViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1FileViewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1FileViewer.hh,v 1.4.4.1 2001/06/28 19:16:00 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1FileViewer.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML1SceneHandler.hh b/source/visualization/VRML/include/G4VRML1SceneHandler.hh
index fee18a2600..57a0bf66ef 100644
--- a/source/visualization/VRML/include/G4VRML1SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML1SceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1SceneHandler.hh,v 1.6 1999/12/16 17:25:12 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1SceneHandler.hh,v 1.6.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1SceneHandler.hh
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/include/G4VRML1Viewer.hh b/source/visualization/VRML/include/G4VRML1Viewer.hh
index 174fd48ebc..46bf7878d8 100644
--- a/source/visualization/VRML/include/G4VRML1Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML1Viewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1Viewer.hh,v 1.4 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1Viewer.hh,v 1.4.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2.hh b/source/visualization/VRML/include/G4VRML2.hh
index 480183bec0..0d1fd20b27 100644
--- a/source/visualization/VRML/include/G4VRML2.hh
+++ b/source/visualization/VRML/include/G4VRML2.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2.hh,v 1.6 1999/12/15 14:54:14 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2.hh,v 1.6.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2File.hh b/source/visualization/VRML/include/G4VRML2File.hh
index c1aedfcc5e..5571c8a709 100644
--- a/source/visualization/VRML/include/G4VRML2File.hh
+++ b/source/visualization/VRML/include/G4VRML2File.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2File.hh,v 1.6 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2File.hh,v 1.6.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2File.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
index fc1a5e4438..a84efca3e2 100644
--- a/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2FileSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2FileSceneHandler.hh,v 1.5 1999/12/16 17:25:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2FileSceneHandler.hh,v 1.5.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2FileSceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2FileViewer.hh b/source/visualization/VRML/include/G4VRML2FileViewer.hh
index fb2f1c0126..f680a1340d 100644
--- a/source/visualization/VRML/include/G4VRML2FileViewer.hh
+++ b/source/visualization/VRML/include/G4VRML2FileViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2FileViewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2FileViewer.hh,v 1.4.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2FileViewer.hh
 // Satoshi Tanaka and Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2SceneHandler.hh b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
index ace8e1f8a8..a7d20c68d6 100644
--- a/source/visualization/VRML/include/G4VRML2SceneHandler.hh
+++ b/source/visualization/VRML/include/G4VRML2SceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2SceneHandler.hh,v 1.5 1999/12/16 17:25:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2SceneHandler.hh,v 1.5.4.1 2001/06/28 19:16:01 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2SceneHandler.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRML2Viewer.hh b/source/visualization/VRML/include/G4VRML2Viewer.hh
index 8d69d32210..111b06ecfd 100644
--- a/source/visualization/VRML/include/G4VRML2Viewer.hh
+++ b/source/visualization/VRML/include/G4VRML2Viewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2Viewer.hh,v 1.4 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2Viewer.hh,v 1.4.4.1 2001/06/28 19:16:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2Viewer.hh
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/include/G4VRMLNetConfig.hh b/source/visualization/VRML/include/G4VRMLNetConfig.hh
index 6215915805..84af6e0fab 100644
--- a/source/visualization/VRML/include/G4VRMLNetConfig.hh
+++ b/source/visualization/VRML/include/G4VRMLNetConfig.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRMLNetConfig.hh,v 1.3 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRMLNetConfig.hh,v 1.3.4.1 2001/06/28 19:16:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRMLNetConfig.hh
 // Satoshi Tanaka
diff --git a/source/visualization/VRML/src/FRClient.cc b/source/visualization/VRML/src/FRClient.cc
index ac779e3718..7546a38757 100644
--- a/source/visualization/VRML/src/FRClient.cc
+++ b/source/visualization/VRML/src/FRClient.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: FRClient.cc,v 1.3 1999/12/15 14:54:15 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: FRClient.cc,v 1.3.4.1 2001/06/28 19:16:02 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // FRClient.cc
 // FukuiRenderer Client
diff --git a/source/visualization/VRML/src/G4FRClient.cc b/source/visualization/VRML/src/G4FRClient.cc
index 1b56a8e6de..48319691af 100644
--- a/source/visualization/VRML/src/G4FRClient.cc
+++ b/source/visualization/VRML/src/G4FRClient.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FRClient.cc,v 1.4 1999/12/27 07:49:22 stanaka Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FRClient.cc,v 1.4.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4FRClient.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1.cc b/source/visualization/VRML/src/G4VRML1.cc
index 317ceff8e5..4b25e80899 100644
--- a/source/visualization/VRML/src/G4VRML1.cc
+++ b/source/visualization/VRML/src/G4VRML1.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1.cc,v 1.5 2000/08/19 18:34:54 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1.cc,v 1.5.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1File.cc b/source/visualization/VRML/src/G4VRML1File.cc
index d7b40dc43f..f612063471 100644
--- a/source/visualization/VRML/src/G4VRML1File.cc
+++ b/source/visualization/VRML/src/G4VRML1File.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1File.cc,v 1.5 2000/08/19 18:34:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1File.cc,v 1.5.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1File.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
index eaf46ad5d2..6a251ba565 100644
--- a/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1FileSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1FileSceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1FileSceneHandler.cc,v 1.4.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1FileViewer.cc b/source/visualization/VRML/src/G4VRML1FileViewer.cc
index 444cad1f10..d50fcafd98 100644
--- a/source/visualization/VRML/src/G4VRML1FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML1FileViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1FileViewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1FileViewer.cc,v 1.4.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRMLView.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandler.cc b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
index f0fb84a404..1e25926121 100644
--- a/source/visualization/VRML/src/G4VRML1SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML1SceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1SceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1SceneHandler.cc,v 1.4.4.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1SceneHandler.cc
 // Yasuhide Sawada and Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
index 6c9999563b..47504c9519 100644
--- a/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
+++ b/source/visualization/VRML/src/G4VRML1SceneHandlerFunc.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1SceneHandlerFunc.icc,v 1.6 2001/01/25 15:28:11 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1SceneHandlerFunc.icc,v 1.7.2.1 2001/06/28 19:16:03 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML1SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -223,18 +239,18 @@ void G4VRML1SCENE::AddPrimitive(const G4Polyline& polyline)
 	fDest << "\t" << "Coordinate3 {" << "\n";
 	fDest << "\t\t" << "point [" << "\n";
 	G4int e, i;
-	for (i = 0, e = polyline.entries(); e; i++, e--) {
+	for (i = 0, e = polyline.size(); e; i++, e--) {
 		fDest << "\t\t\t";
-		fDest << polyline(i).x() << " ";
-		fDest << polyline(i).y() << " ";
-		fDest << polyline(i).z() << "," << "\n";
+		fDest << polyline[i].x() << " ";
+		fDest << polyline[i].y() << " ";
+		fDest << polyline[i].z() << "," << "\n";
 	}
 	fDest << "\t\t" << "]" << "\n";
 	fDest << "\t" << "}" << "\n"; // Coordinate3
 
 	fDest << "\t" << "IndexedLineSet {" << "\n";
 	fDest << "\t\t" << "coordIndex [";
-	for (i = 0, e = polyline.entries(); e; i++, e--) {
+	for (i = 0, e = polyline.size(); e; i++, e--) {
 		if (i % 10 == 0)
 			fDest << "\n" << "\t\t\t";
 		fDest << i << ", ";
diff --git a/source/visualization/VRML/src/G4VRML1Viewer.cc b/source/visualization/VRML/src/G4VRML1Viewer.cc
index 47e3e0f341..b9c6ae78d1 100644
--- a/source/visualization/VRML/src/G4VRML1Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML1Viewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML1Viewer.cc,v 1.4 1999/12/15 14:54:16 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML1Viewer.cc,v 1.4.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRMLView.cc
 // Yasuhide Sawada & Satoshi Tanaka
diff --git a/source/visualization/VRML/src/G4VRML2.cc b/source/visualization/VRML/src/G4VRML2.cc
index e09177772f..06976e4164 100644
--- a/source/visualization/VRML/src/G4VRML2.cc
+++ b/source/visualization/VRML/src/G4VRML2.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2.cc,v 1.5 2000/08/19 18:34:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2.cc,v 1.5.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2File.cc b/source/visualization/VRML/src/G4VRML2File.cc
index 4d0f0d3d66..a8e2ca8ae0 100644
--- a/source/visualization/VRML/src/G4VRML2File.cc
+++ b/source/visualization/VRML/src/G4VRML2File.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2File.cc,v 1.5 2000/08/19 18:35:02 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2File.cc,v 1.5.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2File.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
index 4718ef897b..4ba81aa6ef 100644
--- a/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2FileSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2FileSceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2FileSceneHandler.cc,v 1.4.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2FileSceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2FileViewer.cc b/source/visualization/VRML/src/G4VRML2FileViewer.cc
index 00563a1b5c..49befb9c74 100644
--- a/source/visualization/VRML/src/G4VRML2FileViewer.cc
+++ b/source/visualization/VRML/src/G4VRML2FileViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2FileViewer.cc,v 1.5 2000/05/13 10:55:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2FileViewer.cc,v 1.5.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2FileViewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandler.cc b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
index 9a1aba614c..05f1b7879a 100644
--- a/source/visualization/VRML/src/G4VRML2SceneHandler.cc
+++ b/source/visualization/VRML/src/G4VRML2SceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2SceneHandler.cc,v 1.4 2000/04/27 13:56:16 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2SceneHandler.cc,v 1.4.4.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2SceneHandler.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
index 534dbc0697..248682dcbb 100644
--- a/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
+++ b/source/visualization/VRML/src/G4VRML2SceneHandlerFunc.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2SceneHandlerFunc.icc,v 1.6 2001/01/25 15:28:13 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2SceneHandlerFunc.icc,v 1.7.2.1 2001/06/28 19:16:04 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2SceneHandlerFunc.icc
 // Satoshi Tanaka & Yasuhide Sawada
@@ -118,9 +134,9 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyline& polyline)
 	fDest << "\t\t"   << "coord Coordinate {" << "\n";
 	fDest << "\t\t\t" <<      "point [" << "\n";
 	G4int e, i;
-	for (i = 0, e = polyline.entries(); e; i++, e--) {
+	for (i = 0, e = polyline.size(); e; i++, e--) {
 
-		G4Point3D point = polyline(i);
+		G4Point3D point = polyline[i];
 		point.transform( *fpObjectTransformation );
 
 		fDest << "\t\t\t\t";
@@ -134,7 +150,7 @@ void G4VRML2SCENE::AddPrimitive(const G4Polyline& polyline)
 	fDest << "\t\t"   << "}"      << "\n"; // coord
 
 	fDest << "\t\t" << "coordIndex [";
-	for (i = 0, e = polyline.entries(); e; i++, e--) {
+	for (i = 0, e = polyline.size(); e; i++, e--) {
 		if (i % 10 == 0)
 			fDest << "\n" << "\t\t\t";
 		fDest << i << ", ";
diff --git a/source/visualization/VRML/src/G4VRML2Viewer.cc b/source/visualization/VRML/src/G4VRML2Viewer.cc
index a03f86f878..87ea14788a 100644
--- a/source/visualization/VRML/src/G4VRML2Viewer.cc
+++ b/source/visualization/VRML/src/G4VRML2Viewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VRML2Viewer.cc,v 1.6 2000/05/13 10:55:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VRML2Viewer.cc,v 1.6.4.1 2001/06/28 19:16:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VRML2Viewer.cc
 // Satoshi Tanaka & Yasuhide Sawada
diff --git a/source/visualization/management/include/G4GraphicsSystemList.hh b/source/visualization/management/include/G4GraphicsSystemList.hh
index 9790d43901..ada48a11dd 100644
--- a/source/visualization/management/include/G4GraphicsSystemList.hh
+++ b/source/visualization/management/include/G4GraphicsSystemList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GraphicsSystemList.hh,v 1.6 2001/03/07 14:37:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GraphicsSystemList.hh,v 1.6.2.1 2001/06/28 19:16:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  2nd April 1996
diff --git a/source/visualization/management/include/G4Scene.hh b/source/visualization/management/include/G4Scene.hh
index d422314598..287e406b9b 100644
--- a/source/visualization/management/include/G4Scene.hh
+++ b/source/visualization/management/include/G4Scene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Scene.hh,v 1.8 2001/02/23 15:43:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Scene.hh,v 1.8.2.1 2001/06/28 19:16:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Scene  John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4Scene.icc b/source/visualization/management/include/G4Scene.icc
index a29252c31f..713f82d485 100644
--- a/source/visualization/management/include/G4Scene.icc
+++ b/source/visualization/management/include/G4Scene.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Scene.icc,v 1.7 2001/02/23 15:43:15 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Scene.icc,v 1.7.2.1 2001/06/28 19:16:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Scene data  John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4SceneHandlerList.hh b/source/visualization/management/include/G4SceneHandlerList.hh
index a0ba6fc25c..efba7eebac 100644
--- a/source/visualization/management/include/G4SceneHandlerList.hh
+++ b/source/visualization/management/include/G4SceneHandlerList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SceneHandlerList.hh,v 1.5 2001/03/07 14:37:41 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SceneHandlerList.hh,v 1.5.2.1 2001/06/28 19:16:05 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  May 1996
diff --git a/source/visualization/management/include/G4SceneList.hh b/source/visualization/management/include/G4SceneList.hh
index 886ef1e688..f421056c62 100644
--- a/source/visualization/management/include/G4SceneList.hh
+++ b/source/visualization/management/include/G4SceneList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SceneList.hh,v 1.7 2001/03/07 14:37:42 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SceneList.hh,v 1.7.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  9th August 1998
diff --git a/source/visualization/management/include/G4VGraphicsSystem.hh b/source/visualization/management/include/G4VGraphicsSystem.hh
index a6ce013fcb..fe3dbaeb47 100644
--- a/source/visualization/management/include/G4VGraphicsSystem.hh
+++ b/source/visualization/management/include/G4VGraphicsSystem.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGraphicsSystem.hh,v 1.7 2001/02/23 15:43:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGraphicsSystem.hh,v 1.8.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  27th March 1996
@@ -29,6 +45,7 @@ public: // With description
 
   enum Functionality {
     noFunctionality,
+    nonEuclidian,       // e.g., tree representation of geometry hierarchy.
     twoD,               // Simple 2D, e.g., X (no stored structures).
     twoDStore,          // 2D with stored structures.
     threeD,             // Passive 3D (with stored structures).
diff --git a/source/visualization/management/include/G4VGraphicsSystem.icc b/source/visualization/management/include/G4VGraphicsSystem.icc
index 5ba0ab1da0..a38331e1f4 100644
--- a/source/visualization/management/include/G4VGraphicsSystem.icc
+++ b/source/visualization/management/include/G4VGraphicsSystem.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGraphicsSystem.icc,v 1.5 2001/02/23 15:43:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGraphicsSystem.icc,v 1.5.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  27th March 1996
diff --git a/source/visualization/management/include/G4VSceneHandler.hh b/source/visualization/management/include/G4VSceneHandler.hh
index a372667e50..8812c34215 100644
--- a/source/visualization/management/include/G4VSceneHandler.hh
+++ b/source/visualization/management/include/G4VSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSceneHandler.hh,v 1.13 2001/02/23 15:43:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSceneHandler.hh,v 1.13.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4VSceneHandler.icc b/source/visualization/management/include/G4VSceneHandler.icc
index 01d46985b2..c63d3abd3f 100644
--- a/source/visualization/management/include/G4VSceneHandler.icc
+++ b/source/visualization/management/include/G4VSceneHandler.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSceneHandler.icc,v 1.9 2001/02/23 15:43:17 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSceneHandler.icc,v 1.9.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  19th July 1996.
diff --git a/source/visualization/management/include/G4VViewer.hh b/source/visualization/management/include/G4VViewer.hh
index b1b8572d01..e8c8c2fd89 100644
--- a/source/visualization/management/include/G4VViewer.hh
+++ b/source/visualization/management/include/G4VViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VViewer.hh,v 1.9 2001/02/23 15:43:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VViewer.hh,v 1.9.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  27th March 1996
diff --git a/source/visualization/management/include/G4VViewer.icc b/source/visualization/management/include/G4VViewer.icc
index a9ab0e2091..d53bb12858 100644
--- a/source/visualization/management/include/G4VViewer.icc
+++ b/source/visualization/management/include/G4VViewer.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VViewer.icc,v 1.7 2001/02/23 15:43:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VViewer.icc,v 1.7.2.1 2001/06/28 19:16:06 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  30th December 1996
diff --git a/source/visualization/management/include/G4VVisCommand.hh b/source/visualization/management/include/G4VVisCommand.hh
index 05f80e0835..758a265507 100644
--- a/source/visualization/management/include/G4VVisCommand.hh
+++ b/source/visualization/management/include/G4VVisCommand.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisCommand.hh,v 1.10 2001/03/28 14:11:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisCommand.hh,v 1.10.2.1 2001/06/28 19:16:07 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
diff --git a/source/visualization/management/include/G4VVisCommand.icc b/source/visualization/management/include/G4VVisCommand.icc
index d69e2b0de1..d65f7f39ef 100644
--- a/source/visualization/management/include/G4VVisCommand.icc
+++ b/source/visualization/management/include/G4VVisCommand.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisCommand.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisCommand.icc,v 1.3.4.1 2001/06/28 19:16:07 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
diff --git a/source/visualization/management/include/G4ViewParameters.hh b/source/visualization/management/include/G4ViewParameters.hh
index 3c2b0aaa90..038da44e7a 100644
--- a/source/visualization/management/include/G4ViewParameters.hh
+++ b/source/visualization/management/include/G4ViewParameters.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ViewParameters.hh,v 1.12 2001/03/07 14:30:12 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ViewParameters.hh,v 1.12.2.1 2001/06/28 19:16:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  19th July 1996
diff --git a/source/visualization/management/include/G4ViewParameters.icc b/source/visualization/management/include/G4ViewParameters.icc
index 71b3d74559..c891072cc9 100644
--- a/source/visualization/management/include/G4ViewParameters.icc
+++ b/source/visualization/management/include/G4ViewParameters.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ViewParameters.icc,v 1.4 2001/02/04 20:23:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ViewParameters.icc,v 1.4.2.1 2001/06/28 19:16:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  20th October 1996
diff --git a/source/visualization/management/include/G4ViewerList.hh b/source/visualization/management/include/G4ViewerList.hh
index 8f438dddcf..45d6bc5fc0 100644
--- a/source/visualization/management/include/G4ViewerList.hh
+++ b/source/visualization/management/include/G4ViewerList.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ViewerList.hh,v 1.5 2001/03/07 14:37:43 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ViewerList.hh,v 1.5.2.1 2001/06/28 19:16:07 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  May 1996
diff --git a/source/visualization/management/include/G4VisCommandTemplates.hh b/source/visualization/management/include/G4VisCommandTemplates.hh
index b806f59cbe..76f97f1504 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.hh
+++ b/source/visualization/management/include/G4VisCommandTemplates.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandTemplates.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandTemplates.hh,v 1.3.4.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Visualization Command Messenger Templates.
diff --git a/source/visualization/management/include/G4VisCommandTemplates.icc b/source/visualization/management/include/G4VisCommandTemplates.icc
index 273d75a0a8..dbe4829b02 100644
--- a/source/visualization/management/include/G4VisCommandTemplates.icc
+++ b/source/visualization/management/include/G4VisCommandTemplates.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandTemplates.icc,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandTemplates.icc,v 1.3.4.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Command Messenger Templates.
diff --git a/source/visualization/management/include/G4VisCommands.hh b/source/visualization/management/include/G4VisCommands.hh
index 26b434ea3d..e0d3ed2446 100644
--- a/source/visualization/management/include/G4VisCommands.hh
+++ b/source/visualization/management/include/G4VisCommands.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommands.hh,v 1.1 2001/02/23 15:04:02 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommands.hh,v 1.1.2.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/ top level commands - John Allison  5th February 2001
 
diff --git a/source/visualization/management/include/G4VisCommandsCamera.hh b/source/visualization/management/include/G4VisCommandsCamera.hh
index b29cf2d102..4c82aaad05 100644
--- a/source/visualization/management/include/G4VisCommandsCamera.hh
+++ b/source/visualization/management/include/G4VisCommandsCamera.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCamera.hh,v 1.3 1999/12/15 14:54:20 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCamera.hh,v 1.3.4.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/camera/ commands
diff --git a/source/visualization/management/include/G4VisCommandsClear.hh b/source/visualization/management/include/G4VisCommandsClear.hh
index 188b5061c0..fbe6f1d144 100644
--- a/source/visualization/management/include/G4VisCommandsClear.hh
+++ b/source/visualization/management/include/G4VisCommandsClear.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsClear.hh,v 1.5 2001/02/05 02:33:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsClear.hh,v 1.5.2.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/clear/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCompound.hh b/source/visualization/management/include/G4VisCommandsCompound.hh
index 95f0ac1908..f2d8abd8e0 100644
--- a/source/visualization/management/include/G4VisCommandsCompound.hh
+++ b/source/visualization/management/include/G4VisCommandsCompound.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCompound.hh,v 1.5 2001/02/05 02:33:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCompound.hh,v 1.6.2.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Compound /vis/ commands - John Allison  15th May 2000
 
@@ -15,6 +31,17 @@
 
 #include "G4VVisCommand.hh"
 
+class G4VisCommandDrawTree: public G4VVisCommand {
+public:
+  G4VisCommandDrawTree ();
+  virtual ~G4VisCommandDrawTree ();
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandDrawTree (const G4VisCommandDrawTree&);
+  G4VisCommandDrawTree& operator = (const G4VisCommandDrawTree&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandDrawView: public G4VVisCommand {
 public:
   G4VisCommandDrawView ();
diff --git a/source/visualization/management/include/G4VisCommandsCopy.hh b/source/visualization/management/include/G4VisCommandsCopy.hh
index 13fc69e69b..384ef3b4dc 100644
--- a/source/visualization/management/include/G4VisCommandsCopy.hh
+++ b/source/visualization/management/include/G4VisCommandsCopy.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCopy.hh,v 1.5 2001/02/05 02:33:51 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCopy.hh,v 1.5.2.1 2001/06/28 19:16:08 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/copy/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCreateScene.hh b/source/visualization/management/include/G4VisCommandsCreateScene.hh
index db80fa2683..a32d6abc46 100644
--- a/source/visualization/management/include/G4VisCommandsCreateScene.hh
+++ b/source/visualization/management/include/G4VisCommandsCreateScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCreateScene.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCreateScene.hh,v 1.3.4.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/create_scene/ commands
diff --git a/source/visualization/management/include/G4VisCommandsCreateView.hh b/source/visualization/management/include/G4VisCommandsCreateView.hh
index 61f7da8734..fffddd5fa2 100644
--- a/source/visualization/management/include/G4VisCommandsCreateView.hh
+++ b/source/visualization/management/include/G4VisCommandsCreateView.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCreateView.hh,v 1.5 2001/02/05 02:33:53 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCreateView.hh,v 1.5.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/create_view/ commands
diff --git a/source/visualization/management/include/G4VisCommandsDelete.hh b/source/visualization/management/include/G4VisCommandsDelete.hh
index 461b718918..9d93d407a5 100644
--- a/source/visualization/management/include/G4VisCommandsDelete.hh
+++ b/source/visualization/management/include/G4VisCommandsDelete.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsDelete.hh,v 1.5 2001/02/05 02:33:55 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsDelete.hh,v 1.5.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/delete/ commands
diff --git a/source/visualization/management/include/G4VisCommandsDraw.hh b/source/visualization/management/include/G4VisCommandsDraw.hh
index e1833e575e..d86a84ec43 100644
--- a/source/visualization/management/include/G4VisCommandsDraw.hh
+++ b/source/visualization/management/include/G4VisCommandsDraw.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsDraw.hh,v 1.4 2001/02/05 02:33:56 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsDraw.hh,v 1.4.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/draw/ commands
diff --git a/source/visualization/management/include/G4VisCommandsLights.hh b/source/visualization/management/include/G4VisCommandsLights.hh
index ef6095e996..9edaa91cb9 100644
--- a/source/visualization/management/include/G4VisCommandsLights.hh
+++ b/source/visualization/management/include/G4VisCommandsLights.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsLights.hh,v 1.6 2001/02/05 02:33:58 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsLights.hh,v 1.6.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/lights/ commands
diff --git a/source/visualization/management/include/G4VisCommandsPrint.hh b/source/visualization/management/include/G4VisCommandsPrint.hh
index 45fd30bb94..bfedb3965a 100644
--- a/source/visualization/management/include/G4VisCommandsPrint.hh
+++ b/source/visualization/management/include/G4VisCommandsPrint.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsPrint.hh,v 1.3 1999/12/15 14:54:21 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsPrint.hh,v 1.3.4.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/print/ commands
diff --git a/source/visualization/management/include/G4VisCommandsRefresh.hh b/source/visualization/management/include/G4VisCommandsRefresh.hh
index 616ecf7857..e4d99ad37b 100644
--- a/source/visualization/management/include/G4VisCommandsRefresh.hh
+++ b/source/visualization/management/include/G4VisCommandsRefresh.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsRefresh.hh,v 1.4 2001/02/05 02:33:59 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsRefresh.hh,v 1.4.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/refresh/ commands
diff --git a/source/visualization/management/include/G4VisCommandsScene.hh b/source/visualization/management/include/G4VisCommandsScene.hh
index e3982e6391..7050acc095 100644
--- a/source/visualization/management/include/G4VisCommandsScene.hh
+++ b/source/visualization/management/include/G4VisCommandsScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsScene.hh,v 1.9 2001/02/03 18:39:44 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsScene.hh,v 1.9.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneAdd.hh b/source/visualization/management/include/G4VisCommandsSceneAdd.hh
index a1ef920449..5448902160 100644
--- a/source/visualization/management/include/G4VisCommandsSceneAdd.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneAdd.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneAdd.hh,v 1.6 2001/02/03 18:39:46 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneAdd.hh,v 1.7.2.1 2001/06/28 19:16:09 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -15,6 +31,18 @@
 
 #include "G4VisCommandsScene.hh"
 
+class G4VisCommandSceneAddAxes: public G4VVisCommandScene {
+public:
+  G4VisCommandSceneAddAxes ();
+  virtual ~G4VisCommandSceneAddAxes ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandSceneAddAxes (const G4VisCommandSceneAddAxes&);
+  G4VisCommandSceneAddAxes& operator = (const G4VisCommandSceneAddAxes&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandSceneAddGhosts: public G4VVisCommandScene {
 public:
   G4VisCommandSceneAddGhosts ();
@@ -53,6 +81,18 @@ private:
   G4UIcommand* fpCommand;
 };
 
+class G4VisCommandSceneAddText: public G4VVisCommandScene {
+public:
+  G4VisCommandSceneAddText ();
+  virtual ~G4VisCommandSceneAddText ();
+  G4String GetCurrentValue (G4UIcommand* command);
+  void SetNewValue (G4UIcommand* command, G4String newValue);
+private:
+  G4VisCommandSceneAddText (const G4VisCommandSceneAddText&);
+  G4VisCommandSceneAddText& operator = (const G4VisCommandSceneAddText&);
+  G4UIcommand* fpCommand;
+};
+
 class G4VisCommandSceneAddTrajectories: public G4VVisCommandScene {
 public:
   G4VisCommandSceneAddTrajectories ();
diff --git a/source/visualization/management/include/G4VisCommandsSceneHandler.hh b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
index 0c911cceb9..1072224b93 100644
--- a/source/visualization/management/include/G4VisCommandsSceneHandler.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneHandler.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneHandler.hh,v 1.5 1999/12/16 17:19:16 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneHandler.hh,v 1.5.4.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSceneInclude.hh b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
index ea26c33b7b..a3fd59d6e2 100644
--- a/source/visualization/management/include/G4VisCommandsSceneInclude.hh
+++ b/source/visualization/management/include/G4VisCommandsSceneInclude.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneInclude.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneInclude.hh,v 1.3.4.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsSet.hh b/source/visualization/management/include/G4VisCommandsSet.hh
index ab9f7e741b..e94905ab8d 100644
--- a/source/visualization/management/include/G4VisCommandsSet.hh
+++ b/source/visualization/management/include/G4VisCommandsSet.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSet.hh,v 1.6 2001/02/05 02:34:01 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSet.hh,v 1.6.2.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/set/ commands
diff --git a/source/visualization/management/include/G4VisCommandsShow.hh b/source/visualization/management/include/G4VisCommandsShow.hh
index 60fd42d23d..51a48def31 100644
--- a/source/visualization/management/include/G4VisCommandsShow.hh
+++ b/source/visualization/management/include/G4VisCommandsShow.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsShow.hh,v 1.4 2001/02/05 02:34:03 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsShow.hh,v 1.4.2.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // /vis~/show/ commands
diff --git a/source/visualization/management/include/G4VisCommandsViewer.hh b/source/visualization/management/include/G4VisCommandsViewer.hh
index 44b34c80bc..a947ad9f7f 100644
--- a/source/visualization/management/include/G4VisCommandsViewer.hh
+++ b/source/visualization/management/include/G4VisCommandsViewer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsViewer.hh,v 1.13 2001/02/05 02:34:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsViewer.hh,v 1.13.2.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
diff --git a/source/visualization/management/include/G4VisCommandsViewerSet.hh b/source/visualization/management/include/G4VisCommandsViewerSet.hh
index 30e5e447c4..01b2202970 100644
--- a/source/visualization/management/include/G4VisCommandsViewerSet.hh
+++ b/source/visualization/management/include/G4VisCommandsViewerSet.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsViewerSet.hh,v 1.8 2001/02/06 23:36:52 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsViewerSet.hh,v 1.8.2.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
index 9366aeeaf1..b87132d207 100644
--- a/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfDAWNFILE.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfDAWNFILE.hh,v 1.3.4.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #ifndef G4VISFEATURESOFDAWNFILE_HH
 #define G4VISFEATURESOFDAWNFILE_HH
diff --git a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
index 9d114dd5d1..a9d0324b12 100644
--- a/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfFukuiRenderer.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfFukuiRenderer.hh,v 1.3.4.1 2001/06/28 19:16:10 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
index e9db7f33ae..ec8fd6ef98 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenGL.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfOpenGL.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfOpenGL.hh,v 1.3.4.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
index ea4b5b7197..31cf93b8e8 100644
--- a/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
+++ b/source/visualization/management/include/G4VisFeaturesOfOpenInventor.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfOpenInventor.hh,v 1.3 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfOpenInventor.hh,v 1.3.4.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/include/G4VisManMessenger.hh b/source/visualization/management/include/G4VisManMessenger.hh
index a0e2146d93..6e50b97c2d 100644
--- a/source/visualization/management/include/G4VisManMessenger.hh
+++ b/source/visualization/management/include/G4VisManMessenger.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessenger.hh,v 1.6 2001/02/23 15:43:19 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessenger.hh,v 1.6.2.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
diff --git a/source/visualization/management/include/G4VisManager.hh b/source/visualization/management/include/G4VisManager.hh
index 8c9b24917f..6613e914ef 100644
--- a/source/visualization/management/include/G4VisManager.hh
+++ b/source/visualization/management/include/G4VisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManager.hh,v 1.17 2001/02/23 15:43:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManager.hh,v 1.18.2.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
@@ -329,6 +345,7 @@ protected:
   G4int                 fVerbose;           // Verbosity level 0-10.
   G4VisManMessenger*    fpMessenger;        // Pointer to messenger.
   G4std::vector<G4UImessenger*> fMessengerList;
+  G4std::vector<G4UIcommand*>   fDirectoryList;
   G4VisStateDependent*  fpStateDependent;   // Friend state dependent class.
 
 };
diff --git a/source/visualization/management/include/G4VisManager.icc b/source/visualization/management/include/G4VisManager.icc
index c7b83a191f..9f95c7adcd 100644
--- a/source/visualization/management/include/G4VisManager.icc
+++ b/source/visualization/management/include/G4VisManager.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManager.icc,v 1.5 1999/12/15 14:54:22 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManager.icc,v 1.5.4.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager - John Allison 02/Jan/1996.
diff --git a/source/visualization/management/include/G4VisStateDependent.hh b/source/visualization/management/include/G4VisStateDependent.hh
index 0adb410d6e..53cd2d057f 100644
--- a/source/visualization/management/include/G4VisStateDependent.hh
+++ b/source/visualization/management/include/G4VisStateDependent.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisStateDependent.hh,v 1.3 1999/12/15 14:54:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisStateDependent.hh,v 1.3.4.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // A "state dependent" service class for G4VisManager.
 // John Allison  29th November 1999
diff --git a/source/visualization/management/include/G4VisToOldVisCommands.hh b/source/visualization/management/include/G4VisToOldVisCommands.hh
index 341a61aae9..67f07bfb47 100644
--- a/source/visualization/management/include/G4VisToOldVisCommands.hh
+++ b/source/visualization/management/include/G4VisToOldVisCommands.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisToOldVisCommands.hh,v 1.5 2001/02/23 15:43:20 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisToOldVisCommands.hh,v 1.5.2.1 2001/06/28 19:16:11 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
diff --git a/source/visualization/management/include/MyVisManager.cc b/source/visualization/management/include/MyVisManager.cc
index bbeb549db1..8591db304b 100644
--- a/source/visualization/management/include/MyVisManager.cc
+++ b/source/visualization/management/include/MyVisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: MyVisManager.cc,v 1.5 2000/01/29 00:43:10 asaim Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: MyVisManager.cc,v 1.8.2.1 2001/06/28 19:16:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
@@ -15,6 +31,10 @@
 
 // Supported drivers...
 
+#ifdef G4VIS_USE_ASCIITREE
+#include "G4ASCIITree.hh"
+#endif
+
 #ifdef G4VIS_USE_DAWN
 #include "G4FukuiRenderer.hh"
 #endif
@@ -23,8 +43,8 @@
 #include "G4DAWNFILE.hh"
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-#include "G4RayTracer.hh"
+#ifdef G4VIS_USE_GAGTREE
+#include "G4GAGTree.hh"
 #endif
 
 #ifdef G4VIS_USE_OPACS
@@ -55,6 +75,10 @@
 #include "G4OpenInventorWin32.hh"
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+#include "G4RayTracer.hh"
+#endif
+
 #ifdef G4VIS_USE_VRML
 #include "G4VRML1.hh"
 #include "G4VRML2.hh"
@@ -69,6 +93,10 @@ MyVisManager::MyVisManager () {}
 
 void MyVisManager::RegisterGraphicsSystems () {
 
+#ifdef G4VIS_USE_ASCIITREE
+  RegisterGraphicsSystem (new G4ASCIITree);
+#endif
+
 #ifdef G4VIS_USE_DAWN
   RegisterGraphicsSystem (new G4FukuiRenderer);
 #endif
@@ -77,8 +105,8 @@ void MyVisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4DAWNFILE);
 #endif
 
-#ifdef G4VIS_USE_RAYTRACER
-  RegisterGraphicsSystem (new G4RayTracer);
+#ifdef G4VIS_USE_GAGTREE
+  RegisterGraphicsSystem (new G4GAGTree);
 #endif
 
 #ifdef G4VIS_USE_OPACS
@@ -109,6 +137,10 @@ void MyVisManager::RegisterGraphicsSystems () {
   RegisterGraphicsSystem (new G4OpenInventorWin32);
 #endif
 
+#ifdef G4VIS_USE_RAYTRACER
+  RegisterGraphicsSystem (new G4RayTracer);
+#endif
+
 #ifdef G4VIS_USE_VRML
   RegisterGraphicsSystem (new G4VRML1);
   RegisterGraphicsSystem (new G4VRML2);
diff --git a/source/visualization/management/include/MyVisManager.hh b/source/visualization/management/include/MyVisManager.hh
index 56c08480ee..cb045d0823 100644
--- a/source/visualization/management/include/MyVisManager.hh
+++ b/source/visualization/management/include/MyVisManager.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: MyVisManager.hh,v 1.4 1999/12/15 14:54:23 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: MyVisManager.hh,v 1.4.4.1 2001/06/28 19:16:12 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison 24th January 1998.
diff --git a/source/visualization/management/src/G4GraphicsSystemList.cc b/source/visualization/management/src/G4GraphicsSystemList.cc
index ebe5c53cd9..2e6f4cabfe 100644
--- a/source/visualization/management/src/G4GraphicsSystemList.cc
+++ b/source/visualization/management/src/G4GraphicsSystemList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4GraphicsSystemList.cc,v 1.2 2001/03/07 14:37:45 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4GraphicsSystemList.cc,v 1.2.2.1 2001/06/28 19:16:13 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4GraphicsSystemList.hh"
 
diff --git a/source/visualization/management/src/G4Scene.cc b/source/visualization/management/src/G4Scene.cc
index 9e15e80f61..495a747e49 100644
--- a/source/visualization/management/src/G4Scene.cc
+++ b/source/visualization/management/src/G4Scene.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4Scene.cc,v 1.6 2001/02/23 15:43:22 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4Scene.cc,v 1.7.2.1 2001/06/28 19:16:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Scene data  John Allison  19th July 1996.
@@ -107,7 +123,7 @@ G4bool G4Scene::AddEndOfEventModel (G4VModel* pModel) {
 }
 
 void G4Scene::Clear () {
-  int i;
+  size_t i;
   for (i = 0; i < fRunDurationModelList.size(); ++i) {
     delete fRunDurationModelList[i];
   }
@@ -118,16 +134,18 @@ void G4Scene::Clear () {
 
 G4std::ostream& operator << (G4std::ostream& os, const G4Scene& d) {
 
+  size_t i;
+
   os << "Scene data:";
 
   os << "\n  Run-duration model list:";
-  for (int i = 0; i < d.fRunDurationModelList.size (); i++) {
+  for (i = 0; i < d.fRunDurationModelList.size (); i++) {
     os << "\n  " << *(d.fRunDurationModelList[i]);
   }
 
   os << "\n  End-of-event model list:";
-  for (int ii = 0; ii < d.fEndOfEventModelList.size (); ii++) {
-    os << "\n  " << *(d.fEndOfEventModelList[ii]);
+  for (i = 0; i < d.fEndOfEventModelList.size (); i++) {
+    os << "\n  " << *(d.fEndOfEventModelList[i]);
   }
 
   os << "\n  Extent or bounding box: " << d.fExtent;
@@ -145,7 +163,7 @@ G4bool G4Scene::operator != (const G4Scene& s) const {
       !(fStandardTargetPoint == s.fStandardTargetPoint)
       ) return true;
 
-  for (int i = 0; i < fRunDurationModelList.size (); i++) {
+  for (size_t i = 0; i < fRunDurationModelList.size (); i++) {
     if (fRunDurationModelList[i] != s.fRunDurationModelList[i])
       return true;
   }
diff --git a/source/visualization/management/src/G4SceneHandlerList.cc b/source/visualization/management/src/G4SceneHandlerList.cc
index 8465111bab..16a5607d59 100644
--- a/source/visualization/management/src/G4SceneHandlerList.cc
+++ b/source/visualization/management/src/G4SceneHandlerList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SceneHandlerList.cc,v 1.2 2001/03/07 14:37:47 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SceneHandlerList.cc,v 1.2.2.1 2001/06/28 19:16:13 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4SceneHandlerList.hh"
 
diff --git a/source/visualization/management/src/G4SceneList.cc b/source/visualization/management/src/G4SceneList.cc
index 789a34f628..e574e93c76 100644
--- a/source/visualization/management/src/G4SceneList.cc
+++ b/source/visualization/management/src/G4SceneList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4SceneList.cc,v 1.4 2001/03/07 14:37:48 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4SceneList.cc,v 1.4.2.1 2001/06/28 19:16:13 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4SceneList.hh"
 
diff --git a/source/visualization/management/src/G4VGraphicsSystem.cc b/source/visualization/management/src/G4VGraphicsSystem.cc
index ffbbf2fbba..8af140e282 100644
--- a/source/visualization/management/src/G4VGraphicsSystem.cc
+++ b/source/visualization/management/src/G4VGraphicsSystem.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VGraphicsSystem.cc,v 1.6 2001/02/23 15:43:24 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VGraphicsSystem.cc,v 1.7.2.1 2001/06/28 19:16:13 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  27th March 1996
@@ -52,19 +68,19 @@ G4std::ostream& operator << (G4std::ostream& os, const G4VGraphicsSystem& gs) {
   if (gs.GetDescription () != "") {
     os << "\n  Description: " << gs.GetDescription ();
   }
-  os << "\n  Functionality: " << gs.GetFunctionality ();
+  os << "\n  Functionality: " << G4int(gs.GetFunctionality());
   if (pVMan -> GetVerboseLevel () > 1) {
-    G4int nScenes = scenes.size ();
+    size_t nScenes = scenes.size ();
     if (nScenes) {
       G4int nScenesOfThisSystem = 0;
-      for (int i = 0; i < nScenes; i++) {
+      for (size_t i = 0; i < nScenes; i++) {
 	if (scenes [i] -> GetGraphicsSystem () == &gs) {
 	  nScenesOfThisSystem++;
 	}
       }
       if (nScenesOfThisSystem) {
 	os << "\n  Its scenes are: ";
-	for (int i = 0; i < nScenes; i++) {
+	for (size_t i = 0; i < nScenes; i++) {
 	  if (scenes [i] -> GetGraphicsSystem () == &gs) {
 	    os << "\n  " << *(scenes [i]);
 	  }
diff --git a/source/visualization/management/src/G4VSceneHandler.cc b/source/visualization/management/src/G4VSceneHandler.cc
index 6355809468..b43e283cb0 100644
--- a/source/visualization/management/src/G4VSceneHandler.cc
+++ b/source/visualization/management/src/G4VSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VSceneHandler.cc,v 1.12 2001/02/23 15:43:24 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VSceneHandler.cc,v 1.14.2.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  19th July 1996
@@ -184,15 +200,15 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
   case G4Polymarker::line:
     {
       G4Polyline polyline (polymarker);
-      for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
-	polyline.append (polymarker[iPoint]);
+      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
+	polyline.push_back (polymarker[iPoint]);
       }
       AddPrimitive (polyline);
     }
     break;
   case G4Polymarker::dots:
     {
-      for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
+      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
 	G4Circle dot (polymarker);
         dot.SetPosition (polymarker[iPoint]);
 	dot.SetWorldSize  (0.);
@@ -203,7 +219,7 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
     break;
   case G4Polymarker::circles:
     {
-      for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
+      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
 	G4Circle circle (polymarker);
 	circle.SetPosition (polymarker[iPoint]);
 	AddPrimitive (circle);
@@ -212,7 +228,7 @@ void G4VSceneHandler::AddPrimitive (const G4Polymarker& polymarker) {
     break;
   case G4Polymarker::squares:
     {
-      for (int iPoint = 0; iPoint < polymarker.entries (); iPoint++) {
+      for (size_t iPoint = 0; iPoint < polymarker.size (); iPoint++) {
 	G4Square Square (polymarker);
 	Square.SetPosition (polymarker[iPoint]);
 	AddPrimitive (Square);
@@ -298,7 +314,7 @@ void G4VSceneHandler::ProcessScene (G4VViewer& view) {
   if (runDurationModelList.size ()) {
     G4cout << "Traversing scene data..." << G4endl;
     G4ModelingParameters* pMP = CreateModelingParameters ();
-    for (int i = 0; i < runDurationModelList.size (); i++) {
+    for (size_t i = 0; i < runDurationModelList.size (); i++) {
       G4VModel* pModel = runDurationModelList[i];
       const G4ModelingParameters* tempMP =
 	pModel -> GetModelingParameters ();
@@ -455,15 +471,15 @@ G4double G4VSceneHandler::GetMarkerSize (const G4VMarker& marker,
   G4bool userSpecified = marker.GetWorldSize() || marker.GetScreenSize();
   const G4VMarker& defaultMarker =
     fpViewer -> GetViewParameters().GetDefaultMarker();
-  G4double size;
-  if (size = // Assignment intentional.
-      userSpecified ? marker.GetWorldSize() : defaultMarker.GetWorldSize()) {
+  G4double size = userSpecified ?
+    marker.GetWorldSize() : defaultMarker.GetWorldSize();
+  if (size) {
     // Draw in world coordinates.
     markerSizeType = world;
   }
   else {
-    size = // Assignment intentional.
-      userSpecified ? marker.GetScreenSize() : defaultMarker.GetScreenSize();
+    size = userSpecified ?
+      marker.GetScreenSize() : defaultMarker.GetScreenSize();
     // Draw in screen coordinates.
     markerSizeType = screen;
   }
@@ -476,7 +492,7 @@ G4std::ostream& operator << (G4std::ostream& os, const G4VSceneHandler& s) {
 
   os << "Scene " << s.fName << " has "
      << s.fViewerList.size () << " viewers:";
-  for (int i = 0; i < s.fViewerList.size (); i++) {
+  for (size_t i = 0; i < s.fViewerList.size (); i++) {
     os << "\n  " << *(s.fViewerList [i]);
   }
 
diff --git a/source/visualization/management/src/G4VViewer.cc b/source/visualization/management/src/G4VViewer.cc
index 2f8c9c2210..0b76b42260 100644
--- a/source/visualization/management/src/G4VViewer.cc
+++ b/source/visualization/management/src/G4VViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VViewer.cc,v 1.11 2001/02/23 15:43:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VViewer.cc,v 1.13.2.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  27th March 1996
@@ -17,12 +33,12 @@
 #include "G4ios.hh"
 #include "g4std/strstream"
 
+#include "G4VisManager.hh"
 #include "G4VGraphicsSystem.hh"
 #include "G4VSceneHandler.hh"
 #include "G4Scene.hh"
 #include "G4VPhysicalVolume.hh"
 #include "G4Transform3D.hh"
-#include "G4Event.hh"
 
 G4VViewer::G4VViewer (G4VSceneHandler& sceneHandler,
 		      G4int id, const G4String& name):
@@ -42,6 +58,12 @@ fNeedKernelVisit (true)
   }
   fShortName = fName (0, fName.find (' '));
   fShortName.strip ();
+
+  G4VisManager* pVisMan = G4VisManager::GetInstance();
+  G4double xHint = pVisMan->GetCurrentViewParameters().GetWindowSizeHintX();
+  G4double yHint = pVisMan->GetCurrentViewParameters().GetWindowSizeHintY();
+  fVP.SetWindowSizeHint(xHint,yHint);
+  fDefaultVP.SetWindowSizeHint(xHint,yHint);
 }
 
 G4VViewer::~G4VViewer () {}
diff --git a/source/visualization/management/src/G4VVisCommand.cc b/source/visualization/management/src/G4VVisCommand.cc
index 33e873b26a..e7bf9e2791 100644
--- a/source/visualization/management/src/G4VVisCommand.cc
+++ b/source/visualization/management/src/G4VVisCommand.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VVisCommand.cc,v 1.8 2001/02/06 23:36:55 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VVisCommand.cc,v 1.8.2.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Base class for visualization commands - John Allison  9th August 1998
 // It is really a messenger - we have one command per messenger.
diff --git a/source/visualization/management/src/G4ViewParameters.cc b/source/visualization/management/src/G4ViewParameters.cc
index 4da73d3a26..5cdf0ea4ad 100644
--- a/source/visualization/management/src/G4ViewParameters.cc
+++ b/source/visualization/management/src/G4ViewParameters.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ViewParameters.cc,v 1.11 2001/02/23 15:47:24 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ViewParameters.cc,v 1.12.2.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  19th July 1996
@@ -241,7 +257,7 @@ void G4ViewParameters::PrintDifferences (const G4ViewParameters& v) const {
       G4cout << "Difference in no of cutaway planes." << G4endl;
     }
     else {
-      for (int i = 0; i < fCutawayPlanes.size (); i++) {
+      for (size_t i = 0; i < fCutawayPlanes.size (); i++) {
 	if (!(fCutawayPlanes[i] == v.fCutawayPlanes[i]))
 	  G4cout << "Difference in cutaway plane no. " << i << G4endl;
       }
@@ -310,7 +326,7 @@ G4std::ostream& operator << (G4std::ostream& os, const G4ViewParameters& v) {
   os << "\n  Cutaway flag: ";
   if (v.fCutaway) {
     os << "true, cutaway planes: ";
-    for (int i = 0; i < v.fCutawayPlanes.size (); i++) {
+    for (size_t i = 0; i < v.fCutawayPlanes.size (); i++) {
       os << ' ' << v.fCutawayPlanes[i];
     }
   }
@@ -446,7 +462,7 @@ G4bool G4ViewParameters::operator != (const G4ViewParameters& v) const {
     if (fCutawayPlanes.size () != v.fCutawayPlanes.size ())
       return true;
     else {
-      for (int i = 0; i < fCutawayPlanes.size (); i++) {
+      for (size_t i = 0; i < fCutawayPlanes.size (); i++) {
 	if (!(fCutawayPlanes[i] == v.fCutawayPlanes[i])) return true;
       }
     }
diff --git a/source/visualization/management/src/G4ViewerList.cc b/source/visualization/management/src/G4ViewerList.cc
index d3143f96dd..646fc4d8b7 100644
--- a/source/visualization/management/src/G4ViewerList.cc
+++ b/source/visualization/management/src/G4ViewerList.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ViewerList.cc,v 1.2 2001/03/07 14:37:50 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ViewerList.cc,v 1.2.2.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4ViewerList.hh"
 
diff --git a/source/visualization/management/src/G4VisCommandTemplates.cc b/source/visualization/management/src/G4VisCommandTemplates.cc
index 01bac976a7..4ca748c035 100644
--- a/source/visualization/management/src/G4VisCommandTemplates.cc
+++ b/source/visualization/management/src/G4VisCommandTemplates.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandTemplates.cc,v 1.4 1999/12/15 14:54:25 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandTemplates.cc,v 1.4.4.1 2001/06/28 19:16:14 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Visualization Command Messenger Template private functions.
diff --git a/source/visualization/management/src/G4VisCommands.cc b/source/visualization/management/src/G4VisCommands.cc
index 29bc0606fa..63b374fdac 100644
--- a/source/visualization/management/src/G4VisCommands.cc
+++ b/source/visualization/management/src/G4VisCommands.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommands.cc,v 1.1 2001/02/23 15:04:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommands.cc,v 1.1.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/ top level commands - John Allison  5th February 2001
 
diff --git a/source/visualization/management/src/G4VisCommandsCamera.cc b/source/visualization/management/src/G4VisCommandsCamera.cc
index 9eb10edce8..1064874a8e 100644
--- a/source/visualization/management/src/G4VisCommandsCamera.cc
+++ b/source/visualization/management/src/G4VisCommandsCamera.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCamera.cc,v 1.7 2000/05/13 10:52:14 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCamera.cc,v 1.7.4.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisCommandsCompound.cc b/source/visualization/management/src/G4VisCommandsCompound.cc
index 5a2247b468..dca18716fa 100644
--- a/source/visualization/management/src/G4VisCommandsCompound.cc
+++ b/source/visualization/management/src/G4VisCommandsCompound.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsCompound.cc,v 1.10 2001/02/23 15:43:26 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsCompound.cc,v 1.12.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // Compound /vis/ commands - John Allison  15th May 2000
 
@@ -16,6 +32,46 @@
 #include "G4UImanager.hh"
 #include "G4UIcmdWithAString.hh"
 
+////////////// /vis/drawTree ///////////////////////////////////////
+
+G4VisCommandDrawTree::G4VisCommandDrawTree() {
+  G4bool omitable;
+  fpCommand = new G4UIcommand("/vis/drawTree", this);
+  fpCommand->SetGuidance("/vis/drawTree [<physical-volume-name>] [<system>]");
+  fpCommand->SetGuidance("Default: world ATree");
+  fpCommand->SetGuidance
+    ("(DTREE) Creates a scene consisting of this physical volume and"
+     "\n  produces a represntation of the geometry hieracrhy.");
+  fpCommand->SetGuidance("The scene becomes current.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter("PVname", 's', omitable = true);
+  parameter -> SetDefaultValue("world");
+  fpCommand -> SetParameter (parameter);
+  parameter = new G4UIparameter("system", 's', omitable = true);
+  parameter -> SetDefaultValue("ATree");
+  fpCommand -> SetParameter (parameter);
+}
+
+G4VisCommandDrawTree::~G4VisCommandDrawTree() {
+  delete fpCommand;
+}
+
+void G4VisCommandDrawTree::SetNewValue
+(G4UIcommand* command, G4String newValue) {
+
+  G4String pvname, system;
+  const char* t = newValue;
+  G4std::istrstream is((char*)t);
+  is >> pvname >> system;
+
+  G4UImanager* UImanager = G4UImanager::GetUIpointer();
+  G4int keepVerbose = UImanager->GetVerboseLevel();
+  UImanager->SetVerboseLevel(2);
+  UImanager->ApplyCommand("/vis/open " + system);
+  UImanager->ApplyCommand("/vis/drawVolume " + pvname);
+  UImanager->SetVerboseLevel(keepVerbose);
+}
+
 ////////////// /vis/drawView ///////////////////////////////////////
 
 G4VisCommandDrawView::G4VisCommandDrawView() {
@@ -147,7 +203,7 @@ G4VisCommandOpen::G4VisCommandOpen() {
    const G4GraphicsSystemList& gslist =
     fpVisManager->GetAvailableGraphicsSystems();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.size(); igslist++) {
+  for (size_t igslist = 0; igslist < gslist.size(); igslist++) {
     const G4String& name = gslist[igslist]->GetName();
     const G4String& nickname = gslist[igslist]->GetNickname();
     if (nickname.isNull()) {
diff --git a/source/visualization/management/src/G4VisCommandsScene.cc b/source/visualization/management/src/G4VisCommandsScene.cc
index d3e4bbbf1e..c9068eea59 100644
--- a/source/visualization/management/src/G4VisCommandsScene.cc
+++ b/source/visualization/management/src/G4VisCommandsScene.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsScene.cc,v 1.16 2001/02/23 15:43:27 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsScene.cc,v 1.17.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -328,6 +344,7 @@ void G4VisCommandSceneNotifyHandlers::SetNewValue (G4UIcommand* command,
 	for (G4int iV = 0; iV < nViewers; iV++) {
 	  G4VViewer* aViewer = viewerList [iV];
 	  aViewer -> ClearView ();
+	  aViewer -> SetView ();
 	  aViewer -> DrawView ();
 	  // Triggers rebuild of graphical database by notifying the scene
 	  // handler.  The viewer is supposed to be smart enough to know
diff --git a/source/visualization/management/src/G4VisCommandsSceneAdd.cc b/source/visualization/management/src/G4VisCommandsSceneAdd.cc
index 90d34690ad..40877f5950 100644
--- a/source/visualization/management/src/G4VisCommandsSceneAdd.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneAdd.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneAdd.cc,v 1.14 2001/02/23 15:43:27 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneAdd.cc,v 1.18.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
@@ -20,6 +36,8 @@
 #include "G4ModelingParameters.hh"
 #include "G4HitsModel.hh"
 #include "G4TrajectoriesModel.hh"
+#include "G4TextModel.hh"
+#include "G4AxesModel.hh"
 #include "G4PhysicalVolumeSearchScene.hh"
 #include "G4VGlobalFastSimulationManager.hh"
 #include "G4ParticleTable.hh"
@@ -33,6 +51,70 @@
 #include "g4std/strstream"
 
 
+////////////// /vis/scene/add/axes //////////////////////////////////
+
+G4VisCommandSceneAddAxes::G4VisCommandSceneAddAxes () {
+  G4bool omitable;
+  fpCommand = new G4UIcommand ("/vis/scene/add/axes", this);
+  fpCommand -> SetGuidance
+    ("Draws axes at (x0, y0, z0) of given length.");
+  G4UIparameter* parameter;
+  parameter =  new G4UIparameter ("x0", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("y0", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("z0", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("length", 'd', omitable = true);
+  parameter->SetDefaultValue (1.*m);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("unit", 's', omitable = true);
+  parameter->SetDefaultValue  ("mm");
+  parameter->SetGuidance      ("mm, cm, or m.");
+  fpCommand->SetParameter     (parameter);
+}
+
+G4VisCommandSceneAddAxes::~G4VisCommandSceneAddAxes () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandSceneAddAxes::GetCurrentValue (G4UIcommand*) {
+  return "";
+}
+
+void G4VisCommandSceneAddAxes::SetNewValue (G4UIcommand* command,
+					    G4String newValue) {
+  G4SceneList& sceneList = fpVisManager -> SetSceneList ();
+  if (sceneList.empty ()) {
+    G4cout << "No scenes - please create one before adding anything."
+	   << G4endl;
+    return;
+  }
+
+  G4String unitString;
+  G4double x0, y0, z0, length;
+  const char* s = newValue;
+  G4std::istrstream is ((char*)s);
+  is >> x0 >> y0 >> z0 >> length >> unitString;
+
+  G4double unit = ValueOf(unitString);
+  x0 *= unit; y0 *= unit; z0 *= unit; length *= unit;
+
+  G4VModel* model = new G4AxesModel(x0, y0, z0, length);
+  G4Scene* pScene = fpVisManager -> GetCurrentScene ();
+  const G4String& currentSceneName = pScene -> GetName ();
+  G4bool succesful = pScene -> AddRunDurationModel (model);
+  UpdateVisManagerScene (currentSceneName);
+  if (succesful) {
+    G4cout << "Axes have been added to scene \"" << currentSceneName << "\""
+	   << G4endl;
+  }
+}
+
+
 ////////////// /vis/scene/add/ghosts ///////////////////////////////////////
 
 G4VisCommandSceneAddGhosts::G4VisCommandSceneAddGhosts () {
@@ -82,9 +164,9 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
     G4bool successful;
     for (G4int iParticle=0; iParticle<theParticleTable->entries(); 
 	 iParticle++)
-      if(CurrentFlavoredWorld=theGlobalFastSimulationManager->
-	 GetFlavoredWorldForThis(theParticleTable->
-				 GetParticle(iParticle)))
+      CurrentFlavoredWorld = theGlobalFastSimulationManager->
+	GetFlavoredWorldForThis(theParticleTable->GetParticle(iParticle));
+      if(CurrentFlavoredWorld)
 	successful = pCurrentScene -> AddRunDurationModel
 	  (new G4FlavoredParallelWorldModel (CurrentFlavoredWorld));
     UpdateVisManagerScene ();
@@ -102,9 +184,9 @@ void G4VisCommandSceneAddGhosts::SetNewValue (G4UIcommand* command,
     return;
   }
 
-  G4VFlavoredParallelWorld* worldForThis;
-  if(worldForThis=theGlobalFastSimulationManager->
-     GetFlavoredWorldForThis(currentParticle)) {
+  G4VFlavoredParallelWorld* worldForThis =
+    theGlobalFastSimulationManager->GetFlavoredWorldForThis(currentParticle);
+  if(worldForThis) {
     G4bool successful = pCurrentScene -> AddRunDurationModel
       (new G4FlavoredParallelWorldModel (worldForThis));
     UpdateVisManagerScene (currentSceneName);
@@ -201,7 +283,7 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
   is >> name >> requestedDepthOfDescent;
 
   G4LogicalVolumeStore *pLVStore = G4LogicalVolumeStore::GetInstance();
-  int nLV = pLVStore -> entries ();
+  int nLV = pLVStore -> size ();
   int iLV;
   G4LogicalVolume* pLV;
   for (iLV = 0; iLV < nLV; iLV++ ) {
@@ -229,6 +311,85 @@ void G4VisCommandSceneAddLogicalVolume::SetNewValue (G4UIcommand* command,
 }
 
 
+////////////// /vis/scene/add/text //////////////////////////////////
+
+G4VisCommandSceneAddText::G4VisCommandSceneAddText () {
+  G4bool omitable;
+  fpCommand = new G4UIcommand ("/vis/scene/add/text", this);
+  fpCommand -> SetGuidance 
+    ("Adds text at (x, y, z) unit font_size x_offset y_offset text.");
+  fpCommand -> SetGuidance
+    ("Font size and offsets in pixels.");
+  G4UIparameter* parameter;
+  parameter = new G4UIparameter ("x", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("y", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("z", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("unit", 's', omitable = true);
+  parameter->SetDefaultValue  ("mm");
+  parameter->SetGuidance      ("mm, cm, or m.");
+  fpCommand->SetParameter     (parameter);
+  parameter =  new G4UIparameter ("font_size", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("x_offset", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("y_offset", 'd', omitable = true);
+  parameter->SetDefaultValue (0.);
+  fpCommand->SetParameter (parameter);
+  parameter =  new G4UIparameter ("text", 's', omitable = true);
+  parameter->SetDefaultValue ("text");
+  fpCommand->SetParameter (parameter);
+}
+
+G4VisCommandSceneAddText::~G4VisCommandSceneAddText () {
+  delete fpCommand;
+}
+
+G4String G4VisCommandSceneAddText::GetCurrentValue (G4UIcommand*) {
+  return "";
+}
+
+void G4VisCommandSceneAddText::SetNewValue (G4UIcommand* command,
+					    G4String newValue) {
+  G4SceneList& sceneList = fpVisManager -> SetSceneList ();
+  if (sceneList.empty ()) {
+    G4cout << "No scenes - please create one before adding anything."
+	   << G4endl;
+    return;
+  }
+
+  G4String text, unitString;
+  G4double x, y, z, font_size, x_offset, y_offset;
+  const char* s = newValue;
+  G4std::istrstream is ((char*)s);
+  is >> x >> y >> z >> unitString >> font_size >> x_offset >> y_offset >> text;
+
+  G4double unit = ValueOf(unitString);
+  x *= unit; y *= unit; z *= unit;
+
+  G4Text g4text(text, G4Point3D(x,y,z));
+  g4text.SetScreenSize(font_size);
+  g4text.SetOffset(x_offset,y_offset);
+  G4VModel* model = new G4TextModel(g4text);
+  G4Scene* pScene = fpVisManager -> GetCurrentScene ();
+  const G4String& currentSceneName = pScene -> GetName ();
+  G4bool succesful = pScene -> AddRunDurationModel (model);
+  UpdateVisManagerScene (currentSceneName);
+  if (succesful) {
+    G4cout << "Text \"" << text
+	   << "\" has been added to scene \"" << currentSceneName << "\""
+	   << G4endl;
+  }
+}
+
+
 ////////////// /vis/scene/add/trajectories ///////////////////////////////////
 
 G4VisCommandSceneAddTrajectories::G4VisCommandSceneAddTrajectories () {
@@ -281,7 +442,8 @@ G4VisCommandSceneAddVolume::G4VisCommandSceneAddVolume () {
   //  fpCommand -> SetGuidance  // Not implemented - should be in geom?
   //    ("               \"list\" to list all volumes.");
   fpCommand -> SetGuidance
-    ("2nd parameter: copy number (default 0).");
+    ("2nd parameter: copy number (default -1)."
+     "\n  If negative, first occurrence of physical-volume-name is selected.");
   fpCommand -> SetGuidance
     ("3rd parameter: depth of descending geometry hierarchy"
      " (default G4Scene::UNLIMITED (-1)).");
@@ -290,7 +452,7 @@ G4VisCommandSceneAddVolume::G4VisCommandSceneAddVolume () {
   parameter -> SetDefaultValue ("world");
   fpCommand -> SetParameter (parameter);
   parameter = new G4UIparameter ("copy-no", 'i', omitable = true);
-  parameter -> SetDefaultValue (0);
+  parameter -> SetDefaultValue (-1);
   fpCommand -> SetParameter (parameter);
   parameter = new G4UIparameter ("depth", 'i', omitable = true);
   parameter -> SetDefaultValue (G4Scene::UNLIMITED);
@@ -362,8 +524,11 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
 					 transformation);
     }
     else {
-      G4cout << "Volume \"" << name << "\", copy no. " << copyNo
-	     << " not found." << G4endl;
+      G4cout << "Volume \"" << name << "\"";
+      if (copyNo >= 0) {
+	G4cout << ", copy no. " << copyNo << ",";
+      }
+      G4cout << " not found." << G4endl;
     }
   }
 
@@ -373,12 +538,22 @@ void G4VisCommandSceneAddVolume::SetNewValue (G4UIcommand* command,
     G4bool successful = pScene -> AddRunDurationModel (model);
     UpdateVisManagerScene (currentSceneName);
     if (successful) {
-      G4cout << "First occurrence of \"" << foundVolume -> GetName ()
-	     << "\", copy no. " << copyNo
-	     << ", found at depth " << foundDepth
-	     << ",\n  with further requested depth of descent "
-	     << requestedDepthOfDescent
-	     << ", has been added to scene \"" << currentSceneName << "\""
+      G4cout << "First occurrence of \""
+	     << foundVolume -> GetName ()
+	     << "\"";
+      if (copyNo >= 0) {
+	G4cout << ", copy no. " << copyNo << ",";
+      }
+      G4cout << " found at depth " << foundDepth
+	     << ",\n  with ";
+      if (requestedDepthOfDescent < 0) {
+	G4cout << "unlimited (-1)";
+	  }
+      else {
+	G4cout << requestedDepthOfDescent;
+      }
+      G4cout << " further requested depth of descent"
+	     << ",\n  has been added to scene \"" << currentSceneName << "\""
 	     << G4endl;
     }
   }
diff --git a/source/visualization/management/src/G4VisCommandsSceneHandler.cc b/source/visualization/management/src/G4VisCommandsSceneHandler.cc
index 34060e753c..44893e07fb 100644
--- a/source/visualization/management/src/G4VisCommandsSceneHandler.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneHandler.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneHandler.cc,v 1.15 2001/02/23 15:43:28 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneHandler.cc,v 1.16.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/sceneHandler commands - John Allison  10th October 1998
 
@@ -31,7 +47,7 @@ void G4VVisCommandSceneHandler::UpdateCandidateLists () {
     fpVisManager -> GetAvailableSceneHandlers ();
 
   G4String sceneHandlerNameList;
-  for (int iScene = 0; iScene < list.size (); iScene++) {
+  for (size_t iScene = 0; iScene < list.size (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
     sceneHandlerNameList += sceneHandler -> GetName () + " ";
   }
@@ -150,7 +166,7 @@ G4VisCommandSceneHandlerCreate::G4VisCommandSceneHandlerCreate (): fId (0) {
   const G4GraphicsSystemList& gslist =
     fpVisManager -> GetAvailableGraphicsSystems ();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.size (); igslist++) {
+  for (size_t igslist = 0; igslist < gslist.size (); igslist++) {
     const G4String& name = gslist [igslist] -> GetName ();
     const G4String& nickname = gslist [igslist] -> GetNickname ();
     if (nickname.isNull ()) {
@@ -254,7 +270,7 @@ void G4VisCommandSceneHandlerCreate::SetNewValue (G4UIcommand* command,
   if (newName == nextName) fId++;
 
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
-  int iScene;
+  size_t iScene;
   for (iScene = 0; iScene < list.size (); iScene++) {
     G4VSceneHandler* sceneHandler = list [iScene];
     if (sceneHandler -> GetName () == newName) {
@@ -318,7 +334,7 @@ void G4VisCommandSceneHandlerList::SetNewValue (G4UIcommand* command,
 
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
   G4bool found = false;
-  for (int iSH = 0; iSH < list.size (); iSH++) {
+  for (size_t iSH = 0; iSH < list.size (); iSH++) {
     if (name != "all") {
       if (name != list [iSH] -> GetName ()) continue;
     }
@@ -385,7 +401,8 @@ void G4VisCommandSceneHandlerRemove::SetNewValue (G4UIcommand* command,
     if ((*iSH) -> GetName () == removeName) break;
   }
 
-  if (iSH = list.end()) {
+  iSH = list.end();
+  if (iSH) {
     G4cout << "Scene handler \"" << removeName
 	   << "\" not found - \"/vis/sceneHandler/list\" to see possibilities."
 	   << G4endl;
@@ -440,7 +457,7 @@ void G4VisCommandSceneHandlerSelect::SetNewValue (G4UIcommand* command,
   G4String& selectName = newValue;
   const G4SceneHandlerList& list = fpVisManager -> GetAvailableSceneHandlers ();
   G4cout << "Scene handler \"" << selectName << "\"";
-  G4int iSH;
+  size_t iSH;
   for (iSH = 0; iSH < list.size (); iSH++) {
     if (list [iSH] -> GetName () == selectName) break;
   }
diff --git a/source/visualization/management/src/G4VisCommandsSceneInclude.cc b/source/visualization/management/src/G4VisCommandsSceneInclude.cc
index 9deda3eae9..3d06abc8e3 100644
--- a/source/visualization/management/src/G4VisCommandsSceneInclude.cc
+++ b/source/visualization/management/src/G4VisCommandsSceneInclude.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsSceneInclude.cc,v 1.7 2001/01/18 12:20:00 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsSceneInclude.cc,v 1.7.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/scene commands - John Allison  9th August 1998
 
diff --git a/source/visualization/management/src/G4VisCommandsViewer.cc b/source/visualization/management/src/G4VisCommandsViewer.cc
index cd994f8d02..3456dc3cf7 100644
--- a/source/visualization/management/src/G4VisCommandsViewer.cc
+++ b/source/visualization/management/src/G4VisCommandsViewer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsViewer.cc,v 1.25 2001/04/02 10:08:46 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsViewer.cc,v 1.26.2.1 2001/06/28 19:16:15 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer commands - John Allison  25th October 1998
 
@@ -51,7 +67,7 @@ void G4VVisCommandViewer::UpdateCandidateLists () {
   for (int iHandler = 0; iHandler < nHandlers; iHandler++) {
     G4VSceneHandler* sceneHandler = sceneHandlerList [iHandler];
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
-    for (int iViewer = 0; iViewer < viewerList.size (); iViewer++) {
+    for (size_t iViewer = 0; iViewer < viewerList.size (); iViewer++) {
       viewerNameList += viewerList [iViewer] -> GetShortName () + " ";
     }
   }
@@ -250,7 +266,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
   for (iHandler = 0; iHandler < nHandlers; iHandler++) {
     G4VSceneHandler* sceneHandler = sceneHandlerList [iHandler];
     const G4ViewerList& viewerList = sceneHandler -> GetViewerList ();
-    for (int iViewer = 0; iViewer < viewerList.size (); iViewer++) {
+    for (size_t iViewer = 0; iViewer < viewerList.size (); iViewer++) {
       if (viewerList [iViewer] -> GetShortName () == newShortName ) {
 	G4cout << "Viewer \"" << newShortName << "\" already exists."
 	       << G4endl;
@@ -261,9 +277,7 @@ void G4VisCommandViewerCreate::SetNewValue (G4UIcommand* command,
 
   fpVisManager->SetCurrentViewParameters().SetWindowSizeHint
     (windowSizeHint, windowSizeHint);
-  // Currently the viewer does not pick up the above.  So a viewer
-  // picks up a default set of view parameters adn thus, the default
-  // window size for the moment.
+  // These are picked up in the G4VViewer contructor.
 
   // Create viewer.
   fpVisManager -> CreateViewer (newName);
@@ -693,10 +707,12 @@ void G4VisCommandViewerRefresh::SetNewValue (G4UIcommand* command,
 	   << G4endl;
     return;
   }
+  scene -> AddWorldIfEmpty ();
 
   G4cout << "Refreshing viewer \"" << viewer -> GetName () << "\"..."
 	 << G4endl;
   viewer -> ClearView ();
+  viewer -> SetView ();
   viewer -> DrawView ();
   G4cout << "Viewer \"" << viewer -> GetName () << "\"" << " refreshed."
     "\n  (You might also need \"/vis/viewer/update\".)" << G4endl;
diff --git a/source/visualization/management/src/G4VisCommandsViewerSet.cc b/source/visualization/management/src/G4VisCommandsViewerSet.cc
index 70e59a4a34..e96c246f93 100644
--- a/source/visualization/management/src/G4VisCommandsViewerSet.cc
+++ b/source/visualization/management/src/G4VisCommandsViewerSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisCommandsViewerSet.cc,v 1.10 2001/03/29 13:46:18 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisCommandsViewerSet.cc,v 1.12.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 
 // /vis/viewer/set commands - John Allison  16th May 2000
 
@@ -117,12 +133,12 @@ G4VisCommandsViewerSet::G4VisCommandsViewerSet () {
   fpCommandProjection->SetParameter(parameter);
 
   fpCommandSectionPlane = new G4UIcommand 
-    ("/vis/viewer/set/section_plane",this);
+    ("/vis/viewer/set/sectionPlane",this);
   fpCommandSectionPlane -> SetGuidance
     (
      "Set plane for drawing section (DCUT).  Specify plane by"
      "\nx y z units nx ny nz, e.g., for a y-z plane at x = 1 cm:"
-     "\n/vis~/set/section_plane on 1 0 0 cm 1 0 0"
+     "\n/vis/viewer/set/sectionPlane on 1 0 0 cm 1 0 0"
      );
   parameter  =  new G4UIparameter("Selector",'c',true);
   parameter  -> SetDefaultValue  ("?");
diff --git a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
index ae77a4ab99..7400092ab6 100644
--- a/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfDAWNFILE.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.4 2001/02/05 02:34:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfDAWNFILE.cc,v 1.4.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 #include "G4VisFeaturesOfDAWNFILE.hh"
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
index 2467dd6d9d..2d99c6de76 100644
--- a/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfFukuiRenderer.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfFukuiRenderer.cc,v 1.3.4.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
index 04a520792c..75abc7f63b 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenGL.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfOpenGL.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfOpenGL.cc,v 1.3.4.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
index c923890c12..e36a850c6f 100644
--- a/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
+++ b/source/visualization/management/src/G4VisFeaturesOfOpenInventor.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisFeaturesOfOpenInventor.cc,v 1.3 1999/12/15 14:54:26 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisFeaturesOfOpenInventor.cc,v 1.3.4.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 
diff --git a/source/visualization/management/src/G4VisManMessCamera.cc b/source/visualization/management/src/G4VisManMessCamera.cc
index da068f6a76..ba88a3da1b 100644
--- a/source/visualization/management/src/G4VisManMessCamera.cc
+++ b/source/visualization/management/src/G4VisManMessCamera.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessCamera.cc,v 1.8 2001/02/23 15:43:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessCamera.cc,v 1.8.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
diff --git a/source/visualization/management/src/G4VisManMessCreateView.cc b/source/visualization/management/src/G4VisManMessCreateView.cc
index ddf15467d2..04d516e4a0 100644
--- a/source/visualization/management/src/G4VisManMessCreateView.cc
+++ b/source/visualization/management/src/G4VisManMessCreateView.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessCreateView.cc,v 1.7 2001/02/23 15:43:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessCreateView.cc,v 1.8.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -42,7 +58,7 @@ void G4VisManMessenger::AddCommandCreateView () {
   const G4GraphicsSystemList& gslist =
     fpVMan -> GetAvailableGraphicsSystems ();
   G4String candidates;
-  for (int igslist = 0; igslist < gslist.size (); igslist++) {
+  for (size_t igslist = 0; igslist < gslist.size (); igslist++) {
     G4String nickname = gslist [igslist] -> GetNickname ();
     if (nickname . length () > 0) {
       candidates += nickname;
diff --git a/source/visualization/management/src/G4VisManMessDraw.cc b/source/visualization/management/src/G4VisManMessDraw.cc
index a52122ab3d..89dd7cabd1 100644
--- a/source/visualization/management/src/G4VisManMessDraw.cc
+++ b/source/visualization/management/src/G4VisManMessDraw.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessDraw.cc,v 1.7 2001/02/23 15:43:29 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessDraw.cc,v 1.10.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -142,6 +158,7 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
 
   /////////////////////////////////////////  /vis~/draw/axes  ////
   if (commandPath == "/vis~/draw/axes") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/scene/add/axes\".");
     if (ViewValid ()) {
       G4double x0, y0, z0;
       G4double length ;
@@ -166,22 +183,22 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
 
 		//----- Draw x-axis
       x_axis.SetVisAttributes(&ax);
-      x_axis.append (G4Point3D (x0*unit,y0,z0));
-      x_axis.append ( G4Point3D ( (x0 +length) , y0, z0 ) );
+      x_axis.push_back (G4Point3D (x0*unit,y0,z0));
+      x_axis.push_back ( G4Point3D ( (x0 +length) , y0, z0 ) );
       fpVMan -> Draw (x_axis);
       x_axis.clear ();
 
 		//----- Draw y-axis
       y_axis.SetVisAttributes(&ay);
-      y_axis.append (G4Point3D (x0,y0,z0));
-      y_axis.append ( G4Point3D ( x0 , (y0 +length ) , z0 ) );
+      y_axis.push_back (G4Point3D (x0,y0,z0));
+      y_axis.push_back ( G4Point3D ( x0 , (y0 +length ) , z0 ) );
       fpVMan -> Draw (y_axis);
       y_axis.clear ();
 
 		//----- Draw z-axis
       z_axis.SetVisAttributes(&az);
-      z_axis.append (G4Point3D (x0,y0,z0));
-      z_axis.append ( G4Point3D ( x0 , y0 , ( z0 +length ) ) );
+      z_axis.push_back (G4Point3D (x0,y0,z0));
+      z_axis.push_back ( G4Point3D ( x0 , y0 , ( z0 +length ) ) );
       fpVMan -> Draw (z_axis);
       z_axis.clear ();
 
@@ -190,6 +207,7 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
 
   /////////////////////////////////////////  /vis~/draw/text  ////
   if (commandPath == "/vis~/draw/text") {
+    G4VisManager::PrintCommandDeprecation("Use \"/vis/scene/add/text\".");
     if (ViewValid ()) {
       G4double x, y, z;
       G4double font_size, x_offset, y_offset;
@@ -244,9 +262,9 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
       G4VFlavoredParallelWorld* CurrentFlavoredWorld;
       for (G4int iParticle=0; iParticle<theParticleTable->entries(); 
 	   iParticle++)
-	if(CurrentFlavoredWorld=theGlobalFastSimulationManager->
-	   GetFlavoredWorldForThis(theParticleTable->
-				   GetParticle(iParticle)))
+	CurrentFlavoredWorld = theGlobalFastSimulationManager->
+	  GetFlavoredWorldForThis(theParticleTable->GetParticle(iParticle));
+	if(CurrentFlavoredWorld)
 	  currentScene -> AddRunDurationModel
 	    (new G4FlavoredParallelWorldModel (CurrentFlavoredWorld));
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
@@ -259,9 +277,9 @@ void G4VisManMessenger::DoCommandDraw (const G4String& commandPath,
       G4cout << newValues << ": not found this particle name!" << G4endl;
       return;
     }
-    G4VFlavoredParallelWorld* worldForThis;
-    if(worldForThis=theGlobalFastSimulationManager->
-       GetFlavoredWorldForThis(currentParticle)) {
+    G4VFlavoredParallelWorld* worldForThis =
+      theGlobalFastSimulationManager->GetFlavoredWorldForThis(currentParticle);
+    if(worldForThis) {
       currentScene -> AddRunDurationModel
 	(new G4FlavoredParallelWorldModel (worldForThis));
       G4cout << "Ghosts added to the Scene, refresh the view to see it."
diff --git a/source/visualization/management/src/G4VisManMessExpert.cc b/source/visualization/management/src/G4VisManMessExpert.cc
index b61fc1d312..2160e47351 100644
--- a/source/visualization/management/src/G4VisManMessExpert.cc
+++ b/source/visualization/management/src/G4VisManMessExpert.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessExpert.cc,v 1.6 2001/02/23 15:43:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessExpert.cc,v 1.7.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -227,8 +243,8 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
       G4Colour c(1.0, 0.0, 0.0);
       G4VisAttributes a(c);
       line.SetVisAttributes(&a);
-      line.append (G4Point3D (x0,y0,z0));
-      line.append (G4Point3D (x1,y1,z1));
+      line.push_back (G4Point3D (x0,y0,z0));
+      line.push_back (G4Point3D (x1,y1,z1));
       fpVMan -> Draw (line);
       line.clear ();
     }
@@ -364,7 +380,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 	G4int nPoints = G4int (100 * G4UniformRand());
 	G4double tStart = twopi * G4UniformRand();
 	for (i = 0, t = tStart; i < nPoints; t += dt, a *= fa, z += dz, i++) {
-	  polymarker.append (G4Point3D (x0 + a * cos (t),
+	  polymarker.push_back (G4Point3D (x0 + a * cos (t),
 					y0 + a * sin (t), z0 + z));
 	}
 	G4double red   = G4UniformRand();
@@ -389,7 +405,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
       G4double a = 2000., fa = 0.999;
       G4double z = -500., dz = 1.;
       for (int i = 0; i < 1000; t += dt, a *= fa, z += dz, i++) {
-        line.append (G4Point3D (a * cos (t), a * sin (t), z));
+        line.push_back (G4Point3D (a * cos (t), a * sin (t), z));
       }
       fpVMan -> Draw (line);
     }
@@ -417,7 +433,7 @@ void G4VisManMessenger::DoCommandExpert (const G4String& commandPath,
 	G4int nPoints = G4int (1000 * G4UniformRand());
 	G4double tStart = twopi * G4UniformRand();
 	for (i = 0, t = tStart; i < nPoints; t += dt, a *= fa, z += dz, i++) {
-	  line.append (G4Point3D (x0 + a * cos (t), y0 + a * sin (t), z0 + z));
+	  line.push_back (G4Point3D (x0 + a * cos (t), y0 + a * sin (t), z0 + z));
 	}
 	G4Colour c (G4UniformRand(), G4UniformRand(), G4UniformRand());
 	G4VisAttributes a(c);
diff --git a/source/visualization/management/src/G4VisManMessLights.cc b/source/visualization/management/src/G4VisManMessLights.cc
index 64e011b112..6621c0b907 100644
--- a/source/visualization/management/src/G4VisManMessLights.cc
+++ b/source/visualization/management/src/G4VisManMessLights.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessLights.cc,v 1.7 2001/02/23 15:43:30 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessLights.cc,v 1.7.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
diff --git a/source/visualization/management/src/G4VisManMessSet.cc b/source/visualization/management/src/G4VisManMessSet.cc
index e9937c2ccd..09216129c1 100644
--- a/source/visualization/management/src/G4VisManMessSet.cc
+++ b/source/visualization/management/src/G4VisManMessSet.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessSet.cc,v 1.11 2001/02/23 15:43:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessSet.cc,v 1.12.2.1 2001/06/28 19:16:16 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -493,7 +509,8 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
       }
       fpVMan -> SetCurrentViewParameters ().SetRepStyle (repStyle);
       if (fpVMan -> GetVerboseLevel () > 0) {
-	G4cout << "Representation style changed to " << repStyle << G4endl;
+	G4cout << "Representation style changed to "
+	       << G4int(repStyle) << G4endl;
 	if (fpVMan -> GetVerboseLevel () > 1) {
 	  fpVMan -> PrintCurrentView ();
 	}
@@ -668,8 +685,6 @@ void G4VisManMessenger::DoCommandSet (const G4String& commandPath,
 	G4cout << "Available views:";
 	for (int iView = 0; iView < nViewTotal; iView++) {
 	  const G4VViewer* pView = vList [iView];
-	  const G4VSceneHandler* pScene = pView -> GetSceneHandler ();
-	  const G4VGraphicsSystem* pSystem = pScene -> GetGraphicsSystem ();
 	  G4cout << "\n  " << iView << ") " << pView -> GetName ();
 	}
 	G4cout << "\nChoose by specifying integer parameter.";
diff --git a/source/visualization/management/src/G4VisManMessenger.cc b/source/visualization/management/src/G4VisManMessenger.cc
index ea7b204c8b..fa3de21045 100644
--- a/source/visualization/management/src/G4VisManMessenger.cc
+++ b/source/visualization/management/src/G4VisManMessenger.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManMessenger.cc,v 1.4 2001/02/23 15:43:31 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManMessenger.cc,v 1.5.2.1 2001/06/28 19:16:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager Messenger - John Allison 22nd July 1996.
@@ -23,7 +39,6 @@ G4VisManMessenger::G4VisManMessenger (G4VisManager* pVMan):
 fpVMan (pVMan)
 {
   G4UIcommand* command;
-  G4UIparameter* param;
 
   /////////////////////////////////////////////////  /vis~/...  ////
   command = new G4UIcommand ("/vis~/", this);
diff --git a/source/visualization/management/src/G4VisManager.cc b/source/visualization/management/src/G4VisManager.cc
index 864a747f20..1b794f170f 100644
--- a/source/visualization/management/src/G4VisManager.cc
+++ b/source/visualization/management/src/G4VisManager.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManager.cc,v 1.21 2001/02/23 15:43:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManager.cc,v 1.26.2.1 2001/06/28 19:16:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // GEANT4 Visualization Manager - John Allison 02/Jan/1996.
@@ -50,7 +66,9 @@ G4VisManager::G4VisManager ():
   fpScene          (0),
   fpSceneHandler   (0),
   fpViewer         (0),
-  fVerbose         (0)  // All other objects use default constructors.
+  fVerbose         (0),
+  fpMessenger      (0),
+  fpStateDependent (0)   // All other objects use default constructors.
 {
   if (fpInstance) {
     G4Exception
@@ -72,7 +90,7 @@ G4VisManager::G4VisManager ():
 
 G4VisManager::~G4VisManager () {
   fpInstance = 0;
-  int i;
+  size_t i;
   for (i = 0; i < fSceneList.size (); ++i) {
     delete fSceneList[i];
   }
@@ -88,6 +106,9 @@ G4VisManager::~G4VisManager () {
     delete fMessengerList[i];
   }
   delete fpMessenger;
+  for (i = 0; i < fDirectoryList.size (); ++i) {
+    delete fDirectoryList[i];
+  }
 }
 
 G4VisManager* G4VisManager::GetInstance () {
@@ -139,6 +160,12 @@ void G4VisManager::Initialise () {
 #endif
 #ifdef G4VIS_BUILD_RAYTRACER_DRIVER
       "\n    G4VIS_USE_RAYTRACER"
+#endif
+#ifdef G4VIS_BUILD_ASCIITREE_DRIVER
+      "\n    G4VIS_USE_ASCIITREE"
+#endif
+#ifdef G4VIS_BUILD_GAGTREE_DRIVER
+      "\n    G4VIS_USE_GAGTREE"
 #endif
       "\n  Thus, in your main() you have something like:"
       "\n    G4VisManager* visManager = new MyVisManager;"
@@ -312,6 +339,7 @@ void G4VisManager::ClearView () {
 void G4VisManager::Draw () {
   if (IsValidView ()) {
     fpViewer -> SetViewParameters (fVP);
+    fpViewer -> SetView ();
     fpViewer -> DrawView ();
   }
 }
@@ -465,7 +493,6 @@ void G4VisManager::CreateSceneHandler (G4String name) {
   if (fpGraphicsSystem) {
     G4VSceneHandler* pSceneHandler =
       fpGraphicsSystem -> CreateSceneHandler (name);
-    G4VViewer* pViewer;
     if (pSceneHandler) {
       fAvailableSceneHandlers.push_back (pSceneHandler);
       fpSceneHandler = pSceneHandler;                         // Make current.
@@ -616,7 +643,7 @@ void G4VisManager::GeometryHasChanged () {
     G4TransportationManager::GetTransportationManager ()
     -> GetNavigatorForTracking () -> GetWorldVolume ();
   if (!pWorld) {
-    G4cout << "  The world has ended!!!  (Is this serious?)" << G4endl;
+    G4cout << "  There is no world volume!" << G4endl;
   }
 
   // Check scenes.
@@ -874,6 +901,12 @@ void G4VisManager::PrintInstalledGraphicsSystems () const {
 #endif
 #ifdef G4VIS_BUILD_RAYTRACER_DRIVER
        << "\n  RayTracer (produces JPEG file)"
+#endif
+#ifdef G4VIS_BUILD_ASCIITREE_DRIVER
+       << "\n  ASCII Tree (produces ASCII file of geometry hierarchy)"
+#endif
+#ifdef G4VIS_BUILD_GAGTREE_DRIVER
+       << "\n  GAG Tree (produces ascii file of geometry hierarchy for GAG)"
 #endif
        << G4endl;
 }
@@ -926,7 +959,7 @@ void G4VisManager::EndOfEvent () {
     const G4std::vector<G4VModel*>& EOEModelList =
       fpScene -> GetEndOfEventModelList ();
     fpSceneHandler->ClearTransientStore(); //GB
-    for (int i = 0; i < EOEModelList.size (); i++) {
+    for (size_t i = 0; i < EOEModelList.size (); i++) {
       G4VModel* pModel = EOEModelList [i];
       pModel -> SetModelingParameters (pMP);
       pModel -> DescribeYourselfTo (*fpSceneHandler);
@@ -944,8 +977,8 @@ G4String G4VisManager::ViewerShortName (const G4String& viewerName) const {
 
 G4VViewer* G4VisManager::GetViewer (const G4String& viewerName) const {
   G4String viewerShortName = ViewerShortName (viewerName);
-  G4int nHandlers = fAvailableSceneHandlers.size ();
-  G4int iHandler, iViewer;
+  size_t nHandlers = fAvailableSceneHandlers.size ();
+  size_t iHandler, iViewer;
   G4VSceneHandler* sceneHandler;
   G4VViewer* viewer;
   G4bool found = false;
@@ -1101,6 +1134,32 @@ G4RayTracer::G4RayTracer ():
 
 #endif
 
+#ifndef G4VIS_BUILD_ASCIITREE_DRIVER
+
+class G4ASCIITree: public G4VGraphicsSystem {
+public:
+  G4ASCIITree ();
+};
+G4ASCIITree::G4ASCIITree ():
+  G4VGraphicsSystem ("ASCIITree",
+                     "ATree",
+		     G4VGraphicsSystem::noFunctionality) {}
+
+#endif
+
+#ifndef G4VIS_BUILD_GAGTREE_DRIVER
+
+class G4GAGTree: public G4VGraphicsSystem {
+public:
+  G4GAGTree ();
+};
+G4GAGTree::G4GAGTree ():
+  G4VGraphicsSystem ("GAGTree",
+                     "GAGTree",
+		     G4VGraphicsSystem::noFunctionality) {}
+
+#endif
+
 #ifndef G4VIS_BUILD_OPACS_DRIVER
 
 class G4Wo: public G4VGraphicsSystem {
diff --git a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
index c3329f2c97..fba4a24bb8 100644
--- a/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
+++ b/source/visualization/management/src/G4VisManagerRegisterMessengers.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisManagerRegisterMessengers.cc,v 1.27 2001/02/23 15:43:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisManagerRegisterMessengers.cc,v 1.30.2.1 2001/06/28 19:16:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // G4VisManager::RegisterMessengers - John Allison 30/July/1998.
@@ -115,8 +131,11 @@ NI                      [<copy-no>] [<depth>]
   Adds logical volume to current scene.
 
 /vis/scene/add/volume [<physical-volume-name>] [<copy-no>] [<depth>]
-  default:                     world                0         -1
+  default:                     world                -1         -1
   Adds physical volume to current scene.
+  If copy-no is negative, first occurrence of physical-volume-name is
+    selected.
+  If depth is negative, search is made to all depths.
 
 /vis/scene/add/hits [<sensitive-volume-name>]
   default:              (argument not impl'd yet.)
@@ -144,10 +163,10 @@ NI /vis/scene/set/modelingStyle [<modeling-style>]
   Refreshes all viewers of current scene.
   Does not issue "update" (see /vis/viewer/update).
 
-NI /vis/scene/add/axes
+/vis/scene/add/axes
   Adds to current scene.
 
-NI /vis/scene/add/text
+/vis/scene/add/text
   Adds to current scene.
 
 
@@ -407,6 +426,12 @@ default:          error                600
   /vis/viewer/create ! ! $2
 
 NI /vis/draw <physical-volume-name> clashes with old /vis~/draw/, so...
+
+/vis/drawTree [<physical-volume-name>] [<system>]
+default:           world                ATree
+  /vis/open $2
+  /vis/drawVolume $1
+
 /vis/drawVolume [<physical-volume-name>]
 default:             world
   /vis/scene/create
@@ -438,43 +463,52 @@ default: 0 0 0 0 cm 1 0 cm
 
   G4VVisCommand::SetVisManager (this);
 
-  G4UIcommand* command;
-  command = new G4UIdirectory ("/vis/");
-  command -> SetGuidance ("Visualization commands.");
+  G4UIcommand* directory;
+
+  directory = new G4UIdirectory ("/vis/");
+  directory -> SetGuidance ("Visualization commands.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandEnable);
   fMessengerList.push_back (new G4VisCommandVerbose);
 
-  command = new G4UIdirectory ("/vis/scene/");
-  command -> SetGuidance ("Operations on Geant4 scenes.");
+  directory = new G4UIdirectory ("/vis/scene/");
+  directory -> SetGuidance ("Operations on Geant4 scenes.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandSceneCreate);
   fMessengerList.push_back (new G4VisCommandSceneList);
   fMessengerList.push_back (new G4VisCommandSceneNotifyHandlers);
   fMessengerList.push_back (new G4VisCommandSceneSelect);
   fMessengerList.push_back (new G4VisCommandSceneRemove);
 
-  command = new G4UIdirectory ("/vis/scene/add/");
-  command -> SetGuidance ("Add model to current scene.");
+  directory = new G4UIdirectory ("/vis/scene/add/");
+  directory -> SetGuidance ("Add model to current scene.");
+  fDirectoryList.push_back (directory);
+  fMessengerList.push_back (new G4VisCommandSceneAddAxes);
   fMessengerList.push_back (new G4VisCommandSceneAddGhosts);
   fMessengerList.push_back (new G4VisCommandSceneAddHits);
   fMessengerList.push_back (new G4VisCommandSceneAddLogicalVolume);
+  fMessengerList.push_back (new G4VisCommandSceneAddText);
   fMessengerList.push_back (new G4VisCommandSceneAddTrajectories);
   fMessengerList.push_back (new G4VisCommandSceneAddVolume);
 
-  command = new G4UIdirectory ("/vis/scene/include/");
-  command -> SetGuidance ("Deprecated commands; now in /vis/scene/add/.");
+  directory = new G4UIdirectory ("/vis/scene/include/");
+  directory -> SetGuidance ("Deprecated commands; now in /vis/scene/add/.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandSceneIncludeHits);
   fMessengerList.push_back (new G4VisCommandSceneIncludeTrajectories);
 
-  command = new G4UIdirectory ("/vis/sceneHandler/");
-  command -> SetGuidance ("Operations on Geant4 scene handlers.");
+  directory = new G4UIdirectory ("/vis/sceneHandler/");
+  directory -> SetGuidance ("Operations on Geant4 scene handlers.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandSceneHandlerAttach);
   fMessengerList.push_back (new G4VisCommandSceneHandlerCreate);
   fMessengerList.push_back (new G4VisCommandSceneHandlerList);
   fMessengerList.push_back (new G4VisCommandSceneHandlerSelect);
   fMessengerList.push_back (new G4VisCommandSceneHandlerRemove);
 
-  command = new G4UIdirectory ("/vis/viewer/");
-  command -> SetGuidance ("Operations on Geant4 viewers.");
+  directory = new G4UIdirectory ("/vis/viewer/");
+  directory -> SetGuidance ("Operations on Geant4 viewers.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandViewerClear);
   fMessengerList.push_back (new G4VisCommandViewerCreate);
   fMessengerList.push_back (new G4VisCommandViewerDolly);
@@ -489,11 +523,13 @@ default: 0 0 0 0 cm 1 0 cm
   fMessengerList.push_back (new G4VisCommandViewerViewpoint);
   fMessengerList.push_back (new G4VisCommandViewerZoom);
 
-  command = new G4UIdirectory ("/vis/viewer/set/");
-  command -> SetGuidance ("Set view parameters of current viewer.");
+  directory = new G4UIdirectory ("/vis/viewer/set/");
+  directory -> SetGuidance ("Set view parameters of current viewer.");
+  fDirectoryList.push_back (directory);
   fMessengerList.push_back (new G4VisCommandsViewerSet);
 
   // Compound commands...
+  fMessengerList.push_back (new G4VisCommandDrawTree);
   fMessengerList.push_back (new G4VisCommandDrawVolume);
   fMessengerList.push_back (new G4VisCommandDrawView);
   fMessengerList.push_back (new G4VisCommandOpen);
diff --git a/source/visualization/management/src/G4VisStateDependent.cc b/source/visualization/management/src/G4VisStateDependent.cc
index a5848a2484..acfb569895 100644
--- a/source/visualization/management/src/G4VisStateDependent.cc
+++ b/source/visualization/management/src/G4VisStateDependent.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisStateDependent.cc,v 1.2 1999/12/15 14:54:27 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisStateDependent.cc,v 1.2.4.1 2001/06/28 19:16:17 gunter Exp $
+// GEANT4 tag $Name:  $
 
 #include "G4VisStateDependent.hh"
 
diff --git a/source/visualization/management/src/G4VisToOldVisCommands.cc b/source/visualization/management/src/G4VisToOldVisCommands.cc
index d1dbcd209e..1d0e4943e4 100644
--- a/source/visualization/management/src/G4VisToOldVisCommands.cc
+++ b/source/visualization/management/src/G4VisToOldVisCommands.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VisToOldVisCommands.cc,v 1.5 2001/02/05 02:34:45 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VisToOldVisCommands.cc,v 1.5.2.1 2001/06/28 19:16:17 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // Implements some /vis/ commands as /vis~/ temporarily.
diff --git a/source/visualization/modeling/include/G4AxesModel.hh b/source/visualization/modeling/include/G4AxesModel.hh
new file mode 100644
index 0000000000..8d67cdbf62
--- /dev/null
+++ b/source/visualization/modeling/include/G4AxesModel.hh
@@ -0,0 +1,75 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AxesModel.hh,v 1.1.2.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  3rd April 2001
+//
+// Class Description:
+//
+// Model which knows how to draw axes.
+//
+// For access to base class information, e.g., modeling parameters,
+// use GetModelingParameters() inherited from G4VModel.  See Class
+// Description of the base class G4VModel.
+
+#ifndef G4AXESMODEL_HH
+#define G4AXESMODEL_HH
+
+#include "G4VModel.hh"
+
+class G4AxesModel: public G4VModel {
+
+public: // With description
+
+  G4AxesModel (G4double, G4double, G4double, G4double);
+   
+  virtual ~G4AxesModel ();
+
+  virtual void DescribeYourselfTo (G4VGraphicsScene&);
+  // The main task of a model is to describe itself to the scene.
+
+  virtual G4String GetCurrentDescription () const;
+  // A description which depends on the current state of the model.
+
+  virtual G4String GetCurrentTag () const;
+  // A tag which depends on the current state of the model.
+
+  virtual G4bool Validate ();
+  // Validate, but allow internal changes (hence non-const function).
+
+private:
+
+  // Private copy contructor and assignmen to forbid uset...
+  G4AxesModel (const G4AxesModel&);
+  G4AxesModel& operator = (const G4AxesModel&);
+
+  G4double fX0, fY0, fZ0, fLength;
+
+};
+
+#include "G4AxesModel.icc"
+
+#endif
diff --git a/source/visualization/modeling/include/G4AxesModel.icc b/source/visualization/modeling/include/G4AxesModel.icc
new file mode 100644
index 0000000000..1bf25052c5
--- /dev/null
+++ b/source/visualization/modeling/include/G4AxesModel.icc
@@ -0,0 +1,37 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AxesModel.icc,v 1.1.2.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
+
+inline G4String G4AxesModel::GetCurrentTag () const {
+  return fGlobalTag;
+}
+
+inline G4String G4AxesModel::GetCurrentDescription () const {
+  return fGlobalDescription;
+}
+
+inline G4bool G4AxesModel::Validate () {
+  return true;
+}
diff --git a/source/visualization/modeling/include/G4BoundingSphereScene.hh b/source/visualization/modeling/include/G4BoundingSphereScene.hh
index 1fbcc35e73..be268425c6 100644
--- a/source/visualization/modeling/include/G4BoundingSphereScene.hh
+++ b/source/visualization/modeling/include/G4BoundingSphereScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundingSphereScene.hh,v 1.7 2000/05/15 11:08:49 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundingSphereScene.hh,v 1.8.2.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  7th June 1997
@@ -32,7 +48,7 @@ class G4BoundingSphereScene: public G4VGraphicsScene {
 
 public:
   G4BoundingSphereScene ();
-  ~G4BoundingSphereScene ();
+  virtual ~G4BoundingSphereScene ();
   void AddThis (const G4Box& s) {Accrue (s);}
   void AddThis (const G4Cons& s) {Accrue (s);}
   void AddThis (const G4Tubs& s) {Accrue (s);}
diff --git a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
index 9051e0023a..f463561821 100644
--- a/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
+++ b/source/visualization/modeling/include/G4FlavoredParallelWorldModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FlavoredParallelWorldModel.hh,v 1.5 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FlavoredParallelWorldModel.hh,v 1.5.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.
 //
diff --git a/source/visualization/modeling/include/G4HitsModel.hh b/source/visualization/modeling/include/G4HitsModel.hh
index 4318f2fecc..787e36476a 100644
--- a/source/visualization/modeling/include/G4HitsModel.hh
+++ b/source/visualization/modeling/include/G4HitsModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HitsModel.hh,v 1.4 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HitsModel.hh,v 1.4.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4HitsModel.icc b/source/visualization/modeling/include/G4HitsModel.icc
index 841422bed0..93caae3ab4 100644
--- a/source/visualization/modeling/include/G4HitsModel.icc
+++ b/source/visualization/modeling/include/G4HitsModel.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HitsModel.icc,v 1.4 1999/12/15 14:54:29 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HitsModel.icc,v 1.4.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 
 inline G4String G4HitsModel::GetCurrentTag () const {
   return fGlobalTag;
diff --git a/source/visualization/modeling/include/G4LogicalVolumeModel.hh b/source/visualization/modeling/include/G4LogicalVolumeModel.hh
index a018abaa48..f51e0ece75 100644
--- a/source/visualization/modeling/include/G4LogicalVolumeModel.hh
+++ b/source/visualization/modeling/include/G4LogicalVolumeModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolumeModel.hh,v 1.4 2000/04/12 13:02:36 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolumeModel.hh,v 1.4.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th July 1999.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.hh b/source/visualization/modeling/include/G4ModelingParameters.hh
index 5b1b747f9c..03ba6add94 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.hh
+++ b/source/visualization/modeling/include/G4ModelingParameters.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ModelingParameters.hh,v 1.5 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ModelingParameters.hh,v 1.5.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4ModelingParameters.icc b/source/visualization/modeling/include/G4ModelingParameters.icc
index 833ff1dfe2..7b94e982eb 100644
--- a/source/visualization/modeling/include/G4ModelingParameters.icc
+++ b/source/visualization/modeling/include/G4ModelingParameters.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ModelingParameters.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ModelingParameters.icc,v 1.3.4.1 2001/06/28 19:16:18 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4NullModel.hh b/source/visualization/modeling/include/G4NullModel.hh
index 992499c7fe..642a3f66c6 100644
--- a/source/visualization/modeling/include/G4NullModel.hh
+++ b/source/visualization/modeling/include/G4NullModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NullModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NullModel.hh,v 1.4.4.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
index b7cab10a38..ecf7859dae 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
+++ b/source/visualization/modeling/include/G4PhysicalVolumeModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeModel.hh,v 1.11 2001/02/03 18:39:58 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeModel.hh,v 1.12.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
@@ -78,6 +94,8 @@ public: // With description
   // For use (optional) by the scene handler if it needs to know about
   // the current information maintained through these pointers.
 
+  void CurtailDescent() {fCurtailDescent = true;}
+
 protected:
 
   void VisitGeometryAndGetVisReps (G4VPhysicalVolume*,
@@ -114,6 +132,7 @@ protected:
   G4int              fCurrentDepth;  // Current depth of geom. hierarchy.
   G4VPhysicalVolume* fpCurrentPV;    // Current physical volume.
   G4LogicalVolume*   fpCurrentLV;    // Current logical volume.
+  G4bool             fCurtailDescent;// Can be set to curtail descent.
 
   ////////////////////////////////////////////////////////////
   // Pointers to working space in scene, if required.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
index 16e99f4d9a..d66c972037 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeSearchScene.hh,v 1.7 2000/05/22 07:36:57 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeSearchScene.hh,v 1.7.4.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
index 87772c1e90..15baf0463b 100644
--- a/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
+++ b/source/visualization/modeling/include/G4PhysicalVolumeSearchScene.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeSearchScene.icc,v 1.3 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeSearchScene.icc,v 1.3.4.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  10th August 1998.
diff --git a/source/visualization/modeling/include/G4TextModel.hh b/source/visualization/modeling/include/G4TextModel.hh
new file mode 100644
index 0000000000..a8c4b841f8
--- /dev/null
+++ b/source/visualization/modeling/include/G4TextModel.hh
@@ -0,0 +1,76 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TextModel.hh,v 1.1.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  3rd April 2001
+//
+// Class Description:
+//
+// Model which knows how to draw text.
+//
+// For access to base class information, e.g., modeling parameters,
+// use GetModelingParameters() inherited from G4VModel.  See Class
+// Description of the base class G4VModel.
+
+#ifndef G4TEXTMODEL_HH
+#define G4TEXTMODEL_HH
+
+#include "G4VModel.hh"
+#include "G4Text.hh"
+
+class G4TextModel: public G4VModel {
+
+public: // With description
+
+  G4TextModel (const G4Text&);
+   
+  virtual ~G4TextModel ();
+
+  virtual void DescribeYourselfTo (G4VGraphicsScene&);
+  // The main task of a model is to describe itself to the scene.
+
+  virtual G4String GetCurrentDescription () const;
+  // A description which depends on the current state of the model.
+
+  virtual G4String GetCurrentTag () const;
+  // A tag which depends on the current state of the model.
+
+  virtual G4bool Validate ();
+  // Validate, but allow internal changes (hence non-const function).
+
+private:
+
+  // Private copy contructor and assignmen to forbid uset...
+  G4TextModel (const G4TextModel&);
+  G4TextModel& operator = (const G4TextModel&);
+
+  G4Text fText;
+
+};
+
+#include "G4TextModel.icc"
+
+#endif
diff --git a/source/visualization/modeling/include/G4TextModel.icc b/source/visualization/modeling/include/G4TextModel.icc
new file mode 100644
index 0000000000..873a609929
--- /dev/null
+++ b/source/visualization/modeling/include/G4TextModel.icc
@@ -0,0 +1,37 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TextModel.icc,v 1.1.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
+
+inline G4String G4TextModel::GetCurrentTag () const {
+  return fGlobalTag;
+}
+
+inline G4String G4TextModel::GetCurrentDescription () const {
+  return fGlobalDescription;
+}
+
+inline G4bool G4TextModel::Validate () {
+  return true;
+}
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.hh b/source/visualization/modeling/include/G4TrajectoriesModel.hh
index cdfef43e8c..852a346539 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.hh
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoriesModel.hh,v 1.4 1999/12/15 14:54:30 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoriesModel.hh,v 1.4.4.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/include/G4TrajectoriesModel.icc b/source/visualization/modeling/include/G4TrajectoriesModel.icc
index ec6ae2ace7..e53ba903f3 100644
--- a/source/visualization/modeling/include/G4TrajectoriesModel.icc
+++ b/source/visualization/modeling/include/G4TrajectoriesModel.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoriesModel.icc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoriesModel.icc,v 1.4.4.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 
 inline G4String G4TrajectoriesModel::GetCurrentTag () const {
   return fGlobalTag;
diff --git a/source/visualization/modeling/include/G4VModel.hh b/source/visualization/modeling/include/G4VModel.hh
index 69f2895465..ec625edacb 100644
--- a/source/visualization/modeling/include/G4VModel.hh
+++ b/source/visualization/modeling/include/G4VModel.hh
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VModel.hh,v 1.7 2001/02/23 15:43:33 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VModel.hh,v 1.8.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
@@ -75,9 +91,9 @@ protected:
 
   G4String                    fGlobalTag;
   G4String                    fGlobalDescription;
-  const G4ModelingParameters* fpMP;
   G4VisExtent                 fExtent;
   G4Transform3D               fTransform;           
+  const G4ModelingParameters* fpMP;
 
 private:
 
diff --git a/source/visualization/modeling/include/G4VModel.icc b/source/visualization/modeling/include/G4VModel.icc
index 924c917d9e..7878c67640 100644
--- a/source/visualization/modeling/include/G4VModel.icc
+++ b/source/visualization/modeling/include/G4VModel.icc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VModel.icc,v 1.6 2001/02/23 15:43:34 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VModel.icc,v 1.6.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/include/G4VTreeGraphicsScene.hh b/source/visualization/modeling/include/G4VTreeGraphicsScene.hh
deleted file mode 100644
index f5dc603695..0000000000
--- a/source/visualization/modeling/include/G4VTreeGraphicsScene.hh
+++ /dev/null
@@ -1,80 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VTreeGraphicsScene.hh,v 1.1 2000/05/22 07:39:25 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-// 
-// John Allison  18th May 2000
-// An artificial graphics scene to find dump geometry hierarchy.
-
-#ifndef G4VTREEGRAPHICSSCENE_HH
-#define G4VTREEGRAPHICSSCENE_HH
-
-#include "G4VGraphicsScene.hh"
-#include "G4VisExtent.hh"
-#include "G4Box.hh"
-#include "G4Cons.hh"
-#include "G4Tubs.hh"
-#include "G4Trd.hh"
-#include "G4Trap.hh"
-#include "G4Sphere.hh"
-#include "G4Para.hh"
-#include "G4Torus.hh"
-#include "G4Polycone.hh"
-#include "G4Polyhedra.hh"
-#include "G4VPhysicalVolume.hh"
-#include "G4LogicalVolume.hh"
-
-class G4VTreeGraphicsScene: public G4VGraphicsScene {
-
-public:
-  G4VTreeGraphicsScene();
-  virtual ~G4VTreeGraphicsScene ();
-  void AddThis (const G4Box& s) {Dump (s);}
-  void AddThis (const G4Cons & s) {Dump (s);}
-  void AddThis (const G4Tubs& s) {Dump (s);}
-  void AddThis (const G4Trd& s) {Dump (s);}
-  void AddThis (const G4Trap& s) {Dump (s);}
-  void AddThis (const G4Sphere& s) {Dump (s);}
-  void AddThis (const G4Para& s) {Dump (s);}
-  void AddThis (const G4Torus& s) {Dump (s);}
-  void AddThis (const G4Polycone& s) {Dump (s);}
-  void AddThis (const G4Polyhedra& s) {Dump (s);}
-  void AddThis (const G4VSolid& s) {Dump (s);}
-  void PreAddThis (const G4Transform3D& objectTransformation,
-		   const G4VisAttributes&);
-  void PostAddThis ();
-  void EstablishSpecials (G4PhysicalVolumeModel&);
-  G4int                GetFoundDepth          () const;
-  G4VPhysicalVolume*   GetFoundVolume         () const;
-  const G4Transform3D& GetFoundTransformation () const;
-
-  ////////////////////////////////////////////////////////////////
-  // Functions not used but required by the abstract interface.
-
-  virtual void BeginPrimitives (const G4Transform3D& objectTransformation) {}
-  virtual void EndPrimitives () {}
-  virtual void AddPrimitive (const G4Polyline&)   {}
-  virtual void AddPrimitive (const G4Text&)       {}
-  virtual void AddPrimitive (const G4Circle&)     {}
-  virtual void AddPrimitive (const G4Square&)     {}
-  virtual void AddPrimitive (const G4Polymarker&) {}
-  virtual void AddPrimitive (const G4Polyhedron&) {}
-  virtual void AddPrimitive (const G4NURBS&)      {}
-
-protected:
-  void Dump (const G4VSolid&);
-  G4int                fCurrentDepth;  // Current depth of geom. hierarchy.
-  G4VPhysicalVolume*   fpCurrentPV;    // Current physical volume.
-  G4LogicalVolume*     fpCurrentLV;    // Current logical volume.
-  const G4Transform3D* fpCurrentObjectTransformation;
-};
-
-#include "G4VTreeGraphicsScene.icc"
-
-#endif
diff --git a/source/visualization/modeling/include/G4VTreeGraphicsScene.icc b/source/visualization/modeling/include/G4VTreeGraphicsScene.icc
deleted file mode 100644
index 0e866e8791..0000000000
--- a/source/visualization/modeling/include/G4VTreeGraphicsScene.icc
+++ /dev/null
@@ -1,21 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VTreeGraphicsScene.icc,v 1.1 2000/05/22 07:39:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-// 
-// John Allison  18th May 2000
-// An artificial graphics scene to find dump geometry hierarchy.
-
-inline void G4VTreeGraphicsScene::PreAddThis
-(const G4Transform3D& objectTransformation,
- const G4VisAttributes&) {
-  fpCurrentObjectTransformation = &objectTransformation;
-}
-
-inline void G4VTreeGraphicsScene::PostAddThis () {}
diff --git a/source/visualization/modeling/src/G4AxesModel.cc b/source/visualization/modeling/src/G4AxesModel.cc
new file mode 100644
index 0000000000..7915dc82c6
--- /dev/null
+++ b/source/visualization/modeling/src/G4AxesModel.cc
@@ -0,0 +1,77 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4AxesModel.cc,v 1.2.2.1 2001/06/28 19:16:19 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  3rd April 2001
+// Model which knows how to draw axes.
+
+#include "G4AxesModel.hh"
+
+#include "G4ModelingParameters.hh"
+#include "G4VGraphicsScene.hh"
+#include "G4VisAttributes.hh"
+#include "G4Polyline.hh"
+#include "G4Colour.hh"
+
+G4AxesModel::~G4AxesModel () {}
+
+G4AxesModel::G4AxesModel
+(G4double x0, G4double y0, G4double z0, G4double length):
+  fX0(x0), fY0(y0), fZ0(z0), fLength(length) {
+  fGlobalTag = "G4AxesModel";
+  fGlobalDescription = fGlobalTag;
+}
+
+void G4AxesModel::DescribeYourselfTo (G4VGraphicsScene& scene) {
+
+  G4Polyline x_axis, y_axis, z_axis;
+
+  G4Colour cx(1.0, 0.0, 0.0); // color for x-axis
+  G4Colour cy(0.0, 1.0, 0.0); // color for y-axis
+  G4Colour cz(0.0, 0.0, 1.0); // color for z-axis
+
+  G4VisAttributes ax(cx);     // VA for x-axis
+  G4VisAttributes ay(cy);     // VA for y-axis
+  G4VisAttributes az(cz);     // VA for z-axis
+
+  //----- Draw x-axis
+  x_axis.SetVisAttributes(&ax);
+  x_axis.push_back(G4Point3D(fX0,fY0,fZ0));
+  x_axis.push_back(G4Point3D((fX0 + fLength),fY0,fZ0));
+  scene.AddPrimitive(x_axis);
+
+  //----- Draw y-axis
+  y_axis.SetVisAttributes(&ay);
+  y_axis.push_back(G4Point3D(fX0,fY0,fZ0));
+  y_axis.push_back(G4Point3D(fX0,(fY0 + fLength),fZ0));
+  scene.AddPrimitive(y_axis);
+
+  //----- Draw z-axis
+  z_axis.SetVisAttributes(&az);
+  z_axis.push_back(G4Point3D(fX0,fY0,fZ0));
+  z_axis.push_back(G4Point3D(fX0,fY0,(fZ0 + fLength)));
+  scene.AddPrimitive(z_axis);
+}
diff --git a/source/visualization/modeling/src/G4BoundingSphereScene.cc b/source/visualization/modeling/src/G4BoundingSphereScene.cc
index 4efa4c8647..84d51bb483 100644
--- a/source/visualization/modeling/src/G4BoundingSphereScene.cc
+++ b/source/visualization/modeling/src/G4BoundingSphereScene.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4BoundingSphereScene.cc,v 1.4 2000/05/15 11:09:32 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4BoundingSphereScene.cc,v 1.4.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  7th June 1997
diff --git a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
index b32090031d..84175904fc 100644
--- a/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
+++ b/source/visualization/modeling/src/G4FlavoredParallelWorldModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4FlavoredParallelWorldModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4FlavoredParallelWorldModel.cc,v 1.4.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // P. Mora de Freitas et M.Verderi - 19 June 1998.
 // Model for flavored parallel world volumes.
diff --git a/source/visualization/modeling/src/G4HitsModel.cc b/source/visualization/modeling/src/G4HitsModel.cc
index a8c7112f5f..625871b3e6 100644
--- a/source/visualization/modeling/src/G4HitsModel.cc
+++ b/source/visualization/modeling/src/G4HitsModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4HitsModel.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4HitsModel.cc,v 1.4.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4LogicalVolumeModel.cc b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
index e46e662ef1..347cf70846 100644
--- a/source/visualization/modeling/src/G4LogicalVolumeModel.cc
+++ b/source/visualization/modeling/src/G4LogicalVolumeModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4LogicalVolumeModel.cc,v 1.5 2000/04/12 13:02:40 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4LogicalVolumeModel.cc,v 1.7.2.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th July 1999.
@@ -71,7 +87,7 @@ void G4LogicalVolumeModel::DescribeYourselfTo
     G4DrawVoxels dv;
     G4PlacedPolyhedronList* pPPL =
       dv.CreatePlacedPolyhedra (fpTopPV -> GetLogicalVolume ());
-    for (int i = 0; i < pPPL -> entries (); i++) {
+    for (size_t i = 0; i < pPPL -> size (); i++) {
       const G4Transform3D& transform = (*pPPL)[i].GetTransform ();
       const G4Polyhedron& polyhedron = (*pPPL)[i].GetPolyhedron ();
       sceneHandler.BeginPrimitives (transform);
diff --git a/source/visualization/modeling/src/G4ModelingParameters.cc b/source/visualization/modeling/src/G4ModelingParameters.cc
index 76b7f7c95b..576fbcbed8 100644
--- a/source/visualization/modeling/src/G4ModelingParameters.cc
+++ b/source/visualization/modeling/src/G4ModelingParameters.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4ModelingParameters.cc,v 1.4 1999/12/15 14:54:31 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4ModelingParameters.cc,v 1.4.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/src/G4NullModel.cc b/source/visualization/modeling/src/G4NullModel.cc
index 388d4ee138..7294c31f83 100644
--- a/source/visualization/modeling/src/G4NullModel.cc
+++ b/source/visualization/modeling/src/G4NullModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4NullModel.cc,v 1.3 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4NullModel.cc,v 1.3.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  4th April 1998.
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
index f0c5fb3877..44d97d98ed 100644
--- a/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
+++ b/source/visualization/modeling/src/G4PhysicalVolumeModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeModel.cc,v 1.14 2001/03/15 12:20:53 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeModel.cc,v 1.15.2.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
@@ -42,6 +58,7 @@ G4PhysicalVolumeModel::G4PhysicalVolumeModel
   fCurrentDepth   (0),
   fpCurrentPV     (0),
   fpCurrentLV     (0),
+  fCurtailDescent (false),
   fpCurrentDepth  (0),
   fppCurrentPV    (0),
   fppCurrentLV    (0)
@@ -317,6 +334,12 @@ void G4PhysicalVolumeModel::DescribeAndDescend
     DescribeSolid (theNewAT, pSol, pVisAttribs, sceneHandler);
   }
 
+  if (fCurtailDescent) {
+    fCurtailDescent = false;
+    // Reset for normal descending of next volume at this level.
+    return;
+  }
+
   // First check if mother covers...
 
   // This is only effective in surface drawing style, and then only if
diff --git a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
index 72451268aa..644297b4ed 100644
--- a/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
+++ b/source/visualization/modeling/src/G4PhysicalVolumeSearchScene.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4PhysicalVolumeSearchScene.cc,v 1.4 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4PhysicalVolumeSearchScene.cc,v 1.5.2.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  10th August 1998.
@@ -50,16 +66,9 @@ void G4PhysicalVolumeSearchScene::FindVolume (const G4VSolid& solid) {
 	 << "\", copy no. " << fpCurrentPV -> GetCopyNo () << G4endl;
   *******************************************/
 
-  if (fRequiredPhysicalVolumeName == "list") {
-    for (G4int i = 0; i < fCurrentDepth; i++ ) G4cout << "  ";
-    G4cout << "\"" << fpCurrentPV -> GetName ()
-	   << "\", copy no. " << fpCurrentPV -> GetCopyNo ()
-	   << G4endl;
-    return;
-  }
-
   if (fRequiredPhysicalVolumeName == fpCurrentPV -> GetName () &&
-      fRequiredCopyNo             == fpCurrentPV -> GetCopyNo ()) {
+      (fRequiredCopyNo             < 0 ||  // I.e., ignore negative request.
+       fRequiredCopyNo             == fpCurrentPV -> GetCopyNo ())) {
     // Current policy - take first one found!!
     if (!fpFoundPV) {  // i.e., if not already found.
       fFoundDepth                = fCurrentDepth;
@@ -71,9 +80,13 @@ void G4PhysicalVolumeSearchScene::FindVolume (const G4VSolid& solid) {
       if (!fMultipleOccurrence) {
 	fMultipleOccurrence = true;
 	G4cout << "G4PhysicalVolumeSearchScene::FindVolume:"
-	       << "\n  Required volume: \"" << fRequiredPhysicalVolumeName
-	       << "\", copy no. " << fRequiredCopyNo
-	       << " found more than once."
+	       << "\n  Required volume: \""
+	       << fRequiredPhysicalVolumeName
+	       << "\"";
+	if (fRequiredCopyNo >= 0) {
+	  G4cout << ", copy no. " << fRequiredCopyNo << ",";
+	}
+	G4cout << " found more than once."
 	  "\n  This function is not smart enough to distinguish identical"
 	  "\n  physical volumes which have different parentage.  Besides,"
 	  "\n  it's tricky to specify in general; we plan a GUI to do this."
diff --git a/source/visualization/modeling/src/G4TextModel.cc b/source/visualization/modeling/src/G4TextModel.cc
new file mode 100644
index 0000000000..d267ca76bb
--- /dev/null
+++ b/source/visualization/modeling/src/G4TextModel.cc
@@ -0,0 +1,45 @@
+//
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
+//
+//
+// $Id: G4TextModel.cc,v 1.1.2.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
+//
+// 
+// John Allison  3rd April 2001
+// Model which knows how to draw text.
+
+#include "G4TextModel.hh"
+
+#include "G4ModelingParameters.hh"
+#include "G4VGraphicsScene.hh"
+
+G4TextModel::~G4TextModel () {}
+
+G4TextModel::G4TextModel (const G4Text& text): fText(text) {
+  fGlobalTag = "G4TextModel: " + fText.GetText();
+  fGlobalDescription = fGlobalTag;
+}
+
+void G4TextModel::DescribeYourselfTo (G4VGraphicsScene& scene) {
+  scene.AddPrimitive (fText);
+}
diff --git a/source/visualization/modeling/src/G4TrajectoriesModel.cc b/source/visualization/modeling/src/G4TrajectoriesModel.cc
index 28964754a6..dda126af74 100644
--- a/source/visualization/modeling/src/G4TrajectoriesModel.cc
+++ b/source/visualization/modeling/src/G4TrajectoriesModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4TrajectoriesModel.cc,v 1.6 1999/12/15 14:54:32 gunter Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4TrajectoriesModel.cc,v 1.6.4.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  26th August 1998.
diff --git a/source/visualization/modeling/src/G4VModel.cc b/source/visualization/modeling/src/G4VModel.cc
index 0313c260d3..1cfe24818a 100644
--- a/source/visualization/modeling/src/G4VModel.cc
+++ b/source/visualization/modeling/src/G4VModel.cc
@@ -1,12 +1,28 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
 //
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
+// ********************************************************************
+// * DISCLAIMER                                                       *
+// *                                                                  *
+// * The following disclaimer summarizes all the specific disclaimers *
+// * of contributors to this software. The specific disclaimers,which *
+// * govern, are listed with their locations in:                      *
+// *   http://cern.ch/geant4/license                                  *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.                                                             *
+// *                                                                  *
+// * This  code  implementation is the  intellectual property  of the *
+// * GEANT4 collaboration.                                            *
+// * By copying,  distributing  or modifying the Program (or any work *
+// * based  on  the Program)  you indicate  your  acceptance of  this *
+// * statement, and all its terms.                                    *
+// ********************************************************************
 //
-// $Id: G4VModel.cc,v 1.5 2001/02/03 18:40:04 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
+//
+// $Id: G4VModel.cc,v 1.5.2.1 2001/06/28 19:16:20 gunter Exp $
+// GEANT4 tag $Name:  $
 //
 // 
 // John Allison  31st December 1997.
diff --git a/source/visualization/modeling/src/G4VTreeGraphicsScene.cc b/source/visualization/modeling/src/G4VTreeGraphicsScene.cc
deleted file mode 100644
index d2aa1cc0b6..0000000000
--- a/source/visualization/modeling/src/G4VTreeGraphicsScene.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// This code implementation is the intellectual property of
-// the GEANT4 collaboration.
-//
-// By copying, distributing or modifying the Program (or any work
-// based on the Program) you indicate your acceptance of this statement,
-// and all its terms.
-//
-// $Id: G4VTreeGraphicsScene.cc,v 1.1 2000/05/22 07:39:41 johna Exp $
-// GEANT4 tag $Name: geant4-03-01 $
-//
-// 
-// John Allison  18th May 2000
-// An artificial graphics scene to find dump geometry hierarchy.
-
-#include "G4VTreeGraphicsScene.hh"
-
-#include "G4VSolid.hh"
-#include "G4Vector3D.hh"
-#include "G4PhysicalVolumeModel.hh"
-
-G4VTreeGraphicsScene::G4VTreeGraphicsScene():
-  fCurrentDepth                 (0),
-  fpCurrentPV                   (0),
-  fpCurrentLV                   (0),
-  fpCurrentObjectTransformation (0)
-{}
-
-G4VTreeGraphicsScene::~G4VTreeGraphicsScene () {}
-
-void G4VTreeGraphicsScene::EstablishSpecials
-(G4PhysicalVolumeModel& pvModel) {
-  pvModel.DefinePointersToWorkingSpace (&fCurrentDepth,
-					&fpCurrentPV,
-					&fpCurrentLV);
-}
-
-void G4VTreeGraphicsScene::Dump (const G4VSolid& solid) {
-  for (G4int i = 0; i < fCurrentDepth; i++ ) G4cout << "  ";
-  G4cout << "\"" << fpCurrentPV -> GetName ()
-	 << "\", copy no. " << fpCurrentPV -> GetCopyNo ()
-	 << G4endl;
-  return;
-}